hugetlb: Change the function prototype to take vma_area_struct as arg
Subsystems (12)
PATCH v2 2/2 powerpc/mm/hugetlb: Switch hugetlb update to use pte_update
In reply to Aneesh Kumar K.VNow that we have updated hugetlb functions to take vm_area_struct and we can derive huge page size from vma, switch the pte update to use generic functions.
Signed-off-by Aneesh Kumar K.V <[email protected]>
--- arch/powerpc/include/asm/book3s/64/hugetlb.h | 34 +++++++--------------------- arch/powerpc/include/asm/hugetlb.h | 2 +- 2 files changed, 9 insertions(+), 27 deletions(-)
arch/powerpc/include/asm/book3s/64/hugetlb.h +8 -26
@@ -31,36 +31,18 @@ static inline int hstate_get_psize(struct hstate *hstate) } } -static inline unsigned long huge_pte_update (struct mm_struct *mm,unsigned long addr, +static inline unsigned long huge_pte_update (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned long clr,unsigned long set) { -if (radix_enabled ()) { -unsigned long old_pte; +unsigned long pg_sz; -if (cpu_has_feature (CPU_FTR_POWER9_DD1 )) { +VM_WARN_ON (!is_vm_hugetlb_page (vma)); + pg_sz =huge_page_size (hstate_vma (vma)); -unsigned long new_pte; - - old_pte =__radix_pte_update (ptep, ~0 ,0 ); - asmvolatile ("ptesync" : : :"memory" ); -/* -* new value of pte -*/ - new_pte = (old_pte | set) & ~clr; -/* -* For now let's do heavy pid flush -* radix__flush_tlb_page_psize(mm, addr, mmu_virtual_psize); -*/ -radix__flush_tlb_mm (mm); - -__radix_pte_update (ptep,0 , new_pte); - }else - old_pte =__radix_pte_update (ptep, clr, set); - asmvolatile ("ptesync" : : :"memory" ); -return old_pte; - } -return hash__pte_update (mm, addr, ptep, clr, set, true); +if (radix_enabled ()) +return radix__pte_update (vma->vm_mm, addr, ptep, clr, set, pg_sz); +return hash__pte_update (vma->vm_mm, addr, ptep, clr, set, true); } static inline void huge_ptep_set_wrprotect(struct vm_area_struct *vma,
@@ -69,7 +51,7 @@ static inline void huge_ptep_set_wrprotect(struct vm_area_struct *vma,if ((pte_raw (*ptep) &cpu_to_be64 (_PAGE_WRITE)) ==0 )return ; - huge_pte_update(vma->vm_mm, addr, ptep, _PAGE_WRITE, 0); + huge_pte_update(vma, addr, ptep, _PAGE_WRITE, 0); }#endif
arch/powerpc/include/asm/hugetlb.h +1 -1
@@ -136,7 +136,7 @@ static inline pte_t huge_ptep_get_and_clear(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep) { #ifdef CONFIG_PPC64 - return __pte(huge_pte_update(vma->vm_mm, addr, ptep, ~0UL, 0)); + return __pte(huge_pte_update(vma, addr, ptep, ~0UL, 0));#else return __pte (pte_update (ptep, ~0UL ,0 ));#endif
Signature · 7 lines
2.10.2 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
PATCH v2 1/2 hugetlb: Change the function prototype to take vma_area_struct as arg
This help us to find the hugetlb page size which we need ot use on some archs like ppc64 for tlbflush. This also make the interface consistent with other hugetlb functions
Signed-off-by Aneesh Kumar K.V <[email protected]>
---
NOTE: This series is dependent on another series posted here.
https://lists.ozlabs.org/pipermail/linuxppc-dev/2016-November/150948.html
arch/arm/include/asm/hugetlb-3level.h | 8 ++++---- arch/arm64/include/asm/hugetlb.h | 4 ++-- arch/arm64/mm/hugetlbpage.c | 7 +++++-- arch/ia64/include/asm/hugetlb.h | 8 ++++---- arch/metag/include/asm/hugetlb.h | 8 ++++---- arch/mips/include/asm/hugetlb.h | 7 ++++--- arch/parisc/include/asm/hugetlb.h | 4 ++-- arch/parisc/mm/hugetlbpage.c | 6 ++++-- arch/powerpc/include/asm/book3s/32/pgtable.h | 4 ++-- arch/powerpc/include/asm/book3s/64/hugetlb.h | 4 ++-- arch/powerpc/include/asm/hugetlb.h | 6 +++--- arch/powerpc/include/asm/nohash/32/pgtable.h | 4 ++-- arch/powerpc/include/asm/nohash/64/pgtable.h | 4 ++-- arch/s390/include/asm/hugetlb.h | 12 ++++++------ arch/s390/mm/hugetlbpage.c | 3 ++- arch/sh/include/asm/hugetlb.h | 8 ++++---- arch/sparc/include/asm/hugetlb.h | 6 +++--- arch/sparc/mm/hugetlbpage.c | 3 ++- arch/tile/include/asm/hugetlb.h | 8 ++++---- arch/x86/include/asm/hugetlb.h | 8 ++++---- mm/hugetlb.c | 6 +++--- 21 files changed, 68 insertions(+), 60 deletions(-)
arch/arm/include/asm/hugetlb-3level.h +4 -4
@@ -49,16 +49,16 @@ static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,ptep_clear_flush (vma, addr, ptep); } -static inline void huge_ptep_set_wrprotect (struct mm_struct *mm, +static inline void huge_ptep_set_wrprotect (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) { -ptep_set_wrprotect (mm, addr, ptep); +ptep_set_wrprotect (vma->vm_mm, addr, ptep); } -static inline pte_t huge_ptep_get_and_clear (struct mm_struct *mm, +static inline pte_t huge_ptep_get_and_clear (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) { -return ptep_get_and_clear (mm, addr, ptep); +return ptep_get_and_clear (vma->vm_mm, addr, ptep); } static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
arch/arm64/include/asm/hugetlb.h +2 -2
@@ -76,9 +76,9 @@ extern void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,extern int huge_ptep_set_access_flags (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,pte_t pte,int dirty); -extern pte_t huge_ptep_get_and_clear (struct mm_struct *mm, +extern pte_t huge_ptep_get_and_clear (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep); -extern void huge_ptep_set_wrprotect (struct mm_struct *mm, +extern void huge_ptep_set_wrprotect (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep);extern void huge_ptep_clear_flush (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep);
arch/arm64/mm/hugetlbpage.c +5 -2
@@ -197,10 +197,11 @@ pte_t arch_make_huge_pte(pte_t entry, struct vm_area_struct *vma,return entry; } -pte_t huge_ptep_get_and_clear (struct mm_struct *mm, +pte_t huge_ptep_get_and_clear (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) {pte_t pte; +struct mm_struct *mm = vma->vm_mm;if (pte_cont (*ptep)) {int ncontig, i;
@@ -263,9 +264,11 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma, } } -void huge_ptep_set_wrprotect (struct mm_struct *mm, +void huge_ptep_set_wrprotect (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) { +struct mm_struct *mm = vma->vm_mm; +if (pte_cont (*ptep)) {int ncontig, i;pte_t *cpte;
arch/ia64/include/asm/hugetlb.h +4 -4
@@ -26,10 +26,10 @@ static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,set_pte_at (mm, addr, ptep, pte); } -static inline pte_t huge_ptep_get_and_clear (struct mm_struct *mm, +static inline pte_t huge_ptep_get_and_clear (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) { -return ptep_get_and_clear (mm, addr, ptep); +return ptep_get_and_clear (vma->vm_mm, addr, ptep); } static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
@@ -47,10 +47,10 @@ static inline pte_t huge_pte_wrprotect(pte_t pte)return pte_wrprotect (pte); } -static inline void huge_ptep_set_wrprotect (struct mm_struct *mm, +static inline void huge_ptep_set_wrprotect (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) { -ptep_set_wrprotect (mm, addr, ptep); +ptep_set_wrprotect (vma->vm_mm, addr, ptep); } static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
arch/metag/include/asm/hugetlb.h +4 -4
@@ -28,10 +28,10 @@ static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,set_pte_at (mm, addr, ptep, pte); } -static inline pte_t huge_ptep_get_and_clear (struct mm_struct *mm, +static inline pte_t huge_ptep_get_and_clear (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) { -return ptep_get_and_clear (mm, addr, ptep); +return ptep_get_and_clear (vma->vm_mm, addr, ptep); } static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
@@ -49,10 +49,10 @@ static inline pte_t huge_pte_wrprotect(pte_t pte)return pte_wrprotect (pte); } -static inline void huge_ptep_set_wrprotect (struct mm_struct *mm, +static inline void huge_ptep_set_wrprotect (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) { -ptep_set_wrprotect (mm, addr, ptep); +ptep_set_wrprotect (vma->vm_mm, addr, ptep); } static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
arch/mips/include/asm/hugetlb.h +4 -3
@@ -53,11 +53,12 @@ static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,set_pte_at (mm, addr, ptep, pte); } -static inline pte_t huge_ptep_get_and_clear (struct mm_struct *mm, +static inline pte_t huge_ptep_get_and_clear (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) {pte_t clear;pte_t pte = *ptep; +struct mm_struct *mm = vma->vm_mm;pte_val (clear) = (unsigned long )invalid_pte_table;set_pte_at (mm, addr, ptep, clear);
@@ -81,10 +82,10 @@ static inline pte_t huge_pte_wrprotect(pte_t pte)return pte_wrprotect (pte); } -static inline void huge_ptep_set_wrprotect (struct mm_struct *mm, +static inline void huge_ptep_set_wrprotect (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) { -ptep_set_wrprotect (mm, addr, ptep); +ptep_set_wrprotect (vma->vm_mm, addr, ptep); } static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
arch/parisc/include/asm/hugetlb.h +2 -2
@@ -8,7 +8,7 @@void set_huge_pte_at (struct mm_struct *mm,unsigned long addr,pte_t *ptep,pte_t pte); -pte_t huge_ptep_get_and_clear (struct mm_struct *mm,unsigned long addr, +pte_t huge_ptep_get_and_clear (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep); static inline int is_hugepage_only_range(struct mm_struct *mm,
@@ -54,7 +54,7 @@ static inline pte_t huge_pte_wrprotect(pte_t pte)return pte_wrprotect (pte); } -void huge_ptep_set_wrprotect (struct mm_struct *mm, +void huge_ptep_set_wrprotect (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep); int huge_ptep_set_access_flags(struct vm_area_struct *vma,
arch/parisc/mm/hugetlbpage.c +4 -2
@@ -142,11 +142,12 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, } -pte_t huge_ptep_get_and_clear (struct mm_struct *mm,unsigned long addr, +pte_t huge_ptep_get_and_clear (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) {unsigned long flags;pte_t entry; +struct mm_struct *mm = vma->vma_mm;purge_tlb_start (flags); entry = *ptep;
@@ -157,11 +158,12 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, } -void huge_ptep_set_wrprotect (struct mm_struct *mm, +void huge_ptep_set_wrprotect (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) {unsigned long flags;pte_t old_pte; +struct mm_struct *mm = vma->vm_mm;purge_tlb_start (flags); old_pte = *ptep;
arch/powerpc/include/asm/book3s/32/pgtable.h +2 -2
@@ -216,10 +216,10 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, {pte_update (ptep, (_PAGE_RW | _PAGE_HWWRITE), _PAGE_RO); } -static inline void huge_ptep_set_wrprotect (struct mm_struct *mm, +static inline void huge_ptep_set_wrprotect (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) { -ptep_set_wrprotect (mm, addr, ptep); +ptep_set_wrprotect (vma->vm_mm, addr, ptep); }
arch/powerpc/include/asm/book3s/64/hugetlb.h +2 -2
@@ -63,13 +63,13 @@ static inline unsigned long huge_pte_update(struct mm_struct *mm, unsigned long return hash__pte_update(mm, addr, ptep, clr, set, true); } -static inline void huge_ptep_set_wrprotect (struct mm_struct *mm, +static inline void huge_ptep_set_wrprotect (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) {if ((pte_raw (*ptep) &cpu_to_be64 (_PAGE_WRITE)) ==0 )return ; -huge_pte_update (mm, addr, ptep, _PAGE_WRITE,0 ); +huge_pte_update (vma->vm_mm, addr, ptep, _PAGE_WRITE,0 ); }#endif
arch/powerpc/include/asm/hugetlb.h +3 -3
@@ -132,11 +132,11 @@ static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,set_pte_at (mm, addr, ptep, pte); } -static inline pte_t huge_ptep_get_and_clear (struct mm_struct *mm, +static inline pte_t huge_ptep_get_and_clear (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) {#ifdef CONFIG_PPC64 -return __pte (huge_pte_update (mm, addr, ptep, ~0UL ,0 )); +return __pte (huge_pte_update (vma->vm_mm, addr, ptep, ~0UL ,0 ));#else return __pte (pte_update (ptep, ~0UL ,0 ));#endif
@@ -146,7 +146,7 @@ static inline void huge_ptep_clear_flush(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep) { pte_t pte; - pte =huge_ptep_get_and_clear (vma->vm_mm, addr, ptep); + pte =huge_ptep_get_and_clear (vma, addr, ptep);flush_hugetlb_page (vma, addr); }
arch/powerpc/include/asm/nohash/32/pgtable.h +2 -2
@@ -260,10 +260,10 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, {pte_update (ptep, (_PAGE_RW | _PAGE_HWWRITE), _PAGE_RO); } -static inline void huge_ptep_set_wrprotect (struct mm_struct *mm, +static inline void huge_ptep_set_wrprotect (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) { -ptep_set_wrprotect (mm, addr, ptep); +ptep_set_wrprotect (vma->vm_mm, addr, ptep); }
arch/powerpc/include/asm/nohash/64/pgtable.h +2 -2
@@ -257,13 +257,13 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,pte_update (mm, addr, ptep, _PAGE_RW,0 ,0 ); } -static inline void huge_ptep_set_wrprotect (struct mm_struct *mm, +static inline void huge_ptep_set_wrprotect (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) {if ((pte_val (*ptep) & _PAGE_RW) ==0 )return ; -pte_update (mm, addr, ptep, _PAGE_RW,0 ,1 ); +pte_update (vma->vm_mm, addr, ptep, _PAGE_RW,0 ,1 ); }/*
arch/s390/include/asm/hugetlb.h +6 -6
@@ -19,7 +19,7 @@void set_huge_pte_at (struct mm_struct *mm,unsigned long addr,pte_t *ptep,pte_t pte);pte_t huge_ptep_get (pte_t *ptep); -pte_t huge_ptep_get_and_clear (struct mm_struct *mm, +pte_t huge_ptep_get_and_clear (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep);/*
@@ -50,7 +50,7 @@ static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr,static inline void huge_ptep_clear_flush (struct vm_area_struct *vma,unsigned long address,pte_t *ptep) { -huge_ptep_get_and_clear (vma->vm_mm, address, ptep); +huge_ptep_get_and_clear (vma, address, ptep); } static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
@@ -59,17 +59,17 @@ static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma, {int changed = !pte_same (huge_ptep_get (ptep), pte);if (changed) { -huge_ptep_get_and_clear (vma->vm_mm, addr, ptep); +huge_ptep_get_and_clear (vma, addr, ptep);set_huge_pte_at (vma->vm_mm, addr, ptep, pte); }return changed; } -static inline void huge_ptep_set_wrprotect (struct mm_struct *mm, +static inline void huge_ptep_set_wrprotect (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) { -pte_t pte =huge_ptep_get_and_clear (mm, addr, ptep); -set_huge_pte_at (mm, addr, ptep,pte_wrprotect (pte)); +pte_t pte =huge_ptep_get_and_clear (vma, addr, ptep); +set_huge_pte_at (vma->vm_mm, addr, ptep,pte_wrprotect (pte)); }static inline pte_t mk_huge_pte (struct page *page,pgprot_t pgprot)
arch/s390/mm/hugetlbpage.c +2 -1
@@ -136,12 +136,13 @@ pte_t huge_ptep_get(pte_t *ptep)return __rste_to_pte (pte_val (*ptep)); } -pte_t huge_ptep_get_and_clear (struct mm_struct *mm, +pte_t huge_ptep_get_and_clear (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) {pte_t pte =huge_ptep_get (ptep);pmd_t *pmdp = (pmd_t *) ptep;pud_t *pudp = (pud_t *) ptep; +struct mm_struct *mm = vma->vm_mm;if ((pte_val (*ptep) & _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R3)pudp_xchg_direct (mm, addr, pudp,__pud (_REGION3_ENTRY_EMPTY));
arch/sh/include/asm/hugetlb.h +4 -4
@@ -40,10 +40,10 @@ static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,set_pte_at (mm, addr, ptep, pte); } -static inline pte_t huge_ptep_get_and_clear (struct mm_struct *mm, +static inline pte_t huge_ptep_get_and_clear (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) { -return ptep_get_and_clear (mm, addr, ptep); +return ptep_get_and_clear (vma->vm_mm, addr, ptep); } static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
@@ -61,10 +61,10 @@ static inline pte_t huge_pte_wrprotect(pte_t pte)return pte_wrprotect (pte); } -static inline void huge_ptep_set_wrprotect (struct mm_struct *mm, +static inline void huge_ptep_set_wrprotect (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) { -ptep_set_wrprotect (mm, addr, ptep); +ptep_set_wrprotect (vma->vm_mm, addr, ptep); } static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
arch/sparc/include/asm/hugetlb.h +3 -3
@@ -8,7 +8,7 @@void set_huge_pte_at (struct mm_struct *mm,unsigned long addr,pte_t *ptep,pte_t pte); -pte_t huge_ptep_get_and_clear (struct mm_struct *mm,unsigned long addr, +pte_t huge_ptep_get_and_clear (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep); static inline int is_hugepage_only_range(struct mm_struct *mm,
@@ -46,11 +46,11 @@ static inline pte_t huge_pte_wrprotect(pte_t pte)return pte_wrprotect (pte); } -static inline void huge_ptep_set_wrprotect (struct mm_struct *mm, +static inline void huge_ptep_set_wrprotect (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) {pte_t old_pte = *ptep; -set_huge_pte_at (mm, addr, ptep,pte_wrprotect (old_pte)); +set_huge_pte_at (vma->vm_mm, addr, ptep,pte_wrprotect (old_pte)); } static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
arch/sparc/mm/hugetlbpage.c +2 -1
@@ -174,10 +174,11 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,maybe_tlb_batch_add (mm, addr +REAL_HPAGE_SIZE , ptep, orig,0 ); } -pte_t huge_ptep_get_and_clear (struct mm_struct *mm,unsigned long addr, +pte_t huge_ptep_get_and_clear (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) {pte_t entry; +struct mm_struct *mm = vma->vm_mm; entry = *ptep;if (pte_present (entry))
arch/tile/include/asm/hugetlb.h +4 -4
@@ -54,10 +54,10 @@ static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,set_pte (ptep, pte); } -static inline pte_t huge_ptep_get_and_clear (struct mm_struct *mm, +static inline pte_t huge_ptep_get_and_clear (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) { -return ptep_get_and_clear (mm, addr, ptep); +return ptep_get_and_clear (vma->vm_mm, addr, ptep); } static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
@@ -76,10 +76,10 @@ static inline pte_t huge_pte_wrprotect(pte_t pte)return pte_wrprotect (pte); } -static inline void huge_ptep_set_wrprotect (struct mm_struct *mm, +static inline void huge_ptep_set_wrprotect (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) { -ptep_set_wrprotect (mm, addr, ptep); +ptep_set_wrprotect (vma->vm_mm, addr, ptep); } static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
arch/x86/include/asm/hugetlb.h +4 -4
@@ -41,10 +41,10 @@ static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,set_pte_at (mm, addr, ptep, pte); } -static inline pte_t huge_ptep_get_and_clear (struct mm_struct *mm, +static inline pte_t huge_ptep_get_and_clear (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) { -return ptep_get_and_clear (mm, addr, ptep); +return ptep_get_and_clear (vma->vm_mm, addr, ptep); } static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
@@ -63,10 +63,10 @@ static inline pte_t huge_pte_wrprotect(pte_t pte)return pte_wrprotect (pte); } -static inline void huge_ptep_set_wrprotect (struct mm_struct *mm, +static inline void huge_ptep_set_wrprotect (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) { -ptep_set_wrprotect (mm, addr, ptep); +ptep_set_wrprotect (vma->vm_mm, addr, ptep); } static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
mm/hugetlb.c +3 -3
@@ -3182,7 +3182,7 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src,set_huge_pte_at (dst, addr, dst_pte, entry); }else {if (cow) { -huge_ptep_set_wrprotect (src, addr, src_pte); +huge_ptep_set_wrprotect (vma, addr, src_pte);mmu_notifier_invalidate_range (src, mmun_start, mmun_end); }
@@ -3271,7 +3271,7 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma,set_vma_resv_flags (vma,HPAGE_RESV_UNMAPPED ); } - pte =huge_ptep_get_and_clear (mm, address, ptep); + pte =huge_ptep_get_and_clear (vma, address, ptep);tlb_remove_tlb_entry (tlb, ptep, address);if (huge_pte_dirty (pte))set_page_dirty (page);
@@ -4020,7 +4020,7 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma,continue ; }if (!huge_pte_none (pte)) { - pte =huge_ptep_get_and_clear (mm, address, ptep); + pte =huge_ptep_get_and_clear (vma, address, ptep); pte =pte_mkhuge (huge_pte_modify (pte, newprot)); pte =arch_make_huge_pte (pte, vma,NULL ,0 );set_huge_pte_at (mm, address, ptep, pte);
Signature · 1 line
2.10.2