From patchwork Tue Jan 26 17:10:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 60479 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp2088629lbb; Tue, 26 Jan 2016 09:11:29 -0800 (PST) X-Received: by 10.98.12.21 with SMTP id u21mr35082563pfi.36.1453828285021; Tue, 26 Jan 2016 09:11:25 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sj10si3104405pab.65.2016.01.26.09.11.24; Tue, 26 Jan 2016 09:11:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966996AbcAZRLQ (ORCPT + 30 others); Tue, 26 Jan 2016 12:11:16 -0500 Received: from mail-wm0-f52.google.com ([74.125.82.52]:34849 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966880AbcAZRLG (ORCPT ); Tue, 26 Jan 2016 12:11:06 -0500 Received: by mail-wm0-f52.google.com with SMTP id r129so113311497wmr.0 for ; Tue, 26 Jan 2016 09:11:05 -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=PU7vwZQpxmIZ775exPdyCjzUHYKA7DffICaJnNz/jy8=; b=ERfzrr2I7X7MnR6+OMZfm9BT1/ywTmSioa6XzKOfHTqODh08xzx9FMSvFLpxswm4XC pAWF35/IiGNBwSnlQtSwLlDh0Y1DLtjFFfV7K/1MF6LKg42Xj5l23PLheZTLHjXx6JJd c2xAa+M12BCh49KzF1Y8qc5Lqzo4U3CbPYk0g= 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=PU7vwZQpxmIZ775exPdyCjzUHYKA7DffICaJnNz/jy8=; b=J1CSE0LY0Un2L3J5K/2xhu96VwWrckSx1kQBJotY/T32SJ9WfmksFocUKGU3KjsSll 3Gkv+txdy1zZc8HAIZ7GFd04glNdAgFL+6oEd7mFpvjMjA/+xnhv9PwNbGCAb2sY+eCN FkmD5rq8vF+wZHnx3MS4cC1d/FXHMDm/wy6hEd8eisVuOIwnr2bO7ALlgKWywUmu/y33 KVOWXQb2WCWqfCfep9sgt57Sr7W9DtJ/+WgC9nsUM0jZMccxdxhzooXqZmgGQ05tO77D 0UoEUmEeY/tGqDbax/kmUvJ4fmI6dOqv1HtTbBC61oakj+NArI6jaexlo9TivhWgXvY8 yRCQ== X-Gm-Message-State: AG10YOT7Zlp6ZTW72+vhIIYQ1S0fbmPHJ02t5AuqAveMp6oeWC+njozTmwgStTwrziyICYWj X-Received: by 10.28.1.23 with SMTP id 23mr24281843wmb.37.1453828265458; Tue, 26 Jan 2016 09:11:05 -0800 (PST) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id ko2sm2328617wjc.9.2016.01.26.09.11.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Jan 2016 09:11:04 -0800 (PST) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, kernel-hardening@lists.openwall.com, will.deacon@arm.com, catalin.marinas@arm.com, mark.rutland@arm.com, leif.lindholm@linaro.org, keescook@chromium.org, linux-kernel@vger.kernel.org Cc: stuart.yoder@freescale.com, bhupesh.sharma@freescale.com, arnd@arndb.de, marc.zyngier@arm.com, christoffer.dall@linaro.org, labbott@fedoraproject.org, matt@codeblueprint.co.uk, Ard Biesheuvel Subject: [PATCH v4 03/22] arm64: pgtable: implement static [pte|pmd|pud]_offset variants Date: Tue, 26 Jan 2016 18:10:30 +0100 Message-Id: <1453828249-14467-4-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1453828249-14467-1-git-send-email-ard.biesheuvel@linaro.org> References: <1453828249-14467-1-git-send-email-ard.biesheuvel@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The page table accessors pte_offset(), pud_offset() and pmd_offset() rely on __va translations, so they can only be used after the linear mapping has been installed. For the early fixmap and kasan init routines, whose page tables are allocated statically in the kernel image, these functions will return bogus values. So implement pte_offset_kimg(), pmd_offset_kimg() and pud_offset_kimg(), which can be used instead before any page tables have been allocated dynamically. Reviewed-by: Mark Rutland Signed-off-by: Ard Biesheuvel --- arch/arm64/include/asm/pgtable.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) -- 2.5.0 diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 2fb94ef881f5..e9eaf6e9262d 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -446,6 +446,9 @@ static inline phys_addr_t pmd_page_paddr(pmd_t pmd) #define pmd_page(pmd) pfn_to_page(__phys_to_pfn(pmd_val(pmd) & PHYS_MASK)) +/* use ONLY for statically allocated translation tables */ +#define pte_offset_kimg(dir,addr) ((pte_t *)__phys_to_kimg(pte_offset_phys((dir), (addr)))) + /* * Conversion functions: convert a page and protection to a page entry, * and a page entry and page directory to the page they refer to. @@ -489,6 +492,9 @@ static inline phys_addr_t pud_page_paddr(pud_t pud) #define pud_page(pud) pfn_to_page(__phys_to_pfn(pud_val(pud) & PHYS_MASK)) +/* use ONLY for statically allocated translation tables */ +#define pmd_offset_kimg(dir,addr) ((pmd_t *)__phys_to_kimg(pmd_offset_phys((dir), (addr)))) + #else #define pud_page_paddr(pud) ({ BUILD_BUG(); 0; }) @@ -498,6 +504,8 @@ static inline phys_addr_t pud_page_paddr(pud_t pud) #define pmd_set_fixmap_offset(pudp, addr) ((pmd_t *)pudp) #define pmd_clear_fixmap() +#define pmd_offset_kimg(dir,addr) ((pmd_t *)dir) + #endif /* CONFIG_PGTABLE_LEVELS > 2 */ #if CONFIG_PGTABLE_LEVELS > 3 @@ -536,6 +544,9 @@ static inline phys_addr_t pgd_page_paddr(pgd_t pgd) #define pgd_page(pgd) pfn_to_page(__phys_to_pfn(pgd_val(pgd) & PHYS_MASK)) +/* use ONLY for statically allocated translation tables */ +#define pud_offset_kimg(dir,addr) ((pud_t *)__phys_to_kimg(pud_offset_phys((dir), (addr)))) + #else #define pgd_page_paddr(pgd) ({ BUILD_BUG(); 0;}) @@ -545,6 +556,8 @@ static inline phys_addr_t pgd_page_paddr(pgd_t pgd) #define pud_set_fixmap_offset(pgdp, addr) ((pud_t *)pgdp) #define pud_clear_fixmap() +#define pud_offset_kimg(dir,addr) ((pud_t *)dir) + #endif /* CONFIG_PGTABLE_LEVELS > 3 */ #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd_val(pgd))