Commit 93a98695 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman
Browse files

mm: change pmdp_huge_get_and_clear_full take vm_area_struct as arg 



We will use this in later patch to do tlb flush when clearing pmd entries.

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200505071729.54912-22-aneesh.kumar@linux.ibm.com
parent f2b8d76d

arch/s390/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -1560,7 +1560,7 @@ static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm, 
}



#define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEAR_FULL

static inline pmd_t pmdp_huge_get_and_clear_full(struct mm_struct *mm,

static inline pmd_t pmdp_huge_get_and_clear_full(struct vm_area_struct *vma,

						 unsigned long addr,

						 pmd_t *pmdp, int full)

{
@@ -1569,7 +1569,7 @@ static inline pmd_t pmdp_huge_get_and_clear_full(struct mm_struct *mm, 
		*pmdp = __pmd(_SEGMENT_ENTRY_EMPTY);

		return pmd;

	}

	return pmdp_xchg_lazy(mm, addr, pmdp, __pmd(_SEGMENT_ENTRY_EMPTY));

	return pmdp_xchg_lazy(vma->vm_mm, addr, pmdp, __pmd(_SEGMENT_ENTRY_EMPTY));

}



#define __HAVE_ARCH_PMDP_HUGE_CLEAR_FLUSH

include/asm-generic/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -159,11 +159,11 @@ static inline pud_t pudp_huge_get_and_clear(struct mm_struct *mm, 


#ifdef CONFIG_TRANSPARENT_HUGEPAGE

#ifndef __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEAR_FULL

static inline pmd_t pmdp_huge_get_and_clear_full(struct mm_struct *mm,

static inline pmd_t pmdp_huge_get_and_clear_full(struct vm_area_struct *vma,

					    unsigned long address, pmd_t *pmdp,

					    int full)

{

	return pmdp_huge_get_and_clear(mm, address, pmdp);

	return pmdp_huge_get_and_clear(vma->vm_mm, address, pmdp);

}

#endif

mm/huge_memory.c

+2 −2
Original line number Diff line number Diff line
@@ -1852,7 +1852,7 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, 
	 * pgtable_trans_huge_withdraw after finishing pmdp related

	 * operations.

	 */

	orig_pmd = pmdp_huge_get_and_clear_full(tlb->mm, addr, pmd,

	orig_pmd = pmdp_huge_get_and_clear_full(vma, addr, pmd,

						tlb->fullmm);

	tlb_remove_pmd_tlb_entry(tlb, pmd, addr);

	if (vma_is_special_huge(vma)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE