From mboxrd@z Thu Jan 1 00:00:00 1970 From: punit.agrawal@arm.com (Punit Agrawal) Date: Tue, 23 May 2017 15:53:48 +0100 Subject: [PATCH v3.1 4/6] mm/hugetlb: Allow architectures to override huge_pte_clear() In-Reply-To: <20170523072629.06163fa6@mschwideX1> (Martin Schwidefsky's message of "Tue, 23 May 2017 07:26:29 +0200") References: <20170522133604.11392-5-punit.agrawal@arm.com> <20170522162555.4313-1-punit.agrawal@arm.com> <20170523072629.06163fa6@mschwideX1> Message-ID: <878tlnhber.fsf@e105922-lin.cambridge.arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Martin Schwidefsky writes: > On Mon, 22 May 2017 17:25:55 +0100 > Punit Agrawal 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 >> Cc: Martin Schwidefsky >> Cc: Heiko Carstens >> Cc: Arnd Bergmann >> Cc: "Aneesh Kumar K.V" >> Cc: Mike Kravetz >> --- >> >> 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 Applied the tag locally. Thanks!