From patchwork Wed Jul 31 15:45:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Price X-Patchwork-Id: 11068453 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 297CA1399 for ; Wed, 31 Jul 2019 15:46:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 15C17212BE for ; Wed, 31 Jul 2019 15:46:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0926C23E64; Wed, 31 Jul 2019 15:46:47 +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 8C2F9212BE for ; Wed, 31 Jul 2019 15:46:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6663A8E001B; Wed, 31 Jul 2019 11:46:44 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5EE498E0003; Wed, 31 Jul 2019 11:46:44 -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 4DC178E001B; Wed, 31 Jul 2019 11:46:44 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by kanga.kvack.org (Postfix) with ESMTP id F22D68E0003 for ; Wed, 31 Jul 2019 11:46:43 -0400 (EDT) Received: by mail-ed1-f70.google.com with SMTP id r21so42680971edc.6 for ; Wed, 31 Jul 2019 08:46:43 -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=nxKy+dHCcQ52WwJbQmiHduBQhK1uZKwGIaDaQ5m0n9k=; b=akgPoPCA/jXAB/FaxMIJu7B/0XpFUdU3c+L+GUTHWR9HSz/7M6bogKwE5rvleK+px4 jKAu2IW3FtFwAQ6gokokEawC+rdaE/cSEwjyPelMD24kRynO+LGMfeSmqoRiAn12JAj3 XXA6pXZzb4OcCcfo+5uZXJV9zo9MSOPEwcQpjXAcozfoWo8THpKRvJWkodyLWolRANdm DdiXHtEgwKBUY0IpLmiUzDQoVpgjXb04COE55YV7wNjsS1M/QnFmuK3wACZ5tEe5QUvV 5f51kUDOidGbMf4l6WcN2vN8CRY/63q8hbWKnsqiETeZvdLfWSgeJtAUlGh/qm4BhqaU dABg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of steven.price@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=steven.price@arm.com X-Gm-Message-State: APjAAAX94QC/I+hfpC6PGS6ZC/TXQoURF1nH1ZvseRttl4Jflxdyv6lH n+5lVyVDR/6NcTvKexBtTUmsq+eCQl/UjJXmJW3axZ0fgSbleIU/rpdwOTPXcwF6J+tvRsYSYmf CvlmX7ru5r7gfDnDtHJxJxOJccUF6WWmGgQVNkEqmDkadlUt5+10TWIwAh26KutkHkA== X-Received: by 2002:a17:906:634f:: with SMTP id a15mr93722948ejm.184.1564588003551; Wed, 31 Jul 2019 08:46:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqyIsRYRr5SepoWPBzWcbJHfyW8/N1jjZTY9w+4Emb8m/grHPaQ5c6NqE4UdsgzjsGFsfuBw X-Received: by 2002:a17:906:634f:: with SMTP id a15mr93722887ejm.184.1564588002713; Wed, 31 Jul 2019 08:46:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564588002; cv=none; d=google.com; s=arc-20160816; b=KwsjkAHIG3VoLFolQE2HzG50LvQfM9DSV4z/pN8w9bXV3PXOMWgZ+NotktPKtgg+3R nER6w+Ztn1FaJmWalRSvvGoLadj2R9yg+rmA3NW9W5HLArgvgZih25t7Igs6CPrq8h1N Q0xCmM1kpRAgwI2Thp6Iqn4ntfckRDBrOaJ+jca6pxfo+ZCJNd30KoTiLLbaZB3Brv4G pDzsqq5/YAPrN/ercETWoVuMkuFIyxnp5Zfz9s7G88ocJRpovxGg5pi6NGGR+gkSg5ZK tPnjbMA5yWadlfYbGA+3iVc0ttC77TTMpVjAcaGd/jGGEdBmt6d7y5BfCm3RlJXNoYzR W9dw== 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=nxKy+dHCcQ52WwJbQmiHduBQhK1uZKwGIaDaQ5m0n9k=; b=NWz5ouxTRfgT0MKuYdnJmsTrBo6n+ZRBNl5PQhC0SqSZf+nEXXDEg7uU3TdU2kukJj DlcEBBWqgWlRqb2zLokrE1uBxLoDstwAkbt03Gu44VtM8B44OO15uhsrUAyyf/QcRYs3 L6x2lgRxgx+0ydj+vrevFHraFbPH1aInY9Gn0DJs+l3juK4Ii+uFjD059a38Bp2Wl1Ow t4GJC8C6zLeSeIzDVg9GJdTruZURhnoqfpV7mNZuHkKgvfYoCEHj9INR0yvVZRj7Petd nB1r0T60m6GEsQedgBk76ejMtpmGILkrX3kHI+P2aVnQm/OCZsr0j4zGEzxeCLJhKAqG f5VQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of steven.price@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=steven.price@arm.com Received: from foss.arm.com (foss.arm.com. [217.140.110.172]) by mx.google.com with ESMTP id h53si21822459edh.114.2019.07.31.08.46.42 for ; Wed, 31 Jul 2019 08:46:42 -0700 (PDT) Received-SPF: pass (google.com: domain of steven.price@arm.com designates 217.140.110.172 as permitted sender) client-ip=217.140.110.172; Authentication-Results: mx.google.com; spf=pass (google.com: domain of steven.price@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=steven.price@arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E5E021596; Wed, 31 Jul 2019 08:46:41 -0700 (PDT) Received: from e112269-lin.arm.com (e112269-lin.cambridge.arm.com [10.1.196.133]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5CED33F694; Wed, 31 Jul 2019 08:46:39 -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" , Andrew Morton Subject: [PATCH v10 10/22] x86: mm: Add p?d_leaf() definitions Date: Wed, 31 Jul 2019 16:45:51 +0100 Message-Id: <20190731154603.41797-11-steven.price@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731154603.41797-1-steven.price@arm.com> References: <20190731154603.41797-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_leaf() functions/macros. For x86 we already have p?d_large() functions, so simply add macros to provide the generic p?d_leaf() names for the generic code. Signed-off-by: Steven Price --- arch/x86/include/asm/pgtable.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 0bc530c4eb13..6986a451619e 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -239,6 +239,7 @@ static inline unsigned long pgd_pfn(pgd_t pgd) return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT; } +#define p4d_leaf p4d_large static inline int p4d_large(p4d_t p4d) { /* No 512 GiB pages yet */ @@ -247,6 +248,7 @@ static inline int p4d_large(p4d_t p4d) #define pte_page(pte) pfn_to_page(pte_pfn(pte)) +#define pmd_leaf pmd_large static inline int pmd_large(pmd_t pte) { return pmd_flags(pte) & _PAGE_PSE; @@ -874,6 +876,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_leaf pud_large static inline int pud_large(pud_t pud) { return (pud_val(pud) & (_PAGE_PSE | _PAGE_PRESENT)) == @@ -885,6 +888,7 @@ static inline int pud_bad(pud_t pud) return (pud_flags(pud) & ~(_KERNPG_TABLE | _PAGE_USER)) != 0; } #else +#define pud_leaf pud_large static inline int pud_large(pud_t pud) { return 0; @@ -1233,6 +1237,7 @@ static inline bool pgdp_maps_userspace(void *__ptr) return (((ptr & ~PAGE_MASK) / sizeof(pgd_t)) < PGD_KERNEL_START); } +#define pgd_leaf pgd_large static inline int pgd_large(pgd_t pgd) { return 0; } #ifdef CONFIG_PAGE_TABLE_ISOLATION