| Message ID | 20170522162555.4313-1-punit.agrawal@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, May 22, 2017 at 6:25 PM, Punit Agrawal <punit.agrawal@arm.com> wrote: > When unmapping a hugepage range, huge_pte_clear() is used to clear the > page table entries that are marked as not present. huge_pte_clear() > internally just ends up calling pte_clear() which does not correctly > deal with hugepages consisting of contiguous page table entries. > > Add a size argument to address this issue and allow architectures to > override huge_pte_clear() by wrapping it in a #ifndef block. > > Update s390 implementation with the size parameter as well. > > Note that the change only affects huge_pte_clear() - the other generic > hugetlb functions don't need any change. > > Signed-off-by: Punit Agrawal <punit.agrawal@arm.com> > Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> > Cc: Heiko Carstens <heiko.carstens@de.ibm.com> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> > Cc: Mike Kravetz <mike.kravetz@oracle.com> Acked-by: Arnd Bergmann <arnd@arndb.de>
On Mon, 22 May 2017 17:25:55 +0100 Punit Agrawal <punit.agrawal@arm.com> wrote: > When unmapping a hugepage range, huge_pte_clear() is used to clear the > page table entries that are marked as not present. huge_pte_clear() > internally just ends up calling pte_clear() which does not correctly > deal with hugepages consisting of contiguous page table entries. > > Add a size argument to address this issue and allow architectures to > override huge_pte_clear() by wrapping it in a #ifndef block. > > Update s390 implementation with the size parameter as well. > > Note that the change only affects huge_pte_clear() - the other generic > hugetlb functions don't need any change. > > Signed-off-by: Punit Agrawal <punit.agrawal@arm.com> > Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> > Cc: Heiko Carstens <heiko.carstens@de.ibm.com> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> > Cc: Mike Kravetz <mike.kravetz@oracle.com> > --- > > Changes since v3 > > * Drop weak function and use #ifndef block to allow architecture override > * Drop unnecessary move of s390 function definition > > arch/s390/include/asm/hugetlb.h | 2 +- > include/asm-generic/hugetlb.h | 4 +++- > mm/hugetlb.c | 2 +- > 3 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/arch/s390/include/asm/hugetlb.h b/arch/s390/include/asm/hugetlb.h > index cd546a245c68..c0443500baec 100644 > --- a/arch/s390/include/asm/hugetlb.h > +++ b/arch/s390/include/asm/hugetlb.h > @@ -39,7 +39,7 @@ static inline int prepare_hugepage_range(struct file *file, > #define arch_clear_hugepage_flags(page) do { } while (0) > > static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr, > - pte_t *ptep) > + pte_t *ptep, unsigned long sz) > { > if ((pte_val(*ptep) & _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R3) > pte_val(*ptep) = _REGION3_ENTRY_EMPTY; For the nop-change for s390: Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Arnd Bergmann <arnd@arndb.de> writes: > On Mon, May 22, 2017 at 6:25 PM, Punit Agrawal <punit.agrawal@arm.com> wrote: >> When unmapping a hugepage range, huge_pte_clear() is used to clear the >> page table entries that are marked as not present. huge_pte_clear() >> internally just ends up calling pte_clear() which does not correctly >> deal with hugepages consisting of contiguous page table entries. >> >> Add a size argument to address this issue and allow architectures to >> override huge_pte_clear() by wrapping it in a #ifndef block. >> >> Update s390 implementation with the size parameter as well. >> >> Note that the change only affects huge_pte_clear() - the other generic >> hugetlb functions don't need any change. >> >> Signed-off-by: Punit Agrawal <punit.agrawal@arm.com> >> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> >> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> >> Cc: Arnd Bergmann <arnd@arndb.de> >> Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> >> Cc: Mike Kravetz <mike.kravetz@oracle.com> > > Acked-by: Arnd Bergmann <arnd@arndb.de> Thanks, Arnd. I've applied the tag locally. > > -- > To unsubscribe, send a message with 'unsubscribe linux-mm' in > the body to majordomo@kvack.org. For more info on Linux MM, > see: http://www.linux-mm.org/ . > Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
Martin Schwidefsky <schwidefsky@de.ibm.com> writes: > On Mon, 22 May 2017 17:25:55 +0100 > Punit Agrawal <punit.agrawal@arm.com> wrote: > >> When unmapping a hugepage range, huge_pte_clear() is used to clear the >> page table entries that are marked as not present. huge_pte_clear() >> internally just ends up calling pte_clear() which does not correctly >> deal with hugepages consisting of contiguous page table entries. >> >> Add a size argument to address this issue and allow architectures to >> override huge_pte_clear() by wrapping it in a #ifndef block. >> >> Update s390 implementation with the size parameter as well. >> >> Note that the change only affects huge_pte_clear() - the other generic >> hugetlb functions don't need any change. >> >> Signed-off-by: Punit Agrawal <punit.agrawal@arm.com> >> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> >> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> >> Cc: Arnd Bergmann <arnd@arndb.de> >> Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> >> Cc: Mike Kravetz <mike.kravetz@oracle.com> >> --- >> >> Changes since v3 >> >> * Drop weak function and use #ifndef block to allow architecture override >> * Drop unnecessary move of s390 function definition >> >> arch/s390/include/asm/hugetlb.h | 2 +- >> include/asm-generic/hugetlb.h | 4 +++- >> mm/hugetlb.c | 2 +- >> 3 files changed, 5 insertions(+), 3 deletions(-) >> >> diff --git a/arch/s390/include/asm/hugetlb.h b/arch/s390/include/asm/hugetlb.h >> index cd546a245c68..c0443500baec 100644 >> --- a/arch/s390/include/asm/hugetlb.h >> +++ b/arch/s390/include/asm/hugetlb.h >> @@ -39,7 +39,7 @@ static inline int prepare_hugepage_range(struct file *file, >> #define arch_clear_hugepage_flags(page) do { } while (0) >> >> static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr, >> - pte_t *ptep) >> + pte_t *ptep, unsigned long sz) >> { >> if ((pte_val(*ptep) & _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R3) >> pte_val(*ptep) = _REGION3_ENTRY_EMPTY; > > For the nop-change for s390: > Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Applied the tag locally. Thanks!
diff --git a/arch/s390/include/asm/hugetlb.h b/arch/s390/include/asm/hugetlb.h index cd546a245c68..c0443500baec 100644 --- a/arch/s390/include/asm/hugetlb.h +++ b/arch/s390/include/asm/hugetlb.h @@ -39,7 +39,7 @@ static inline int prepare_hugepage_range(struct file *file, #define arch_clear_hugepage_flags(page) do { } while (0) static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr, - pte_t *ptep) + pte_t *ptep, unsigned long sz) { if ((pte_val(*ptep) & _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R3) pte_val(*ptep) = _REGION3_ENTRY_EMPTY; diff --git a/include/asm-generic/hugetlb.h b/include/asm-generic/hugetlb.h index 99b490b4d05a..540354f94f83 100644 --- a/include/asm-generic/hugetlb.h +++ b/include/asm-generic/hugetlb.h @@ -31,10 +31,12 @@ static inline pte_t huge_pte_modify(pte_t pte, pgprot_t newprot) return pte_modify(pte, newprot); } +#ifndef huge_pte_clear static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr, - pte_t *ptep) + pte_t *ptep, unsigned long sz) { pte_clear(mm, addr, ptep); } +#endif #endif /* _ASM_GENERIC_HUGETLB_H */ diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 0e4d1fb3122f..ddfed20cd637 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3338,7 +3338,7 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, * unmapped and its refcount is dropped, so just clear pte here. */ if (unlikely(!pte_present(pte))) { - huge_pte_clear(mm, address, ptep); + huge_pte_clear(mm, address, ptep, sz); spin_unlock(ptl); continue; }
When unmapping a hugepage range, huge_pte_clear() is used to clear the page table entries that are marked as not present. huge_pte_clear() internally just ends up calling pte_clear() which does not correctly deal with hugepages consisting of contiguous page table entries. Add a size argument to address this issue and allow architectures to override huge_pte_clear() by wrapping it in a #ifndef block. Update s390 implementation with the size parameter as well. Note that the change only affects huge_pte_clear() - the other generic hugetlb functions don't need any change. Signed-off-by: Punit Agrawal <punit.agrawal@arm.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> Cc: Mike Kravetz <mike.kravetz@oracle.com> --- Changes since v3 * Drop weak function and use #ifndef block to allow architecture override * Drop unnecessary move of s390 function definition arch/s390/include/asm/hugetlb.h | 2 +- include/asm-generic/hugetlb.h | 4 +++- mm/hugetlb.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-)