From: peterx@redhat•com
To: linux-mm@kvack•org, linux-kernel@vger•kernel.org
Cc: linux-arm-kernel@lists•infradead.org, x86@kernel•org,
Will Deacon <will@kernel•org>,
Catalin Marinas <catalin.marinas@arm•com>,
Muchun Song <muchun.song@linux•dev>,
peterx@redhat•com, Matthew Wilcox <willy@infradead•org>,
Jason Gunthorpe <jgg@nvidia•com>,
Mark Salter <msalter@redhat•com>,
sparclinux@vger•kernel.org,
Andrew Morton <akpm@linux-foundation•org>,
linuxppc-dev@lists•ozlabs.org, Mike Rapoport <rppt@kernel•org>
Subject: [PATCH RFC 08/13] mm/arm64: Merge pXd_huge() and pXd_leaf() definitions
Date: Wed, 6 Mar 2024 18:41:42 +0800 [thread overview]
Message-ID: <20240306104147.193052-9-peterx@redhat.com> (raw)
In-Reply-To: <20240306104147.193052-1-peterx@redhat.com>
From: Peter Xu <peterx@redhat•com>
Unlike most archs, aarch64 defines pXd_huge() and pXd_leaf() slightly
differently. Redefine the pXd_huge() with pXd_leaf().
There used to be two traps for old aarch64 definitions over these APIs that
I found when reading the code around, they're:
(1) 4797ec2dc83a ("arm64: fix pud_huge() for 2-level pagetables")
(2) 23bc8f69f0ec ("arm64: mm: fix p?d_leaf()")
Define pXd_huge() with the current pXd_leaf() will make sure (2) isn't a
problem (on PROT_NONE checks). To make sure it also works for (1), we move
over the __PAGETABLE_PMD_FOLDED check to pud_leaf(), allowing it to
constantly returning "false" for 2-level pgtables, which looks even safer
to cover both now.
Cc: Muchun Song <muchun.song@linux•dev>
Cc: Mark Salter <msalter@redhat•com>
Cc: Catalin Marinas <catalin.marinas@arm•com>
Cc: Will Deacon <will@kernel•org>
Cc: linux-arm-kernel@lists•infradead.org
Signed-off-by: Peter Xu <peterx@redhat•com>
---
arch/arm64/include/asm/pgtable.h | 4 ++++
arch/arm64/mm/hugetlbpage.c | 8 ++------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
index 401087e8a43d..14d24c357c7a 100644
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@ -704,7 +704,11 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd)
#define pud_none(pud) (!pud_val(pud))
#define pud_bad(pud) (!pud_table(pud))
#define pud_present(pud) pte_present(pud_pte(pud))
+#ifndef __PAGETABLE_PMD_FOLDED
#define pud_leaf(pud) (pud_present(pud) && !pud_table(pud))
+#else
+#define pud_leaf(pud) false
+#endif
#define pud_valid(pud) pte_valid(pud_pte(pud))
#define pud_user(pud) pte_user(pud_pte(pud))
#define pud_user_exec(pud) pte_user_exec(pud_pte(pud))
diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c
index 0f0e10bb0a95..1234bbaef5bf 100644
--- a/arch/arm64/mm/hugetlbpage.c
+++ b/arch/arm64/mm/hugetlbpage.c
@@ -81,16 +81,12 @@ bool arch_hugetlb_migration_supported(struct hstate *h)
int pmd_huge(pmd_t pmd)
{
- return pmd_val(pmd) && !(pmd_val(pmd) & PMD_TABLE_BIT);
+ return pmd_leaf(pmd);
}
int pud_huge(pud_t pud)
{
-#ifndef __PAGETABLE_PMD_FOLDED
- return pud_val(pud) && !(pud_val(pud) & PUD_TABLE_BIT);
-#else
- return 0;
-#endif
+ return pud_leaf(pud);
}
static int find_num_contig(struct mm_struct *mm, unsigned long addr,
--
2.44.0
next prev parent reply other threads:[~2024-03-06 10:48 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-06 10:41 [PATCH RFC 00/13] mm/treewide: Remove pXd_huge() API peterx
2024-03-06 10:41 ` [PATCH RFC 01/13] mm/hmm: Process pud swap entry without pud_huge() peterx
2024-03-07 18:12 ` Jason Gunthorpe
2024-03-08 6:50 ` Peter Xu
2024-03-06 10:41 ` [PATCH RFC 02/13] mm/gup: Cache p4d in follow_p4d_mask() peterx
2024-03-06 10:41 ` [PATCH RFC 03/13] mm/gup: Check p4d presence before going on peterx
2024-03-07 20:08 ` Jason Gunthorpe
2024-03-06 10:41 ` [PATCH RFC 04/13] mm/x86: Change pXd_huge() behavior to exclude swap entries peterx
2024-03-07 20:16 ` Jason Gunthorpe
2024-03-06 10:41 ` [PATCH RFC 05/13] mm/sparc: " peterx
2024-03-06 10:41 ` [PATCH RFC 06/13] mm/arm: Use macros to define pmd/pud helpers peterx
2024-03-06 10:41 ` [PATCH RFC 07/13] mm/arm: Redefine pmd_huge() with pmd_leaf() peterx
2024-03-06 10:41 ` peterx [this message]
2024-03-06 10:41 ` [PATCH RFC 09/13] mm/powerpc: Redefine pXd_huge() with pXd_leaf() peterx
2024-03-06 12:56 ` Michael Ellerman
2024-03-07 3:05 ` Peter Xu
2024-03-06 10:41 ` [PATCH RFC 10/13] mm/gup: Merge pXd huge mapping checks peterx
2024-03-07 20:19 ` Jason Gunthorpe
2024-03-06 10:41 ` [PATCH RFC 11/13] mm/treewide: Replace pXd_huge() with pXd_leaf() peterx
2024-03-06 10:41 ` [PATCH RFC 12/13] mm/treewide: Remove pXd_huge() peterx
2024-03-06 10:41 ` [PATCH RFC 13/13] mm: Document pXd_leaf() API peterx
2024-03-08 15:20 ` Jason Gunthorpe
2024-03-11 9:58 ` [PATCH RFC 00/13] mm/treewide: Remove pXd_huge() API Christophe Leroy
2024-03-12 20:01 ` Peter Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240306104147.193052-9-peterx@redhat.com \
--to=peterx@redhat$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=catalin.marinas@arm$(echo .)com \
--cc=jgg@nvidia$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-mm@kvack$(echo .)org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=msalter@redhat$(echo .)com \
--cc=muchun.song@linux$(echo .)dev \
--cc=rppt@kernel$(echo .)org \
--cc=sparclinux@vger$(echo .)kernel.org \
--cc=will@kernel$(echo .)org \
--cc=willy@infradead$(echo .)org \
--cc=x86@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox