Skip to content

Commit cef18bb

Browse files
Anshuman Khandualgregkh
authored andcommitted
mm: replace READ_ONCE() with standard page table accessors
[ Upstream commit c0efdb3 ] Replace all READ_ONCE() with a standard page table accessors i.e pxdp_get() that defaults into READ_ONCE() in cases where platform does not override. Link: https://lkml.kernel.org/r/20251007063100.2396936-1-anshuman.khandual@arm.com Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> Acked-by: David Hildenbrand <david@redhat.com> Reviewed-by: Lance Yang <lance.yang@linux.dev> Reviewed-by: Wei Yang <richard.weiyang@gmail.com> Reviewed-by: Dev Jain <dev.jain@arm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Stable-dep-of: ffef67b ("mm/memory: fix PMD/PUD checks in follow_pfnmap_start()") Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent a836054 commit cef18bb

6 files changed

Lines changed: 11 additions & 11 deletions

File tree

mm/gup.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -950,7 +950,7 @@ static struct page *follow_pud_mask(struct vm_area_struct *vma,
950950
struct mm_struct *mm = vma->vm_mm;
951951

952952
pudp = pud_offset(p4dp, address);
953-
pud = READ_ONCE(*pudp);
953+
pud = pudp_get(pudp);
954954
if (!pud_present(pud))
955955
return no_page_table(vma, flags, address);
956956
if (pud_leaf(pud)) {
@@ -975,7 +975,7 @@ static struct page *follow_p4d_mask(struct vm_area_struct *vma,
975975
p4d_t *p4dp, p4d;
976976

977977
p4dp = p4d_offset(pgdp, address);
978-
p4d = READ_ONCE(*p4dp);
978+
p4d = p4dp_get(p4dp);
979979
BUILD_BUG_ON(p4d_leaf(p4d));
980980

981981
if (!p4d_present(p4d) || p4d_bad(p4d))
@@ -3060,7 +3060,7 @@ static int gup_fast_pud_range(p4d_t *p4dp, p4d_t p4d, unsigned long addr,
30603060

30613061
pudp = pud_offset_lockless(p4dp, p4d, addr);
30623062
do {
3063-
pud_t pud = READ_ONCE(*pudp);
3063+
pud_t pud = pudp_get(pudp);
30643064

30653065
next = pud_addr_end(addr, end);
30663066
if (unlikely(!pud_present(pud)))
@@ -3086,7 +3086,7 @@ static int gup_fast_p4d_range(pgd_t *pgdp, pgd_t pgd, unsigned long addr,
30863086

30873087
p4dp = p4d_offset_lockless(pgdp, pgd, addr);
30883088
do {
3089-
p4d_t p4d = READ_ONCE(*p4dp);
3089+
p4d_t p4d = p4dp_get(p4dp);
30903090

30913091
next = p4d_addr_end(addr, end);
30923092
if (!p4d_present(p4d))
@@ -3108,7 +3108,7 @@ static void gup_fast_pgd_range(unsigned long addr, unsigned long end,
31083108

31093109
pgdp = pgd_offset(current->mm, addr);
31103110
do {
3111-
pgd_t pgd = READ_ONCE(*pgdp);
3111+
pgd_t pgd = pgdp_get(pgdp);
31123112

31133113
next = pgd_addr_end(addr, end);
31143114
if (pgd_none(pgd))

mm/hmm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ static int hmm_vma_walk_pud(pud_t *pudp, unsigned long start, unsigned long end,
491491
/* Normally we don't want to split the huge page */
492492
walk->action = ACTION_CONTINUE;
493493

494-
pud = READ_ONCE(*pudp);
494+
pud = pudp_get(pudp);
495495
if (!pud_present(pud)) {
496496
spin_unlock(ptl);
497497
return hmm_vma_walk_hole(start, end, -1, walk);

mm/memory.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6691,12 +6691,12 @@ int follow_pfnmap_start(struct follow_pfnmap_args *args)
66916691
goto out;
66926692

66936693
p4dp = p4d_offset(pgdp, address);
6694-
p4d = READ_ONCE(*p4dp);
6694+
p4d = p4dp_get(p4dp);
66956695
if (p4d_none(p4d) || unlikely(p4d_bad(p4d)))
66966696
goto out;
66976697

66986698
pudp = pud_offset(p4dp, address);
6699-
pud = READ_ONCE(*pudp);
6699+
pud = pudp_get(pudp);
67006700
if (pud_none(pud))
67016701
goto out;
67026702
if (pud_leaf(pud)) {

mm/mprotect.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ static inline long change_pud_range(struct mmu_gather *tlb,
599599
break;
600600
}
601601

602-
pud = READ_ONCE(*pudp);
602+
pud = pudp_get(pudp);
603603
if (pud_none(pud))
604604
continue;
605605

mm/sparse-vmemmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ int __meminit vmemmap_populate_hugepages(unsigned long start, unsigned long end,
439439
return -ENOMEM;
440440

441441
pmd = pmd_offset(pud, addr);
442-
if (pmd_none(READ_ONCE(*pmd))) {
442+
if (pmd_none(pmdp_get(pmd))) {
443443
void *p;
444444

445445
p = vmemmap_alloc_block_buf(PMD_SIZE, node, altmap);

mm/vmscan.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3783,7 +3783,7 @@ static int walk_pud_range(p4d_t *p4d, unsigned long start, unsigned long end,
37833783
pud = pud_offset(p4d, start & P4D_MASK);
37843784
restart:
37853785
for (i = pud_index(start), addr = start; addr != end; i++, addr = next) {
3786-
pud_t val = READ_ONCE(pud[i]);
3786+
pud_t val = pudp_get(pud + i);
37873787

37883788
next = pud_addr_end(addr, end);
37893789

0 commit comments

Comments
 (0)