From nobody Thu Sep 24 12:53:49 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 22B654028C3 for ; Thu, 24 Sep 2026 06:22:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790230949; cv=none; b=LMmI9aKT2yUz1A9g8lDdWPgf70XKiOIFltQj34XD74xEN2/vYVccGWfa1QtxilXlYkqSwMFt0rgauLeBbWserKKojHt5xqV+qCl0XjDepcfbuJ2Gh1VKW/9gOxcuK2Jwxl/tuxB5s6xRQP6YsaaoBFvtI7I6+GUSvzkHxauApvk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790230949; c=relaxed/simple; bh=4PrI51eVVgccN6CZO2v1jXQu32rlYnlV7ls3tEU9gKk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mQZ2s/3U1dIXpFmDOjavYOGqqxkdDXf7+3u+kDilNAQmNNgsYy4f8wQa88w6udXrN121E1Msks2QxlJFEKOUNqE4ETOlDUB6V45n3UVRaINaoI+HFTLg8brFJ0myaFr7g1a5t9Tb1zmAWZlqkmBUfl6axqGHqIhUAXNQ6i+m74E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=eee0xbA8; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="eee0xbA8" 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 C5D3E152B; Wed, 23 Sep 2026 23:22:22 -0700 (PDT) Received: from localhost (a085714.arm.com [10.164.19.28]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8B4783F86C; Wed, 23 Sep 2026 23:22:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1790230946; bh=4PrI51eVVgccN6CZO2v1jXQu32rlYnlV7ls3tEU9gKk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eee0xbA8SYI+UnqHhB96wS8cBEoHBPgeBK4s30BWor/TVQIPRj8yB9qVvMkp3QXdC RCjAR5/PcuDAfJ9+ttTkkgPa/9ACBk2zS97xYTRDe2RQ7Z8f1e8LR+RHqLlWRlda2M kG1zdIiVDWxaDDw4kCyByys9lKNrVCJf0BZ1BMJ4= From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org Cc: Anshuman Khandual , Catalin Marinas , Will Deacon , Ryan Roberts , Mark Rutland , Lorenzo Stoakes , Andrew Morton , David Hildenbrand , Mike Rapoport , Linu Cherian , linux-kernel@vger.kernel.org, linux-mm@kvack.org, kasan-dev@googlegroups.com Subject: [PATCH V3 1/4] arm64/mm: Use pmdp_get() for PMD accesses Date: Thu, 24 Sep 2026 11:52:11 +0530 Message-ID: <20260924062214.1635078-2-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260924062214.1635078-1-anshuman.khandual@arm.com> References: <20260924062214.1635078-1-anshuman.khandual@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace READ_ONCE() with pmdp_get() for PMD accesses in preparation for supporting both D64 and D128 translation table formats. READ_ONCE() cannot currently be used for 128-bit page table entries on arm64 because it does not provide the required 128-bit single-copy atomicity, causing builds to fail for accesses wider than 64 bits. Although LDP/STP provide the required atomicity when FEAT_LSE is available (as required by FEAT_D128), extending READ_ONCE() to support 128-bit accesses is undesirable. READ_ONCE() is a general-purpose API, so doing so could encourage other 128-bit users that would either fail to build in configurations without D128 support or, if D128 becomes a runtime option, silently permit tearing on systems without the required hardware support. Instead, standardize PMD accesses on the existing page-table helpers. These can be overridden on arm64 to provide 128-bit single-copy atomicity when required. For now override pmdp_get() which is same as the generic memory default to avoid build dependency problem for callers in header . No functional change intended. Cc: Catalin Marinas Cc: Will Deacon Cc: Ryan Roberts Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: kasan-dev@googlegroups.com Signed-off-by: Anshuman Khandual Reviewed-by: Ryan Roberts --- Changes in V3 - Added platform override for pmdp_get() - Replaced READ_ONCE() in pmdp_test_and_clear_young() arch/arm64/include/asm/pgtable.h | 11 +++++++++-- arch/arm64/mm/fault.c | 2 +- arch/arm64/mm/fixmap.c | 2 +- arch/arm64/mm/hugetlbpage.c | 2 +- arch/arm64/mm/kasan_init.c | 4 ++-- arch/arm64/mm/mmu.c | 22 +++++++++++----------- arch/arm64/mm/pageattr.c | 2 +- arch/arm64/mm/trans_pgd.c | 2 +- 8 files changed, 27 insertions(+), 20 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgta= ble.h index 763c5a411d64..9ad2d03e86ad 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -84,6 +84,12 @@ static inline void arch_leave_lazy_mmu_mode(void) arch_flush_lazy_mmu_mode(); } =20 +#define pmdp_get pmdp_get +static inline pmd_t pmdp_get(pmd_t *pmdp) +{ + return READ_ONCE(*pmdp); +} + #ifdef CONFIG_TRANSPARENT_HUGEPAGE #define __HAVE_ARCH_FLUSH_PMD_TLB_RANGE =20 @@ -811,7 +817,8 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd) } =20 /* Find an entry in the third-level page table. */ -#define pte_offset_phys(dir,addr) (pmd_page_paddr(READ_ONCE(*(dir))) + pte= _index(addr) * sizeof(pte_t)) +#define pte_offset_phys(dir, addr) (pmd_page_paddr(pmdp_get(dir)) + \ + pte_index(addr) * sizeof(pte_t)) =20 #define pte_set_fixmap(addr) ((pte_t *)set_fixmap_offset(FIX_PTE, addr)) #define pte_set_fixmap_offset(pmd, addr) pte_set_fixmap(pte_offset_phys(pm= d, addr)) @@ -1291,7 +1298,7 @@ static inline bool pmdp_test_and_clear_young(struct v= m_area_struct *vma, unsigned long address, pmd_t *pmdp) { /* Operation applies to PMD table entry only if FEAT_HAFT is enabled */ - VM_WARN_ON(pmd_table(READ_ONCE(*pmdp)) && !system_supports_haft()); + VM_WARN_ON(pmd_table(pmdp_get(pmdp)) && !system_supports_haft()); return __ptep_test_and_clear_young(vma, address, (pte_t *)pmdp); } #endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG= */ diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 2cecf6ba6df7..2757ee0c4300 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -188,7 +188,7 @@ static void show_pte(unsigned long addr) break; =20 pmdp =3D pmd_offset_lockless(pudp, pud, addr); - pmd =3D READ_ONCE(*pmdp); + pmd =3D pmdp_get(pmdp); ptval_to_str(pxd_str, pmd_val(pmd)); pr_cont(", pmd=3D%s", pxd_str); if (pmd_none(pmd) || pmd_bad(pmd)) diff --git a/arch/arm64/mm/fixmap.c b/arch/arm64/mm/fixmap.c index f66a0016dd02..3cdac8021d4f 100644 --- a/arch/arm64/mm/fixmap.c +++ b/arch/arm64/mm/fixmap.c @@ -42,7 +42,7 @@ static inline pte_t *fixmap_pte(unsigned long addr) =20 static void __init early_fixmap_init_pte(pmd_t *pmdp, unsigned long addr) { - pmd_t pmd =3D READ_ONCE(*pmdp); + pmd_t pmd =3D pmdp_get(pmdp); pte_t *ptep; =20 if (pmd_none(pmd)) { diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 8e799c1fe0aa..cdaa4500faf9 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -304,7 +304,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm, addr &=3D CONT_PMD_MASK; =20 pmdp =3D pmd_offset(pudp, addr); - pmd =3D READ_ONCE(*pmdp); + pmd =3D pmdp_get(pmdp); if (!(sz =3D=3D PMD_SIZE || sz =3D=3D CONT_PMD_SIZE) && pmd_none(pmd)) return NULL; diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c index 45fbdce684c8..7ca833c5de5e 100644 --- a/arch/arm64/mm/kasan_init.c +++ b/arch/arm64/mm/kasan_init.c @@ -62,7 +62,7 @@ static phys_addr_t __init kasan_alloc_raw_page(int node) static pte_t *__init kasan_pte_offset(pmd_t *pmdp, unsigned long addr, int= node, bool early) { - if (pmd_none(READ_ONCE(*pmdp))) { + if (pmd_none(pmdp_get(pmdp))) { phys_addr_t pte_phys =3D early ? __pa_symbol(kasan_early_shadow_pte) : kasan_alloc_zeroed_page(node); @@ -138,7 +138,7 @@ static void __init kasan_pmd_populate(pud_t *pudp, unsi= gned long addr, do { next =3D pmd_addr_end(addr, end); kasan_pte_populate(pmdp, addr, next, node, early); - } while (pmdp++, addr =3D next, addr !=3D end && pmd_none(READ_ONCE(*pmdp= ))); + } while (pmdp++, addr =3D next, addr !=3D end && pmd_none(pmdp_get(pmdp))= ); } =20 static void __init kasan_pud_populate(p4d_t *p4dp, unsigned long addr, diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index e589fb00d1e3..95621913679e 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -200,7 +200,7 @@ static int alloc_init_cont_pte(pmd_t *pmdp, unsigned lo= ng addr, int flags) { unsigned long next; - pmd_t pmd =3D READ_ONCE(*pmdp); + pmd_t pmd =3D pmdp_get(pmdp); pte_t *ptep; =20 BUG_ON(pmd_leaf(pmd)); @@ -257,7 +257,7 @@ static int init_pmd(pmd_t *pmdp, unsigned long addr, un= signed long end, unsigned long next; =20 do { - pmd_t old_pmd =3D READ_ONCE(*pmdp); + pmd_t old_pmd =3D pmdp_get(pmdp); =20 next =3D pmd_addr_end(addr, end); =20 @@ -272,7 +272,7 @@ static int init_pmd(pmd_t *pmdp, unsigned long addr, un= signed long end, * only allow updates to the permission attributes. */ BUG_ON(!pgattr_change_is_safe(pmd_val(old_pmd), - READ_ONCE(pmd_val(*pmdp)))); + pmd_val(pmdp_get(pmdp)))); } else { int ret; =20 @@ -282,7 +282,7 @@ static int init_pmd(pmd_t *pmdp, unsigned long addr, un= signed long end, return ret; =20 VM_WARN_ON_ONCE(pmd_val(old_pmd) !=3D 0 && - pmd_val(old_pmd) !=3D READ_ONCE(pmd_val(*pmdp))); + pmd_val(old_pmd) !=3D pmd_val(pmdp_get(pmdp))); } phys +=3D next - addr; } while (pmdp++, addr =3D next, addr !=3D end); @@ -293,7 +293,7 @@ static int init_pmd(pmd_t *pmdp, unsigned long addr, un= signed long end, static bool pmd_range_has_valid_noncont(pmd_t *pmdp) { for (int i =3D 0; i < CONT_PMDS; i++) { - pte_t pte =3D pmd_pte(READ_ONCE(pmdp[i])); + pte_t pte =3D pmd_pte(pmdp_get(pmdp + i)); =20 if (pte_valid(pte) && !pte_cont(pte)) return true; @@ -1553,7 +1553,7 @@ static void unmap_hotplug_pmd_range(pud_t *pudp, unsi= gned long addr, do { next =3D pmd_addr_end(addr, end); pmdp =3D pmd_offset(pudp, addr); - pmd =3D READ_ONCE(*pmdp); + pmd =3D pmdp_get(pmdp); if (pmd_none(pmd)) continue; =20 @@ -1708,7 +1708,7 @@ static void free_empty_pmd_table(pud_t *pudp, unsigne= d long addr, do { next =3D pmd_addr_end(addr, end); pmdp =3D pmd_offset(pudp, addr); - pmd =3D READ_ONCE(*pmdp); + pmd =3D pmdp_get(pmdp); if (pmd_none(pmd)) continue; =20 @@ -1729,7 +1729,7 @@ static void free_empty_pmd_table(pud_t *pudp, unsigne= d long addr, */ pmdp =3D pmd_offset(pudp, 0UL); for (i =3D 0; i < PTRS_PER_PMD; i++) { - if (!pmd_none(READ_ONCE(pmdp[i]))) + if (!pmd_none(pmdp_get(pmdp + i))) return; } =20 @@ -1881,7 +1881,7 @@ int pmd_set_huge(pmd_t *pmdp, phys_addr_t phys, pgpro= t_t prot) pmd_t new_pmd =3D pfn_pmd(__phys_to_pfn(phys), mk_pmd_sect_prot(prot)); =20 /* Only allow permission changes for now */ - if (!pgattr_change_is_safe(READ_ONCE(pmd_val(*pmdp)), + if (!pgattr_change_is_safe(pmd_val(pmdp_get(pmdp)), pmd_val(new_pmd))) return 0; =20 @@ -1906,7 +1906,7 @@ int pud_clear_huge(pud_t *pudp) =20 int pmd_clear_huge(pmd_t *pmdp) { - if (!pmd_leaf(READ_ONCE(*pmdp))) + if (!pmd_leaf(pmdp_get(pmdp))) return 0; pmd_clear(pmdp); return 1; @@ -1917,7 +1917,7 @@ int pmd_free_pte_page(pmd_t *pmdp, unsigned long addr) pte_t *table; pmd_t pmd; =20 - pmd =3D READ_ONCE(*pmdp); + pmd =3D pmdp_get(pmdp); =20 if (!pmd_table(pmd)) { VM_WARN_ON(1); diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c index bbe98ac9ad8c..0ca07bd5ded9 100644 --- a/arch/arm64/mm/pageattr.c +++ b/arch/arm64/mm/pageattr.c @@ -414,7 +414,7 @@ bool kernel_page_present(struct page *page) return pud_valid(pud); =20 pmdp =3D pmd_offset(pudp, addr); - pmd =3D READ_ONCE(*pmdp); + pmd =3D pmdp_get(pmdp); if (pmd_none(pmd)) return false; if (pmd_leaf(pmd)) diff --git a/arch/arm64/mm/trans_pgd.c b/arch/arm64/mm/trans_pgd.c index cca9706a875c..b27b2d2c20c3 100644 --- a/arch/arm64/mm/trans_pgd.c +++ b/arch/arm64/mm/trans_pgd.c @@ -74,7 +74,7 @@ static int copy_pmd(struct trans_pgd_info *info, pud_t *d= st_pudp, =20 src_pmdp =3D pmd_offset(src_pudp, start); do { - pmd_t pmd =3D READ_ONCE(*src_pmdp); + pmd_t pmd =3D pmdp_get(src_pmdp); =20 next =3D pmd_addr_end(addr, end); if (pmd_none(pmd)) --=20 2.43.0 From nobody Thu Sep 24 12:53:49 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A7695400995 for ; Thu, 24 Sep 2026 06:22:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790230952; cv=none; b=DgZoT9HyPIDPdReRO3uF95uWRmPul15bStx9AqqRlg78ozTnXsTt4zY6SJq0kcU2broUCkENdWDNu1BaBCIHeBlaUKD3XnUMnic+fpN3ibzlPVdWjFaRUJMo9FqWVjvhNijVbvEKVZgCl+pUj/eot/UsVwhwGqddTsH5Ygf6Alk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790230952; c=relaxed/simple; bh=It4nFYOWQrTcREnmA+umTClf9lhzbtVM+nYFpA3hDmU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l9ORGtFzsJYBDXPChu4mSn90AwXKcEeX21xRi8oIitJYhDFHjF134sNqCkfSgR/9IPvRu1/IsWzhh9sTOHrobhF9lwZJ6H1xWralRw5Vf/1dLn3PAb5KxClZ1vLP5emZpwNjbahvRj8Ht0h7sw/uGmOgYcPryLwg0TMp7W9B8EQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=leqM5NGC; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="leqM5NGC" 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 9AFFD1516; Wed, 23 Sep 2026 23:22:26 -0700 (PDT) Received: from localhost (a085714.arm.com [10.164.19.28]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 60B223F86C; Wed, 23 Sep 2026 23:22:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1790230950; bh=It4nFYOWQrTcREnmA+umTClf9lhzbtVM+nYFpA3hDmU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=leqM5NGCeYm3VoU7xCCd/l+6BtTKxtY/iRZlgxhA9FRMpTgJhok+cFuzYo2K8MjUQ DqCCPrDz7N+nPaGfhGAuVdxHSff5mEiFAMOV93x+1Ti7dUwFdS3ci1rrpiwPB99LP3 04wAMtbrH6hub3jJYOfn0HMFJMAiJScGKVWjVQh0= From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org Cc: Anshuman Khandual , Catalin Marinas , Will Deacon , Ryan Roberts , Mark Rutland , Lorenzo Stoakes , Andrew Morton , David Hildenbrand , Mike Rapoport , Linu Cherian , linux-kernel@vger.kernel.org, linux-mm@kvack.org, kasan-dev@googlegroups.com Subject: [PATCH V3 2/4] arm64/mm: Use pudp_get() for PUD accesses Date: Thu, 24 Sep 2026 11:52:12 +0530 Message-ID: <20260924062214.1635078-3-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260924062214.1635078-1-anshuman.khandual@arm.com> References: <20260924062214.1635078-1-anshuman.khandual@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace READ_ONCE() with pudp_get() for PUD accesses in preparation for supporting both D64 and D128 translation table formats. READ_ONCE() cannot currently be used for 128-bit page table entries on arm64 because it does not provide the required 128-bit single-copy atomicity, causing builds to fail for accesses wider than 64 bits. Although LDP/STP provide the required atomicity when FEAT_LSE is available (as required by FEAT_D128), extending READ_ONCE() to support 128-bit accesses is undesirable. READ_ONCE() is a general-purpose API, so doing so could encourage other 128-bit users that would either fail to build in configurations without D128 support or, if D128 becomes a runtime option, silently permit tearing on systems without the required hardware support. Instead, standardize PUD accesses on the existing page-table helpers. These can be overridden on arm64 to provide 128-bit single-copy atomicity when required. For now override pudp_get() which is same as the generic memory default in order to be consistent with similar helpers. No functional change intended. Cc: Catalin Marinas Cc: Will Deacon Cc: Ryan Roberts Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: kasan-dev@googlegroups.com Signed-off-by: Anshuman Khandual Reviewed-by: Ryan Roberts --- Changes in V3 - Added platform override for pudp_get() arch/arm64/include/asm/pgtable.h | 9 ++++++++- arch/arm64/mm/fault.c | 2 +- arch/arm64/mm/fixmap.c | 2 +- arch/arm64/mm/hugetlbpage.c | 4 ++-- arch/arm64/mm/kasan_init.c | 4 ++-- arch/arm64/mm/mmu.c | 20 ++++++++++---------- arch/arm64/mm/pageattr.c | 2 +- arch/arm64/mm/trans_pgd.c | 4 ++-- 8 files changed, 27 insertions(+), 20 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgta= ble.h index 9ad2d03e86ad..b46930f844a2 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -90,6 +90,12 @@ static inline pmd_t pmdp_get(pmd_t *pmdp) return READ_ONCE(*pmdp); } =20 +#define pudp_get pudp_get +static inline pud_t pudp_get(pud_t *pudp) +{ + return READ_ONCE(*pudp); +} + #ifdef CONFIG_TRANSPARENT_HUGEPAGE #define __HAVE_ARCH_FLUSH_PMD_TLB_RANGE =20 @@ -879,7 +885,8 @@ static inline pmd_t *pud_pgtable(pud_t pud) } =20 /* Find an entry in the second-level page table. */ -#define pmd_offset_phys(dir, addr) (pud_page_paddr(READ_ONCE(*(dir))) + pm= d_index(addr) * sizeof(pmd_t)) +#define pmd_offset_phys(dir, addr) (pud_page_paddr(pudp_get(dir)) + \ + pmd_index(addr) * sizeof(pmd_t)) =20 #define pmd_set_fixmap(addr) ((pmd_t *)set_fixmap_offset(FIX_PMD, addr)) #define pmd_set_fixmap_offset(pud, addr) pmd_set_fixmap(pmd_offset_phys(pu= d, addr)) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 2757ee0c4300..435e2e14c070 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -181,7 +181,7 @@ static void show_pte(unsigned long addr) break; =20 pudp =3D pud_offset_lockless(p4dp, p4d, addr); - pud =3D READ_ONCE(*pudp); + pud =3D pudp_get(pudp); ptval_to_str(pxd_str, pud_val(pud)); pr_cont(", pud=3D%s", pxd_str); if (pud_none(pud) || pud_bad(pud)) diff --git a/arch/arm64/mm/fixmap.c b/arch/arm64/mm/fixmap.c index 3cdac8021d4f..d9a870836faf 100644 --- a/arch/arm64/mm/fixmap.c +++ b/arch/arm64/mm/fixmap.c @@ -56,7 +56,7 @@ static void __init early_fixmap_init_pmd(pud_t *pudp, uns= igned long addr, unsigned long end) { unsigned long next; - pud_t pud =3D READ_ONCE(*pudp); + pud_t pud =3D pudp_get(pudp); pmd_t *pmdp; =20 if (pud_none(pud)) diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index cdaa4500faf9..c9ad5e75b073 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -262,7 +262,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, struct vm_a= rea_struct *vma, WARN_ON(addr & (sz - 1)); ptep =3D pte_alloc_huge(mm, pmdp, addr); } else if (sz =3D=3D PMD_SIZE) { - if (want_pmd_share(vma, addr) && pud_none(READ_ONCE(*pudp))) + if (want_pmd_share(vma, addr) && pud_none(pudp_get(pudp))) ptep =3D huge_pmd_share(mm, vma, addr, pudp); else ptep =3D (pte_t *)pmd_alloc(mm, pudp, addr); @@ -292,7 +292,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm, return NULL; =20 pudp =3D pud_offset(p4dp, addr); - pud =3D READ_ONCE(*pudp); + pud =3D pudp_get(pudp); if (sz !=3D PUD_SIZE && pud_none(pud)) return NULL; /* hugepage or swap? */ diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c index 7ca833c5de5e..aad29bcc7622 100644 --- a/arch/arm64/mm/kasan_init.c +++ b/arch/arm64/mm/kasan_init.c @@ -76,7 +76,7 @@ static pte_t *__init kasan_pte_offset(pmd_t *pmdp, unsign= ed long addr, int node, static pmd_t *__init kasan_pmd_offset(pud_t *pudp, unsigned long addr, int= node, bool early) { - if (pud_none(READ_ONCE(*pudp))) { + if (pud_none(pudp_get(pudp))) { phys_addr_t pmd_phys =3D early ? __pa_symbol(kasan_early_shadow_pmd) : kasan_alloc_zeroed_page(node); @@ -150,7 +150,7 @@ static void __init kasan_pud_populate(p4d_t *p4dp, unsi= gned long addr, do { next =3D pud_addr_end(addr, end); kasan_pmd_populate(pudp, addr, next, node, early); - } while (pudp++, addr =3D next, addr !=3D end && pud_none(READ_ONCE(*pudp= ))); + } while (pudp++, addr =3D next, addr !=3D end && pud_none(pudp_get(pudp))= ); } =20 static void __init kasan_p4d_populate(pgd_t *pgdp, unsigned long addr, diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 95621913679e..22efaee79293 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -309,7 +309,7 @@ static int alloc_init_cont_pmd(pud_t *pudp, unsigned lo= ng addr, { int ret; unsigned long next; - pud_t pud =3D READ_ONCE(*pudp); + pud_t pud =3D pudp_get(pudp); pmd_t *pmdp; =20 /* @@ -390,7 +390,7 @@ static int alloc_init_pud(p4d_t *p4dp, unsigned long ad= dr, unsigned long end, } =20 do { - pud_t old_pud =3D READ_ONCE(*pudp); + pud_t old_pud =3D pudp_get(pudp); =20 next =3D pud_addr_end(addr, end); =20 @@ -408,7 +408,7 @@ static int alloc_init_pud(p4d_t *p4dp, unsigned long ad= dr, unsigned long end, * only allow updates to the permission attributes. */ BUG_ON(!pgattr_change_is_safe(pud_val(old_pud), - READ_ONCE(pud_val(*pudp)))); + pud_val(pudp_get(pudp)))); } else { ret =3D alloc_init_cont_pmd(pudp, addr, next, phys, prot, pgtable_alloc, flags); @@ -416,7 +416,7 @@ static int alloc_init_pud(p4d_t *p4dp, unsigned long ad= dr, unsigned long end, goto out; =20 VM_WARN_ON_ONCE(pud_val(old_pud) !=3D 0 && - pud_val(old_pud) !=3D READ_ONCE(pud_val(*pudp))); + pud_val(old_pud) !=3D pud_val(pudp_get(pudp))); } phys +=3D next - addr; } while (pudp++, addr =3D next, addr !=3D end); @@ -1591,7 +1591,7 @@ static void unmap_hotplug_pud_range(p4d_t *p4dp, unsi= gned long addr, do { next =3D pud_addr_end(addr, end); pudp =3D pud_offset(p4dp, addr); - pud =3D READ_ONCE(*pudp); + pud =3D pudp_get(pudp); if (pud_none(pud)) continue; =20 @@ -1748,7 +1748,7 @@ static void free_empty_pud_table(p4d_t *p4dp, unsigne= d long addr, do { next =3D pud_addr_end(addr, end); pudp =3D pud_offset(p4dp, addr); - pud =3D READ_ONCE(*pudp); + pud =3D pudp_get(pudp); if (pud_none(pud)) continue; =20 @@ -1769,7 +1769,7 @@ static void free_empty_pud_table(p4d_t *p4dp, unsigne= d long addr, */ pudp =3D pud_offset(p4dp, 0UL); for (i =3D 0; i < PTRS_PER_PUD; i++) { - if (!pud_none(READ_ONCE(pudp[i]))) + if (!pud_none(pudp_get(pudp + i))) return; } =20 @@ -1867,7 +1867,7 @@ int pud_set_huge(pud_t *pudp, phys_addr_t phys, pgpro= t_t prot) pud_t new_pud =3D pfn_pud(__phys_to_pfn(phys), mk_pud_sect_prot(prot)); =20 /* Only allow permission changes for now */ - if (!pgattr_change_is_safe(READ_ONCE(pud_val(*pudp)), + if (!pgattr_change_is_safe(pud_val(pudp_get(pudp)), pud_val(new_pud))) return 0; =20 @@ -1898,7 +1898,7 @@ void p4d_clear_huge(p4d_t *p4dp) =20 int pud_clear_huge(pud_t *pudp) { - if (!pud_leaf(READ_ONCE(*pudp))) + if (!pud_leaf(pudp_get(pudp))) return 0; pud_clear(pudp); return 1; @@ -1938,7 +1938,7 @@ int pud_free_pmd_page(pud_t *pudp, unsigned long addr) pud_t pud; unsigned long next, end; =20 - pud =3D READ_ONCE(*pudp); + pud =3D pudp_get(pudp); =20 if (!pud_table(pud)) { VM_WARN_ON(1); diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c index 0ca07bd5ded9..07b2fa4de57f 100644 --- a/arch/arm64/mm/pageattr.c +++ b/arch/arm64/mm/pageattr.c @@ -407,7 +407,7 @@ bool kernel_page_present(struct page *page) return false; =20 pudp =3D pud_offset(p4dp, addr); - pud =3D READ_ONCE(*pudp); + pud =3D pudp_get(pudp); if (pud_none(pud)) return false; if (pud_leaf(pud)) diff --git a/arch/arm64/mm/trans_pgd.c b/arch/arm64/mm/trans_pgd.c index b27b2d2c20c3..d119119455f1 100644 --- a/arch/arm64/mm/trans_pgd.c +++ b/arch/arm64/mm/trans_pgd.c @@ -64,7 +64,7 @@ static int copy_pmd(struct trans_pgd_info *info, pud_t *d= st_pudp, unsigned long next; unsigned long addr =3D start; =20 - if (pud_none(READ_ONCE(*dst_pudp))) { + if (pud_none(pudp_get(dst_pudp))) { dst_pmdp =3D trans_alloc(info); if (!dst_pmdp) return -ENOMEM; @@ -109,7 +109,7 @@ static int copy_pud(struct trans_pgd_info *info, p4d_t = *dst_p4dp, =20 src_pudp =3D pud_offset(src_p4dp, start); do { - pud_t pud =3D READ_ONCE(*src_pudp); + pud_t pud =3D pudp_get(src_pudp); =20 next =3D pud_addr_end(addr, end); if (pud_none(pud)) --=20 2.43.0 From nobody Thu Sep 24 12:53:49 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9010540D59C for ; Thu, 24 Sep 2026 06:22:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790230956; cv=none; b=mEeiyOMRJDU/O6WSV5DSMXlZewrARAtbB4r8XK8FxiojPDqRptk1fIfijdPo+qejzudvOLUy6CCKYILuZFWaK7Ugd1SIxa7y9d3DOmWsyaRM32l2cyIKwNBR46RkVkH4zxGBRsbcVUSYrr2fvy/Uu+Utx8YYxXvusuLjKH6gh6o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790230956; c=relaxed/simple; bh=Izqyl3NqNDKyfXa9ucdwjbJWtozKpu+9KkF7o0jxLqU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TIbOdJL7UDbA/fwcbTSSDEGj4bArMioOIF0aQ+T0W4afEGmpMqKAKGjI19b/EbtHrRvSQjWwJG4/Ag5KsKGhXQqyHMzyLcGw4KywUqrjqLs4lz+oql4NqkeeGg68ZUivMCE6QujRbx3CL+/pB7xGkJzfSgAUbyCqZ8/nJhuDrUg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=OPa+4zC9; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="OPa+4zC9" 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 6F1641650; Wed, 23 Sep 2026 23:22:30 -0700 (PDT) Received: from localhost (a085714.arm.com [10.164.19.28]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 37B9F3F86C; Wed, 23 Sep 2026 23:22:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1790230953; bh=Izqyl3NqNDKyfXa9ucdwjbJWtozKpu+9KkF7o0jxLqU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OPa+4zC9f9wtpdd0jHUw79KM+PmDxqo33Qy51Nr+CSk2x54pJbO4UOQECBNk17oDq 47MeSSMtXam3UGJyZu6M9VB3iRorzwxWRsq7g8W5HqFQbtmH5CdE98QL3hJFujMxol IgHW3ux46V5woHgSfjyTUXHAUC4ccX0FKBiX3G6Q= From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org Cc: Anshuman Khandual , Catalin Marinas , Will Deacon , Ryan Roberts , Mark Rutland , Lorenzo Stoakes , Andrew Morton , David Hildenbrand , Mike Rapoport , Linu Cherian , linux-kernel@vger.kernel.org, linux-mm@kvack.org, kasan-dev@googlegroups.com Subject: [PATCH V3 3/4] arm64/mm: Use p4dp_get() for P4D accesses Date: Thu, 24 Sep 2026 11:52:13 +0530 Message-ID: <20260924062214.1635078-4-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260924062214.1635078-1-anshuman.khandual@arm.com> References: <20260924062214.1635078-1-anshuman.khandual@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace READ_ONCE() with p4dp_get() for P4D accesses in preparation for supporting both D64 and D128 translation table formats. READ_ONCE() cannot currently be used for 128-bit page table entries on arm64 because it does not provide the required 128-bit single-copy atomicity, causing builds to fail for accesses wider than 64 bits. Although LDP/STP provide the required atomicity when FEAT_LSE is available (as required by FEAT_D128), extending READ_ONCE() to support 128-bit accesses is undesirable. READ_ONCE() is a general-purpose API, so doing so could encourage other 128-bit users that would either fail to build in configurations without D128 support or, if D128 becomes a runtime option, silently permit tearing on systems without the required hardware support. Instead, standardize P4D accesses on the existing page-table helpers. These can be overridden on arm64 to provide 128-bit single-copy atomicity when required. For now override p4dp_get() which is same as the generic memory default to avoid build dependency problem for callers in header . No functional change intended. Cc: Catalin Marinas Cc: Will Deacon Cc: Ryan Roberts Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: kasan-dev@googlegroups.com Signed-off-by: Anshuman Khandual Reviewed-by: Ryan Roberts --- Changes in V3 - Added platform override for p4dp_get() - Replaced READ_ONCE() in pud_offset_phys() and pud_offset() arch/arm64/include/asm/pgtable.h | 10 ++++++++-- arch/arm64/mm/fault.c | 2 +- arch/arm64/mm/fixmap.c | 2 +- arch/arm64/mm/hugetlbpage.c | 2 +- arch/arm64/mm/kasan_init.c | 4 ++-- arch/arm64/mm/mmu.c | 12 ++++++------ arch/arm64/mm/pageattr.c | 2 +- arch/arm64/mm/trans_pgd.c | 4 ++-- 8 files changed, 22 insertions(+), 16 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgta= ble.h index b46930f844a2..f235f68a7518 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -96,6 +96,12 @@ static inline pud_t pudp_get(pud_t *pudp) return READ_ONCE(*pudp); } =20 +#define p4dp_get p4dp_get +static inline p4d_t p4dp_get(p4d_t *p4dp) +{ + return READ_ONCE(*p4dp); +} + #ifdef CONFIG_TRANSPARENT_HUGEPAGE #define __HAVE_ARCH_FLUSH_PMD_TLB_RANGE =20 @@ -976,7 +982,7 @@ static inline phys_addr_t pud_offset_phys(p4d_t *p4dp, = unsigned long addr) { VM_WARN_ON_ONCE(!pgtable_l4_enabled()); =20 - return p4d_page_paddr(READ_ONCE(*p4dp)) + pud_index(addr) * sizeof(pud_t); + return p4d_page_paddr(p4dp_get(p4dp)) + pud_index(addr) * sizeof(pud_t); } =20 static inline @@ -990,7 +996,7 @@ pud_t *pud_offset_lockless(p4d_t *p4dp, p4d_t p4d, unsi= gned long addr) =20 static inline pud_t *pud_offset(p4d_t *p4dp, unsigned long addr) { - return pud_offset_lockless(p4dp, READ_ONCE(*p4dp), addr); + return pud_offset_lockless(p4dp, p4dp_get(p4dp), addr); } #define pud_offset pud_offset =20 diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 435e2e14c070..a6afd8929a10 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -174,7 +174,7 @@ static void show_pte(unsigned long addr) break; =20 p4dp =3D p4d_offset_lockless(pgdp, pgd, addr); - p4d =3D READ_ONCE(*p4dp); + p4d =3D p4dp_get(p4dp); ptval_to_str(pxd_str, p4d_val(p4d)); pr_cont(", p4d=3D%s", pxd_str); if (p4d_none(p4d) || p4d_bad(p4d)) diff --git a/arch/arm64/mm/fixmap.c b/arch/arm64/mm/fixmap.c index d9a870836faf..2a0fe0b0f771 100644 --- a/arch/arm64/mm/fixmap.c +++ b/arch/arm64/mm/fixmap.c @@ -74,7 +74,7 @@ static void __init early_fixmap_init_pmd(pud_t *pudp, uns= igned long addr, static void __init early_fixmap_init_pud(p4d_t *p4dp, unsigned long addr, unsigned long end) { - p4d_t p4d =3D READ_ONCE(*p4dp); + p4d_t p4d =3D p4dp_get(p4dp); pud_t *pudp; =20 if (CONFIG_PGTABLE_LEVELS > 3 && !p4d_none(p4d) && diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index c9ad5e75b073..5771bf49e1fe 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -288,7 +288,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm, return NULL; =20 p4dp =3D p4d_offset(pgdp, addr); - if (!p4d_present(READ_ONCE(*p4dp))) + if (!p4d_present(p4dp_get(p4dp))) return NULL; =20 pudp =3D pud_offset(p4dp, addr); diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c index aad29bcc7622..4dd8c1186471 100644 --- a/arch/arm64/mm/kasan_init.c +++ b/arch/arm64/mm/kasan_init.c @@ -89,7 +89,7 @@ static pmd_t *__init kasan_pmd_offset(pud_t *pudp, unsign= ed long addr, int node, static pud_t *__init kasan_pud_offset(p4d_t *p4dp, unsigned long addr, int= node, bool early) { - if (p4d_none(READ_ONCE(*p4dp))) { + if (p4d_none(p4dp_get(p4dp))) { phys_addr_t pud_phys =3D early ? __pa_symbol(kasan_early_shadow_pud) : kasan_alloc_zeroed_page(node); @@ -162,7 +162,7 @@ static void __init kasan_p4d_populate(pgd_t *pgdp, unsi= gned long addr, do { next =3D p4d_addr_end(addr, end); kasan_pud_populate(p4dp, addr, next, node, early); - } while (p4dp++, addr =3D next, addr !=3D end && p4d_none(READ_ONCE(*p4dp= ))); + } while (p4dp++, addr =3D next, addr !=3D end && p4d_none(p4dp_get(p4dp))= ); } =20 static void __init kasan_pgd_populate(unsigned long addr, unsigned long en= d, diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 22efaee79293..83709d987e7c 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -367,7 +367,7 @@ static int alloc_init_pud(p4d_t *p4dp, unsigned long ad= dr, unsigned long end, { int ret =3D 0; unsigned long next; - p4d_t p4d =3D READ_ONCE(*p4dp); + p4d_t p4d =3D p4dp_get(p4dp); pud_t *pudp; =20 if (p4d_none(p4d)) { @@ -457,7 +457,7 @@ static int alloc_init_p4d(pgd_t *pgdp, unsigned long ad= dr, unsigned long end, } =20 do { - p4d_t old_p4d =3D READ_ONCE(*p4dp); + p4d_t old_p4d =3D p4dp_get(p4dp); =20 next =3D p4d_addr_end(addr, end); =20 @@ -467,7 +467,7 @@ static int alloc_init_p4d(pgd_t *pgdp, unsigned long ad= dr, unsigned long end, goto out; =20 VM_WARN_ON_ONCE(p4d_val(old_p4d) !=3D 0 && - p4d_val(old_p4d) !=3D READ_ONCE(p4d_val(*p4dp))); + p4d_val(old_p4d) !=3D (p4d_val(p4dp_get(p4dp)))); =20 phys +=3D next - addr; } while (p4dp++, addr =3D next, addr !=3D end); @@ -1622,7 +1622,7 @@ static void unmap_hotplug_p4d_range(pgd_t *pgdp, unsi= gned long addr, do { next =3D p4d_addr_end(addr, end); p4dp =3D p4d_offset(pgdp, addr); - p4d =3D READ_ONCE(*p4dp); + p4d =3D p4dp_get(p4dp); if (p4d_none(p4d)) continue; =20 @@ -1788,7 +1788,7 @@ static void free_empty_p4d_table(pgd_t *pgdp, unsigne= d long addr, do { next =3D p4d_addr_end(addr, end); p4dp =3D p4d_offset(pgdp, addr); - p4d =3D READ_ONCE(*p4dp); + p4d =3D p4dp_get(p4dp); if (p4d_none(p4d)) continue; =20 @@ -1809,7 +1809,7 @@ static void free_empty_p4d_table(pgd_t *pgdp, unsigne= d long addr, */ p4dp =3D p4d_offset(pgdp, 0UL); for (i =3D 0; i < PTRS_PER_P4D; i++) { - if (!p4d_none(READ_ONCE(p4dp[i]))) + if (!p4d_none(p4dp_get(p4dp + i))) return; } =20 diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c index 07b2fa4de57f..826856ef64a8 100644 --- a/arch/arm64/mm/pageattr.c +++ b/arch/arm64/mm/pageattr.c @@ -403,7 +403,7 @@ bool kernel_page_present(struct page *page) return false; =20 p4dp =3D p4d_offset(pgdp, addr); - if (p4d_none(READ_ONCE(*p4dp))) + if (p4d_none(p4dp_get(p4dp))) return false; =20 pudp =3D pud_offset(p4dp, addr); diff --git a/arch/arm64/mm/trans_pgd.c b/arch/arm64/mm/trans_pgd.c index d119119455f1..7afe2beca4ba 100644 --- a/arch/arm64/mm/trans_pgd.c +++ b/arch/arm64/mm/trans_pgd.c @@ -99,7 +99,7 @@ static int copy_pud(struct trans_pgd_info *info, p4d_t *d= st_p4dp, unsigned long next; unsigned long addr =3D start; =20 - if (p4d_none(READ_ONCE(*dst_p4dp))) { + if (p4d_none(p4dp_get(dst_p4dp))) { dst_pudp =3D trans_alloc(info); if (!dst_pudp) return -ENOMEM; @@ -145,7 +145,7 @@ static int copy_p4d(struct trans_pgd_info *info, pgd_t = *dst_pgdp, src_p4dp =3D p4d_offset(src_pgdp, start); do { next =3D p4d_addr_end(addr, end); - if (p4d_none(READ_ONCE(*src_p4dp))) + if (p4d_none(p4dp_get(src_p4dp))) continue; if (copy_pud(info, dst_p4dp, src_p4dp, addr, next)) return -ENOMEM; --=20 2.43.0 From nobody Thu Sep 24 12:53:49 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5DF584028C3 for ; Thu, 24 Sep 2026 06:22:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790230960; cv=none; b=t7nlaq/LP9KDK1/iMXrYO0NXYGu1z7LoOrUEgTHGk9JxoYmdAS5Fv9NzvcMuFZL+4RIitXuU3TGGQnYAhd/Tacl6cTdu4A3SCekfqq5k/gSsh/QEdVg6Ig8xhQWq3LhzrOcufBqiWRe16dBWQ6p8bv5FwEQdLxAf8ZdSgA9+fio= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790230960; c=relaxed/simple; bh=MbarBIp95Pz3ZZkxqGhq8vWSNi6Qxjc6YojSk+L58R4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oLeGEcnARtimTnXvfATfJLN3i8D3JBmuVbkY0UGkMjIwHXyAPgxW2buxjFWkz4K30ALYlw4PYpp+GB4NwhJRlUsixe4veORM4sCMUv8H6yXq3NdJebRtYT3KCqZ3t9yxG26iQ1/F+FEKrgsqluBTTI2vz+UJVV6ccuYuSqxRDf4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=Cm95oBd8; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="Cm95oBd8" 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 484271682; Wed, 23 Sep 2026 23:22:34 -0700 (PDT) Received: from localhost (a085714.arm.com [10.164.19.28]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0F3B23F86C; Wed, 23 Sep 2026 23:22:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1790230957; bh=MbarBIp95Pz3ZZkxqGhq8vWSNi6Qxjc6YojSk+L58R4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cm95oBd8XRa6BEsVHeaJqsurIo0tIR1i4OeiLxj8Cdc7CcvCD46G8IgbYQsSmTzOc 3FcRm11y545CyEPF3NAyOUvtK4BtG2vOmoL2R3uMNR8dc9tNGNb5jGl/6JBpuZ+J8N qQf6LBycrt1yMY3dsWI4qtF0DGNZtG52JoaPJPQc= From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org Cc: Anshuman Khandual , Catalin Marinas , Will Deacon , Ryan Roberts , Mark Rutland , Lorenzo Stoakes , Andrew Morton , David Hildenbrand , Mike Rapoport , Linu Cherian , linux-kernel@vger.kernel.org, linux-mm@kvack.org, kasan-dev@googlegroups.com Subject: [PATCH V3 4/4] arm64/mm: Use pgdp_get() for PGD accesses Date: Thu, 24 Sep 2026 11:52:14 +0530 Message-ID: <20260924062214.1635078-5-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260924062214.1635078-1-anshuman.khandual@arm.com> References: <20260924062214.1635078-1-anshuman.khandual@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace READ_ONCE() with pgdp_get() for PGD accesses in preparation for supporting both D64 and D128 translation table formats. READ_ONCE() cannot currently be used for 128-bit page table entries on arm64 because it does not provide the required 128-bit single-copy atomicity, causing builds to fail for accesses wider than 64 bits. Although LDP/STP provide the required atomicity when FEAT_LSE is available (as required by FEAT_D128), extending READ_ONCE() to support 128-bit accesses is undesirable. READ_ONCE() is a general-purpose API, so doing so could encourage other 128-bit users that would either fail to build in configurations without D128 support or, if D128 becomes a runtime option, silently permit tearing on systems without the required hardware support. Instead, standardize PGD accesses on the existing page-table helpers. These can be overridden on arm64 to provide 128-bit single-copy atomicity when required. For now override pgdp_get() which is same as the generic memory default to avoid build dependency problem for callers in header . No functional change intended. Cc: Catalin Marinas Cc: Will Deacon Cc: Ryan Roberts Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: kasan-dev@googlegroups.com Signed-off-by: Anshuman Khandual Reviewed-by: Ryan Roberts --- Changes in V3 - Added platform override for pgdp_get() - Replaced READ_ONCE() in p4d_offset_phys() and p4d_offset() arch/arm64/include/asm/pgtable.h | 10 ++++++++-- arch/arm64/mm/fault.c | 2 +- arch/arm64/mm/hugetlbpage.c | 2 +- arch/arm64/mm/kasan_init.c | 6 +++--- arch/arm64/mm/mmu.c | 6 +++--- arch/arm64/mm/pageattr.c | 2 +- arch/arm64/mm/trans_pgd.c | 4 ++-- 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgta= ble.h index f235f68a7518..05d273f276b8 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -102,6 +102,12 @@ static inline p4d_t p4dp_get(p4d_t *p4dp) return READ_ONCE(*p4dp); } =20 +#define pgdp_get pgdp_get +static inline pgd_t pgdp_get(pgd_t *pgdp) +{ + return READ_ONCE(*pgdp); +} + #ifdef CONFIG_TRANSPARENT_HUGEPAGE #define __HAVE_ARCH_FLUSH_PMD_TLB_RANGE =20 @@ -1102,7 +1108,7 @@ static inline phys_addr_t p4d_offset_phys(pgd_t *pgdp= , unsigned long addr) { VM_WARN_ON_ONCE(!pgtable_l5_enabled()); =20 - return pgd_page_paddr(READ_ONCE(*pgdp)) + p4d_index(addr) * sizeof(p4d_t); + return pgd_page_paddr(pgdp_get(pgdp)) + p4d_index(addr) * sizeof(p4d_t); } =20 static inline @@ -1116,7 +1122,7 @@ p4d_t *p4d_offset_lockless(pgd_t *pgdp, pgd_t pgd, un= signed long addr) =20 static inline p4d_t *p4d_offset(pgd_t *pgdp, unsigned long addr) { - return p4d_offset_lockless(pgdp, READ_ONCE(*pgdp), addr); + return p4d_offset_lockless(pgdp, pgdp_get(pgdp), addr); } =20 static inline p4d_t *p4d_set_fixmap(unsigned long addr) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index a6afd8929a10..43f25418275a 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -160,7 +160,7 @@ static void show_pte(unsigned long addr) guard(irqsave)(); =20 pgdp =3D pgd_offset(mm, addr); - pgd =3D READ_ONCE(*pgdp); + pgd =3D pgdp_get(pgdp); ptval_to_str(pxd_str, pgd_val(pgd)); pr_alert("[%016lx] pgd=3D%s", addr, pxd_str); =20 diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 5771bf49e1fe..e05e5b41ae50 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -284,7 +284,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm, pmd_t *pmdp, pmd; =20 pgdp =3D pgd_offset(mm, addr); - if (!pgd_present(READ_ONCE(*pgdp))) + if (!pgd_present(pgdp_get(pgdp))) return NULL; =20 p4dp =3D p4d_offset(pgdp, addr); diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c index 4dd8c1186471..f61f5bc09467 100644 --- a/arch/arm64/mm/kasan_init.c +++ b/arch/arm64/mm/kasan_init.c @@ -102,7 +102,7 @@ static pud_t *__init kasan_pud_offset(p4d_t *p4dp, unsi= gned long addr, int node, static p4d_t *__init kasan_p4d_offset(pgd_t *pgdp, unsigned long addr, int= node, bool early) { - if (pgd_none(READ_ONCE(*pgdp))) { + if (pgd_none(pgdp_get(pgdp))) { phys_addr_t p4d_phys =3D early ? __pa_symbol(kasan_early_shadow_p4d) : kasan_alloc_zeroed_page(node); @@ -256,7 +256,7 @@ static int __init root_level_idx(u64 addr) static void __init clone_next_level(u64 addr, pgd_t *tmp_pg_dir, pud_t *pu= d) { int idx =3D root_level_idx(addr); - pgd_t pgd =3D READ_ONCE(swapper_pg_dir[idx]); + pgd_t pgd =3D pgdp_get(swapper_pg_dir + idx); pud_t *pudp =3D (pud_t *)__phys_to_kimg(__pgd_to_phys(pgd)); =20 memcpy(pud, pudp, PAGE_SIZE); @@ -280,7 +280,7 @@ static int __init next_level_idx(u64 addr) */ static void __init clear_next_level(int pgd_idx, int start, int end) { - pgd_t pgd =3D READ_ONCE(swapper_pg_dir[pgd_idx]); + pgd_t pgd =3D pgdp_get(swapper_pg_dir + pgd_idx); pud_t *pudp =3D (pud_t *)__phys_to_kimg(__pgd_to_phys(pgd)); =20 memset(&pudp[start], 0, (end - start) * sizeof(pud_t)); diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 83709d987e7c..76d8d320aeed 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -434,7 +434,7 @@ static int alloc_init_p4d(pgd_t *pgdp, unsigned long ad= dr, unsigned long end, { int ret; unsigned long next; - pgd_t pgd =3D READ_ONCE(*pgdp); + pgd_t pgd =3D pgdp_get(pgdp); p4d_t *p4dp; =20 if (pgd_none(pgd)) { @@ -1649,7 +1649,7 @@ static void unmap_hotplug_range(unsigned long addr, u= nsigned long end, do { next =3D pgd_addr_end(addr, end); pgdp =3D pgd_offset_k(addr); - pgd =3D READ_ONCE(*pgdp); + pgd =3D pgdp_get(pgdp); if (pgd_none(pgd)) continue; =20 @@ -1827,7 +1827,7 @@ static void free_empty_tables(unsigned long addr, uns= igned long end, do { next =3D pgd_addr_end(addr, end); pgdp =3D pgd_offset_k(addr); - pgd =3D READ_ONCE(*pgdp); + pgd =3D pgdp_get(pgdp); if (pgd_none(pgd)) continue; =20 diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c index 826856ef64a8..dfa1356daac2 100644 --- a/arch/arm64/mm/pageattr.c +++ b/arch/arm64/mm/pageattr.c @@ -399,7 +399,7 @@ bool kernel_page_present(struct page *page) unsigned long addr =3D (unsigned long)page_address(page); =20 pgdp =3D pgd_offset_k(addr); - if (pgd_none(READ_ONCE(*pgdp))) + if (pgd_none(pgdp_get(pgdp))) return false; =20 p4dp =3D p4d_offset(pgdp, addr); diff --git a/arch/arm64/mm/trans_pgd.c b/arch/arm64/mm/trans_pgd.c index 7afe2beca4ba..06470d690f9f 100644 --- a/arch/arm64/mm/trans_pgd.c +++ b/arch/arm64/mm/trans_pgd.c @@ -134,7 +134,7 @@ static int copy_p4d(struct trans_pgd_info *info, pgd_t = *dst_pgdp, unsigned long next; unsigned long addr =3D start; =20 - if (pgd_none(READ_ONCE(*dst_pgdp))) { + if (pgd_none(pgdp_get(dst_pgdp))) { dst_p4dp =3D trans_alloc(info); if (!dst_p4dp) return -ENOMEM; @@ -164,7 +164,7 @@ static int copy_page_tables(struct trans_pgd_info *info= , pgd_t *dst_pgdp, dst_pgdp =3D pgd_offset_pgd(dst_pgdp, start); do { next =3D pgd_addr_end(addr, end); - if (pgd_none(READ_ONCE(*src_pgdp))) + if (pgd_none(pgdp_get(src_pgdp))) continue; if (copy_p4d(info, dst_pgdp, src_pgdp, addr, next)) return -ENOMEM; --=20 2.43.0