From patchwork Wed Mar 30 14:45:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 8697401 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2F3B2C0553 for ; Wed, 30 Mar 2016 14:49:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 52CE920389 for ; Wed, 30 Mar 2016 14:49:07 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6ED7820386 for ; Wed, 30 Mar 2016 14:49:06 +0000 (UTC) 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 1alHPD-0000X8-RM; Wed, 30 Mar 2016 14:47:35 +0000 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1alHOL-00085D-Dk for linux-arm-kernel@lists.infradead.org; Wed, 30 Mar 2016 14:46:44 +0000 Received: by mail-wm0-x234.google.com with SMTP id 191so92690175wmq.0 for ; Wed, 30 Mar 2016 07:46:22 -0700 (PDT) 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=k92ryfc0HqdUDh+kuVQi9a71crmV7zmR63vezkTCrsU=; b=OIS7LiBE7ooBGGEGJUykUDXiwUyEYG/5TXQxeR2xH2MLFR6xVrw5YFH5mb5xTiSC4d 5rgoktsdwRNr8wj6H/pRzpXw8EUDYuLNIhi2MrchhnR0p25OI4z4roPGintQgrgrVxWB 2ZARR5w6MXy9suX1Wf6lkFCIRGX72gxD6JqaI= 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=k92ryfc0HqdUDh+kuVQi9a71crmV7zmR63vezkTCrsU=; b=dvmLpKOKUYc50XdcF4C+NnnlN2FI7gzP3BzHlNhlPypRk9PwdeXljVkYl4bHdQsbfq +sY1qZVnDhll0v91p/1VmTIqt15SFvT5rddMexxHA2PNOZDX7hrxp0PtMpu4SDVT4V0c gcIwrf+F7DpUmv6Alr2Yy3dAUbSXz3K0fzRaHuuHNjBhC34eIZUXqji78Pt6hgGEB0o8 0LWklWN0AIwuBTkDIIBG8D51VahwfeN68QVJn4ClHBNIe2/noBDoHnBelJd9JMhKjDna kIDXchcVJLnwmmLU8zkebD+1wfW6HY4w+vb/az6kU3mU8zHzxiV4VcDM4cACHBiSTBrE ef/w== X-Gm-Message-State: AD7BkJIx/91RYFdDnn11Zz0PXNdOwxhCbuOuMJcA5vm9WKZ3mAyq4sEiPHC5U0ngr2YfC8dL X-Received: by 10.28.7.196 with SMTP id 187mr11059526wmh.12.1459349180832; Wed, 30 Mar 2016 07:46:20 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id i5sm4325336wjx.15.2016.03.30.07.46.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Mar 2016 07:46:20 -0700 (PDT) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com, will.deacon@arm.com, linux-mm@kvack.org, akpm@linux-foundation.org, nios2-dev@lists.rocketboards.org, lftan@altera.com, jonas@southpole.se, linux@lists.openrisc.net Subject: [PATCH v2 3/9] arm64: mm: avoid virt_to_page() translation for the zero page Date: Wed, 30 Mar 2016 16:45:58 +0200 Message-Id: <1459349164-27175-4-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459349164-27175-1-git-send-email-ard.biesheuvel@linaro.org> References: <1459349164-27175-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160330_074641_916473_D46D7036 X-CRM114-Status: GOOD ( 10.28 ) X-Spam-Score: -2.7 (--) 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: mark.rutland@arm.com, steve.capper@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The zero page is statically allocated, so grab its struct page pointer without using virt_to_page(), which will be restricted to the linear mapping later. Signed-off-by: Ard Biesheuvel --- arch/arm64/include/asm/pgtable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index aa6106ac050c..377257a8d393 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -57,7 +57,7 @@ extern void __pgd_error(const char *file, int line, unsigned long val); * for zero-mapped memory areas etc.. */ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; -#define ZERO_PAGE(vaddr) virt_to_page(empty_zero_page) +#define ZERO_PAGE(vaddr) pfn_to_page(PHYS_PFN(__pa(empty_zero_page))) #define pte_ERROR(pte) __pte_error(__FILE__, __LINE__, pte_val(pte))