From patchwork Mon Feb 29 14:44:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 63216 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1291686lbc; Mon, 29 Feb 2016 06:47:35 -0800 (PST) X-Received: by 10.66.102.104 with SMTP id fn8mr22498036pab.129.1456757255232; Mon, 29 Feb 2016 06:47:35 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id 184si43501318pfa.13.2016.02.29.06.47.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Feb 2016 06:47:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aaP5v-00047o-Py; Mon, 29 Feb 2016 14:46:43 +0000 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aaP52-0003OM-VT for linux-arm-kernel@lists.infradead.org; Mon, 29 Feb 2016 14:45:49 +0000 Received: by mail-wm0-x22f.google.com with SMTP id l68so40024308wml.0 for ; Mon, 29 Feb 2016 06:45:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9SdDiYYXFV4XGFrADcNXY/8yIJ0pkHxY4RYhGBdJLao=; b=hiK9kgRofS21IyrZS1WAXEK9naBd00PB+OTCIsKh9kF1uhXCR4XzpoO9i+VOdnade7 8uiaHWCchWnYGnGjhLphcPUjKvB5v5E7qD55u9cl0w1GPsxG4mCGhNfTw0ZUOsT+qsrG ya/S9g4ZB1MaQJeEc827+JFPRmQb/q8Sdb9RQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9SdDiYYXFV4XGFrADcNXY/8yIJ0pkHxY4RYhGBdJLao=; b=HD1HcSgNBd3FFZpzbKLobeRu+OkQdPKVy9lKEGwAZLrkJMUNnQKau41/6EvPGCzpgx e7tO2uM7tIxQzCar4y0Fqxl8ecXDxTdJjdlo3tfK7aUaqRL7o546hn/yLTh2fewkK3If oxJjhtI8DgR26y+GL4rubg29eHI+F2xWEldrCodGrS57AwMSB9jjFFmsdhWkPKGw6maK QmHc2ZZqU3bERZyo6FSBCCmecHnGCOCspCkt9SONyVNx2Klqv2iMv9jH1ogqGC23dP8F MaBl74x0ywNzjIGHmQ70ZXJiyNpP8yW/Ll5BdDD5TlsXbhbZ6vTNJGwMdvuBbegbX4fo qT8A== X-Gm-Message-State: AD7BkJLL+ya5GPx/7YqGocxUqZ7iWi8JTY3DagOwRu8ZZ9B1i29edOcF1leQW2zpa15ry6Ad X-Received: by 10.28.150.148 with SMTP id y142mr11253967wmd.55.1456757127293; Mon, 29 Feb 2016 06:45:27 -0800 (PST) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id di1sm26196693wjc.3.2016.02.29.06.45.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 29 Feb 2016 06:45:26 -0800 (PST) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com, will.deacon@arm.com, mark.rutland@arm.com Subject: [PATCH v2 1/9] arm64: vdso: avoid virt_to_page() translations on kernel symbols Date: Mon, 29 Feb 2016 15:44:36 +0100 Message-Id: <1456757084-1078-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456757084-1078-1-git-send-email-ard.biesheuvel@linaro.org> References: <1456757084-1078-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160229_064549_229207_885F6156 X-CRM114-Status: GOOD ( 12.51 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:22f listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jonas@southpole.se, Ard Biesheuvel , linux-mm@kvack.org, nios2-dev@lists.rocketboards.org, linux@lists.openrisc.net, lftan@altera.com, akpm@linux-foundation.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org The translation performed by virt_to_page() is only valid for linear addresses, and kernel symbols are no longer in the linear mapping. So perform the __pa() translation explicitly, which does the right thing in either case, and only then translate to a struct page offset. Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/vdso.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.5.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index 97bc68f4c689..fb3c17f031aa 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -131,11 +131,12 @@ static int __init vdso_init(void) return -ENOMEM; /* Grab the vDSO data page. */ - vdso_pagelist[0] = virt_to_page(vdso_data); + vdso_pagelist[0] = pfn_to_page(__pa(vdso_data) >> PAGE_SHIFT); /* Grab the vDSO code pages. */ - for (i = 0; i < vdso_pages; i++) - vdso_pagelist[i + 1] = virt_to_page(&vdso_start + i * PAGE_SIZE); + vdso_pagelist[1] = pfn_to_page(__pa(&vdso_start) >> PAGE_SHIFT); + for (i = 1; i < vdso_pages; i++) + vdso_pagelist[i + 1] = vdso_pagelist[1] + i; /* Populate the special mapping structures */ vdso_spec[0] = (struct vm_special_mapping) {