change young flag check functions to return bool
Subsystems (13)
cover change young flag check functions to return bool
This is a cleanup patchset to change all young flag check functions to return bool, as discussed with David in the previous thread[1]. Since callers only care about whether the young flag was set, returning bool makes the intention clearer. No functional changes intended.
Ran mm selftests on Arm64 and x86 machines, and no issues were found.
Note that I only CC'd the arch mailing lists to avoid disturbing too many people.
[1] https://lore.kernel.org/all/[email protected]/
Baolin Wang (6):
mm: change to return bool for ptep_test_and_clear_young()
mm: change to return bool for
ptep_clear_flush_young()/clear_flush_young_ptes()
mm: change to return bool for pmdp_test_and_clear_young()
mm: change to return bool for pmdp_clear_flush_young()
mm: change to return bool for pudp_test_and_clear_young()
mm: change to return bool for the MMU notifier's young flag check
arch/arm64/include/asm/pgtable.h | 29 ++++---- arch/arm64/mm/contpte.c | 8 +-- arch/microblaze/include/asm/pgtable.h | 2 +- arch/parisc/include/asm/pgtable.h | 8 +-- arch/parisc/kernel/cache.c | 8 +-- arch/powerpc/include/asm/book3s/32/pgtable.h | 4 +- arch/powerpc/include/asm/book3s/64/pgtable.h | 26 +++---- arch/powerpc/include/asm/nohash/64/pgtable.h | 2 +- arch/powerpc/include/asm/nohash/pgtable.h | 4 +- arch/powerpc/mm/book3s64/pgtable.c | 8 +-- arch/riscv/include/asm/pgtable.h | 14 ++-- arch/riscv/mm/pgtable.c | 8 +-- arch/s390/include/asm/pgtable.h | 16 ++--- arch/x86/include/asm/pgtable.h | 20 +++--- arch/x86/mm/pgtable.c | 28 ++++---- arch/xtensa/include/asm/pgtable.h | 6 +- include/linux/mmu_notifier.h | 76 +++++++++----------- include/linux/pgtable.h | 53 +++++++------- mm/internal.h | 16 ++--- mm/mmu_notifier.c | 20 +++--- mm/pgtable-generic.c | 14 ++-- virt/kvm/kvm_main.c | 40 +++++------ 22 files changed, 201 insertions(+), 209 deletions(-)
Signature · 1 line
2.47.3
PATCH 1/6 mm: change to return bool for ptep_test_and_clear_young()
Callers use ptep_test_and_clear_young() to clear the young flag and check whether it was set. Change the return type to bool to make the intention clearer.
--- arch/arm64/include/asm/pgtable.h | 8 ++++---- arch/arm64/mm/contpte.c | 4 ++-- arch/microblaze/include/asm/pgtable.h | 2 +- arch/parisc/include/asm/pgtable.h | 6 +++--- arch/powerpc/include/asm/book3s/32/pgtable.h | 4 ++-- arch/powerpc/include/asm/book3s/64/pgtable.h | 6 +++--- arch/powerpc/include/asm/nohash/pgtable.h | 4 ++-- arch/riscv/include/asm/pgtable.h | 4 ++-- arch/riscv/mm/pgtable.c | 8 ++++---- arch/s390/include/asm/pgtable.h | 4 ++-- arch/x86/include/asm/pgtable.h | 4 ++-- arch/x86/mm/pgtable.c | 6 +++--- arch/xtensa/include/asm/pgtable.h | 6 +++--- include/linux/pgtable.h | 16 ++++++++-------- 14 files changed, 41 insertions(+), 41 deletions(-)
arch/arm64/include/asm/pgtable.h +4 -4
@@ -1282,7 +1282,7 @@ static inline void __pte_clear(struct mm_struct *mm,__set_pte (ptep,__pte (0 )); } -static inline int __ptep_test_and_clear_young (struct vm_area_struct *vma, +static inline bool __ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long address,pte_t *ptep) {
@@ -1646,7 +1646,7 @@ extern void contpte_clear_full_ptes(struct mm_struct *mm, unsigned long addr,extern pte_t contpte_get_and_clear_full_ptes (struct mm_struct *mm,unsigned long addr,pte_t *ptep,unsigned int nr,int full); -int contpte_test_and_clear_young_ptes (struct vm_area_struct *vma, +bool contpte_test_and_clear_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr);int contpte_clear_flush_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr);
@@ -1813,7 +1813,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, }#define test_and_clear_young_ptes test_and_clear_young_ptes -static inline int test_and_clear_young_ptes (struct vm_area_struct *vma, +static inline bool test_and_clear_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr) {
@@ -1824,7 +1824,7 @@ static inline int test_and_clear_young_ptes(struct vm_area_struct *vma, }#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG -static inline int ptep_test_and_clear_young (struct vm_area_struct *vma, +static inline bool ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) {return test_and_clear_young_ptes (vma, addr, ptep,1 );
arch/arm64/mm/contpte.c +2 -2
@@ -508,7 +508,7 @@ pte_t contpte_get_and_clear_full_ptes(struct mm_struct *mm, }EXPORT_SYMBOL_GPL (contpte_get_and_clear_full_ptes); -int contpte_test_and_clear_young_ptes (struct vm_area_struct *vma, +bool contpte_test_and_clear_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr) {
@@ -525,7 +525,7 @@ int contpte_test_and_clear_young_ptes(struct vm_area_struct *vma,*/ unsigned long end = addr + nr *PAGE_SIZE ; -int young =0 ; +bool young = false; ptep =contpte_align_addr_ptep (&addr, &end, ptep, nr);for (; addr != end; ptep++, addr +=PAGE_SIZE )
arch/microblaze/include/asm/pgtable.h +1 -1
@@ -318,7 +318,7 @@ static inline void set_pte(pte_t *ptep, pte_t pte)#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNGstruct vm_area_struct ; -static inline int ptep_test_and_clear_young (struct vm_area_struct *vma, +static inline bool ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long address,pte_t *ptep) {return (pte_update (ptep, _PAGE_ACCESSED,0 ) & _PAGE_ACCESSED) !=0 ;
arch/parisc/include/asm/pgtable.h +3 -3
@@ -438,16 +438,16 @@ static inline pte_t ptep_get(pte_t *ptep) }#define ptep_get ptep_get -static inline int ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) +static inline bool ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) {pte_t pte; pte =ptep_get (ptep);if (!pte_young (pte)) { -return 0 ; +return false; }set_pte_at (vma->vm_mm, addr, ptep,pte_mkold (pte)); -return 1 ; +return true; }int ptep_clear_flush_young (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep);
arch/powerpc/include/asm/book3s/32/pgtable.h +2 -2
@@ -295,8 +295,8 @@ static inline pte_basic_t pte_update(struct mm_struct *mm, unsigned long addr, p* for our hash-based implementation, we fix that up here. */ #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG -static inline int __ptep_test_and_clear_young (struct mm_struct *mm, -unsigned long addr,pte_t *ptep) +static inline bool __ptep_test_and_clear_young (struct mm_struct *mm, +unsigned long addr,pte_t *ptep) {unsigned long old; old =pte_update (mm, addr, ptep, _PAGE_ACCESSED,0 ,0 );
arch/powerpc/include/asm/book3s/64/pgtable.h +3 -3
@@ -349,13 +349,13 @@ static inline unsigned long pte_update(struct mm_struct *mm, unsigned long addr,* For radix: H_PAGE_HASHPTE should be zero. Hence we can use the same * function for both hash and radix. */ -static inline int __ptep_test_and_clear_young (struct mm_struct *mm, -unsigned long addr,pte_t *ptep) +static inline bool __ptep_test_and_clear_young (struct mm_struct *mm, +unsigned long addr,pte_t *ptep) {unsigned long old;if ((pte_raw (*ptep) &cpu_to_be64 (_PAGE_ACCESSED |H_PAGE_HASHPTE )) ==0 ) -return 0 ; +return false; old =pte_update (mm, addr, ptep, _PAGE_ACCESSED,0 ,0 );return (old & _PAGE_ACCESSED) !=0 ; }
arch/powerpc/include/asm/nohash/pgtable.h +2 -2
@@ -101,8 +101,8 @@ static inline pte_basic_t pte_update(struct mm_struct *mm, unsigned long addr, p }#endif -static inline int ptep_test_and_clear_young (struct vm_area_struct *vma, -unsigned long addr,pte_t *ptep) +static inline bool ptep_test_and_clear_young (struct vm_area_struct *vma, +unsigned long addr,pte_t *ptep) {unsigned long old;
arch/riscv/include/asm/pgtable.h +2 -2
@@ -659,8 +659,8 @@ static inline void pte_clear(struct mm_struct *mm,extern int ptep_set_access_flags (struct vm_area_struct *vma,unsigned long address,pte_t *ptep,pte_t entry,int dirty);#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG/* defined in mm/pgtable.c */ -extern int ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long address, -pte_t *ptep); +extern bool ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long address, +pte_t *ptep);#define __HAVE_ARCH_PTEP_GET_AND_CLEAR static inline pte_t ptep_get_and_clear(struct mm_struct *mm,
arch/riscv/mm/pgtable.c +4 -4
@@ -29,12 +29,12 @@ int ptep_set_access_flags(struct vm_area_struct *vma,return true; } -int ptep_test_and_clear_young (struct vm_area_struct *vma, -unsigned long address, -pte_t *ptep) +bool ptep_test_and_clear_young (struct vm_area_struct *vma, +unsigned long address, +pte_t *ptep) {if (!pte_young (ptep_get (ptep))) -return 0 ; +return false;return test_and_clear_bit (_PAGE_ACCESSED_OFFSET, &pte_val (*ptep)); }EXPORT_SYMBOL_GPL (ptep_test_and_clear_young);
arch/s390/include/asm/pgtable.h +2 -2
@@ -1164,8 +1164,8 @@ pte_t ptep_xchg_direct(struct mm_struct *, unsigned long, pte_t *, pte_t);pte_t ptep_xchg_lazy (struct mm_struct *,unsigned long ,pte_t *,pte_t );#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG -static inline int ptep_test_and_clear_young (struct vm_area_struct *vma, -unsigned long addr,pte_t *ptep) +static inline bool ptep_test_and_clear_young (struct vm_area_struct *vma, +unsigned long addr,pte_t *ptep) {pte_t pte = *ptep;
arch/x86/include/asm/pgtable.h +2 -2
@@ -1232,8 +1232,8 @@ extern int ptep_set_access_flags(struct vm_area_struct *vma, pte_t entry, int dirty);#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG -extern int ptep_test_and_clear_young (struct vm_area_struct *vma, -unsigned long addr,pte_t *ptep); +extern bool ptep_test_and_clear_young (struct vm_area_struct *vma, +unsigned long addr,pte_t *ptep);#define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH extern int ptep_clear_flush_young(struct vm_area_struct *vma,
arch/x86/mm/pgtable.c +3 -3
@@ -443,10 +443,10 @@ int pudp_set_access_flags(struct vm_area_struct *vma, unsigned long address, }#endif -int ptep_test_and_clear_young (struct vm_area_struct *vma, -unsigned long addr,pte_t *ptep) +bool ptep_test_and_clear_young (struct vm_area_struct *vma, +unsigned long addr,pte_t *ptep) { -int ret =0 ; +bool ret = false;if (pte_young (*ptep)) ret = test_and_clear_bit(_PAGE_BIT_ACCESSED,
arch/xtensa/include/asm/pgtable.h +3 -3
@@ -304,15 +304,15 @@ set_pmd(pmd_t *pmdp, pmd_t pmdval)struct vm_area_struct ; -static inline int +static inline bool ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) {pte_t pte = *ptep;if (!pte_young (pte)) -return 0 ; +return false;update_pte (ptep,pte_mkold (pte)); -return 1 ; +return true; } static inline pte_t
include/linux/pgtable.h +8 -8
@@ -491,17 +491,17 @@ static inline pgd_t pgdp_get(pgd_t *pgdp)#endif #ifndef __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG -static inline int ptep_test_and_clear_young (struct vm_area_struct *vma, -unsigned long address, -pte_t *ptep) +static inline bool ptep_test_and_clear_young (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep) {pte_t pte =ptep_get (ptep); -int r =1 ; +bool young = true; +if (!pte_young (pte)) - r =0 ; + young = false;else set_pte_at (vma->vm_mm, address, ptep,pte_mkold (pte)); -return r; +return young; }#endif
@@ -1123,10 +1123,10 @@ static inline int clear_flush_young_ptes(struct vm_area_struct *vma,* * Returns: whether any PTE was young. */ -static inline int test_and_clear_young_ptes (struct vm_area_struct *vma, +static inline bool test_and_clear_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr) { -int young =0 ; +bool young = false;for (;;) { young |=ptep_test_and_clear_young (vma, addr, ptep);
Signature · 1 line
2.47.3
Re: [PATCH 1/6] mm: change to return bool for ptep_test_and_clear_young()
Quoted 5 lines · Baolin Wang
Callers use
ptep_test_and_clear_young()to clear the young flag and check whether it was set. Change the return type to bool to make the intention clearer.Signed-off-by Baolin Wang <[email protected]>
Couple nits about dropping externs below but otherwise LGTM, so:
Quoted 172 lines
--- arch/arm64/include/asm/pgtable.h | 8 ++++---- arch/arm64/mm/contpte.c | 4 ++-- arch/microblaze/include/asm/pgtable.h | 2 +- arch/parisc/include/asm/pgtable.h | 6 +++--- arch/powerpc/include/asm/book3s/32/pgtable.h | 4 ++-- arch/powerpc/include/asm/book3s/64/pgtable.h | 6 +++--- arch/powerpc/include/asm/nohash/pgtable.h | 4 ++-- arch/riscv/include/asm/pgtable.h | 4 ++-- arch/riscv/mm/pgtable.c | 8 ++++---- arch/s390/include/asm/pgtable.h | 4 ++-- arch/x86/include/asm/pgtable.h | 4 ++-- arch/x86/mm/pgtable.c | 6 +++--- arch/xtensa/include/asm/pgtable.h | 6 +++--- include/linux/pgtable.h | 16 ++++++++-------- 14 files changed, 41 insertions(+), 41 deletions(-)arch/arm64/include/asm/pgtable.h +4
-4@@ -1282,7 +1282,7 @@ static inline void __pte_clear(struct mm_struct *mm,__set_pte (ptep,__pte (0 )); } -static inline int __ptep_test_and_clear_young (struct vm_area_struct *vma, +static inline bool __ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long address,pte_t *ptep) {@@ -1646,7 +1646,7 @@ extern void contpte_clear_full_ptes(struct mm_struct *mm, unsigned long addr,extern pte_t contpte_get_and_clear_full_ptes (struct mm_struct *mm,unsigned long addr,pte_t *ptep,unsigned int nr,int full); -int contpte_test_and_clear_young_ptes (struct vm_area_struct *vma, +bool contpte_test_and_clear_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr);int contpte_clear_flush_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr);@@ -1813,7 +1813,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, }#define test_and_clear_young_ptes test_and_clear_young_ptes -static inline int test_and_clear_young_ptes (struct vm_area_struct *vma, +static inline bool test_and_clear_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr) {@@ -1824,7 +1824,7 @@ static inline int test_and_clear_young_ptes(struct vm_area_struct *vma, }#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG -static inline int ptep_test_and_clear_young (struct vm_area_struct *vma, +static inline bool ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) {return test_and_clear_young_ptes (vma, addr, ptep,1 );arch/arm64/mm/contpte.c +2
-2@@ -508,7 +508,7 @@ pte_t contpte_get_and_clear_full_ptes(struct mm_struct *mm, }EXPORT_SYMBOL_GPL (contpte_get_and_clear_full_ptes); -int contpte_test_and_clear_young_ptes (struct vm_area_struct *vma, +bool contpte_test_and_clear_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr) {@@ -525,7 +525,7 @@ int contpte_test_and_clear_young_ptes(struct vm_area_struct *vma,*/ unsigned long end = addr + nr *PAGE_SIZE ; -int young =0 ; +bool young = false; ptep =contpte_align_addr_ptep (&addr, &end, ptep, nr);for (; addr != end; ptep++, addr +=PAGE_SIZE )arch/microblaze/include/asm/pgtable.h +1
-1@@ -318,7 +318,7 @@ static inline void set_pte(pte_t *ptep, pte_t pte)#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNGstruct vm_area_struct ; -static inline int ptep_test_and_clear_young (struct vm_area_struct *vma, +static inline bool ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long address,pte_t *ptep) {return (pte_update (ptep, _PAGE_ACCESSED,0 ) & _PAGE_ACCESSED) !=0 ;arch/parisc/include/asm/pgtable.h +3
-3@@ -438,16 +438,16 @@ static inline pte_t ptep_get(pte_t *ptep) }#define ptep_get ptep_get -static inline int ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) +static inline bool ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) {pte_t pte; pte =ptep_get (ptep);if (!pte_young (pte)) { -return 0 ; +return false; }set_pte_at (vma->vm_mm, addr, ptep,pte_mkold (pte)); -return 1 ; +return true; }int ptep_clear_flush_young (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep);arch/powerpc/include/asm/book3s/32/pgtable.h +2
-2@@ -295,8 +295,8 @@ static inline pte_basic_t pte_update(struct mm_struct *mm, unsigned long addr, p* for our hash-based implementation, we fix that up here. */ #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG -static inline int __ptep_test_and_clear_young (struct mm_struct *mm, -unsigned long addr,pte_t *ptep) +static inline bool __ptep_test_and_clear_young (struct mm_struct *mm, +unsigned long addr,pte_t *ptep) {unsigned long old; old =pte_update (mm, addr, ptep, _PAGE_ACCESSED,0 ,0 );arch/powerpc/include/asm/book3s/64/pgtable.h +3
-3@@ -349,13 +349,13 @@ static inline unsigned long pte_update(struct mm_struct *mm, unsigned long addr,* For radix: H_PAGE_HASHPTE should be zero. Hence we can use the same * function for both hash and radix. */ -static inline int __ptep_test_and_clear_young (struct mm_struct *mm, -unsigned long addr,pte_t *ptep) +static inline bool __ptep_test_and_clear_young (struct mm_struct *mm, +unsigned long addr,pte_t *ptep) {unsigned long old;if ((pte_raw (*ptep) &cpu_to_be64 (_PAGE_ACCESSED |H_PAGE_HASHPTE )) ==0 ) -return 0 ; +return false; old =pte_update (mm, addr, ptep, _PAGE_ACCESSED,0 ,0 );return (old & _PAGE_ACCESSED) !=0 ; }arch/powerpc/include/asm/nohash/pgtable.h +2
-2@@ -101,8 +101,8 @@ static inline pte_basic_t pte_update(struct mm_struct *mm, unsigned long addr, p }#endif -static inline int ptep_test_and_clear_young (struct vm_area_struct *vma, -unsigned long addr,pte_t *ptep) +static inline bool ptep_test_and_clear_young (struct vm_area_struct *vma, +unsigned long addr,pte_t *ptep) {unsigned long old;arch/riscv/include/asm/pgtable.h +0
-0
arch/riscv/include/asm/pgtable.h static inline void pte_clear(struct mm_struct *mm, · line 663
Quoted 7 lines
arch/riscv/include/asm/pgtable.h +2
-2@@ -659,8 +659,8 @@ static inline void pte_clear(struct mm_struct *mm,extern int ptep_set_access_flags (struct vm_area_struct *vma,unsigned long address,pte_t *ptep,pte_t entry,int dirty);#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG/* defined in mm/pgtable.c */ -extern int ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long address, -pte_t *ptep); +extern bool ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long address, +pte_t *ptep);
Let's drop the extern.
Quoted 44 lines
arch/riscv/include/asm/pgtable.h +0
-0#define __HAVE_ARCH_PTEP_GET_AND_CLEAR static inline pte_t ptep_get_and_clear(struct mm_struct *mm,arch/riscv/mm/pgtable.c +4
-4@@ -29,12 +29,12 @@ int ptep_set_access_flags(struct vm_area_struct *vma,return true; } -int ptep_test_and_clear_young (struct vm_area_struct *vma, -unsigned long address, -pte_t *ptep) +bool ptep_test_and_clear_young (struct vm_area_struct *vma, +unsigned long address, +pte_t *ptep) {if (!pte_young (ptep_get (ptep))) -return 0 ; +return false;return test_and_clear_bit (_PAGE_ACCESSED_OFFSET, &pte_val (*ptep)); }EXPORT_SYMBOL_GPL (ptep_test_and_clear_young);arch/s390/include/asm/pgtable.h +2
-2@@ -1164,8 +1164,8 @@ pte_t ptep_xchg_direct(struct mm_struct *, unsigned long, pte_t *, pte_t);pte_t ptep_xchg_lazy (struct mm_struct *,unsigned long ,pte_t *,pte_t );#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG -static inline int ptep_test_and_clear_young (struct vm_area_struct *vma, -unsigned long addr,pte_t *ptep) +static inline bool ptep_test_and_clear_young (struct vm_area_struct *vma, +unsigned long addr,pte_t *ptep) {pte_t pte = *ptep;arch/x86/include/asm/pgtable.h +0
-0
arch/x86/include/asm/pgtable.h extern int ptep_set_access_flags(struct vm_area_struct *vma, · line 1236
Quoted 7 lines
arch/x86/include/asm/pgtable.h +2
-2@@ -1232,8 +1232,8 @@ extern int ptep_set_access_flags(struct vm_area_struct *vma, pte_t entry, int dirty);#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG -extern int ptep_test_and_clear_young (struct vm_area_struct *vma, -unsigned long addr,pte_t *ptep); +extern bool ptep_test_and_clear_young (struct vm_area_struct *vma, +unsigned long addr,pte_t *ptep);
Let's drop the extern.
Quoted 88 lines
arch/x86/include/asm/pgtable.h +0
-0#define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH extern int ptep_clear_flush_young(struct vm_area_struct *vma,arch/x86/mm/pgtable.c +3
-3@@ -443,10 +443,10 @@ int pudp_set_access_flags(struct vm_area_struct *vma, unsigned long address, }#endif -int ptep_test_and_clear_young (struct vm_area_struct *vma, -unsigned long addr,pte_t *ptep) +bool ptep_test_and_clear_young (struct vm_area_struct *vma, +unsigned long addr,pte_t *ptep) { -int ret =0 ; +bool ret = false;if (pte_young (*ptep)) ret = test_and_clear_bit(_PAGE_BIT_ACCESSED,arch/xtensa/include/asm/pgtable.h +3
-3@@ -304,15 +304,15 @@ set_pmd(pmd_t *pmdp, pmd_t pmdval)struct vm_area_struct ; -static inline int +static inline bool ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) {pte_t pte = *ptep;if (!pte_young (pte)) -return 0 ; +return false;update_pte (ptep,pte_mkold (pte)); -return 1 ; +return true; } static inline pte_tinclude/linux/pgtable.h +8
-9@@ -491,17 +491,17 @@ static inline pgd_t pgdp_get(pgd_t *pgdp)#endif #ifndef __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG -static inline int ptep_test_and_clear_young (struct vm_area_struct *vma, -unsigned long address, -pte_t *ptep) +static inline bool ptep_test_and_clear_young (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep) {pte_t pte =ptep_get (ptep); -int r =1 ; +bool young = true; +if (!pte_young (pte)) - r =0 ; + young = false;else set_pte_at (vma->vm_mm, address, ptep,pte_mkold (pte)); -return r; +return young; }#endif @@ -1123,10 +1123,10 @@ static inline int clear_flush_young_ptes(struct vm_area_struct *vma,* * Returns: whether any PTE was young. */ -static inline int test_and_clear_young_ptes (struct vm_area_struct *vma, +static inline bool test_and_clear_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr) { -int young =0 ; +bool young = false;for (;;) { young |=ptep_test_and_clear_young (vma, addr, ptep); --2.47.3
Re: [PATCH 1/6] mm: change to return bool for ptep_test_and_clear_young()
Quoted 10 lines · Lorenzo Stoakes (Oracle)
Quoted 5 lines · Baolin Wang
Callers use
ptep_test_and_clear_young()to clear the young flag and check whether it was set. Change the return type to bool to make the intention clearer.Signed-off-by Baolin Wang <[email protected]>Couple nits about dropping externs below but otherwise LGTM, so:
Reviewed-by Lorenzo Stoakes (Oracle) <[email protected]>
Thanks for reviewing.
Quoted 167 lines
Quoted 167 lines
--- arch/arm64/include/asm/pgtable.h | 8 ++++---- arch/arm64/mm/contpte.c | 4 ++-- arch/microblaze/include/asm/pgtable.h | 2 +- arch/parisc/include/asm/pgtable.h | 6 +++--- arch/powerpc/include/asm/book3s/32/pgtable.h | 4 ++-- arch/powerpc/include/asm/book3s/64/pgtable.h | 6 +++--- arch/powerpc/include/asm/nohash/pgtable.h | 4 ++-- arch/riscv/include/asm/pgtable.h | 4 ++-- arch/riscv/mm/pgtable.c | 8 ++++---- arch/s390/include/asm/pgtable.h | 4 ++-- arch/x86/include/asm/pgtable.h | 4 ++-- arch/x86/mm/pgtable.c | 6 +++--- arch/xtensa/include/asm/pgtable.h | 6 +++--- include/linux/pgtable.h | 16 ++++++++-------- 14 files changed, 41 insertions(+), 41 deletions(-)arch/arm64/include/asm/pgtable.h +4
-4@@ -1282,7 +1282,7 @@ static inline void __pte_clear(struct mm_struct *mm,__set_pte (ptep,__pte (0 )); } -static inline int __ptep_test_and_clear_young (struct vm_area_struct *vma, +static inline bool __ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long address,pte_t *ptep) {@@ -1646,7 +1646,7 @@ extern void contpte_clear_full_ptes(struct mm_struct *mm, unsigned long addr,extern pte_t contpte_get_and_clear_full_ptes (struct mm_struct *mm,unsigned long addr,pte_t *ptep,unsigned int nr,int full); -int contpte_test_and_clear_young_ptes (struct vm_area_struct *vma, +bool contpte_test_and_clear_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr);int contpte_clear_flush_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr);@@ -1813,7 +1813,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, }#define test_and_clear_young_ptes test_and_clear_young_ptes -static inline int test_and_clear_young_ptes (struct vm_area_struct *vma, +static inline bool test_and_clear_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr) {@@ -1824,7 +1824,7 @@ static inline int test_and_clear_young_ptes(struct vm_area_struct *vma, }#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG -static inline int ptep_test_and_clear_young (struct vm_area_struct *vma, +static inline bool ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) {return test_and_clear_young_ptes (vma, addr, ptep,1 );arch/arm64/mm/contpte.c +2
-2@@ -508,7 +508,7 @@ pte_t contpte_get_and_clear_full_ptes(struct mm_struct *mm, }EXPORT_SYMBOL_GPL (contpte_get_and_clear_full_ptes); -int contpte_test_and_clear_young_ptes (struct vm_area_struct *vma, +bool contpte_test_and_clear_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr) {@@ -525,7 +525,7 @@ int contpte_test_and_clear_young_ptes(struct vm_area_struct *vma,*/ unsigned long end = addr + nr *PAGE_SIZE ; -int young =0 ; +bool young = false; ptep =contpte_align_addr_ptep (&addr, &end, ptep, nr);for (; addr != end; ptep++, addr +=PAGE_SIZE )arch/microblaze/include/asm/pgtable.h +1
-1@@ -318,7 +318,7 @@ static inline void set_pte(pte_t *ptep, pte_t pte)#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNGstruct vm_area_struct ; -static inline int ptep_test_and_clear_young (struct vm_area_struct *vma, +static inline bool ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long address,pte_t *ptep) {return (pte_update (ptep, _PAGE_ACCESSED,0 ) & _PAGE_ACCESSED) !=0 ;arch/parisc/include/asm/pgtable.h +3
-3@@ -438,16 +438,16 @@ static inline pte_t ptep_get(pte_t *ptep) }#define ptep_get ptep_get -static inline int ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) +static inline bool ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) {pte_t pte; pte =ptep_get (ptep);if (!pte_young (pte)) { -return 0 ; +return false; }set_pte_at (vma->vm_mm, addr, ptep,pte_mkold (pte)); -return 1 ; +return true; }int ptep_clear_flush_young (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep);arch/powerpc/include/asm/book3s/32/pgtable.h +2
-2@@ -295,8 +295,8 @@ static inline pte_basic_t pte_update(struct mm_struct *mm, unsigned long addr, p* for our hash-based implementation, we fix that up here. */ #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG -static inline int __ptep_test_and_clear_young (struct mm_struct *mm, -unsigned long addr,pte_t *ptep) +static inline bool __ptep_test_and_clear_young (struct mm_struct *mm, +unsigned long addr,pte_t *ptep) {unsigned long old; old =pte_update (mm, addr, ptep, _PAGE_ACCESSED,0 ,0 );arch/powerpc/include/asm/book3s/64/pgtable.h +3
-3@@ -349,13 +349,13 @@ static inline unsigned long pte_update(struct mm_struct *mm, unsigned long addr,* For radix: H_PAGE_HASHPTE should be zero. Hence we can use the same * function for both hash and radix. */ -static inline int __ptep_test_and_clear_young (struct mm_struct *mm, -unsigned long addr,pte_t *ptep) +static inline bool __ptep_test_and_clear_young (struct mm_struct *mm, +unsigned long addr,pte_t *ptep) {unsigned long old;if ((pte_raw (*ptep) &cpu_to_be64 (_PAGE_ACCESSED |H_PAGE_HASHPTE )) ==0 ) -return 0 ; +return false; old =pte_update (mm, addr, ptep, _PAGE_ACCESSED,0 ,0 );return (old & _PAGE_ACCESSED) !=0 ; }arch/powerpc/include/asm/nohash/pgtable.h +2
-2@@ -101,8 +101,8 @@ static inline pte_basic_t pte_update(struct mm_struct *mm, unsigned long addr, p }#endif -static inline int ptep_test_and_clear_young (struct vm_area_struct *vma, -unsigned long addr,pte_t *ptep) +static inline bool ptep_test_and_clear_young (struct vm_area_struct *vma, +unsigned long addr,pte_t *ptep) {unsigned long old;
Quoted 14 lines
arch/riscv/include/asm/pgtable.h static inline void pte_clear(struct mm_struct *mm, · line 663
Quoted 12 lines
arch/riscv/include/asm/pgtable.h +2
-2@@ -659,8 +659,8 @@ static inline void pte_clear(struct mm_struct *mm,extern int ptep_set_access_flags (struct vm_area_struct *vma,unsigned long address,pte_t *ptep,pte_t entry,int dirty);#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG/* defined in mm/pgtable.c */ -extern int ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long address, -pte_t *ptep); +extern bool ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long address, +pte_t *ptep);Let's drop the extern.
Yes, I followed the original code style, but dropping the extern looks reasonable to me. Will do.
Quoted 45 lines
Quoted 45 lines
arch/riscv/include/asm/pgtable.h +0
-0#define __HAVE_ARCH_PTEP_GET_AND_CLEAR static inline pte_t ptep_get_and_clear(struct mm_struct *mm,arch/riscv/mm/pgtable.c +4
-4@@ -29,12 +29,12 @@ int ptep_set_access_flags(struct vm_area_struct *vma,return true; } -int ptep_test_and_clear_young (struct vm_area_struct *vma, -unsigned long address, -pte_t *ptep) +bool ptep_test_and_clear_young (struct vm_area_struct *vma, +unsigned long address, +pte_t *ptep) {if (!pte_young (ptep_get (ptep))) -return 0 ; +return false;return test_and_clear_bit (_PAGE_ACCESSED_OFFSET, &pte_val (*ptep)); }EXPORT_SYMBOL_GPL (ptep_test_and_clear_young);arch/s390/include/asm/pgtable.h +2
-2@@ -1164,8 +1164,8 @@ pte_t ptep_xchg_direct(struct mm_struct *, unsigned long, pte_t *, pte_t);pte_t ptep_xchg_lazy (struct mm_struct *,unsigned long ,pte_t *,pte_t );#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG -static inline int ptep_test_and_clear_young (struct vm_area_struct *vma, -unsigned long addr,pte_t *ptep) +static inline bool ptep_test_and_clear_young (struct vm_area_struct *vma, +unsigned long addr,pte_t *ptep) {pte_t pte = *ptep;arch/x86/include/asm/pgtable.h +0
-0@@ -1232,8 +1232,8 @@ extern int ptep_set_access_flags(struct vm_area_struct *vma, pte_t entry, int dirty);
Quoted 7 lines
arch/x86/include/asm/pgtable.h extern int ptep_set_access_flags(struct vm_area_struct *vma, · line 1236
Quoted 5 lines
arch/x86/include/asm/pgtable.h +2
-2#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG -extern int ptep_test_and_clear_young (struct vm_area_struct *vma, -unsigned long addr,pte_t *ptep); +extern bool ptep_test_and_clear_young (struct vm_area_struct *vma, +unsigned long addr,pte_t *ptep);Let's drop the extern.
Ack.
Re: [PATCH 1/6] mm: change to return bool for ptep_test_and_clear_young()
In reply to Baolin WangQuoted 4 lines · Baolin Wang
Callers use
ptep_test_and_clear_young()to clear the young flag and check whether it was set. Change the return type to bool to make the intention clearer.
Right I checked all callers of ptep_test_and_clear_young(). I agree, we only need bool here.
Quoted 9 lines
Signed-off-by Baolin Wang <[email protected]>--- arch/arm64/include/asm/pgtable.h | 8 ++++---- arch/arm64/mm/contpte.c | 4 ++-- arch/microblaze/include/asm/pgtable.h | 2 +- arch/parisc/include/asm/pgtable.h | 6 +++--- arch/powerpc/include/asm/book3s/32/pgtable.h | 4 ++-- arch/powerpc/include/asm/book3s/64/pgtable.h | 6 +++--- arch/powerpc/include/asm/nohash/pgtable.h | 4 ++--
I looked at it because of powerpc changes, but ended up looking into all call sites anyways. So overall it LGTM (and I agree that we can remove the unnecessary externs from function declarations)
With that please feel free to add:
Re: [PATCH 1/6] mm: change to return bool for ptep_test_and_clear_young()
Quoted 20 lines · Ritesh Harjani (IBM)
Quoted 4 lines · Baolin Wang
Callers use
ptep_test_and_clear_young()to clear the young flag and check whether it was set. Change the return type to bool to make the intention clearer.Right I checked all callers of
ptep_test_and_clear_young(). I agree, we only need bool here.Quoted 9 lines
Signed-off-by Baolin Wang <[email protected]>--- arch/arm64/include/asm/pgtable.h | 8 ++++---- arch/arm64/mm/contpte.c | 4 ++-- arch/microblaze/include/asm/pgtable.h | 2 +- arch/parisc/include/asm/pgtable.h | 6 +++--- arch/powerpc/include/asm/book3s/32/pgtable.h | 4 ++-- arch/powerpc/include/asm/book3s/64/pgtable.h | 6 +++--- arch/powerpc/include/asm/nohash/pgtable.h | 4 ++--
Quoted 6 lines
I looked at it because of powerpc changes, but ended up looking into all call sites anyways. So overall it LGTM (and I agree that we can remove the unnecessary externs from function declarations)
With that please feel free to add:
Reviewed-by Ritesh Harjani (IBM) <[email protected]>
Thanks for reviewing. Will remove externs:)
PATCH 2/6 mm: change to return bool for ptep_clear_flush_young()/clear_flush_young_ptes()
In reply to Baolin WangThe ptep_clear_flush_young() and clear_flush_young_ptes() are used to clear the young flag and flush the TLB, returning whether the young flag was set. Change the return type to bool to make the intention clearer.
--- arch/arm64/include/asm/pgtable.h | 15 +++++++-------- arch/arm64/mm/contpte.c | 4 ++-- arch/parisc/include/asm/pgtable.h | 2 +- arch/parisc/kernel/cache.c | 8 ++++---- arch/powerpc/include/asm/nohash/64/pgtable.h | 2 +- arch/riscv/include/asm/pgtable.h | 4 ++-- arch/s390/include/asm/pgtable.h | 4 ++-- arch/x86/include/asm/pgtable.h | 4 ++-- arch/x86/mm/pgtable.c | 4 ++-- include/linux/pgtable.h | 8 ++++---- mm/pgtable-generic.c | 7 ++++--- 11 files changed, 31 insertions(+), 31 deletions(-)
arch/arm64/include/asm/pgtable.h +7 -8
@@ -1299,10 +1299,10 @@ static inline bool __ptep_test_and_clear_young(struct vm_area_struct *vma,return pte_young (pte); } -static inline int __ptep_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pte_t *ptep) +static inline bool __ptep_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep) { -int young =__ptep_test_and_clear_young (vma, address, ptep); +bool young =__ptep_test_and_clear_young (vma, address, ptep);if (young) {/*
@@ -1648,7 +1648,7 @@ extern pte_t contpte_get_and_clear_full_ptes(struct mm_struct *mm, unsigned int nr, int full);bool contpte_test_and_clear_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr); -int contpte_clear_flush_young_ptes (struct vm_area_struct *vma, +bool contpte_clear_flush_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr);extern void contpte_wrprotect_ptes (struct mm_struct *mm,unsigned long addr,pte_t *ptep,unsigned int nr);
@@ -1831,7 +1831,7 @@ static inline bool ptep_test_and_clear_young(struct vm_area_struct *vma, }#define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH -static inline int ptep_clear_flush_young (struct vm_area_struct *vma, +static inline bool ptep_clear_flush_young (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) {pte_t orig_pte =__ptep_get (ptep);
@@ -1843,9 +1843,8 @@ static inline int ptep_clear_flush_young(struct vm_area_struct *vma, }#define clear_flush_young_ptes clear_flush_young_ptes -static inline int clear_flush_young_ptes (struct vm_area_struct *vma, -unsigned long addr,pte_t *ptep, -unsigned int nr) +static inline bool clear_flush_young_ptes (struct vm_area_struct *vma, +unsigned long addr,pte_t *ptep,unsigned int nr) {if (likely (nr ==1 && !pte_cont (__ptep_get (ptep))))return __ptep_clear_flush_young (vma, addr, ptep);
arch/arm64/mm/contpte.c +2 -2
@@ -535,11 +535,11 @@ bool contpte_test_and_clear_young_ptes(struct vm_area_struct *vma, }EXPORT_SYMBOL_GPL (contpte_test_and_clear_young_ptes); -int contpte_clear_flush_young_ptes (struct vm_area_struct *vma, +bool contpte_clear_flush_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr) { -int young; +bool young; young =contpte_test_and_clear_young_ptes (vma, addr, ptep, nr);
arch/parisc/include/asm/pgtable.h +1 -1
@@ -450,7 +450,7 @@ static inline bool ptep_test_and_clear_young(struct vm_area_struct *vma, unsignereturn true; } -int ptep_clear_flush_young (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep); +bool ptep_clear_flush_young (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep);pte_t ptep_clear_flush (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep);struct mm_struct ;
arch/parisc/kernel/cache.c +4 -4
@@ -781,18 +781,18 @@ void flush_anon_page(struct vm_area_struct *vma, struct page *page, unsigned lon__flush_cache_page (vma, vmaddr,PFN_PHYS (page_to_pfn (page))); } -int ptep_clear_flush_young (struct vm_area_struct *vma,unsigned long addr, -pte_t *ptep) +bool ptep_clear_flush_young (struct vm_area_struct *vma,unsigned long addr, +pte_t *ptep) {pte_t pte =ptep_get (ptep);if (!pte_young (pte)) -return 0 ; +return false;set_pte (ptep,pte_mkold (pte));#if CONFIG_FLUSH_PAGE_ACCESSED __flush_cache_page (vma, addr,PFN_PHYS (pte_pfn (pte)));#endif -return 1 ; +return true; }/*
arch/powerpc/include/asm/nohash/64/pgtable.h +1 -1
@@ -155,7 +155,7 @@ static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,#define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH#define ptep_clear_flush_young (__vma, __address, __ptep) \ ({ \ - int __young = ptep_test_and_clear_young(__vma, __address, __ptep);\ + bool __young = ptep_test_and_clear_young(__vma, __address, __ptep);\ __young; \ })
arch/riscv/include/asm/pgtable.h +2 -2
@@ -695,8 +695,8 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, }#define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH -static inline int ptep_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pte_t *ptep) +static inline bool ptep_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep) {/* * This comment is borrowed from x86, but applies equally to RISC-V:
arch/s390/include/asm/pgtable.h +2 -2
@@ -1174,8 +1174,8 @@ static inline bool ptep_test_and_clear_young(struct vm_area_struct *vma, }#define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH -static inline int ptep_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pte_t *ptep) +static inline bool ptep_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep) {return ptep_test_and_clear_young (vma, address, ptep); }
arch/x86/include/asm/pgtable.h +2 -2
@@ -1236,8 +1236,8 @@ extern bool ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep);#define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH -extern int ptep_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pte_t *ptep); +extern bool ptep_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep);#define __HAVE_ARCH_PTEP_GET_AND_CLEAR static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,
arch/x86/mm/pgtable.c +2 -2
@@ -483,8 +483,8 @@ int pudp_test_and_clear_young(struct vm_area_struct *vma, }#endif -int ptep_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pte_t *ptep) +bool ptep_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep) {/* * On x86 CPUs, clearing the accessed bit without a TLB flush
include/linux/pgtable.h +4 -4
@@ -531,8 +531,8 @@ static inline int pmdp_test_and_clear_young(struct vm_area_struct *vma,#endif #ifndef __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH -int ptep_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pte_t *ptep); +bool ptep_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep);#endif #ifndef __HAVE_ARCH_PMDP_CLEAR_YOUNG_FLUSH
@@ -1086,10 +1086,10 @@ static inline void wrprotect_ptes(struct mm_struct *mm, unsigned long addr,* Context: The caller holds the page table lock. The PTEs map consecutive * pages that belong to the same folio. The PTEs are all in the same PMD. */ -static inline int clear_flush_young_ptes (struct vm_area_struct *vma, +static inline bool clear_flush_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr) { -int young =0 ; +bool young = false;for (;;) { young |=ptep_clear_flush_young (vma, addr, ptep);
mm/pgtable-generic.c +4 -3
@@ -81,10 +81,11 @@ int ptep_set_access_flags(struct vm_area_struct *vma,#endif #ifndef __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH -int ptep_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pte_t *ptep) +bool ptep_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep) { -int young; +bool young; + young =ptep_test_and_clear_young (vma, address, ptep);if (young)flush_tlb_page (vma, address);
Signature · 1 line
2.47.3
Re: [PATCH 2/6] mm: change to return bool for ptep_clear_flush_young()/clear_flush_young_ptes()
Quoted 5 lines · Baolin Wang
The
ptep_clear_flush_young()andclear_flush_young_ptes()are used to clear the young flag and flush the TLB, returning whether the young flag was set. Change the return type to bool to make the intention clearer.Signed-off-by Baolin Wang <[email protected]>
Couple nits but LGTM, so:
Quoted 19 lines
--- arch/arm64/include/asm/pgtable.h | 15 +++++++-------- arch/arm64/mm/contpte.c | 4 ++-- arch/parisc/include/asm/pgtable.h | 2 +- arch/parisc/kernel/cache.c | 8 ++++---- arch/powerpc/include/asm/nohash/64/pgtable.h | 2 +- arch/riscv/include/asm/pgtable.h | 4 ++-- arch/s390/include/asm/pgtable.h | 4 ++-- arch/x86/include/asm/pgtable.h | 4 ++-- arch/x86/mm/pgtable.c | 4 ++-- include/linux/pgtable.h | 8 ++++---- mm/pgtable-generic.c | 7 ++++--- 11 files changed, 31 insertions(+), 31 deletions(-)arch/arm64/include/asm/pgtable.h +0
-0
arch/arm64/include/asm/pgtable.h static inline bool __ptep_test_and_clear_young(struct vm_area_struct *vma, · line 1303
Quoted 7 lines
arch/arm64/include/asm/pgtable.h +2
-2@@ -1299,10 +1299,10 @@ static inline bool __ptep_test_and_clear_young(struct vm_area_struct *vma,return pte_young (pte); } -static inline int __ptep_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pte_t *ptep) +static inline bool __ptep_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep)
I mean this is subjective stuff but can we just put 2nd line 2 tabs indented underneath? Makes it easier for changes like this to not propagate.
Same comment for all of these!
Quoted 142 lines
arch/arm64/include/asm/pgtable.h +5
-6{ -int young =__ptep_test_and_clear_young (vma, address, ptep); +bool young =__ptep_test_and_clear_young (vma, address, ptep);if (young) {/* @@ -1648,7 +1648,7 @@ extern pte_t contpte_get_and_clear_full_ptes(struct mm_struct *mm, unsigned int nr, int full);bool contpte_test_and_clear_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr); -int contpte_clear_flush_young_ptes (struct vm_area_struct *vma, +bool contpte_clear_flush_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr);extern void contpte_wrprotect_ptes (struct mm_struct *mm,unsigned long addr,pte_t *ptep,unsigned int nr);@@ -1831,7 +1831,7 @@ static inline bool ptep_test_and_clear_young(struct vm_area_struct *vma, }#define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH -static inline int ptep_clear_flush_young (struct vm_area_struct *vma, +static inline bool ptep_clear_flush_young (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) {pte_t orig_pte =__ptep_get (ptep);@@ -1843,9 +1843,8 @@ static inline int ptep_clear_flush_young(struct vm_area_struct *vma, }#define clear_flush_young_ptes clear_flush_young_ptes -static inline int clear_flush_young_ptes (struct vm_area_struct *vma, -unsigned long addr,pte_t *ptep, -unsigned int nr) +static inline bool clear_flush_young_ptes (struct vm_area_struct *vma, +unsigned long addr,pte_t *ptep,unsigned int nr) {if (likely (nr ==1 && !pte_cont (__ptep_get (ptep))))return __ptep_clear_flush_young (vma, addr, ptep);arch/arm64/mm/contpte.c +2
-2@@ -535,11 +535,11 @@ bool contpte_test_and_clear_young_ptes(struct vm_area_struct *vma, }EXPORT_SYMBOL_GPL (contpte_test_and_clear_young_ptes); -int contpte_clear_flush_young_ptes (struct vm_area_struct *vma, +bool contpte_clear_flush_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr) { -int young; +bool young; young =contpte_test_and_clear_young_ptes (vma, addr, ptep, nr);arch/parisc/include/asm/pgtable.h +1
-1@@ -450,7 +450,7 @@ static inline bool ptep_test_and_clear_young(struct vm_area_struct *vma, unsignereturn true; } -int ptep_clear_flush_young (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep); +bool ptep_clear_flush_young (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep);pte_t ptep_clear_flush (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep);struct mm_struct ;arch/parisc/kernel/cache.c +4
-4@@ -781,18 +781,18 @@ void flush_anon_page(struct vm_area_struct *vma, struct page *page, unsigned lon__flush_cache_page (vma, vmaddr,PFN_PHYS (page_to_pfn (page))); } -int ptep_clear_flush_young (struct vm_area_struct *vma,unsigned long addr, -pte_t *ptep) +bool ptep_clear_flush_young (struct vm_area_struct *vma,unsigned long addr, +pte_t *ptep) {pte_t pte =ptep_get (ptep);if (!pte_young (pte)) -return 0 ; +return false;set_pte (ptep,pte_mkold (pte));#if CONFIG_FLUSH_PAGE_ACCESSED __flush_cache_page (vma, addr,PFN_PHYS (pte_pfn (pte)));#endif -return 1 ; +return true; }/* arch/powerpc/include/asm/nohash/64/pgtable.h +1
-1@@ -155,7 +155,7 @@ static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,#define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH#define ptep_clear_flush_young (__vma, __address, __ptep) \ ({ \ - int __young = ptep_test_and_clear_young(__vma, __address, __ptep);\ + bool __young = ptep_test_and_clear_young(__vma, __address, __ptep);\ __young; \ })arch/riscv/include/asm/pgtable.h +2
-2@@ -695,8 +695,8 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, }#define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH -static inline int ptep_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pte_t *ptep) +static inline bool ptep_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep) {/* * This comment is borrowed from x86, but applies equally to RISC-V: arch/s390/include/asm/pgtable.h +2
-2@@ -1174,8 +1174,8 @@ static inline bool ptep_test_and_clear_young(struct vm_area_struct *vma, }#define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH -static inline int ptep_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pte_t *ptep) +static inline bool ptep_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep) {return ptep_test_and_clear_young (vma, address, ptep); }arch/x86/include/asm/pgtable.h +0
-0
arch/x86/include/asm/pgtable.h extern bool ptep_test_and_clear_young(struct vm_area_struct *vma, · line 1240
Quoted 7 lines
arch/x86/include/asm/pgtable.h +2
-2@@ -1236,8 +1236,8 @@ extern bool ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep);#define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH -extern int ptep_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pte_t *ptep); +extern bool ptep_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep);
Drop extern please!
Quoted 68 lines
arch/x86/include/asm/pgtable.h +0
-0#define __HAVE_ARCH_PTEP_GET_AND_CLEAR static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,arch/x86/mm/pgtable.c +2
-2@@ -483,8 +483,8 @@ int pudp_test_and_clear_young(struct vm_area_struct *vma, }#endif -int ptep_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pte_t *ptep) +bool ptep_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep) {/* * On x86 CPUs, clearing the accessed bit without a TLB flush include/linux/pgtable.h +4
-4@@ -531,8 +531,8 @@ static inline int pmdp_test_and_clear_young(struct vm_area_struct *vma,#endif #ifndef __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH -int ptep_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pte_t *ptep); +bool ptep_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep);#endif #ifndef __HAVE_ARCH_PMDP_CLEAR_YOUNG_FLUSH@@ -1086,10 +1086,10 @@ static inline void wrprotect_ptes(struct mm_struct *mm, unsigned long addr,* Context: The caller holds the page table lock. The PTEs map consecutive * pages that belong to the same folio. The PTEs are all in the same PMD. */ -static inline int clear_flush_young_ptes (struct vm_area_struct *vma, +static inline bool clear_flush_young_ptes (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr) { -int young =0 ; +bool young = false;for (;;) { young |=ptep_clear_flush_young (vma, addr, ptep);mm/pgtable-generic.c +4
-4@@ -81,10 +81,11 @@ int ptep_set_access_flags(struct vm_area_struct *vma,#endif #ifndef __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH -int ptep_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pte_t *ptep) +bool ptep_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep) { -int young; +bool young; + young =ptep_test_and_clear_young (vma, address, ptep);if (young)flush_tlb_page (vma, address); --2.47.3
Re: [PATCH 2/6] mm: change to return bool for ptep_clear_flush_young()/clear_flush_young_ptes()
Quoted 10 lines · Lorenzo Stoakes (Oracle)
Quoted 5 lines · Baolin Wang
The
ptep_clear_flush_young()andclear_flush_young_ptes()are used to clear the young flag and flush the TLB, returning whether the young flag was set. Change the return type to bool to make the intention clearer.Signed-off-by Baolin Wang <[email protected]>Couple nits but LGTM, so:
Reviewed-by Lorenzo Stoakes (Oracle) <[email protected]>
Thanks.
Quoted 30 lines
Quoted 19 lines
--- arch/arm64/include/asm/pgtable.h | 15 +++++++-------- arch/arm64/mm/contpte.c | 4 ++-- arch/parisc/include/asm/pgtable.h | 2 +- arch/parisc/kernel/cache.c | 8 ++++---- arch/powerpc/include/asm/nohash/64/pgtable.h | 2 +- arch/riscv/include/asm/pgtable.h | 4 ++-- arch/s390/include/asm/pgtable.h | 4 ++-- arch/x86/include/asm/pgtable.h | 4 ++-- arch/x86/mm/pgtable.c | 4 ++-- include/linux/pgtable.h | 8 ++++---- mm/pgtable-generic.c | 7 ++++--- 11 files changed, 31 insertions(+), 31 deletions(-)arch/arm64/include/asm/pgtable.h +0
-0arch/arm64/include/asm/pgtable.h static inline bool __ptep_test_and_clear_young(struct vm_area_struct *vma, · line 1303
Quoted 7 lines
arch/arm64/include/asm/pgtable.h +2
-2@@ -1299,10 +1299,10 @@ static inline bool __ptep_test_and_clear_young(struct vm_area_struct *vma,return pte_young (pte); } -static inline int __ptep_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pte_t *ptep) +static inline bool __ptep_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep)I mean this is subjective stuff but can we just put 2nd line 2 tabs indented underneath? Makes it easier for changes like this to not propagate.
Quoted 1 line
Same comment for all of these!
I usually use 2 tabs for indentation in the mm subsystem, but for other subsystems, I try to follow the existing style since I'm unsure of other maintainers' preferences:)
Anyway, I can do this if no other objections.
Re: [PATCH 2/6] mm: change to return bool for ptep_clear_flush_young()/clear_flush_young_ptes()
In reply to Baolin WangQuoted 5 lines · Baolin Wang
The
ptep_clear_flush_young()andclear_flush_young_ptes()are used to clear the young flag and flush the TLB, returning whether the young flag was set. Change the return type to bool to make the intention clearer.Signed-off-by Baolin Wang <[email protected]>
Quoted 13 lines
--- arch/arm64/include/asm/pgtable.h | 15 +++++++-------- arch/arm64/mm/contpte.c | 4 ++-- arch/parisc/include/asm/pgtable.h | 2 +- arch/parisc/kernel/cache.c | 8 ++++---- arch/powerpc/include/asm/nohash/64/pgtable.h | 2 +- arch/riscv/include/asm/pgtable.h | 4 ++-- arch/s390/include/asm/pgtable.h | 4 ++-- arch/x86/include/asm/pgtable.h | 4 ++-- arch/x86/mm/pgtable.c | 4 ++-- include/linux/pgtable.h | 8 ++++---- mm/pgtable-generic.c | 7 ++++--- 11 files changed, 31 insertions(+), 31 deletions(-)
LGTM. Please feel free to add:
PATCH 3/6 mm: change to return bool for pmdp_test_and_clear_young()
In reply to Baolin WangCallers use pmdp_test_and_clear_young() to clear the young flag and check whether it was set for this PMD entry. Change the return type to bool to make the intention clearer.
--- arch/arm64/include/asm/pgtable.h | 6 +++--- arch/powerpc/include/asm/book3s/64/pgtable.h | 10 +++++----- arch/powerpc/mm/book3s64/pgtable.c | 4 ++-- arch/riscv/include/asm/pgtable.h | 2 +- arch/s390/include/asm/pgtable.h | 4 ++-- arch/x86/include/asm/pgtable.h | 4 ++-- arch/x86/mm/pgtable.c | 6 +++--- include/linux/pgtable.h | 19 +++++++++---------- 8 files changed, 27 insertions(+), 28 deletions(-)
arch/arm64/include/asm/pgtable.h +3 -3
@@ -1321,9 +1321,9 @@ static inline bool __ptep_clear_flush_young(struct vm_area_struct *vma,#if defined(CONFIG_TRANSPARENT_HUGEPAGE ) || defined(CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG )#define __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNG -static inline int pmdp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long address, -pmd_t *pmdp) +static inline bool pmdp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long address, +pmd_t *pmdp) {/* Operation applies to PMD table entry only if FEAT_HAFT is enabled */ VM_WARN_ON (pmd_table (READ_ONCE (*pmdp)) && !system_supports_haft ());
arch/powerpc/include/asm/book3s/64/pgtable.h +5 -5
@@ -1161,13 +1161,13 @@ pud_hugepage_update(struct mm_struct *mm, unsigned long addr, pud_t *pudp,* For radix we should always find H_PAGE_HASHPTE zero. Hence * the below will work for radix too */ -static inline int __pmdp_test_and_clear_young (struct mm_struct *mm, -unsigned long addr,pmd_t *pmdp) +static inline bool __pmdp_test_and_clear_young (struct mm_struct *mm, +unsigned long addr,pmd_t *pmdp) {unsigned long old;if ((pmd_raw (*pmdp) &cpu_to_be64 (_PAGE_ACCESSED |H_PAGE_HASHPTE )) ==0 ) -return 0 ; +return false; old =pmd_hugepage_update (mm, addr, pmdp, _PAGE_ACCESSED,0 );return ((old & _PAGE_ACCESSED) !=0 ); }
@@ -1300,8 +1300,8 @@ extern int pudp_set_access_flags(struct vm_area_struct *vma, pud_t entry, int dirty);#define __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNG -extern int pmdp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long address,pmd_t *pmdp); +extern bool pmdp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp);#define __HAVE_ARCH_PUDP_TEST_AND_CLEAR_YOUNGextern int pudp_test_and_clear_young (struct vm_area_struct *vma,unsigned long address,pud_t *pudp);
arch/powerpc/mm/book3s64/pgtable.c +2 -2
@@ -98,8 +98,8 @@ int pudp_set_access_flags(struct vm_area_struct *vma, unsigned long address, } -int pmdp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long address,pmd_t *pmdp) +bool pmdp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp) {return __pmdp_test_and_clear_young (vma->vm_mm, address, pmdp); }
arch/riscv/include/asm/pgtable.h +1 -1
@@ -1015,7 +1015,7 @@ static inline int pmdp_set_access_flags(struct vm_area_struct *vma, }#define __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNG -static inline int pmdp_test_and_clear_young (struct vm_area_struct *vma, +static inline bool pmdp_test_and_clear_young (struct vm_area_struct *vma,unsigned long address,pmd_t *pmdp) {return ptep_test_and_clear_young (vma, address, (pte_t *)pmdp);
arch/s390/include/asm/pgtable.h +2 -2
@@ -1683,8 +1683,8 @@ static inline int pmdp_set_access_flags(struct vm_area_struct *vma, }#define __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNG -static inline int pmdp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long addr,pmd_t *pmdp) +static inline bool pmdp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long addr,pmd_t *pmdp) {pmd_t pmd = *pmdp;
arch/x86/include/asm/pgtable.h +2 -2
@@ -1295,8 +1295,8 @@ extern int pudp_set_access_flags(struct vm_area_struct *vma, pud_t entry, int dirty);#define __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNG -extern int pmdp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long addr,pmd_t *pmdp); +extern bool pmdp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long addr,pmd_t *pmdp);extern int pudp_test_and_clear_young (struct vm_area_struct *vma,unsigned long addr,pud_t *pudp);
arch/x86/mm/pgtable.c +3 -3
@@ -456,10 +456,10 @@ bool ptep_test_and_clear_young(struct vm_area_struct *vma, }#if defined(CONFIG_TRANSPARENT_HUGEPAGE ) || defined(CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG ) -int pmdp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long addr,pmd_t *pmdp) +bool pmdp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long addr,pmd_t *pmdp) { -int ret =0 ; +bool ret = false;if (pmd_young (*pmdp)) ret = test_and_clear_bit(_PAGE_BIT_ACCESSED,
include/linux/pgtable.h +9 -10
@@ -507,25 +507,24 @@ static inline bool ptep_test_and_clear_young(struct vm_area_struct *vma,#ifndef __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNG#if defined(CONFIG_TRANSPARENT_HUGEPAGE ) || defined(CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG ) -static inline int pmdp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long address, -pmd_t *pmdp) +static inline bool pmdp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp) {pmd_t pmd = *pmdp; -int r =1 ; +bool young = true; +if (!pmd_young (pmd)) - r =0 ; + young = false;else set_pmd_at (vma->vm_mm, address, pmdp,pmd_mkold (pmd)); -return r; +return young; }#else -static inline int pmdp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long address, -pmd_t *pmdp) +static inline bool pmdp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp) {BUILD_BUG (); -return 0 ; +return false; }#endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG */ #endif
Signature · 1 line
2.47.3
Re: [PATCH 3/6] mm: change to return bool for pmdp_test_and_clear_young()
Quoted 5 lines · Baolin Wang
Callers use
pmdp_test_and_clear_young()to clear the young flag and check whether it was set for this PMD entry. Change the return type to bool to make the intention clearer.Signed-off-by Baolin Wang <[email protected]>
Some nits similar to before, otherwise LGTM so:
Quoted 16 lines
--- arch/arm64/include/asm/pgtable.h | 6 +++--- arch/powerpc/include/asm/book3s/64/pgtable.h | 10 +++++----- arch/powerpc/mm/book3s64/pgtable.c | 4 ++-- arch/riscv/include/asm/pgtable.h | 2 +- arch/s390/include/asm/pgtable.h | 4 ++-- arch/x86/include/asm/pgtable.h | 4 ++-- arch/x86/mm/pgtable.c | 6 +++--- include/linux/pgtable.h | 19 +++++++++---------- 8 files changed, 27 insertions(+), 28 deletions(-)arch/arm64/include/asm/pgtable.h +0
-0
arch/arm64/include/asm/pgtable.h static inline bool __ptep_clear_flush_young(struct vm_area_struct *vma, · line 1326
Quoted 9 lines
arch/arm64/include/asm/pgtable.h +3
-3@@ -1321,9 +1321,9 @@ static inline bool __ptep_clear_flush_young(struct vm_area_struct *vma,#if defined(CONFIG_TRANSPARENT_HUGEPAGE ) || defined(CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG )#define __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNG -static inline int pmdp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long address, -pmd_t *pmdp) +static inline bool pmdp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long address, +pmd_t *pmdp)
Similar comment as before re: indetation, let's use 2 tabs please, so this would become:
static inline bool pmdp_test_and_clear_young(struct vm_area_struct *vma,
unsigned long address, pmd_t *pmdp)
Thanks!
Same comment to all other cases here.
Quoted 25 lines
arch/arm64/include/asm/pgtable.h +0
-0{/* Operation applies to PMD table entry only if FEAT_HAFT is enabled */ VM_WARN_ON (pmd_table (READ_ONCE (*pmdp)) && !system_supports_haft ());arch/powerpc/include/asm/book3s/64/pgtable.h +3
-3@@ -1161,13 +1161,13 @@ pud_hugepage_update(struct mm_struct *mm, unsigned long addr, pud_t *pudp,* For radix we should always find H_PAGE_HASHPTE zero. Hence * the below will work for radix too */ -static inline int __pmdp_test_and_clear_young (struct mm_struct *mm, -unsigned long addr,pmd_t *pmdp) +static inline bool __pmdp_test_and_clear_young (struct mm_struct *mm, +unsigned long addr,pmd_t *pmdp) {unsigned long old;if ((pmd_raw (*pmdp) &cpu_to_be64 (_PAGE_ACCESSED |H_PAGE_HASHPTE )) ==0 ) -return 0 ; +return false; old =pmd_hugepage_update (mm, addr, pmdp, _PAGE_ACCESSED,0 );return ((old & _PAGE_ACCESSED) !=0 ); }
arch/powerpc/include/asm/book3s/64/pgtable.h extern int pudp_set_access_flags(struct vm_area_struct *vma, · line 1304
Quoted 7 lines
arch/powerpc/include/asm/book3s/64/pgtable.h +2
-2@@ -1300,8 +1300,8 @@ extern int pudp_set_access_flags(struct vm_area_struct *vma, pud_t entry, int dirty);#define __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNG -extern int pmdp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long address,pmd_t *pmdp); +extern bool pmdp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp);
Remove the extern please!
Quoted 51 lines
arch/powerpc/include/asm/book3s/64/pgtable.h +0
-0#define __HAVE_ARCH_PUDP_TEST_AND_CLEAR_YOUNGextern int pudp_test_and_clear_young (struct vm_area_struct *vma,unsigned long address,pud_t *pudp);arch/powerpc/mm/book3s64/pgtable.c +2
-2@@ -98,8 +98,8 @@ int pudp_set_access_flags(struct vm_area_struct *vma, unsigned long address, } -int pmdp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long address,pmd_t *pmdp) +bool pmdp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp) {return __pmdp_test_and_clear_young (vma->vm_mm, address, pmdp); }arch/riscv/include/asm/pgtable.h +1
-1@@ -1015,7 +1015,7 @@ static inline int pmdp_set_access_flags(struct vm_area_struct *vma, }#define __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNG -static inline int pmdp_test_and_clear_young (struct vm_area_struct *vma, +static inline bool pmdp_test_and_clear_young (struct vm_area_struct *vma,unsigned long address,pmd_t *pmdp) {return ptep_test_and_clear_young (vma, address, (pte_t *)pmdp);arch/s390/include/asm/pgtable.h +2
-2@@ -1683,8 +1683,8 @@ static inline int pmdp_set_access_flags(struct vm_area_struct *vma, }#define __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNG -static inline int pmdp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long addr,pmd_t *pmdp) +static inline bool pmdp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long addr,pmd_t *pmdp) {pmd_t pmd = *pmdp;arch/x86/include/asm/pgtable.h +0
-0
arch/x86/include/asm/pgtable.h extern int pudp_set_access_flags(struct vm_area_struct *vma, · line 1299
Quoted 7 lines
arch/x86/include/asm/pgtable.h +2
-2@@ -1295,8 +1295,8 @@ extern int pudp_set_access_flags(struct vm_area_struct *vma, pud_t entry, int dirty);#define __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNG -extern int pmdp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long addr,pmd_t *pmdp); +extern bool pmdp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long addr,pmd_t *pmdp);
Remove the extern please!
Quoted 63 lines
arch/x86/include/asm/pgtable.h +0
-0extern int pudp_test_and_clear_young (struct vm_area_struct *vma,unsigned long addr,pud_t *pudp);arch/x86/mm/pgtable.c +3
-3@@ -456,10 +456,10 @@ bool ptep_test_and_clear_young(struct vm_area_struct *vma, }#if defined(CONFIG_TRANSPARENT_HUGEPAGE ) || defined(CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG ) -int pmdp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long addr,pmd_t *pmdp) +bool pmdp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long addr,pmd_t *pmdp) { -int ret =0 ; +bool ret = false;if (pmd_young (*pmdp)) ret = test_and_clear_bit(_PAGE_BIT_ACCESSED,include/linux/pgtable.h +9
-11@@ -507,25 +507,24 @@ static inline bool ptep_test_and_clear_young(struct vm_area_struct *vma,#ifndef __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNG#if defined(CONFIG_TRANSPARENT_HUGEPAGE ) || defined(CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG ) -static inline int pmdp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long address, -pmd_t *pmdp) +static inline bool pmdp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp) {pmd_t pmd = *pmdp; -int r =1 ; +bool young = true; +if (!pmd_young (pmd)) - r =0 ; + young = false;else set_pmd_at (vma->vm_mm, address, pmdp,pmd_mkold (pmd)); -return r; +return young; }#else -static inline int pmdp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long address, -pmd_t *pmdp) +static inline bool pmdp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp) {BUILD_BUG (); -return 0 ; +return false; }#endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG */ #endif --2.47.3
Re: [PATCH 3/6] mm: change to return bool for pmdp_test_and_clear_young()
Quoted 10 lines · Lorenzo Stoakes (Oracle)
Quoted 5 lines · Baolin Wang
Callers use
pmdp_test_and_clear_young()to clear the young flag and check whether it was set for this PMD entry. Change the return type to bool to make the intention clearer.Signed-off-by Baolin Wang <[email protected]>Some nits similar to before, otherwise LGTM so:
Reviewed-by Lorenzo Stoakes (Oracle) <[email protected]>
Thanks. And all comments acked.
Re: [PATCH 3/6] mm: change to return bool for pmdp_test_and_clear_young()
In reply to Baolin WangQuoted 5 lines · Baolin Wang
Callers use
pmdp_test_and_clear_young()to clear the young flag and check whether it was set for this PMD entry. Change the return type to bool to make the intention clearer.Signed-off-by Baolin Wang <[email protected]>
Quoted 11 lines
--- arch/arm64/include/asm/pgtable.h | 6 +++--- arch/powerpc/include/asm/book3s/64/pgtable.h | 10 +++++----- arch/powerpc/mm/book3s64/pgtable.c | 4 ++-- arch/riscv/include/asm/pgtable.h | 2 +- arch/s390/include/asm/pgtable.h | 4 ++-- arch/x86/include/asm/pgtable.h | 4 ++-- arch/x86/mm/pgtable.c | 6 +++--- include/linux/pgtable.h | 19 +++++++++---------- 8 files changed, 27 insertions(+), 28 deletions(-)
LGTM. Please feel free to add:
(assuming you will anyway kill the unwanted externs)
PATCH 4/6 mm: change to return bool for pmdp_clear_flush_young()
In reply to Baolin WangThe pmdp_clear_flush_young() is used to clear the young flag and flush the TLB, returning whether the young flag was set for this PMD entry. Change the return type to bool to make the intention clearer.
--- arch/s390/include/asm/pgtable.h | 4 ++-- arch/x86/include/asm/pgtable.h | 4 ++-- arch/x86/mm/pgtable.c | 6 +++--- include/linux/pgtable.h | 10 +++++----- mm/pgtable-generic.c | 7 ++++--- 5 files changed, 16 insertions(+), 15 deletions(-)
arch/s390/include/asm/pgtable.h +2 -2
@@ -1693,8 +1693,8 @@ static inline bool pmdp_test_and_clear_young(struct vm_area_struct *vma, }#define __HAVE_ARCH_PMDP_CLEAR_YOUNG_FLUSH -static inline int pmdp_clear_flush_young (struct vm_area_struct *vma, -unsigned long addr,pmd_t *pmdp) +static inline bool pmdp_clear_flush_young (struct vm_area_struct *vma, +unsigned long addr,pmd_t *pmdp) {VM_BUG_ON (addr & ~HPAGE_MASK );return pmdp_test_and_clear_young (vma, addr, pmdp);
arch/x86/include/asm/pgtable.h +2 -2
@@ -1301,8 +1301,8 @@ extern int pudp_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pud_t *pudp);#define __HAVE_ARCH_PMDP_CLEAR_YOUNG_FLUSH -extern int pmdp_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pmd_t *pmdp); +extern bool pmdp_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp);#define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEAR
arch/x86/mm/pgtable.c +3 -3
@@ -503,10 +503,10 @@ bool ptep_clear_flush_young(struct vm_area_struct *vma, }#ifdef CONFIG_TRANSPARENT_HUGEPAGE -int pmdp_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pmd_t *pmdp) +bool pmdp_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp) { -int young; +bool young;VM_BUG_ON (address & ~HPAGE_PMD_MASK );
include/linux/pgtable.h +5 -5
@@ -536,18 +536,18 @@ bool ptep_clear_flush_young(struct vm_area_struct *vma,#ifndef __HAVE_ARCH_PMDP_CLEAR_YOUNG_FLUSH#ifdef CONFIG_TRANSPARENT_HUGEPAGE -extern int pmdp_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pmd_t *pmdp); +bool pmdp_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp);#else /* * Despite relevant to THP only, this API is called from generic rmap code * under PageTransHuge(), hence needs a dummy implementation for !THP */ -static inline int pmdp_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pmd_t *pmdp) +static inline bool pmdp_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp) {BUILD_BUG (); -return 0 ; +return false; }#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ #endif
mm/pgtable-generic.c +4 -3
@@ -124,10 +124,11 @@ int pmdp_set_access_flags(struct vm_area_struct *vma,#endif #ifndef __HAVE_ARCH_PMDP_CLEAR_YOUNG_FLUSH -int pmdp_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pmd_t *pmdp) +bool pmdp_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp) { -int young; +bool young; +VM_BUG_ON (address & ~HPAGE_PMD_MASK ); young =pmdp_test_and_clear_young (vma, address, pmdp);if (young)
Signature · 1 line
2.47.3
Re: [PATCH 4/6] mm: change to return bool for pmdp_clear_flush_young()
Quoted 5 lines · Baolin Wang
The
pmdp_clear_flush_young()is used to clear the young flag and flush the TLB, returning whether the young flag was set for this PMD entry. Change the return type to bool to make the intention clearer.Signed-off-by Baolin Wang <[email protected]>
Some nits, but otherwise LGTM, so:
Quoted 13 lines
--- arch/s390/include/asm/pgtable.h | 4 ++-- arch/x86/include/asm/pgtable.h | 4 ++-- arch/x86/mm/pgtable.c | 6 +++--- include/linux/pgtable.h | 10 +++++----- mm/pgtable-generic.c | 7 ++++--- 5 files changed, 16 insertions(+), 15 deletions(-)arch/s390/include/asm/pgtable.h +0
-0
arch/s390/include/asm/pgtable.h static inline bool pmdp_test_and_clear_young(struct vm_area_struct *vma, · line 1697
Quoted 7 lines
arch/s390/include/asm/pgtable.h +2
-2@@ -1693,8 +1693,8 @@ static inline bool pmdp_test_and_clear_young(struct vm_area_struct *vma, }#define __HAVE_ARCH_PMDP_CLEAR_YOUNG_FLUSH -static inline int pmdp_clear_flush_young (struct vm_area_struct *vma, -unsigned long addr,pmd_t *pmdp) +static inline bool pmdp_clear_flush_young (struct vm_area_struct *vma, +unsigned long addr,pmd_t *pmdp)
Same indentation comment as with other patches, 2 tabs you know the drill :) applies to all such in this patch.
Quoted 8 lines
arch/s390/include/asm/pgtable.h +0
-0{VM_BUG_ON (addr & ~HPAGE_MASK );return pmdp_test_and_clear_young (vma, addr, pmdp);arch/x86/include/asm/pgtable.h +0
-0
arch/x86/include/asm/pgtable.h extern int pudp_test_and_clear_young(struct vm_area_struct *vma, · line 1305
Quoted 7 lines
arch/x86/include/asm/pgtable.h +2
-2@@ -1301,8 +1301,8 @@ extern int pudp_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pud_t *pudp);#define __HAVE_ARCH_PMDP_CLEAR_YOUNG_FLUSH -extern int pmdp_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pmd_t *pmdp); +extern bool pmdp_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp);
Drop the extern please!
Quoted 26 lines
arch/x86/include/asm/pgtable.h +0
-0#define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEARarch/x86/mm/pgtable.c +3
-3@@ -503,10 +503,10 @@ bool ptep_clear_flush_young(struct vm_area_struct *vma, }#ifdef CONFIG_TRANSPARENT_HUGEPAGE -int pmdp_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pmd_t *pmdp) +bool pmdp_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp) { -int young; +bool young;VM_BUG_ON (address & ~HPAGE_PMD_MASK );include/linux/pgtable.h +0
-0
include/linux/pgtable.h bool ptep_clear_flush_young(struct vm_area_struct *vma, · line 540
Quoted 7 lines
include/linux/pgtable.h +2
-2@@ -536,18 +536,18 @@ bool ptep_clear_flush_young(struct vm_area_struct *vma,#ifndef __HAVE_ARCH_PMDP_CLEAR_YOUNG_FLUSH#ifdef CONFIG_TRANSPARENT_HUGEPAGE -extern int pmdp_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pmd_t *pmdp); +bool pmdp_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp);
Ahh! Here you drop the extern :) AND use 2 tabs :)) thanks!
Quoted 38 lines
include/linux/pgtable.h +3
-3#else /* * Despite relevant to THP only, this API is called from generic rmap code * under PageTransHuge(), hence needs a dummy implementation for !THP */ -static inline int pmdp_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pmd_t *pmdp) +static inline bool pmdp_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp) {BUILD_BUG (); -return 0 ; +return false; }#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ #endif mm/pgtable-generic.c +4
-4@@ -124,10 +124,11 @@ int pmdp_set_access_flags(struct vm_area_struct *vma,#endif #ifndef __HAVE_ARCH_PMDP_CLEAR_YOUNG_FLUSH -int pmdp_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pmd_t *pmdp) +bool pmdp_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp) { -int young; +bool young; +VM_BUG_ON (address & ~HPAGE_PMD_MASK ); young =pmdp_test_and_clear_young (vma, address, pmdp);if (young) --2.47.3
Re: [PATCH 4/6] mm: change to return bool for pmdp_clear_flush_young()
Quoted 45 lines · Lorenzo Stoakes (Oracle)
Quoted 5 lines · Baolin Wang
The
pmdp_clear_flush_young()is used to clear the young flag and flush the TLB, returning whether the young flag was set for this PMD entry. Change the return type to bool to make the intention clearer.Signed-off-by Baolin Wang <[email protected]>Some nits, but otherwise LGTM, so:
Reviewed-by Lorenzo Stoakes (Oracle) <[email protected]>Quoted 13 lines
--- arch/s390/include/asm/pgtable.h | 4 ++-- arch/x86/include/asm/pgtable.h | 4 ++-- arch/x86/mm/pgtable.c | 6 +++--- include/linux/pgtable.h | 10 +++++----- mm/pgtable-generic.c | 7 ++++--- 5 files changed, 16 insertions(+), 15 deletions(-)arch/s390/include/asm/pgtable.h +0
-0arch/s390/include/asm/pgtable.h static inline bool pmdp_test_and_clear_young(struct vm_area_struct *vma, · line 1697
Quoted 7 lines
arch/s390/include/asm/pgtable.h +2
-2@@ -1693,8 +1693,8 @@ static inline bool pmdp_test_and_clear_young(struct vm_area_struct *vma, }#define __HAVE_ARCH_PMDP_CLEAR_YOUNG_FLUSH -static inline int pmdp_clear_flush_young (struct vm_area_struct *vma, -unsigned long addr,pmd_t *pmdp) +static inline bool pmdp_clear_flush_young (struct vm_area_struct *vma, +unsigned long addr,pmd_t *pmdp)Same indentation comment as with other patches, 2 tabs you know the drill :) applies to all such in this patch.
Quoted 10 lines
arch/s390/include/asm/pgtable.h +0
-0{VM_BUG_ON (addr & ~HPAGE_MASK );return pmdp_test_and_clear_young (vma, addr, pmdp);arch/x86/include/asm/pgtable.h +0
-0@@ -1301,8 +1301,8 @@ extern int pudp_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pud_t *pudp);
Quoted 7 lines
arch/x86/include/asm/pgtable.h extern int pudp_test_and_clear_young(struct vm_area_struct *vma, · line 1305
Quoted 5 lines
arch/x86/include/asm/pgtable.h +2
-2#define __HAVE_ARCH_PMDP_CLEAR_YOUNG_FLUSH -extern int pmdp_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pmd_t *pmdp); +extern bool pmdp_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp);Drop the extern please!
Ack.
Quoted 25 lines
Quoted 25 lines
arch/x86/include/asm/pgtable.h +0
-0#define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEARarch/x86/mm/pgtable.c +3
-3@@ -503,10 +503,10 @@ bool ptep_clear_flush_young(struct vm_area_struct *vma, }#ifdef CONFIG_TRANSPARENT_HUGEPAGE -int pmdp_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pmd_t *pmdp) +bool pmdp_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp) { -int young; +bool young;VM_BUG_ON (address & ~HPAGE_PMD_MASK );include/linux/pgtable.h +0
-0@@ -536,18 +536,18 @@ bool ptep_clear_flush_young(struct vm_area_struct *vma,
Quoted 8 lines
include/linux/pgtable.h bool ptep_clear_flush_young(struct vm_area_struct *vma, · line 540
Quoted 6 lines
include/linux/pgtable.h +2
-2#ifndef __HAVE_ARCH_PMDP_CLEAR_YOUNG_FLUSH#ifdef CONFIG_TRANSPARENT_HUGEPAGE -extern int pmdp_clear_flush_young (struct vm_area_struct *vma, -unsigned long address,pmd_t *pmdp); +bool pmdp_clear_flush_young (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp);Ahh! Here you drop the extern :) AND use 2 tabs :)) thanks!
Right. Because this is the mm subsystem, and I know the maintainers' preferences:)
PATCH 5/6 mm: change to return bool for pudp_test_and_clear_young()
In reply to Baolin WangThe pudp_test_and_clear_young() is used to clear the young flag, returning whether the young flag was set for this PUD entry. Change the return type to bool to make the intention clearer.
--- arch/powerpc/include/asm/book3s/64/pgtable.h | 10 +++++----- arch/powerpc/mm/book3s64/pgtable.c | 4 ++-- arch/riscv/include/asm/pgtable.h | 4 ++-- arch/x86/include/asm/pgtable.h | 4 ++-- arch/x86/mm/pgtable.c | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-)
arch/powerpc/include/asm/book3s/64/pgtable.h +5 -5
@@ -1172,13 +1172,13 @@ static inline bool __pmdp_test_and_clear_young(struct mm_struct *mm,return ((old & _PAGE_ACCESSED) !=0 ); } -static inline int __pudp_test_and_clear_young (struct mm_struct *mm, -unsigned long addr,pud_t *pudp) +static inline bool __pudp_test_and_clear_young (struct mm_struct *mm, +unsigned long addr,pud_t *pudp) {unsigned long old;if ((pud_raw (*pudp) &cpu_to_be64 (_PAGE_ACCESSED |H_PAGE_HASHPTE )) ==0 ) -return 0 ; +return false; old =pud_hugepage_update (mm, addr, pudp, _PAGE_ACCESSED,0 );return ((old & _PAGE_ACCESSED) !=0 ); }
@@ -1303,8 +1303,8 @@ extern int pudp_set_access_flags(struct vm_area_struct *vma,extern bool pmdp_test_and_clear_young (struct vm_area_struct *vma,unsigned long address,pmd_t *pmdp);#define __HAVE_ARCH_PUDP_TEST_AND_CLEAR_YOUNG -extern int pudp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long address,pud_t *pudp); +extern bool pudp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long address,pud_t *pudp);#define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEAR
arch/powerpc/mm/book3s64/pgtable.c +2 -2
@@ -104,8 +104,8 @@ bool pmdp_test_and_clear_young(struct vm_area_struct *vma,return __pmdp_test_and_clear_young (vma->vm_mm, address, pmdp); } -int pudp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long address,pud_t *pudp) +bool pudp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long address,pud_t *pudp) {return __pudp_test_and_clear_young (vma->vm_mm, address, pudp); }
arch/riscv/include/asm/pgtable.h +2 -2
@@ -1109,8 +1109,8 @@ static inline int pudp_set_access_flags(struct vm_area_struct *vma,return ptep_set_access_flags (vma, address, (pte_t *)pudp,pud_pte (entry), dirty); } -static inline int pudp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long address,pud_t *pudp) +static inline bool pudp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long address,pud_t *pudp) {return ptep_test_and_clear_young (vma, address, (pte_t *)pudp); }
arch/x86/include/asm/pgtable.h +2 -2
@@ -1297,8 +1297,8 @@ extern int pudp_set_access_flags(struct vm_area_struct *vma,#define __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNGextern bool pmdp_test_and_clear_young (struct vm_area_struct *vma,unsigned long addr,pmd_t *pmdp); -extern int pudp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long addr,pud_t *pudp); +extern bool pudp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long addr,pud_t *pudp);#define __HAVE_ARCH_PMDP_CLEAR_YOUNG_FLUSH extern bool pmdp_clear_flush_young(struct vm_area_struct *vma,
arch/x86/mm/pgtable.c +3 -3
@@ -470,10 +470,10 @@ bool pmdp_test_and_clear_young(struct vm_area_struct *vma,#endif #ifdef CONFIG_TRANSPARENT_HUGEPAGE -int pudp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long addr,pud_t *pudp) +bool pudp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long addr,pud_t *pudp) { -int ret =0 ; +bool ret = false;if (pud_young (*pudp)) ret = test_and_clear_bit(_PAGE_BIT_ACCESSED,
Signature · 1 line
2.47.3
Re: [PATCH 5/6] mm: change to return bool for pudp_test_and_clear_young()
Quoted 5 lines · Baolin Wang
The
pudp_test_and_clear_young()is used to clear the young flag, returning whether the young flag was set for this PUD entry. Change the return type to bool to make the intention clearer.Signed-off-by Baolin Wang <[email protected]>
Some nits but otherwise loogs good so:
Quoted 13 lines
--- arch/powerpc/include/asm/book3s/64/pgtable.h | 10 +++++----- arch/powerpc/mm/book3s64/pgtable.c | 4 ++-- arch/riscv/include/asm/pgtable.h | 4 ++-- arch/x86/include/asm/pgtable.h | 4 ++-- arch/x86/mm/pgtable.c | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-)arch/powerpc/include/asm/book3s/64/pgtable.h +0
-0
arch/powerpc/include/asm/book3s/64/pgtable.h static inline bool __pmdp_test_and_clear_young(struct mm_struct *mm, · line 1176
Quoted 7 lines
arch/powerpc/include/asm/book3s/64/pgtable.h +2
-2@@ -1172,13 +1172,13 @@ static inline bool __pmdp_test_and_clear_young(struct mm_struct *mm,return ((old & _PAGE_ACCESSED) !=0 ); } -static inline int __pudp_test_and_clear_young (struct mm_struct *mm, -unsigned long addr,pud_t *pudp) +static inline bool __pudp_test_and_clear_young (struct mm_struct *mm, +unsigned long addr,pud_t *pudp)
Formatting yada yada you know the drill, 2 tabs etc. :))
Quoted 10 lines
arch/powerpc/include/asm/book3s/64/pgtable.h +1
-1{unsigned long old;if ((pud_raw (*pudp) &cpu_to_be64 (_PAGE_ACCESSED |H_PAGE_HASHPTE )) ==0 ) -return 0 ; +return false; old =pud_hugepage_update (mm, addr, pudp, _PAGE_ACCESSED,0 );return ((old & _PAGE_ACCESSED) !=0 ); }
arch/powerpc/include/asm/book3s/64/pgtable.h extern int pudp_set_access_flags(struct vm_area_struct *vma, · line 1307
Quoted 7 lines
arch/powerpc/include/asm/book3s/64/pgtable.h +2
-2@@ -1303,8 +1303,8 @@ extern int pudp_set_access_flags(struct vm_area_struct *vma,extern bool pmdp_test_and_clear_young (struct vm_area_struct *vma,unsigned long address,pmd_t *pmdp);#define __HAVE_ARCH_PUDP_TEST_AND_CLEAR_YOUNG -extern int pudp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long address,pud_t *pudp); +extern bool pudp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long address,pud_t *pudp);
Drop the extern please!
Quoted 38 lines
arch/powerpc/include/asm/book3s/64/pgtable.h +0
-0#define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEARarch/powerpc/mm/book3s64/pgtable.c +2
-2@@ -104,8 +104,8 @@ bool pmdp_test_and_clear_young(struct vm_area_struct *vma,return __pmdp_test_and_clear_young (vma->vm_mm, address, pmdp); } -int pudp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long address,pud_t *pudp) +bool pudp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long address,pud_t *pudp) {return __pudp_test_and_clear_young (vma->vm_mm, address, pudp); }arch/riscv/include/asm/pgtable.h +2
-2@@ -1109,8 +1109,8 @@ static inline int pudp_set_access_flags(struct vm_area_struct *vma,return ptep_set_access_flags (vma, address, (pte_t *)pudp,pud_pte (entry), dirty); } -static inline int pudp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long address,pud_t *pudp) +static inline bool pudp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long address,pud_t *pudp) {return ptep_test_and_clear_young (vma, address, (pte_t *)pudp); }arch/x86/include/asm/pgtable.h +0
-0
arch/x86/include/asm/pgtable.h extern int pudp_set_access_flags(struct vm_area_struct *vma, · line 1301
Quoted 7 lines
arch/x86/include/asm/pgtable.h +2
-2@@ -1297,8 +1297,8 @@ extern int pudp_set_access_flags(struct vm_area_struct *vma,#define __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNGextern bool pmdp_test_and_clear_young (struct vm_area_struct *vma,unsigned long addr,pmd_t *pmdp); -extern int pudp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long addr,pud_t *pudp); +extern bool pudp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long addr,pud_t *pudp);
Drop the extern please!
Quoted 24 lines
arch/x86/include/asm/pgtable.h +0
-0#define __HAVE_ARCH_PMDP_CLEAR_YOUNG_FLUSH extern bool pmdp_clear_flush_young(struct vm_area_struct *vma,arch/x86/mm/pgtable.c +3
-4@@ -470,10 +470,10 @@ bool pmdp_test_and_clear_young(struct vm_area_struct *vma,#endif #ifdef CONFIG_TRANSPARENT_HUGEPAGE -int pudp_test_and_clear_young (struct vm_area_struct *vma, -unsigned long addr,pud_t *pudp) +bool pudp_test_and_clear_young (struct vm_area_struct *vma, +unsigned long addr,pud_t *pudp) { -int ret =0 ; +bool ret = false;if (pud_young (*pudp)) ret = test_and_clear_bit(_PAGE_BIT_ACCESSED, --2.47.3
Re: [PATCH 5/6] mm: change to return bool for pudp_test_and_clear_young()
In reply to Baolin WangQuoted 4 lines · Baolin Wang
The
pudp_test_and_clear_young()is used to clear the young flag, returning whether the young flag was set for this PUD entry. Change the return type to bool to make the intention clearer.
Quoted 9 lines
Signed-off-by Baolin Wang <[email protected]>--- arch/powerpc/include/asm/book3s/64/pgtable.h | 10 +++++----- arch/powerpc/mm/book3s64/pgtable.c | 4 ++-- arch/riscv/include/asm/pgtable.h | 4 ++-- arch/x86/include/asm/pgtable.h | 4 ++-- arch/x86/mm/pgtable.c | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-)
LGTM. Please feel free to add:
(assuming you will anyway kill the unwanted externs)
PATCH 6/6 mm: change to return bool for the MMU notifier's young flag check
In reply to Baolin WangThe MMU notifier young flag check related functions only return whether the young flag was set. Change the return type to bool to make the intention clearer.
--- include/linux/mmu_notifier.h | 76 +++++++++++++++++------------------- mm/internal.h | 16 ++++---- mm/mmu_notifier.c | 20 +++++----- virt/kvm/kvm_main.c | 40 +++++++++---------- 4 files changed, 72 insertions(+), 80 deletions(-)
include/linux/mmu_notifier.h +35 -41
@@ -97,20 +97,20 @@ struct mmu_notifier_ops {* Start-end is necessary in case the secondary MMU is mapping the page * at a smaller granularity than the primary MMU. */ -int (*clear_flush_young)(struct mmu_notifier *subscription, -struct mm_struct *mm, -unsigned long start, -unsigned long end); +bool (*clear_flush_young)(struct mmu_notifier *subscription, +struct mm_struct *mm, +unsigned long start, +unsigned long end);/* * clear_young is a lightweight version of clear_flush_young. Like the * latter, it is supposed to test-and-clear the young/accessed bitflag * in the secondary pte, but it may omit flushing the secondary tlb. */ -int (*clear_young)(struct mmu_notifier *subscription, -struct mm_struct *mm, -unsigned long start, -unsigned long end); +bool (*clear_young)(struct mmu_notifier *subscription, +struct mm_struct *mm, +unsigned long start, +unsigned long end);/* * test_young is called to check the young/accessed bitflag in
@@ -118,9 +118,9 @@ struct mmu_notifier_ops {* frequently used without actually clearing the flag or tearing * down the secondary mapping on the page. */ -int (*test_young)(struct mmu_notifier *subscription, -struct mm_struct *mm, -unsigned long address); +bool (*test_young)(struct mmu_notifier *subscription, +struct mm_struct *mm, +unsigned long address);/* * invalidate_range_start() and invalidate_range_end() must be
@@ -376,14 +376,12 @@ mmu_interval_check_retry(struct mmu_interval_notifier *interval_sub,extern void __mmu_notifier_subscriptions_destroy (struct mm_struct *mm);extern void __mmu_notifier_release (struct mm_struct *mm); -extern int __mmu_notifier_clear_flush_young (struct mm_struct *mm, -unsigned long start, -unsigned long end); -extern int __mmu_notifier_clear_young (struct mm_struct *mm, -unsigned long start, -unsigned long end); -extern int __mmu_notifier_test_young (struct mm_struct *mm, -unsigned long address); +bool __mmu_notifier_clear_flush_young (struct mm_struct *mm, +unsigned long start,unsigned long end); +bool __mmu_notifier_clear_young (struct mm_struct *mm, +unsigned long start,unsigned long end); +bool __mmu_notifier_test_young (struct mm_struct *mm, +unsigned long address);extern int __mmu_notifier_invalidate_range_start (struct mmu_notifier_range *r);extern void __mmu_notifier_invalidate_range_end (struct mmu_notifier_range *r); extern void __mmu_notifier_arch_invalidate_secondary_tlbs(struct mm_struct *mm,
@@ -403,30 +401,28 @@ static inline void mmu_notifier_release(struct mm_struct *mm)__mmu_notifier_release (mm); } -static inline int mmu_notifier_clear_flush_young (struct mm_struct *mm, -unsigned long start, -unsigned long end) +static inline bool mmu_notifier_clear_flush_young (struct mm_struct *mm, +unsigned long start,unsigned long end) {if (mm_has_notifiers (mm))return __mmu_notifier_clear_flush_young (mm, start, end); -return 0 ; +return false; } -static inline int mmu_notifier_clear_young (struct mm_struct *mm, -unsigned long start, -unsigned long end) +static inline bool mmu_notifier_clear_young (struct mm_struct *mm, +unsigned long start,unsigned long end) {if (mm_has_notifiers (mm))return __mmu_notifier_clear_young (mm, start, end); -return 0 ; +return false; } -static inline int mmu_notifier_test_young (struct mm_struct *mm, -unsigned long address) +static inline bool mmu_notifier_test_young (struct mm_struct *mm, +unsigned long address) {if (mm_has_notifiers (mm))return __mmu_notifier_test_young (mm, address); -return 0 ; +return false; } static inline void
@@ -552,24 +548,22 @@ static inline void mmu_notifier_release(struct mm_struct *mm) { } -static inline int mmu_notifier_clear_flush_young (struct mm_struct *mm, -unsigned long start, -unsigned long end) +static inline bool mmu_notifier_clear_flush_young (struct mm_struct *mm, +unsigned long start,unsigned long end) { -return 0 ; +return false; } -static inline int mmu_notifier_clear_young (struct mm_struct *mm, -unsigned long start, -unsigned long end) +static inline bool mmu_notifier_clear_young (struct mm_struct *mm, +unsigned long start,unsigned long end) { -return 0 ; +return false; } -static inline int mmu_notifier_test_young (struct mm_struct *mm, -unsigned long address) +static inline bool mmu_notifier_test_young (struct mm_struct *mm, +unsigned long address) { -return 0 ; +return false; } static inline void
mm/internal.h +8 -8
@@ -1831,10 +1831,10 @@ static inline int io_remap_pfn_range_complete(struct vm_area_struct *vma, }#ifdef CONFIG_MMU_NOTIFIER -static inline int clear_flush_young_ptes_notify (struct vm_area_struct *vma, +static inline bool clear_flush_young_ptes_notify (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr) { -int young; +bool young; young =clear_flush_young_ptes (vma, addr, ptep, nr); young |= mmu_notifier_clear_flush_young(vma->vm_mm, addr,
@@ -1842,30 +1842,30 @@ static inline int clear_flush_young_ptes_notify(struct vm_area_struct *vma,return young; } -static inline int pmdp_clear_flush_young_notify (struct vm_area_struct *vma, +static inline bool pmdp_clear_flush_young_notify (struct vm_area_struct *vma,unsigned long addr,pmd_t *pmdp) { -int young; +bool young; young =pmdp_clear_flush_young (vma, addr, pmdp); young |=mmu_notifier_clear_flush_young (vma->vm_mm, addr, addr +PMD_SIZE );return young; } -static inline int test_and_clear_young_ptes_notify (struct vm_area_struct *vma, +static inline bool test_and_clear_young_ptes_notify (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr) { -int young; +bool young; young =test_and_clear_young_ptes (vma, addr, ptep, nr); young |=mmu_notifier_clear_young (vma->vm_mm, addr, addr + nr *PAGE_SIZE );return young; } -static inline int pmdp_test_and_clear_young_notify (struct vm_area_struct *vma, +static inline bool pmdp_test_and_clear_young_notify (struct vm_area_struct *vma,unsigned long addr,pmd_t *pmdp) { -int young; +bool young; young =pmdp_test_and_clear_young (vma, addr, pmdp); young |=mmu_notifier_clear_young (vma->vm_mm, addr, addr +PMD_SIZE );
mm/mmu_notifier.c +9 -11
@@ -364,12 +364,11 @@ void __mmu_notifier_release(struct mm_struct *mm)* unmap the address and return 1 or 0 depending if the mapping previously * existed or not. */ -int __mmu_notifier_clear_flush_young (struct mm_struct *mm, -unsigned long start, -unsigned long end) +bool __mmu_notifier_clear_flush_young (struct mm_struct *mm, +unsigned long start,unsigned long end) {struct mmu_notifier *subscription; -int young =0 , id; +bool young = false, id; id =srcu_read_lock (&srcu); hlist_for_each_entry_srcu(subscription,
@@ -384,12 +383,11 @@ int __mmu_notifier_clear_flush_young(struct mm_struct *mm,return young; } -int __mmu_notifier_clear_young (struct mm_struct *mm, -unsigned long start, -unsigned long end) +bool __mmu_notifier_clear_young (struct mm_struct *mm, +unsigned long start,unsigned long end) {struct mmu_notifier *subscription; -int young =0 , id; +bool young = false, id; id =srcu_read_lock (&srcu); hlist_for_each_entry_srcu(subscription,
@@ -404,11 +402,11 @@ int __mmu_notifier_clear_young(struct mm_struct *mm,return young; } -int __mmu_notifier_test_young (struct mm_struct *mm, -unsigned long address) +bool __mmu_notifier_test_young (struct mm_struct *mm, +unsigned long address) {struct mmu_notifier *subscription; -int young =0 , id; +bool young = false, id; id =srcu_read_lock (&srcu); hlist_for_each_entry_srcu(subscription,
virt/kvm/kvm_main.c +20 -20
@@ -646,11 +646,11 @@ static __always_inline kvm_mn_ret_t kvm_handle_hva_range(struct kvm *kvm,return r; } -static __always_inline int kvm_age_hva_range(struct mmu_notifier *mn, -unsigned long start, -unsigned long end, -gfn_handler_t handler, -bool flush_on_ret) +static __always_inline bool kvm_age_hva_range(struct mmu_notifier *mn, +unsigned long start, +unsigned long end, +gfn_handler_t handler, +bool flush_on_ret) {struct kvm *kvm =mmu_notifier_to_kvm (mn);const struct kvm_mmu_notifier_range range = {
@@ -666,10 +666,10 @@ static __always_inline int kvm_age_hva_range(struct mmu_notifier *mn,return kvm_handle_hva_range (kvm, &range).ret; } -static __always_inline int kvm_age_hva_range_no_flush(struct mmu_notifier *mn, -unsigned long start, -unsigned long end, -gfn_handler_t handler) +static __always_inline bool kvm_age_hva_range_no_flush(struct mmu_notifier *mn, +unsigned long start, +unsigned long end, +gfn_handler_t handler) {return kvm_age_hva_range (mn, start, end, handler, false); }
@@ -829,10 +829,10 @@ static void kvm_mmu_notifier_invalidate_range_end(struct mmu_notifier *mn,rcuwait_wake_up (&kvm->mn_memslots_update_rcuwait); } -static int kvm_mmu_notifier_clear_flush_young (struct mmu_notifier *mn, -struct mm_struct *mm, -unsigned long start, -unsigned long end) +static bool kvm_mmu_notifier_clear_flush_young (struct mmu_notifier *mn, +struct mm_struct *mm, +unsigned long start, +unsigned long end) {trace_kvm_age_hva (start, end);
@@ -840,10 +840,10 @@ static int kvm_mmu_notifier_clear_flush_young(struct mmu_notifier *mn, !IS_ENABLED(CONFIG_KVM_ELIDE_TLB_FLUSH_IF_YOUNG)); } -static int kvm_mmu_notifier_clear_young (struct mmu_notifier *mn, -struct mm_struct *mm, -unsigned long start, -unsigned long end) +static bool kvm_mmu_notifier_clear_young (struct mmu_notifier *mn, +struct mm_struct *mm, +unsigned long start, +unsigned long end) {trace_kvm_age_hva (start, end);
@@ -863,9 +863,9 @@ static int kvm_mmu_notifier_clear_young(struct mmu_notifier *mn,return kvm_age_hva_range_no_flush (mn, start, end, kvm_age_gfn); } -static int kvm_mmu_notifier_test_young (struct mmu_notifier *mn, -struct mm_struct *mm, -unsigned long address) +static bool kvm_mmu_notifier_test_young (struct mmu_notifier *mn, +struct mm_struct *mm, +unsigned long address) {trace_kvm_test_age_hva (address);
Signature · 1 line
2.47.3
Re: [PATCH 6/6] mm: change to return bool for the MMU notifier's young flag check
Quoted 5 lines · Baolin Wang
The MMU notifier young flag check related functions only return whether the young flag was set. Change the return type to bool to make the intention clearer.
Signed-off-by Baolin Wang <[email protected]>
I can see KVM is the only user for the mmu_notifier_ops clear_flush_young, clear_young and test_young hooks, which map to kvm_mmu_notifier_[clear_flush,clear,test]_young() functions, and you have updated them all.
So this LGTM with nits below, and so (with nits addressed as per the other R-b tags :):
Thanks for doing this! Int as bool is a pet peeve of mine :))
Cheers, Lorenzo
Quoted 64 lines
--- include/linux/mmu_notifier.h | 76 +++++++++++++++++------------------- mm/internal.h | 16 ++++---- mm/mmu_notifier.c | 20 +++++----- virt/kvm/kvm_main.c | 40 +++++++++---------- 4 files changed, 72 insertions(+), 80 deletions(-)include/linux/mmu_notifier.h +11
-18@@ -97,20 +97,20 @@ struct mmu_notifier_ops {* Start-end is necessary in case the secondary MMU is mapping the page * at a smaller granularity than the primary MMU. */ -int (*clear_flush_young)(struct mmu_notifier *subscription, -struct mm_struct *mm, -unsigned long start, -unsigned long end); +bool (*clear_flush_young)(struct mmu_notifier *subscription, +struct mm_struct *mm, +unsigned long start, +unsigned long end);/* * clear_young is a lightweight version of clear_flush_young. Like the * latter, it is supposed to test-and-clear the young/accessed bitflag * in the secondary pte, but it may omit flushing the secondary tlb. */ -int (*clear_young)(struct mmu_notifier *subscription, -struct mm_struct *mm, -unsigned long start, -unsigned long end); +bool (*clear_young)(struct mmu_notifier *subscription, +struct mm_struct *mm, +unsigned long start, +unsigned long end);/* * test_young is called to check the young/accessed bitflag in @@ -118,9 +118,9 @@ struct mmu_notifier_ops {* frequently used without actually clearing the flag or tearing * down the secondary mapping on the page. */ -int (*test_young)(struct mmu_notifier *subscription, -struct mm_struct *mm, -unsigned long address); +bool (*test_young)(struct mmu_notifier *subscription, +struct mm_struct *mm, +unsigned long address);/* * invalidate_range_start() and invalidate_range_end() must be @@ -376,14 +376,12 @@ mmu_interval_check_retry(struct mmu_interval_notifier *interval_sub,extern void __mmu_notifier_subscriptions_destroy (struct mm_struct *mm);extern void __mmu_notifier_release (struct mm_struct *mm); -extern int __mmu_notifier_clear_flush_young (struct mm_struct *mm, -unsigned long start, -unsigned long end); -extern int __mmu_notifier_clear_young (struct mm_struct *mm, -unsigned long start, -unsigned long end); -extern int __mmu_notifier_test_young(struct mm_struct *mm,
include/linux/mmu_notifier.h mmu_interval_check_retry(struct mmu_interval_notifier *interval_sub, · line 387
Quoted 10 lines
include/linux/mmu_notifier.h +6
-1- unsigned long address); +bool __mmu_notifier_clear_flush_young (struct mm_struct *mm, +unsigned long start,unsigned long end); +bool __mmu_notifier_clear_young (struct mm_struct *mm, +unsigned long start,unsigned long end); +bool __mmu_notifier_test_young (struct mm_struct *mm, +unsigned long address);extern int __mmu_notifier_invalidate_range_start (struct mmu_notifier_range *r);extern void __mmu_notifier_invalidate_range_end (struct mmu_notifier_range *r); extern void __mmu_notifier_arch_invalidate_secondary_tlbs(struct mm_struct *mm,
I mean damn, at this point maybe it's legit to drop the surrounding externs here too? But maybe not :))
Quoted 187 lines
include/linux/mmu_notifier.h +18
-22@@ -403,30 +401,28 @@ static inline void mmu_notifier_release(struct mm_struct *mm)__mmu_notifier_release (mm); } -static inline int mmu_notifier_clear_flush_young (struct mm_struct *mm, -unsigned long start, -unsigned long end) +static inline bool mmu_notifier_clear_flush_young (struct mm_struct *mm, +unsigned long start,unsigned long end) {if (mm_has_notifiers (mm))return __mmu_notifier_clear_flush_young (mm, start, end); -return 0 ; +return false; } -static inline int mmu_notifier_clear_young (struct mm_struct *mm, -unsigned long start, -unsigned long end) +static inline bool mmu_notifier_clear_young (struct mm_struct *mm, +unsigned long start,unsigned long end) {if (mm_has_notifiers (mm))return __mmu_notifier_clear_young (mm, start, end); -return 0 ; +return false; } -static inline int mmu_notifier_test_young (struct mm_struct *mm, -unsigned long address) +static inline bool mmu_notifier_test_young (struct mm_struct *mm, +unsigned long address) {if (mm_has_notifiers (mm))return __mmu_notifier_test_young (mm, address); -return 0 ; +return false; } static inline void@@ -552,24 +548,22 @@ static inline void mmu_notifier_release(struct mm_struct *mm) { } -static inline int mmu_notifier_clear_flush_young (struct mm_struct *mm, -unsigned long start, -unsigned long end) +static inline bool mmu_notifier_clear_flush_young (struct mm_struct *mm, +unsigned long start,unsigned long end) { -return 0 ; +return false; } -static inline int mmu_notifier_clear_young (struct mm_struct *mm, -unsigned long start, -unsigned long end) +static inline bool mmu_notifier_clear_young (struct mm_struct *mm, +unsigned long start,unsigned long end) { -return 0 ; +return false; } -static inline int mmu_notifier_test_young (struct mm_struct *mm, -unsigned long address) +static inline bool mmu_notifier_test_young (struct mm_struct *mm, +unsigned long address) { -return 0 ; +return false; } static inline voidmm/internal.h +8
-8@@ -1831,10 +1831,10 @@ static inline int io_remap_pfn_range_complete(struct vm_area_struct *vma, }#ifdef CONFIG_MMU_NOTIFIER -static inline int clear_flush_young_ptes_notify (struct vm_area_struct *vma, +static inline bool clear_flush_young_ptes_notify (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr) { -int young; +bool young; young =clear_flush_young_ptes (vma, addr, ptep, nr); young |= mmu_notifier_clear_flush_young(vma->vm_mm, addr,@@ -1842,30 +1842,30 @@ static inline int clear_flush_young_ptes_notify(struct vm_area_struct *vma,return young; } -static inline int pmdp_clear_flush_young_notify (struct vm_area_struct *vma, +static inline bool pmdp_clear_flush_young_notify (struct vm_area_struct *vma,unsigned long addr,pmd_t *pmdp) { -int young; +bool young; young =pmdp_clear_flush_young (vma, addr, pmdp); young |=mmu_notifier_clear_flush_young (vma->vm_mm, addr, addr +PMD_SIZE );return young; } -static inline int test_and_clear_young_ptes_notify (struct vm_area_struct *vma, +static inline bool test_and_clear_young_ptes_notify (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,unsigned int nr) { -int young; +bool young; young =test_and_clear_young_ptes (vma, addr, ptep, nr); young |=mmu_notifier_clear_young (vma->vm_mm, addr, addr + nr *PAGE_SIZE );return young; } -static inline int pmdp_test_and_clear_young_notify (struct vm_area_struct *vma, +static inline bool pmdp_test_and_clear_young_notify (struct vm_area_struct *vma,unsigned long addr,pmd_t *pmdp) { -int young; +bool young; young =pmdp_test_and_clear_young (vma, addr, pmdp); young |=mmu_notifier_clear_young (vma->vm_mm, addr, addr +PMD_SIZE );mm/mmu_notifier.c +9
-11@@ -364,12 +364,11 @@ void __mmu_notifier_release(struct mm_struct *mm)* unmap the address and return 1 or 0 depending if the mapping previously * existed or not. */ -int __mmu_notifier_clear_flush_young (struct mm_struct *mm, -unsigned long start, -unsigned long end) +bool __mmu_notifier_clear_flush_young (struct mm_struct *mm, +unsigned long start,unsigned long end) {struct mmu_notifier *subscription; -int young =0 , id; +bool young = false, id; id =srcu_read_lock (&srcu); hlist_for_each_entry_srcu(subscription,@@ -384,12 +383,11 @@ int __mmu_notifier_clear_flush_young(struct mm_struct *mm,return young; } -int __mmu_notifier_clear_young (struct mm_struct *mm, -unsigned long start, -unsigned long end) +bool __mmu_notifier_clear_young (struct mm_struct *mm, +unsigned long start,unsigned long end) {struct mmu_notifier *subscription; -int young =0 , id; +bool young = false, id; id =srcu_read_lock (&srcu); hlist_for_each_entry_srcu(subscription,@@ -404,11 +402,11 @@ int __mmu_notifier_clear_young(struct mm_struct *mm,return young; } -int __mmu_notifier_test_young (struct mm_struct *mm, -unsigned long address) +bool __mmu_notifier_test_young (struct mm_struct *mm, +unsigned long address) {struct mmu_notifier *subscription; -int young =0 , id; +bool young = false, id; id =srcu_read_lock (&srcu); hlist_for_each_entry_srcu(subscription,virt/kvm/kvm_main.c +0
-0@@ -646,11 +646,11 @@ static __always_inline kvm_mn_ret_t kvm_handle_hva_range(struct kvm *kvm,return r; }
virt/kvm/kvm_main.c static __always_inline kvm_mn_ret_t kvm_handle_hva_range(struct kvm *kvm, · line 653
Quoted 10 lines
virt/kvm/kvm_main.c +5
-5-static __always_inline int kvm_age_hva_range(struct mmu_notifier *mn, -unsigned long start, -unsigned long end, -gfn_handler_t handler, -bool flush_on_ret) +static __always_inline bool kvm_age_hva_range(struct mmu_notifier *mn, +unsigned long start, +unsigned long end, +gfn_handler_t handler, +bool flush_on_ret)
Can we please fix this terrrible indentation while we're here :)?
static __always_inline bool kvm_age_hva_range(struct mmu_notifier *mn,
unsigned long start, unsigned long end, gfn_handler_t handler, bool flush_on_ret)
Would be nicer, thanks!
Quoted 5 lines
virt/kvm/kvm_main.c +0
-0{struct kvm *kvm =mmu_notifier_to_kvm (mn);const struct kvm_mmu_notifier_range range = {@@ -666,10 +666,10 @@ static __always_inline int kvm_age_hva_range(struct mmu_notifier *mn,return kvm_handle_hva_range (kvm, &range).ret;
virt/kvm/kvm_main.c static __always_inline int kvm_age_hva_range(struct mmu_notifier *mn, · line 672
Quoted 10 lines
virt/kvm/kvm_main.c +4
-4} -static __always_inline int kvm_age_hva_range_no_flush(struct mmu_notifier *mn, -unsigned long start, -unsigned long end, -gfn_handler_t handler) +static __always_inline bool kvm_age_hva_range_no_flush(struct mmu_notifier *mn, +unsigned long start, +unsigned long end, +gfn_handler_t handler)
Same indentation comment here.
Quoted 5 lines
virt/kvm/kvm_main.c +0
-0{return kvm_age_hva_range (mn, start, end, handler, false); }@@ -829,10 +829,10 @@ static void kvm_mmu_notifier_invalidate_range_end(struct mmu_notifier *mn,rcuwait_wake_up (&kvm->mn_memslots_update_rcuwait);
virt/kvm/kvm_main.c static void kvm_mmu_notifier_invalidate_range_end(struct mmu_notifier *mn, · line 835
Quoted 10 lines
virt/kvm/kvm_main.c +4
-4} -static int kvm_mmu_notifier_clear_flush_young (struct mmu_notifier *mn, -struct mm_struct *mm, -unsigned long start, -unsigned long end) +static bool kvm_mmu_notifier_clear_flush_young (struct mmu_notifier *mn, +struct mm_struct *mm, +unsigned long start, +unsigned long end)
Same indentation comment here.
Quoted 5 lines
virt/kvm/kvm_main.c +0
-0{trace_kvm_age_hva (start, end);@@ -840,10 +840,10 @@ static int kvm_mmu_notifier_clear_flush_young(struct mmu_notifier *mn, !IS_ENABLED(CONFIG_KVM_ELIDE_TLB_FLUSH_IF_YOUNG));
virt/kvm/kvm_main.c static int kvm_mmu_notifier_clear_flush_young(struct mmu_notifier *mn, · line 846
Quoted 10 lines
virt/kvm/kvm_main.c +4
-4} -static int kvm_mmu_notifier_clear_young (struct mmu_notifier *mn, -struct mm_struct *mm, -unsigned long start, -unsigned long end) +static bool kvm_mmu_notifier_clear_young (struct mmu_notifier *mn, +struct mm_struct *mm, +unsigned long start, +unsigned long end)
Same indentation comment here.
virt/kvm/kvm_main.c static int kvm_mmu_notifier_clear_young(struct mmu_notifier *mn, · line 868
Quoted 13 lines
virt/kvm/kvm_main.c +3
-3{trace_kvm_age_hva (start, end);@@ -863,9 +863,9 @@ static int kvm_mmu_notifier_clear_young(struct mmu_notifier *mn,return kvm_age_hva_range_no_flush (mn, start, end, kvm_age_gfn); } -static int kvm_mmu_notifier_test_young (struct mmu_notifier *mn, -struct mm_struct *mm, -unsigned long address) +static bool kvm_mmu_notifier_test_young (struct mmu_notifier *mn, +struct mm_struct *mm, +unsigned long address)
Same indentation comment here.
Quoted 6 lines
virt/kvm/kvm_main.c +0
-1{trace_kvm_test_age_hva (address); --2.47.3
Re: [PATCH 6/6] mm: change to return bool for the MMU notifier's young flag check
Quoted 11 lines · Lorenzo Stoakes (Oracle)
Quoted 5 lines · Baolin Wang
The MMU notifier young flag check related functions only return whether the young flag was set. Change the return type to bool to make the intention clearer.
Signed-off-by Baolin Wang <[email protected]>I can see KVM is the only user for the
mmu_notifier_opsclear_flush_young,clear_youngandtest_younghooks, which map to kvm_mmu_notifier_[clear_flush,clear,test]_young() functions, and you have updated them all.
Yes.
Quoted 6 lines
So this LGTM with nits below, and so (with nits addressed as per the other R-b tags :):
Reviewed-by Lorenzo Stoakes (Oracle) <[email protected]>Thanks for doing this! Int as bool is a pet peeve of mine :))
Thanks for reviewing.
Quoted 68 lines
Quoted 68 lines
include/linux/mmu_notifier.h | 76 +++++++++++++++++------------------- mm/internal.h | 16 ++++---- mm/mmu_notifier.c | 20 +++++----- virt/kvm/kvm_main.c | 40 +++++++++---------- 4 files changed, 72 insertions(+), 80 deletions(-)include/linux/mmu_notifier.h +15
-19@@ -97,20 +97,20 @@ struct mmu_notifier_ops {* Start-end is necessary in case the secondary MMU is mapping the page * at a smaller granularity than the primary MMU. */ -int (*clear_flush_young)(struct mmu_notifier *subscription, -struct mm_struct *mm, -unsigned long start, -unsigned long end); +bool (*clear_flush_young)(struct mmu_notifier *subscription, +struct mm_struct *mm, +unsigned long start, +unsigned long end);/* * clear_young is a lightweight version of clear_flush_young. Like the * latter, it is supposed to test-and-clear the young/accessed bitflag * in the secondary pte, but it may omit flushing the secondary tlb. */ -int (*clear_young)(struct mmu_notifier *subscription, -struct mm_struct *mm, -unsigned long start, -unsigned long end); +bool (*clear_young)(struct mmu_notifier *subscription, +struct mm_struct *mm, +unsigned long start, +unsigned long end);/* * test_young is called to check the young/accessed bitflag in @@ -118,9 +118,9 @@ struct mmu_notifier_ops {* frequently used without actually clearing the flag or tearing * down the secondary mapping on the page. */ -int (*test_young)(struct mmu_notifier *subscription, -struct mm_struct *mm, -unsigned long address); +bool (*test_young)(struct mmu_notifier *subscription, +struct mm_struct *mm, +unsigned long address);/* * invalidate_range_start() and invalidate_range_end() must be @@ -376,14 +376,12 @@ mmu_interval_check_retry(struct mmu_interval_notifier *interval_sub,extern void __mmu_notifier_subscriptions_destroy (struct mm_struct *mm);extern void __mmu_notifier_release (struct mm_struct *mm); -extern int __mmu_notifier_clear_flush_young (struct mm_struct *mm, -unsigned long start, -unsigned long end); -extern int __mmu_notifier_clear_young (struct mm_struct *mm, -unsigned long start, -unsigned long end); -extern int __mmu_notifier_test_young (struct mm_struct *mm, -unsigned long address); +bool __mmu_notifier_clear_flush_young (struct mm_struct *mm, +unsigned long start,unsigned long end); +bool __mmu_notifier_clear_young (struct mm_struct *mm, +unsigned long start,unsigned long end);
Quoted 8 lines
include/linux/mmu_notifier.h mmu_interval_check_retry(struct mmu_interval_notifier *interval_sub, · line 387
Quoted 5 lines
include/linux/mmu_notifier.h +2
-0+bool __mmu_notifier_test_young (struct mm_struct *mm, +unsigned long address);extern int __mmu_notifier_invalidate_range_start (struct mmu_notifier_range *r);extern void __mmu_notifier_invalidate_range_end (struct mmu_notifier_range *r); extern void __mmu_notifier_arch_invalidate_secondary_tlbs(struct mm_struct *mm,I mean damn, at this point maybe it's legit to drop the surrounding externs here too? But maybe not :))
I prefer to leave the others as is:)
[snip]
Quoted 14 lines
include/linux/mmu_notifier.h
Quoted 11 lines
include/linux/mmu_notifier.h +5
-5-static __always_inline int kvm_age_hva_range(struct mmu_notifier *mn, -unsigned long start, -unsigned long end, -gfn_handler_t handler, -bool flush_on_ret) +static __always_inline bool kvm_age_hva_range(struct mmu_notifier *mn, +unsigned long start, +unsigned long end, +gfn_handler_t handler, +bool flush_on_ret)Can we please fix this terrrible indentation while we're here :)?
Quoted 5 lines
static
__always_inlinebool kvm_age_hva_range(structmmu_notifier*mn,
unsigned long start, unsigned long end,gfn_handler_thandler, boolflush_on_ret)Would be nicer, thanks!
Will do if KVM maintainers are also happy with this.
Sean Christopherson
reviewerRe: [PATCH 6/6] mm: change to return bool for the MMU notifier's young flag check
Quoted 13 lines · Baolin Wang
Quoted 13 lines
virt/kvm/kvm_main.c static __always_inline kvm_mn_ret_t kvm_handle_hva_range(struct kvm *kvm, · line 653
Quoted 10 lines
virt/kvm/kvm_main.c +5
-5-static __always_inline int kvm_age_hva_range(struct mmu_notifier *mn, -unsigned long start, -unsigned long end, -gfn_handler_t handler, -bool flush_on_ret) +static __always_inline bool kvm_age_hva_range(struct mmu_notifier *mn, +unsigned long start, +unsigned long end, +gfn_handler_t handler, +bool flush_on_ret)Can we please fix this terrrible indentation while we're here :)?
Quoted 5 lines
Quoted 5 lines
static
__always_inlinebool kvm_age_hva_range(structmmu_notifier*mn,
unsigned long start, unsigned long end,gfn_handler_thandler, boolflush_on_ret)Would be nicer, thanks!
No, please keep this as-is. KVM's preferred style is exactly this (and I personally find mm's style much harder to parse).
Re: [PATCH 6/6] mm: change to return bool for the MMU notifier's young flag check
Quoted 14 lines · Sean Christopherson
Quoted 13 lines · Baolin Wang
Quoted 13 lines
virt/kvm/kvm_main.c static __always_inline kvm_mn_ret_t kvm_handle_hva_range(struct kvm *kvm, · line 653
Quoted 10 lines
virt/kvm/kvm_main.c +5
-5-static __always_inline int kvm_age_hva_range(struct mmu_notifier *mn, -unsigned long start, -unsigned long end, -gfn_handler_t handler, -bool flush_on_ret) +static __always_inline bool kvm_age_hva_range(struct mmu_notifier *mn, +unsigned long start, +unsigned long end, +gfn_handler_t handler, +bool flush_on_ret)Can we please fix this terrrible indentation while we're here :)?
Quoted 8 lines
Quoted 5 lines
Quoted 5 lines
static
__always_inlinebool kvm_age_hva_range(structmmu_notifier*mn,
unsigned long start, unsigned long end,gfn_handler_thandler, boolflush_on_ret)Would be nicer, thanks!
No, please keep this as-is. KVM's preferred style is exactly this (and I personally find mm's style much harder to parse).
Um, Andrew has already queued v2[1] into the mm-stable branch. Do you want me to send a follow-up patch to restore the original KVM coding style?
Sean Christopherson
reviewerRe: [PATCH 6/6] mm: change to return bool for the MMU notifier's young flag check
Quoted 19 lines · Baolin Wang
Quoted 18 lines · Sean Christopherson
Quoted 17 lines · Baolin Wang
Quoted 17 lines
virt/kvm/kvm_main.c static __always_inline kvm_mn_ret_t kvm_handle_hva_range(struct kvm *kvm, · line 653
Quoted 10 lines
virt/kvm/kvm_main.c +5
-5-static __always_inline int kvm_age_hva_range(struct mmu_notifier *mn, -unsigned long start, -unsigned long end, -gfn_handler_t handler, -bool flush_on_ret) +static __always_inline bool kvm_age_hva_range(struct mmu_notifier *mn, +unsigned long start, +unsigned long end, +gfn_handler_t handler, +bool flush_on_ret)Can we please fix this terrrible indentation while we're here :)?
static
__always_inlinebool kvm_age_hva_range(structmmu_notifier*mn,
unsigned long start, unsigned long end,gfn_handler_thandler, boolflush_on_ret)
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Would be nicer, thanks!
No, please keep this as-is. KVM's preferred style is exactly this (and I personally find mm's style much harder to parse).
Um, Andrew has already queued v2[1] into the mm-stable branch. Do you want me to send a follow-up patch to restore the original KVM coding style?
Nah, not worth the churn. Thanks though!
Andrew Morton
maintainerQuoted 4 lines · On Thu, 19 Mar 2026 11:23:59 +0800 Baolin Wang <[email protected]>…
This is a cleanup patchset to change all young flag check functions to return bool, as discussed with David in the previous thread[1]. Since callers only care about whether the young flag was set, returning bool makes the intention clearer. No functional changes intended.
One observation from Sashiko. Minorish, worth addressing:
https://sashiko.dev/#/patchset/cover.1773890510.git.baolin.wang%40linux.alibaba.com
Quoted 9 lines · Andrew Morton
Quoted 4 lines · On Thu, 19 Mar 2026 11:23:59 +0800 Baolin Wang <[email protected]>…
This is a cleanup patchset to change all young flag check functions to return bool, as discussed with David in the previous thread[1]. Since callers only care about whether the young flag was set, returning bool makes the intention clearer. No functional changes intended.
One observation from Sashiko. Minorish, worth addressing:
https://sashiko.dev/#/patchset/cover.1773890510.git.baolin.wang%40linux.alibaba.com
Yes, good catch. Will fix in next version. Thanks.
Ritesh Harjani (IBM)
reviewerQuoted 21 lines · Baolin Wang
This is a cleanup patchset to change all young flag check functions to return bool, as discussed with David in the previous thread[1]. Since callers only care about whether the young flag was set, returning bool makes the intention clearer. No functional changes intended.
Ran mm selftests on Arm64 and x86 machines, and no issues were found.
Note that I only CC'd the arch mailing lists to avoid disturbing too many people.
[1] https://lore.kernel.org/all/[email protected]/
Baolin Wang (6):
mm: change to return bool forptep_test_and_clear_young()
mm: change to return bool for
ptep_clear_flush_young()/clear_flush_young_ptes()
mm: change to return bool forpmdp_test_and_clear_young()
mm: change to return bool forpmdp_clear_flush_young()
mm: change to return bool forpudp_test_and_clear_young()
mm: change to return bool for the MMU notifier's young flag check
Quoted 10 lines
arch/arm64/include/asm/pgtable.h | 29 ++++---- arch/arm64/mm/contpte.c | 8 +-- arch/microblaze/include/asm/pgtable.h | 2 +- arch/parisc/include/asm/pgtable.h | 8 +-- arch/parisc/kernel/cache.c | 8 +-- arch/powerpc/include/asm/book3s/32/pgtable.h | 4 +- arch/powerpc/include/asm/book3s/64/pgtable.h | 26 +++---- arch/powerpc/include/asm/nohash/64/pgtable.h | 2 +- arch/powerpc/include/asm/nohash/pgtable.h | 4 +- arch/powerpc/mm/book3s64/pgtable.c | 8 +--
I did compile and boot test on powerpc with various configs and overall it looks good.
-ritesh
Quoted 34 lines · Ritesh Harjani (IBM)
Quoted 21 lines · Baolin Wang
This is a cleanup patchset to change all young flag check functions to return bool, as discussed with David in the previous thread[1]. Since callers only care about whether the young flag was set, returning bool makes the intention clearer. No functional changes intended.
Ran mm selftests on Arm64 and x86 machines, and no issues were found.
Note that I only CC'd the arch mailing lists to avoid disturbing too many people.
[1] https://lore.kernel.org/all/[email protected]/
Baolin Wang (6):
mm: change to return bool forptep_test_and_clear_young()
mm: change to return bool for
ptep_clear_flush_young()/clear_flush_young_ptes()
mm: change to return bool forpmdp_test_and_clear_young()
mm: change to return bool forpmdp_clear_flush_young()
mm: change to return bool forpudp_test_and_clear_young()
mm: change to return bool for the MMU notifier's young flag checkQuoted 10 lines
arch/arm64/include/asm/pgtable.h | 29 ++++---- arch/arm64/mm/contpte.c | 8 +-- arch/microblaze/include/asm/pgtable.h | 2 +- arch/parisc/include/asm/pgtable.h | 8 +-- arch/parisc/kernel/cache.c | 8 +-- arch/powerpc/include/asm/book3s/32/pgtable.h | 4 +- arch/powerpc/include/asm/book3s/64/pgtable.h | 26 +++---- arch/powerpc/include/asm/nohash/64/pgtable.h | 2 +- arch/powerpc/include/asm/nohash/pgtable.h | 4 +- arch/powerpc/mm/book3s64/pgtable.c | 8 +--
Quoted 2 lines
I did compile and boot test on powerpc with various configs and overall it looks good.
Really appreciate your help with testing!