From patchwork Wed Jul 10 07:51:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13728972 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 8F960C38150 for ; Wed, 10 Jul 2024 07:51:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2A5456B0082; Wed, 10 Jul 2024 03:51:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2553F6B0092; Wed, 10 Jul 2024 03:51:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 11DA46B0095; Wed, 10 Jul 2024 03:51:52 -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 E93566B0082 for ; Wed, 10 Jul 2024 03:51:51 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 93C031A1B7A for ; Wed, 10 Jul 2024 07:51:51 +0000 (UTC) X-FDA: 82323074022.16.8B46562 Received: from pegase2.c-s.fr (pegase2.c-s.fr [93.17.235.10]) by imf18.hostedemail.com (Postfix) with ESMTP id 6D3DC1C0009 for ; Wed, 10 Jul 2024 07:51:49 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; spf=pass (imf18.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.235.10 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu; dmarc=pass (policy=quarantine) header.from=csgroup.eu ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720597893; a=rsa-sha256; cv=none; b=YOmke0QcneUUUO7JhD5g2Yqa3EtCU4R1nEzCMUx5fGZhz7lh152nUputE4CxJ3PTGVTyTb PhwZzVml32sXca1sPtJD/3odRiTecxu1EqSSgBxSUpVA+ZYPO4wHfUokDm4MnmjBQMMo8W Tkosa26IJhiA8DfjmV32UwRgNJuzIHI= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; spf=pass (imf18.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.235.10 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu; dmarc=pass (policy=quarantine) header.from=csgroup.eu ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720597893; 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=h2weCAB2MuTaWXEdH4ydOXvNYvEll2n3bnETY0Buj48=; b=jpv3ubH3WsIaaPPJ8Yvt7ZA/QpZXAzdBTOyJP3StIp8foh61bH/2SUAga2Hc65ClVmhvr3 +URyonBctF0qdL0CxLU9AP4HbuJf5VgaPq+ZqB2dJdKDZ1fBD4LGk9Br/oXdlHgr33fgYt bbSxMalZs7bFHsbdfhJ8JyWNf0fqm44= Received: from localhost (mailhub3.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4WJqn86kSVz9sT0; Wed, 10 Jul 2024 09:51:40 +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 DO_FCbpqAp2z; Wed, 10 Jul 2024 09:51:40 +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 4WJqmw5Xm4z9sTL; Wed, 10 Jul 2024 09:51:28 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id AEAED8B778; Wed, 10 Jul 2024 09:51:28 +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 F75U0umoaS2G; Wed, 10 Jul 2024 09:51:28 +0200 (CEST) Received: from PO20335.idsi0.si.c-s.fr (unknown [192.168.233.26]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 6EC4A8B766; Wed, 10 Jul 2024 09:51:28 +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 , Peter Xu Subject: [PATCH v2 3/3] mm: Add p{g/4}d_leaf() in asm-generic/pgtable-nop{4/u}d.h Date: Wed, 10 Jul 2024 09:51:22 +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=1720597882; l=2461; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=KrmMH7bKbT2qDBAZ6LB+t1vXN/9qd6MtCCjJv9qO9v0=; b=pGaWWJEGDivcTq/5LpqkCHIxHohVMbXxhf5suF8mh+EeYylaNrKQXv2k5AEG2JkUQc5H3Jal6 i+vMA84HOjbCpusC+m6HDo5+DieuE1RR+YB2uewJR0SbO5l1KYE5xsN X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Stat-Signature: roqek7351t17q44aqrc1gfin8i6x9hu3 X-Rspamd-Queue-Id: 6D3DC1C0009 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1720597909-949378 X-HE-Meta: U2FsdGVkX1/YYQmvlAS+uYf7TGD+tIoYTDxdb2Bk+flCUM0ht+FgRGqPOIggVGwX0OX6m5+ievfLL2x3XRsZ6FG7Z+f3ZV/vAugQVH1M3fGhAlnmbM1G6fgk+POCLMFWny52fdr3uvE2DgQ4EwjWH8h7TB0ToU6MhOcVDgSxdrvNLzVuygH1ctynsPeEddxb6SbWgzhr/NoNe0Ou5zCXZ85qQjw7ZYrvNGfhuDae48YdsUm1B6cMtHYoeSpXdN6pGcXzWfGGEkgTtDHgSxNbuh1LOP1d/CLqhlrm/bov4sqTTeMzsRqnUAE12n56Fh5uKqQ/qApye0PQdgsB2KPFqCmS3BzAJslpRYIcRMp46e9B10xkWQ7Sj8Ux1wUs9w/wgMr0CXFewonqmI8lbPEJLe8SMXMj287/us9cXDLOpXhectMklCoY1FW6ySGzUdRnXPpnMBUls1ifibqvZeeEUdju6etL8HKjkZE+gqx71KvjP0vz2NxOlL72BBoUF84BI59aZgdvLVH5AnD6GNVFeqtNXFGjGLSZQmU8HeXalcST9LfRNYQET5bhRokg8Ysj1gpKegjD9jVyahkIUX6ZxPYXHoq1PIHHZrQGVS+AFo7GRybESKJvQN7EVd+/GubAXOQA9z45AkyPYI40aidk8gmMmaHszLF8B70Zp+eMOkIF5Lx821YKE2qctNvFGs7sfdScPLUs1+MpXgs8+XYoLgCXQU83hZS5DpCstxo64/e4e1vB+GF+wu6QSzqOj/GGFHT7rIw6pWYSeT5dWn1inTk/5PwioV5CA9kmzgTILUmD6AtTPRfkzT/USqeNi65wPS7RV73S5aFWLh0RsyLqG/xqysi0xrE1tNGtsm0GQaoEV2cYTtL6hQbQczGlItotFlIaPCOFDiFTHYIr2XVEyoV7tN7iT+6ab9FThWOpd4aRjiZHv408ersNROMCzmvfYduNcRANOivmJy8vX2j oiE9/bbk 10e3P7F41VreQGLGhnUv/Y3WAoE1yzhDWmDKHQD+sDTM5SKJbyYwDRRSt20WldgQGx7zF8YJXs8eFH/XqtDUVYH/RejTo/pFBSuxd7Oq65rXhAvIs4gns+NGQeU74BcncZtU5GnvewPUCWZNBxSRvOEAcu1mhhIJNMCRkMx6yNe+jOQc= 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 Reviewed-by: Peter Xu --- v2: Added pXd_leaf macro as well in asm-generic/pgtable-nopXd.h to cohabit with the fallback --- include/asm-generic/pgtable-nop4d.h | 2 ++ include/asm-generic/pgtable-nopmd.h | 1 + include/asm-generic/pgtable-nopud.h | 2 ++ 3 files changed, 5 insertions(+) diff --git a/include/asm-generic/pgtable-nop4d.h b/include/asm-generic/pgtable-nop4d.h index 03b7dae47dd4..ed7ba008469f 100644 --- a/include/asm-generic/pgtable-nop4d.h +++ b/include/asm-generic/pgtable-nop4d.h @@ -21,6 +21,8 @@ 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; } +#define pgd_leaf pgd_leaf static inline void pgd_clear(pgd_t *pgd) { } #define p4d_ERROR(p4d) (pgd_ERROR((p4d).pgd)) diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h index b01349a312fa..e178ace2e23e 100644 --- a/include/asm-generic/pgtable-nopmd.h +++ b/include/asm-generic/pgtable-nopmd.h @@ -31,6 +31,7 @@ static inline int pud_none(pud_t pud) { return 0; } static inline int pud_bad(pud_t pud) { return 0; } static inline int pud_present(pud_t pud) { return 1; } static inline int pud_leaf(pud_t pud) { return 0; } +#define pud_leaf pud_leaf static inline void pud_clear(pud_t *pud) { } #define pmd_ERROR(pmd) (pud_ERROR((pmd).pud)) diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h index eb70c6d7ceff..655dfebea91c 100644 --- a/include/asm-generic/pgtable-nopud.h +++ b/include/asm-generic/pgtable-nopud.h @@ -28,6 +28,8 @@ 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; } +#define p4d_leaf p4d_leaf static inline void p4d_clear(p4d_t *p4d) { } #define pud_ERROR(pud) (p4d_ERROR((pud).p4d))