From patchwork Thu Jul 4 06:30:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13723293 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC188C30653 for ; Thu, 4 Jul 2024 06:30:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 705F66B00B3; Thu, 4 Jul 2024 02:30:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 68F0C6B00B4; Thu, 4 Jul 2024 02:30:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 52F676B00B5; Thu, 4 Jul 2024 02:30:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 3283D6B00B3 for ; Thu, 4 Jul 2024 02:30:26 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A59A8A3560 for ; Thu, 4 Jul 2024 06:30:25 +0000 (UTC) X-FDA: 82301096010.16.4F7BA9B Received: from pegase2.c-s.fr (pegase2.c-s.fr [93.17.235.10]) by imf03.hostedemail.com (Postfix) with ESMTP id 8677620012 for ; Thu, 4 Jul 2024 06:30:23 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=csgroup.eu; spf=pass (imf03.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.235.10 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720074600; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VCxo9RA95ZXxfCvke4eCxOsciTSuuDApyGKtl1it+mg=; b=WGD8GG2QuiktJJTYXeAnkYxtAAXA1ST+ylN2uKn24gOAxSKe0Ze1oXcfQi5oY8TeXKJd+W Ry37TayYDwsqay04+qz3VgHT4hJf+Djm/TpqytfDJbKd1TciKMUVRV599rEeQFOfmvOMUl cPtRdf/ITdMekdkZIRC4EFm0w+quvto= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720074600; a=rsa-sha256; cv=none; b=fdNFUnGENWWEJ9wZCv3cHK8n2LftwU4mkTC9r6oRPnkjeEjUAx4pVGlRbY5qN4mrtqc2DP mD4f6rwd98jo+7aYJzVwK1wMSMTmQzq/E+mscMwRx4T7bKHOU59vHcPDz1YQOXr5DarVIz +SIil1gvCnVaEIXMCRPAHJQrbxYOKeA= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=csgroup.eu; spf=pass (imf03.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.235.10 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu Received: from localhost (mailhub3.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4WF6Fv1xlNz9sS8; Thu, 4 Jul 2024 08:30:11 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase2.c-s.fr ([172.26.127.65]) by localhost (pegase2.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tzQAq9F0VSsR; Thu, 4 Jul 2024 08:30:11 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase2.c-s.fr (Postfix) with ESMTP id 4WF6Fs5QfBz9sRy; Thu, 4 Jul 2024 08:30:09 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id A8A5D8B774; Thu, 4 Jul 2024 08:30:09 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id jUYe5UpM6zxp; Thu, 4 Jul 2024 08:30:09 +0200 (CEST) Received: from PO20335.idsi0.si.c-s.fr (unknown [192.168.202.46]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 049628B764; Thu, 4 Jul 2024 08:30:08 +0200 (CEST) From: Christophe Leroy To: Andrew Morton , Arnd Bergmann Cc: Christophe Leroy , linux-kernel@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org, linux-riscv@lists.infradead.org, Oscar Salvador Subject: [PATCH 3/3] mm: Add p{g/4}d_leaf() in asm-generic/pgtable-nop{4/u}d.h Date: Thu, 4 Jul 2024 08:30:05 +0200 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1720074605; l=2466; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=Qtio/5SWrxR4yNgLMS59Jf0uRJ+1ynjUQGU6piFtlq0=; b=azkcAf3wdFGcbqU1O5vMt5uKoTHRw3KHARwsWzN1kcj9JA/2Zqkg3tgnO+WN7dI+hkpsqGuyU Ek7ifyQRmn6BRdM6oZNuS29ECHniE5zPf7j4PVxqF0C1xeD9cC9pPk1 X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Rspamd-Queue-Id: 8677620012 X-Stat-Signature: 4k8gt8dj3ntj7hwgtggrfe3urpcojgec X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1720074623-927636 X-HE-Meta: U2FsdGVkX18l2MH9eHh3H6y1Ho/dD1hNIh6qQHKukdYp+X1eFvL6BLR/1VzdCwmlzz4u2UJqHSRniEAgQsg1XIyXVrScYixWEUzH+udnVu7ta24re5oSYxhGGVYUlpaeoG26ybudDjuYjkhAnKrCiMzD1UOWVybYrna/YcJ7sak+G0EXlkr6VKSHzjb54DMFgBFNElBeawrxUK1JFPOMEdKA61FNVhgH9S7GqWpgrpIXB7i78Hv7pOQKug1Gg/Z7gz+0H+blZ4ru39r9X1NRB8miNK7CFthov3MCsxPX5Vo6Yx/UGXBMucsA8qDzS6ICLaXv9fgwhaGNzssLWdKrz+bVL8JglwlTu02ERdHxjHfOGOdItH8ExGxerH82YJyLV36DV49irswGP+dZf/PyIfYd6EAR80SgfjNftWCQ0454ND9ogDt5UyhSCDZJS14Rfg+jkRnEe8OM9D8xiemCwbh0X3pRc91BNvDsEEOkbwKVagqoyBmCGdV9Cg4GmZCrgYLJltRc0SNsr0x/0is5DAOc82B46GX4MNwnAqDIbU+c10SM5Ksxee+me/xGWMjgvxfvkLJNU/hKe8/7uZ/vEDj5MCKfrG0L+mBok+uMzQUtTbq/8i7SCflvlQZBMAjnymjW7pvLgTobFCpjGwM9/T+lbFD6OgHTMOgiTGMxe/q0uVR4ahBRAFQ1egloz7pkyq6Uj2p5uUp4hD0UgQFzBAEj59BE1hrC6yOgqid98a09+q5MVdGsZNpRDRbWRExizRvR0W+vUKPUhBUe/S1iwBe6OMFIzjiy/fitvlwMsrJobWtspSTwV28ts2PHgWVfwUXDS6GbnRe2YIKrYItrUy/PnkE5IutgZmO5NK2oQ8mhhhHVupTw8gDX6Lr2gmvzbPoPmvCRvA+UPCDHyzhGSIDKKGC38ddrqqqb9WtLp1xeVZdXitkF0gkIf2ZEg1S9qcMVLhDccS68qCFb8WC LftoTJZX Kz4iFfIflEalkLso/ICJIyATrAI3USN9FTD7PqLz2dBMl2UmzRRB1SrcflNs+h8j3jpBrXESF0qVLBsGKDrv36Y34FoexxUreLwOuKqHbJchgXnCuesD/xxaNuB5L7XHa8xFcasArISBVgWrD7naVflRJ+EvBxlhD43k6998kMT0dn2Y= 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: List-Subscribe: List-Unsubscribe: Commit 2c8a81dc0cc5 ("riscv/mm: fix two page table check related issues") added pud_leaf() in include/asm-generic/pgtable-nopmd.h Do the same for p4d_leaf() and pgd_leaf() to avoid getting them erroneously defined by architectures that do not implement the related page level. Signed-off-by: Christophe Leroy --- include/asm-generic/pgtable-nop4d.h | 1 + include/asm-generic/pgtable-nopud.h | 1 + include/linux/pgtable.h | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/asm-generic/pgtable-nop4d.h b/include/asm-generic/pgtable-nop4d.h index 03b7dae47dd4..75c96bbc5a96 100644 --- a/include/asm-generic/pgtable-nop4d.h +++ b/include/asm-generic/pgtable-nop4d.h @@ -21,6 +21,7 @@ typedef struct { pgd_t pgd; } p4d_t; static inline int pgd_none(pgd_t pgd) { return 0; } static inline int pgd_bad(pgd_t pgd) { return 0; } static inline int pgd_present(pgd_t pgd) { return 1; } +static inline int pgd_leaf(pgd_t pgd) { return 0; } static inline void pgd_clear(pgd_t *pgd) { } #define p4d_ERROR(p4d) (pgd_ERROR((p4d).pgd)) diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h index eb70c6d7ceff..14aeb8ef2d8a 100644 --- a/include/asm-generic/pgtable-nopud.h +++ b/include/asm-generic/pgtable-nopud.h @@ -28,6 +28,7 @@ typedef struct { p4d_t p4d; } pud_t; static inline int p4d_none(p4d_t p4d) { return 0; } static inline int p4d_bad(p4d_t p4d) { return 0; } static inline int p4d_present(p4d_t p4d) { return 1; } +static inline int p4d_leaf(p4d_t p4d) { return 0; } static inline void p4d_clear(p4d_t *p4d) { } #define pud_ERROR(pud) (p4d_ERROR((pud).p4d)) diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 2a6a3cccfc36..b27e66f542d6 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -1882,13 +1882,13 @@ typedef unsigned int pgtbl_mod_mask; * - It should cover all kinds of huge mappings (e.g., pXd_trans_huge(), * pXd_devmap(), or hugetlb mappings). */ -#ifndef pgd_leaf +#if !defined(__PAGETABLE_P4D_FOLDED) && !defined(pgd_leaf) #define pgd_leaf(x) false #endif -#ifndef p4d_leaf +#if !defined(__PAGETABLE_PUD_FOLDED) && !defined(p4d_leaf) #define p4d_leaf(x) false #endif -#ifndef pud_leaf +#if !defined(__PAGETABLE_PMD_FOLDED) && !defined(pud_leaf) #define pud_leaf(x) false #endif #ifndef pmd_leaf