Commit f32928ab authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Andrew Morton
Browse files

mm: change pudp_huge_get_and_clear_full take vm_area_struct as arg 

We will use this in a later patch to do tlb flush when clearing pud
entries on powerpc.  This is similar to commit 93a98695 ("mm: change
pmdp_huge_get_and_clear_full take vm_area_struct as arg")

Link: https://lkml.kernel.org/r/20230724190759.483013-3-aneesh.kumar@linux.ibm.com


Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Reviewed-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Joao Martins <joao.m.martins@oracle.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 348ad160

include/linux/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -456,11 +456,11 @@ static inline pmd_t pmdp_huge_get_and_clear_full(struct vm_area_struct *vma, 
#endif



#ifndef __HAVE_ARCH_PUDP_HUGE_GET_AND_CLEAR_FULL

static inline pud_t pudp_huge_get_and_clear_full(struct mm_struct *mm,

static inline pud_t pudp_huge_get_and_clear_full(struct vm_area_struct *vma,

					    unsigned long address, pud_t *pudp,

					    int full)

{

	return pudp_huge_get_and_clear(mm, address, pudp);

	return pudp_huge_get_and_clear(vma->vm_mm, address, pudp);

}

#endif

#endif /* CONFIG_TRANSPARENT_HUGEPAGE */

mm/debug_vm_pgtable.c

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ static void __init pud_advanced_tests(struct pgtable_debug_args *args) 
	WARN_ON(!(pud_write(pud) && pud_dirty(pud)));



#ifndef __PAGETABLE_PMD_FOLDED

	pudp_huge_get_and_clear_full(args->mm, vaddr, args->pudp, 1);

	pudp_huge_get_and_clear_full(args->vma, vaddr, args->pudp, 1);

	pud = READ_ONCE(*args->pudp);

	WARN_ON(!pud_none(pud));

#endif /* __PAGETABLE_PMD_FOLDED */

mm/huge_memory.c

+1 −1
Original line number Diff line number Diff line
@@ -1981,7 +1981,7 @@ int zap_huge_pud(struct mmu_gather *tlb, struct vm_area_struct *vma, 
	if (!ptl)

		return 0;



	pudp_huge_get_and_clear_full(tlb->mm, addr, pud, tlb->fullmm);

	pudp_huge_get_and_clear_full(vma, addr, pud, tlb->fullmm);

	tlb_remove_pud_tlb_entry(tlb, pud, addr);

	if (vma_is_special_huge(vma)) {

		spin_unlock(ptl);