From patchwork Thu Mar 21 14:19:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Price X-Patchwork-Id: 10863621 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0CBC314DE for ; Thu, 21 Mar 2019 14:20:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5FCF2A179 for ; Thu, 21 Mar 2019 14:20:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA2EC2A2A3; Thu, 21 Mar 2019 14:20:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 619822A29B for ; Thu, 21 Mar 2019 14:20:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E89556B026A; Thu, 21 Mar 2019 10:20:39 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E37A66B026B; Thu, 21 Mar 2019 10:20:39 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D26EC6B026C; Thu, 21 Mar 2019 10:20:39 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by kanga.kvack.org (Postfix) with ESMTP id 874246B026A for ; Thu, 21 Mar 2019 10:20:39 -0400 (EDT) Received: by mail-ed1-f71.google.com with SMTP id 41so2302325edr.19 for ; Thu, 21 Mar 2019 07:20:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=3QT6OWyC9JAMeDMFDYFJBPhytDtBHqA6u+Xz2reowKo=; b=dWTEO26Ws/1gW0+ftOYPAMALovBymNgFNzQrenMCtY9fx5rbJD9rDhKnoiNviHUcQ+ CQZNDCcTrrXIQfOknyIo+Y5yd3AYx1v8j5dSjvAZCwf3pJATa3/PxXM2kDP8G8cICN7P 7x6gzSVr5ybN64mVW5fp1Xfl58oJBfxO+nhkT7npcVjxqSnZln13dTHVZ/glaKms9HLz a2tMA5Gix3BypNZlBjpyVuSgKZEo+K31RuI4+GMdyQ3FAgBCp4/M2r9jHkRPQVKeVBno GT023aS/GkEi3TRD4p7CgNT4RvpfNRcL0wLMw06ub+kAv02Ptp6hQNH2lqps85cSrGV2 7seg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of steven.price@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=steven.price@arm.com X-Gm-Message-State: APjAAAVpIOTuraqxRSVBrJv9AfcIND/BQZheL2mI2PMb8Fi6KvpC5HdP WPGD+5bVP+6qS48p5MEjN5VmAl9TAbfVmozg4UBeXGLUK0wsJFjCrrfQMLtdZ5URBZVFCYHNKyB 2Z0qh0S19OLxm1lwNL10A5nzcqh+iJxelyS9Ko4Z1IEewRnandaOTR5nPL6tE6pTouQ== X-Received: by 2002:a17:906:c827:: with SMTP id dd7mr2490495ejb.100.1553178039045; Thu, 21 Mar 2019 07:20:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqwu1pNsoVVmejTIumheUL+5w0oiN/nFTq3Qq5yUtXsUfFWJWwP3c/dgck3/AFtYMPCKe0LE X-Received: by 2002:a17:906:c827:: with SMTP id dd7mr2490438ejb.100.1553178037960; Thu, 21 Mar 2019 07:20:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553178037; cv=none; d=google.com; s=arc-20160816; b=BpJGfHaxFwgxhdvSgy8jtwYM4/EOCT9SNzzi1RftEbdsW/RnQrzPt3n+PUHQGBmUnb LjUwT1SiEBiiqzoFIpyGWrikghmwFtv4clcvhsUQaZ8+nNljR8OoQpyXY3TD2BBY2xo2 TGcvzppcaDohOXeI8VA2Xi81msWzkWuNdbQpUTk+SGX61i7VjhZFdPyzRVDYbNVGlBWa 6G3HTYeQ6FhPHq+O9gouKCPHgdEJPa8hsCjTJJQgDtd919bUNzwCnokJK5E6Az7vykNy x4uNIHSNMeyodUgfZcQQkYd2fNYhAFZXq4cazfrilDm5J/8DVr9X9odSn8wpQLd245X2 +q7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=3QT6OWyC9JAMeDMFDYFJBPhytDtBHqA6u+Xz2reowKo=; b=vrzJmQf3uQhgpTB9dFunOLqId2JRWdgW8h48V//va1x3SWywuN6thFXK40gIIvrf/a Z6MAo3ie4DSfncvGB2C/FbO2a0/7WVsFDn2aKtZHj9hoSnn0OBDGTIduXS8YQBFacTGE jFgHUM3TwuVO9bAPspp9IFKvKMz4vss0rrsKIpN7PB1bsYnUq6OfN0l3swkjJo/eRzcs E8BGsg9wVL6tSZ/Y1jMtxW9dYG+08J7Fvm8+UYVyT2rutmz95nF8Vo7kYCVeazEH1JDj ONNza8rSI7sPWSq6ZBgOQJYMOdYk7PLeVEYxf1SiYOJpKl1dEOQrD6UHgI+fm2eWQcuf 1ceA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of steven.price@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=steven.price@arm.com Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com. [217.140.101.70]) by mx.google.com with ESMTP id o46si1609372edc.36.2019.03.21.07.20.37 for ; Thu, 21 Mar 2019 07:20:37 -0700 (PDT) Received-SPF: pass (google.com: domain of steven.price@arm.com designates 217.140.101.70 as permitted sender) client-ip=217.140.101.70; Authentication-Results: mx.google.com; spf=pass (google.com: domain of steven.price@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=steven.price@arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BF884EBD; Thu, 21 Mar 2019 07:20:36 -0700 (PDT) Received: from e112269-lin.arm.com (e112269-lin.cambridge.arm.com [10.1.196.69]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 83A1A3F575; Thu, 21 Mar 2019 07:20:33 -0700 (PDT) From: Steven Price To: linux-mm@kvack.org Cc: Steven Price , Andy Lutomirski , Ard Biesheuvel , Arnd Bergmann , Borislav Petkov , Catalin Marinas , Dave Hansen , Ingo Molnar , James Morse , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , Peter Zijlstra , Thomas Gleixner , Will Deacon , x86@kernel.org, "H. Peter Anvin" , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Rutland , "Liang, Kan" Subject: [PATCH v5 08/19] x86: mm: Add p?d_large() definitions Date: Thu, 21 Mar 2019 14:19:42 +0000 Message-Id: <20190321141953.31960-9-steven.price@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190321141953.31960-1-steven.price@arm.com> References: <20190321141953.31960-1-steven.price@arm.com> MIME-Version: 1.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP walk_page_range() is going to be allowed to walk page tables other than those of user space. For this it needs to know when it has reached a 'leaf' entry in the page tables. This information is provided by the p?d_large() functions/macros. For x86 we already have static inline functions, so simply add #defines to prevent the generic versions (added in a later patch) from being picked up. We also need to add corresponding #undefs in dump_pagetables.c. This code will be removed when x86 is switched over to using the generic pagewalk code in a later patch. Signed-off-by: Steven Price --- arch/x86/include/asm/pgtable.h | 5 +++++ arch/x86/mm/dump_pagetables.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 2779ace16d23..0dd04cf6ebeb 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -222,6 +222,7 @@ static inline unsigned long pgd_pfn(pgd_t pgd) return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT; } +#define p4d_large p4d_large static inline int p4d_large(p4d_t p4d) { /* No 512 GiB pages yet */ @@ -230,6 +231,7 @@ static inline int p4d_large(p4d_t p4d) #define pte_page(pte) pfn_to_page(pte_pfn(pte)) +#define pmd_large pmd_large static inline int pmd_large(pmd_t pte) { return pmd_flags(pte) & _PAGE_PSE; @@ -857,6 +859,7 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address) return (pmd_t *)pud_page_vaddr(*pud) + pmd_index(address); } +#define pud_large pud_large static inline int pud_large(pud_t pud) { return (pud_val(pud) & (_PAGE_PSE | _PAGE_PRESENT)) == @@ -868,6 +871,7 @@ static inline int pud_bad(pud_t pud) return (pud_flags(pud) & ~(_KERNPG_TABLE | _PAGE_USER)) != 0; } #else +#define pud_large pud_large static inline int pud_large(pud_t pud) { return 0; @@ -1213,6 +1217,7 @@ static inline bool pgdp_maps_userspace(void *__ptr) return (((ptr & ~PAGE_MASK) / sizeof(pgd_t)) < PGD_KERNEL_START); } +#define pgd_large pgd_large static inline int pgd_large(pgd_t pgd) { return 0; } #ifdef CONFIG_PAGE_TABLE_ISOLATION diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c index ee8f8ab46941..ca270fb00805 100644 --- a/arch/x86/mm/dump_pagetables.c +++ b/arch/x86/mm/dump_pagetables.c @@ -432,6 +432,7 @@ static void walk_pmd_level(struct seq_file *m, struct pg_state *st, pud_t addr, #else #define walk_pmd_level(m,s,a,e,p) walk_pte_level(m,s,__pmd(pud_val(a)),e,p) +#undef pud_large #define pud_large(a) pmd_large(__pmd(pud_val(a))) #define pud_none(a) pmd_none(__pmd(pud_val(a))) #endif @@ -467,6 +468,7 @@ static void walk_pud_level(struct seq_file *m, struct pg_state *st, p4d_t addr, #else #define walk_pud_level(m,s,a,e,p) walk_pmd_level(m,s,__pud(p4d_val(a)),e,p) +#undef p4d_large #define p4d_large(a) pud_large(__pud(p4d_val(a))) #define p4d_none(a) pud_none(__pud(p4d_val(a))) #endif @@ -501,6 +503,7 @@ static void walk_p4d_level(struct seq_file *m, struct pg_state *st, pgd_t addr, } } +#undef pgd_large #define pgd_large(a) (pgtable_l5_enabled() ? pgd_large(a) : p4d_large(__p4d(pgd_val(a)))) #define pgd_none(a) (pgtable_l5_enabled() ? pgd_none(a) : p4d_none(__p4d(pgd_val(a))))