support batched checking of the young flag for MGLRU
Subsystems (6)
Baolin Wang
reviewerv2 cover support batched checking of the young flag for MGLRU
This is a follow-up to the previous work [1], to support batched checking of the young flag for MGLRU.
Similarly, batched checking of young flag for large folios can improve performance during large-folio reclamation when MGLRU is enabled. I observed noticeable performance improvements (see patch 5) on an Arm64 machine that supports contiguous PTEs. All mm-selftests are passed.
Patch 1 - 3: cleanup patches.
Patch 4: add a new generic batched PTE helper: test_and_clear_young_ptes(). Patch 5: support batched young flag checking for MGLRU.
Patch 6: implement the Arm64 arch-specific test_and_clear_young_ptes().
[1] https://lore.kernel.org/all/[email protected]/
Changes from v1:
v1: https://lore.kernel.org/all/[email protected]/
- Update some commit message (per David).
- Fix some coding style issues (per David).
- Use VM_WARN_ON_ONCE_FOLIO() instead of VM_WARN_ON_FOLIO() (per Rik).
- Define a generic ptep_test_and_clear_young_notify() (per David).
- Remove redundant 'nr > 1' check in folio_referenced_one() (per David).
- Rename some variables' to make code more clear (per David).
- Add a new patch to rename some functions (per David).
- Update the young counters with the batched count for MGLRU.
- Collect reviewed tags from Rik, Barry, Alistair and David. Thanks.
Baolin Wang (6):
mm: use inline helper functions instead of ugly macros
mm: rename ptep/pmdp_clear_young_notify() to
ptep/pmdp_test_and_clear_young_notify()
mm: rmap: add a ZONE_DEVICE folio warning in folio_referenced()
mm: add a batched helper to clear the young flag for large folios
mm: support batched checking of the young flag for MGLRU
arm64: mm: implement the architecture-specific
test_and_clear_young_ptes()
arch/arm64/include/asm/pgtable.h | 18 +++++++---- include/linux/mmu_notifier.h | 54 -------------------------------- include/linux/mmzone.h | 5 +-- include/linux/pgtable.h | 38 ++++++++++++++++++++++ mm/internal.h | 52 ++++++++++++++++++++++++++++++ mm/rmap.c | 29 ++++++++--------- mm/vmscan.c | 46 ++++++++++++++++++++------- 7 files changed, 154 insertions(+), 88 deletions(-)
Signature · 1 line
2.47.3
Baolin Wang
reviewerPATCH v2 3/6 mm: rmap: add a ZONE_DEVICE folio warning in folio_referenced()
The folio_referenced() is used to test whether a folio was referenced during reclaim. Moreover, ZONE_DEVICE folios are controlled by their device driver, have a lifetime tied to that driver, and are never placed on the LRU list. That means we should never try to reclaim ZONE_DEVICE folios, so add a warning to catch this unexpected behavior in folio_referenced() to avoid confusion, as discussed in the previous thread[1].
[1] https://lore.kernel.org/all/[email protected]/
--- mm/rmap.c | 1 + 1 file changed, 1 insertion(+)
mm/rmap.c +1 -0
@@ -1065,6 +1065,7 @@ int folio_referenced(struct folio *folio, int is_locked, .invalid_vma = invalid_folio_referenced_vma, }; +VM_WARN_ON_ONCE_FOLIO (folio_is_zone_device (folio), folio); *vm_flags =0 ;if (!pra.mapcount)return 0 ;
Signature · 1 line
2.47.3
Baolin Wang
reviewerPATCH v2 4/6 mm: add a batched helper to clear the young flag for large folios
In reply to Baolin WangCurrently, MGLRU will call ptep_test_and_clear_young_notify() to check and clear the young flag for each PTE sequentially, which is inefficient for large folios reclamation.
Moreover, on Arm64 architecture, which supports contiguous PTEs, the Arm64- specific ptep_test_and_clear_young() already implements an optimization to clear the young flags for PTEs within a contiguous range. However, this is not sufficient. Similar to the Arm64 specific clear_flush_young_ptes(), we can extend this to perform batched operations for the entire large folio (which might exceed the contiguous range: CONT_PTE_SIZE).
Thus, we can introduce a new batched helper: test_and_clear_young_ptes() and its wrapper test_and_clear_young_ptes_notify() which are consistent with the existing functions, to perform batched checking of the young flags for large folios, which can help improve performance during large folio reclamation when MGLRU is enabled. And it will be overridden by the architecture that implements a more efficient batch operation in the following patches.
--- include/linux/pgtable.h | 38 ++++++++++++++++++++++++++++++++++++++ mm/internal.h | 16 +++++++++++----- 2 files changed, 49 insertions(+), 5 deletions(-)
include/linux/pgtable.h +38 -0
@@ -1103,6 +1103,44 @@ static inline int clear_flush_young_ptes(struct vm_area_struct *vma, }#endif +#ifndef test_and_clear_young_ptes +/** +* test_and_clear_young_ptes - Mark PTEs that map consecutive pages of the same +* folio as old +* @vma: The virtual memory area the pages are mapped into. +* @addr: Address the first page is mapped at. +* @ptep: Page table pointer for the first entry. +* @nr: Number of entries to clear access bit. +* +* May be overridden by the architecture; otherwise, implemented as a simple +* loop over ptep_test_and_clear_young(). +* +* Note that PTE bits in the PTE range besides the PFN can differ. For example, +* some PTEs might be write-protected. +* +* 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. +* +* Returns: whether any PTE was young. +*/ +static inline int test_and_clear_young_ptes (struct vm_area_struct *vma, +unsigned long addr,pte_t *ptep, +unsigned int nr) +{ +int young =0 ; + +for (;;) { + young |=ptep_test_and_clear_young (vma, addr, ptep); +if (--nr ==0 ) +break ; + ptep++; + addr +=PAGE_SIZE ; + } + +return young; +} +#endif +/* * On some architectures hardware does not set page access bit when accessing * memory page, it is responsibility of software setting this bit. It brings
mm/internal.h +11 -5
@@ -1814,13 +1814,13 @@ static inline int pmdp_clear_flush_young_notify(struct vm_area_struct *vma,return young; } -static inline int ptep_test_and_clear_young_notify (struct vm_area_struct *vma, -unsigned long addr,pte_t *ptep) +static inline int test_and_clear_young_ptes_notify (struct vm_area_struct *vma, +unsigned long addr,pte_t *ptep,unsigned int nr) {int young; - young =ptep_test_and_clear_young (vma, addr, ptep); - young |=mmu_notifier_clear_young (vma->vm_mm, addr, addr +PAGE_SIZE ); + 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; }
@@ -1838,9 +1838,15 @@ static inline int pmdp_test_and_clear_young_notify(struct vm_area_struct *vma,#define clear_flush_young_ptes_notify clear_flush_young_ptes#define pmdp_clear_flush_young_notify pmdp_clear_flush_young -#define ptep_test_and_clear_young_notify ptep_test_and_clear_young +#define test_and_clear_young_ptes_notify test_and_clear_young_ptes#define pmdp_test_and_clear_young_notify pmdp_test_and_clear_young#endif /* CONFIG_MMU_NOTIFIER */ +static inline int ptep_test_and_clear_young_notify (struct vm_area_struct *vma, +unsigned long addr,pte_t *ptep) +{ +return test_and_clear_young_ptes_notify (vma, addr, ptep,1 ); +} +#endif /* __MM_INTERNAL_H */
Signature · 1 line
2.47.3
Baolin Wang
reviewerPATCH v2 1/6 mm: use inline helper functions instead of ugly macros
In reply to Baolin WangPeople have already complained that these *_clear_young_notify() related macros are very ugly, so let's use inline helpers to make them more readable.
In addition, we cannot implement these inline helper functions in the mmu_notifier.h file, because some arch-specific files will include the mmu_notifier.h, which introduces header compilation dependencies and causes build errors (e.g., arch/arm64/include/asm/tlbflush.h). Moreover, since these functions are only used in the mm, implementing these inline helpers in the mm/internal.h header seems reasonable.
--- include/linux/mmu_notifier.h | 54 ------------------------------------ mm/internal.h | 52 ++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 54 deletions(-)
include/linux/mmu_notifier.h +0 -54
@@ -515,55 +515,6 @@ static inline void mmu_notifier_range_init_owner( range->owner = owner; } -#define clear_flush_young_ptes_notify (__vma, __address, __ptep, __nr) \ -({ \ - int __young; \ - struct vm_area_struct *___vma = __vma; \ - unsigned long ___address = __address; \ - unsigned int ___nr = __nr; \ - __young = clear_flush_young_ptes(___vma, ___address, __ptep, ___nr); \ - __young |= mmu_notifier_clear_flush_young(___vma->vm_mm, \ - ___address, \ - ___address + \ - ___nr * PAGE_SIZE); \ - __young; \ -}) - -#define pmdp_clear_flush_young_notify (__vma, __address, __pmdp) \ -({ \ - int __young; \ - struct vm_area_struct *___vma = __vma; \ - unsigned long ___address = __address; \ - __young = pmdp_clear_flush_young(___vma, ___address, __pmdp); \ - __young |= mmu_notifier_clear_flush_young(___vma->vm_mm, \ - ___address, \ - ___address + \ - PMD_SIZE); \ - __young; \ -}) - -#define ptep_clear_young_notify (__vma, __address, __ptep) \ -({ \ - int __young; \ - struct vm_area_struct *___vma = __vma; \ - unsigned long ___address = __address; \ - __young = ptep_test_and_clear_young(___vma, ___address, __ptep);\ - __young |= mmu_notifier_clear_young(___vma->vm_mm, ___address, \ - ___address + PAGE_SIZE); \ - __young; \ -}) - -#define pmdp_clear_young_notify (__vma, __address, __pmdp) \ -({ \ - int __young; \ - struct vm_area_struct *___vma = __vma; \ - unsigned long ___address = __address; \ - __young = pmdp_test_and_clear_young(___vma, ___address, __pmdp);\ - __young |= mmu_notifier_clear_young(___vma->vm_mm, ___address, \ - ___address + PMD_SIZE); \ - __young; \ -}) -#else /* CONFIG_MMU_NOTIFIER */ struct mmu_notifier_range {
@@ -651,11 +602,6 @@ static inline void mmu_notifier_subscriptions_destroy(struct mm_struct *mm)#define mmu_notifier_range_update_to_read_only (r) false -#define clear_flush_young_ptes_notify clear_flush_young_ptes -#define pmdp_clear_flush_young_notify pmdp_clear_flush_young -#define ptep_clear_young_notify ptep_test_and_clear_young -#define pmdp_clear_young_notify pmdp_test_and_clear_young -static inline void mmu_notifier_synchronize (void ) { }
mm/internal.h +52 -0
62 lines not on this page · raw message
Signature · 1 line
2.47.3
Baolin Wang
reviewerPATCH v2 2/6 mm: rename ptep/pmdp_clear_young_notify() to ptep/pmdp_test_and_clear_young_notify()
In reply to Baolin WangRename ptep/pmdp_clear_young_notify() to ptep/pmdp_test_and_clear_young_notify() to make the function names consistent.
--- mm/internal.h | 8 ++++---- mm/vmscan.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
mm/internal.h +4 -4
@@ -1814,7 +1814,7 @@ static inline int pmdp_clear_flush_young_notify(struct vm_area_struct *vma,return young; } -static inline int ptep_clear_young_notify (struct vm_area_struct *vma, +static inline int ptep_test_and_clear_young_notify (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) {int young;
@@ -1824,7 +1824,7 @@ static inline int ptep_clear_young_notify(struct vm_area_struct *vma,return young; } -static inline int pmdp_clear_young_notify (struct vm_area_struct *vma, +static inline int pmdp_test_and_clear_young_notify (struct vm_area_struct *vma,unsigned long addr,pmd_t *pmdp) {int young;
@@ -1838,8 +1838,8 @@ static inline int pmdp_clear_young_notify(struct vm_area_struct *vma,#define clear_flush_young_ptes_notify clear_flush_young_ptes#define pmdp_clear_flush_young_notify pmdp_clear_flush_young -#define ptep_clear_young_notify ptep_test_and_clear_young -#define pmdp_clear_young_notify pmdp_test_and_clear_young +#define ptep_test_and_clear_young_notify ptep_test_and_clear_young +#define pmdp_test_and_clear_young_notify pmdp_test_and_clear_young#endif /* CONFIG_MMU_NOTIFIER */
mm/vmscan.c +4 -4
@@ -3508,7 +3508,7 @@ static bool walk_pte_range(pmd_t *pmd, unsigned long start, unsigned long end,if (!folio)continue ; -if (!ptep_clear_young_notify (args->vma, addr, pte + i)) +if (!ptep_test_and_clear_young_notify (args->vma, addr, pte + i))continue ;if (last != folio) {
@@ -3599,7 +3599,7 @@ static void walk_pmd_range_locked(pud_t *pud, unsigned long addr, struct vm_areaif (!folio) goto next; -if (!pmdp_clear_young_notify (vma, addr, pmd + i)) +if (!pmdp_test_and_clear_young_notify (vma, addr, pmd + i)) goto next;if (last != folio) {
@@ -4189,7 +4189,7 @@ bool lru_gen_look_around(struct page_vma_mapped_walk *pvmw)lockdep_assert_held (pvmw->ptl);VM_WARN_ON_ONCE_FOLIO (folio_test_lru (folio), folio); -if (!ptep_clear_young_notify (vma, addr, pte)) +if (!ptep_test_and_clear_young_notify (vma, addr, pte))return false;if (spin_is_contended (pvmw->ptl))
@@ -4241,7 +4241,7 @@ bool lru_gen_look_around(struct page_vma_mapped_walk *pvmw)if (!folio)continue ; -if (!ptep_clear_young_notify (vma, addr, pte + i)) +if (!ptep_test_and_clear_young_notify (vma, addr, pte + i))continue ;if (last != folio) {
Signature · 1 line
2.47.3
Baolin Wang
reviewerPATCH v2 5/6 mm: support batched checking of the young flag for MGLRU
In reply to Baolin WangUse the batched helper test_and_clear_young_ptes_notify() to check and clear the young flag to improve the performance during large folio reclamation when MGLRU is enabled.
Meanwhile, we can also support batched checking the young and dirty flag when MGLRU walks the mm's pagetable to update the folios' generation counter. Since MGLRU also checks the PTE dirty bit, use folio_pte_batch_flags() with FPB_MERGE_YOUNG_DIRTY set to detect batches of PTEs for a large folio.
Then we can remove the ptep_test_and_clear_young_notify() since it has no users now.
Note that we also update the 'young' counter and 'mm_stats[MM_LEAF_YOUNG]' counter with the batched count in the lru_gen_look_around() and walk_pte_range(). However, the batched operations may inflate these two counters, because in a large folio not all PTEs may have been accessed. (Additionally, tracking how many PTEs have been accessed within a large folio is not very meaningful, since the mm core actually tracks access/dirty on a per-folio basis, not per page). The impact analysis is as follows:
1. The 'mm_stats[MM_LEAF_YOUNG]' counter has no functional impact and is mainly for debugging.
2. The 'young' counter is used to decide whether to place the current PMD entry into the bloom filters by suitable_to_scan() (so that next time we can check whether it has been accessed again), which may set the hash bit in the bloom filters for a PMD entry that hasn’t seen much access. However, bloom filters inherently allow some error, so this effect appears negligible.
--- include/linux/mmzone.h | 5 +++-- mm/internal.h | 6 ------ mm/rmap.c | 28 +++++++++++++-------------- mm/vmscan.c | 44 +++++++++++++++++++++++++++++++----------- 4 files changed, 50 insertions(+), 33 deletions(-)
include/linux/mmzone.h +3 -2
@@ -630,7 +630,7 @@ struct lru_gen_memcg {void lru_gen_init_pgdat (struct pglist_data *pgdat);void lru_gen_init_lruvec (struct lruvec *lruvec); -bool lru_gen_look_around (struct page_vma_mapped_walk *pvmw); +bool lru_gen_look_around (struct page_vma_mapped_walk *pvmw,unsigned int nr);void lru_gen_init_memcg (struct mem_cgroup *memcg);void lru_gen_exit_memcg (struct mem_cgroup *memcg);
@@ -652,7 +652,8 @@ static inline void lru_gen_init_lruvec(struct lruvec *lruvec) { } -static inline bool lru_gen_look_around (struct page_vma_mapped_walk *pvmw) +static inline bool lru_gen_look_around (struct page_vma_mapped_walk *pvmw, +unsigned int nr) {return false; }
mm/internal.h +0 -6
@@ -1843,10 +1843,4 @@ static inline int pmdp_test_and_clear_young_notify(struct vm_area_struct *vma,#endif /* CONFIG_MMU_NOTIFIER */ -static inline int ptep_test_and_clear_young_notify (struct vm_area_struct *vma, -unsigned long addr,pte_t *ptep) -{ -return test_and_clear_young_ptes_notify (vma, addr, ptep,1 ); -} -#endif /* __MM_INTERNAL_H */
mm/rmap.c +14 -14
@@ -958,25 +958,21 @@ static bool folio_referenced_one(struct folio *folio,return false; } +if (pvmw.pte &&folio_test_large (folio)) { +const unsigned long end_addr =pmd_addr_end (address, vma->vm_end); +const unsigned int max_nr = (end_addr - address) >>PAGE_SHIFT ; +pte_t pteval =ptep_get (pvmw.pte); + + nr =folio_pte_batch (folio, pvmw.pte, pteval, max_nr); + ptes += nr; + } +if (lru_gen_enabled () && pvmw.pte) { -if (lru_gen_look_around (&pvmw)) +if (lru_gen_look_around (&pvmw, nr)) referenced++; }else if (pvmw.pte) { -if (folio_test_large (folio)) { -unsigned long end_addr =pmd_addr_end (address, vma->vm_end); -unsigned int max_nr = (end_addr - address) >>PAGE_SHIFT ; -pte_t pteval =ptep_get (pvmw.pte); - - nr =folio_pte_batch (folio, pvmw.pte, - pteval, max_nr); - } - - ptes += nr;if (clear_flush_young_ptes_notify (vma, address, pvmw.pte, nr)) referenced++; -/* Skip the batched PTEs */ - pvmw.pte += nr -1 ; - pvmw.address += (nr -1 ) *PAGE_SIZE ; }else if (IS_ENABLED (CONFIG_TRANSPARENT_HUGEPAGE )) {if (pmdp_clear_flush_young_notify (vma, address, pvmw.pmd))
@@ -995,6 +991,10 @@ static bool folio_referenced_one(struct folio *folio,page_vma_mapped_walk_done (&pvmw);break ; } + +/* Skip the batched PTEs */ + pvmw.pte += nr -1 ; + pvmw.address += (nr -1 ) *PAGE_SIZE ; }if (referenced)
mm/vmscan.c +33 -11
108 lines not on this page · raw message
Signature · 1 line
2.47.3
Baolin Wang
reviewerPATCH v2 6/6 arm64: mm: implement the architecture-specific test_and_clear_young_ptes()
In reply to Baolin WangImplement the Arm64 architecture-specific test_and_clear_young_ptes() to enable batched checking of young flags, improving performance during large folio reclamation when MGLRU is enabled.
While we're at it, simplify ptep_test_and_clear_young() by calling test_and_clear_young_ptes(). Since callers guarantee that PTEs are present before calling these functions, we can use pte_cont() to check the CONT_PTE flag instead of pte_valid_cont().
Performance testing:
Enable MGLRU, then allocate 10G clean file-backed folios by mmap() in a memory cgroup, and try to reclaim 8G file-backed folios via the memory.reclaim interface. I can observe 60%+ performance improvement on my Arm64 32-core server (and about 15% improvement on my X86 machine).
W/o patchset:
real 0m0.470s
user 0m0.000s
sys 0m0.470s
W/ patchset:
real 0m0.180s
user 0m0.001s
sys 0m0.179s
--- arch/arm64/include/asm/pgtable.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
arch/arm64/include/asm/pgtable.h +12 -6
@@ -1812,16 +1812,22 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm,return __ptep_get_and_clear (mm, addr, ptep); } +#define test_and_clear_young_ptes test_and_clear_young_ptes +static inline int test_and_clear_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_test_and_clear_young (vma, addr, ptep); + +return contpte_test_and_clear_young_ptes (vma, addr, ptep, nr); +} +#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNGstatic inline int ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) { -pte_t orig_pte =__ptep_get (ptep); - -if (likely (!pte_valid_cont (orig_pte))) -return __ptep_test_and_clear_young (vma, addr, ptep); - -return contpte_test_and_clear_young_ptes (vma, addr, ptep,1 ); +return test_and_clear_young_ptes (vma, addr, ptep,1 ); }#define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH
Signature · 1 line
2.47.3
Re: [PATCH v2 2/6] mm: rename ptep/pmdp_clear_young_notify() to ptep/pmdp_test_and_clear_young_notify()
In reply to Baolin WangQuoted 5 lines · Baolin Wang
Rename ptep/pmdp_clear_young_notify() to ptep/pmdp_test_and_clear_young_notify() to make the function names consistent.
Suggested-by David Hildenbrand (Arm) <[email protected]>Signed-off-by Baolin Wang <[email protected]>
Signature · 3 lines
Cheers, David
David Hildenbrand (Arm)
maintainerRe: [PATCH v2 4/6] mm: add a batched helper to clear the young flag for large folios
In reply to Baolin WangQuoted 45 lines · Baolin Wang
Currently, MGLRU will call
ptep_test_and_clear_young_notify()to check and clear the young flag for each PTE sequentially, which is inefficient for large folios reclamation.Moreover, on Arm64 architecture, which supports contiguous PTEs, the Arm64- specific
ptep_test_and_clear_young()already implements an optimization to clear the young flags for PTEs within a contiguous range. However, this is not sufficient. Similar to the Arm64 specificclear_flush_young_ptes(), we can extend this to perform batched operations for the entire large folio (which might exceed the contiguous range:CONT_PTE_SIZE).Thus, we can introduce a new batched helper:
test_and_clear_young_ptes()and its wrappertest_and_clear_young_ptes_notify()which are consistent with the existing functions, to perform batched checking of the young flags for large folios, which can help improve performance during large folio reclamation when MGLRU is enabled. And it will be overridden by the architecture that implements a more efficient batch operation in the following patches.Signed-off-by Baolin Wang <[email protected]>--- include/linux/pgtable.h | 38 ++++++++++++++++++++++++++++++++++++++ mm/internal.h | 16 +++++++++++----- 2 files changed, 49 insertions(+), 5 deletions(-)include/linux/pgtable.h +13
-0@@ -1103,6 +1103,44 @@ static inline int clear_flush_young_ptes(struct vm_area_struct *vma, }#endif +#ifndef test_and_clear_young_ptes +/** +* test_and_clear_young_ptes - Mark PTEs that map consecutive pages of the same +* folio as old +* @vma: The virtual memory area the pages are mapped into. +* @addr: Address the first page is mapped at. +* @ptep: Page table pointer for the first entry. +* @nr: Number of entries to clear access bit. +* +* May be overridden by the architecture; otherwise, implemented as a simple +* loop over ptep_test_and_clear_young(). +* +* Note that PTE bits in the PTE range besides the PFN can differ. For example,
include/linux/pgtable.h static inline int clear_flush_young_ptes(struct vm_area_struct *vma, · line 1128
Quoted 10 lines
include/linux/pgtable.h +10
-0+* some PTEs might be write-protected. +* +* 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. +* +* Returns: whether any PTE was young. +*/ +static inline int test_and_clear_young_ptes (struct vm_area_struct *vma, +unsigned long addr,pte_t *ptep, +unsigned int nr)
Two tabs ...
What happened to using a boolen as return type and for "int young"?
Quoted 14 lines
include/linux/pgtable.h +14
-0+{ +int young =0 ; + +for (;;) { + young |=ptep_test_and_clear_young (vma, addr, ptep); +if (--nr ==0 ) +break ; + ptep++; + addr +=PAGE_SIZE ; + } + +return young; +} +#endif
Signature · 3 lines
Cheers, David
David Hildenbrand (Arm)
maintainerRe: [PATCH v2 5/6] mm: support batched checking of the young flag for MGLRU
In reply to Baolin WangQuoted 20 lines · Baolin Wang
Use the batched helper
test_and_clear_young_ptes_notify()to check and clear the young flag to improve the performance during large folio reclamation when MGLRU is enabled.Meanwhile, we can also support batched checking the young and dirty flag when MGLRU walks the mm's pagetable to update the folios' generation counter. Since MGLRU also checks the PTE dirty bit, use
folio_pte_batch_flags()withFPB_MERGE_YOUNG_DIRTYset to detect batches of PTEs for a large folio.Then we can remove the
ptep_test_and_clear_young_notify()since it has no users now.Note that we also update the 'young' counter and 'mm_stats[MM_LEAF_YOUNG]' counter with the batched count in the
lru_gen_look_around()andwalk_pte_range(). However, the batched operations may inflate these two counters, because in a large folio not all PTEs may have been accessed. (Additionally, tracking how many PTEs have been accessed within a large folio is not very meaningful, since the mm core actually tracks access/dirty on a per-folio basis, not per page). The impact analysis is as follows:
Quoted 8 lines
1. The 'mm_stats[MM_LEAF_YOUNG]' counter has no functional impact and is mainly for debugging.
2. The 'young' counter is used to decide whether to place the current PMD entry into the bloom filters by
suitable_to_scan()(so that next time we can check whether it has been accessed again), which may set the hash bit in the bloom filters for a PMD entry that hasn’t seen much access. However, bloom filters inherently allow some error, so this effect appears negligible.
Doesn't checkpatch complain about long lines in the patch description?
Quoted 4 lines
Reviewed-by Rik van Riel <[email protected]>Signed-off-by Baolin Wang <[email protected]>---
...
Quoted 19 lines
index
a5f0a264ad56..a1b3967afe41100644mm/internal.h +0
-6@@ -1843,10 +1843,4 @@ static inline int pmdp_test_and_clear_young_notify(struct vm_area_struct *vma,#endif /* CONFIG_MMU_NOTIFIER */ -static inline int ptep_test_and_clear_young_notify (struct vm_area_struct *vma, -unsigned long addr,pte_t *ptep) -{ -return test_and_clear_young_ptes_notify (vma, addr, ptep,1 ); -} -#endif /* __MM_INTERNAL_H */ mm/rmap.c +0
-0
mm/rmap.c static bool folio_referenced_one(struct folio *folio, · line 967
Quoted 10 lines
mm/rmap.c +7
-0@@ -958,25 +958,21 @@ static bool folio_referenced_one(struct folio *folio,return false; } +if (pvmw.pte &&folio_test_large (folio)) { +const unsigned long end_addr =pmd_addr_end (address, vma->vm_end); +const unsigned int max_nr = (end_addr - address) >>PAGE_SHIFT ; +pte_t pteval =ptep_get (pvmw.pte); + + nr =folio_pte_batch (folio, pvmw.pte, pteval, max_nr); + ptes += nr;
Could we move that "ptes += nr;" just before the "pra->mapcount -= nr;"?
Would make the whole thing look less weird (only incrementing "ptes" with large folios).
Quoted 51 lines
mm/rmap.c +7
-14+ } +if (lru_gen_enabled () && pvmw.pte) { -if (lru_gen_look_around (&pvmw)) +if (lru_gen_look_around (&pvmw, nr)) referenced++; }else if (pvmw.pte) { -if (folio_test_large (folio)) { -unsigned long end_addr =pmd_addr_end (address, vma->vm_end); -unsigned int max_nr = (end_addr - address) >>PAGE_SHIFT ; -pte_t pteval =ptep_get (pvmw.pte); - - nr =folio_pte_batch (folio, pvmw.pte, - pteval, max_nr); - } - - ptes += nr;if (clear_flush_young_ptes_notify (vma, address, pvmw.pte, nr)) referenced++; -/* Skip the batched PTEs */ - pvmw.pte += nr -1 ; - pvmw.address += (nr -1 ) *PAGE_SIZE ; }else if (IS_ENABLED (CONFIG_TRANSPARENT_HUGEPAGE )) {if (pmdp_clear_flush_young_notify (vma, address, pvmw.pmd))@@ -995,6 +991,10 @@ static bool folio_referenced_one(struct folio *folio,page_vma_mapped_walk_done (&pvmw);break ; } + +/* Skip the batched PTEs */ + pvmw.pte += nr -1 ; + pvmw.address += (nr -1 ) *PAGE_SIZE ; }if (referenced)mm/vmscan.c +1
-0@@ -3474,6 +3474,7 @@ static bool walk_pte_range(pmd_t *pmd, unsigned long start, unsigned long end,struct pglist_data *pgdat =lruvec_pgdat (walk->lruvec);DEFINE_MAX_SEQ (walk->lruvec);int gen =lru_gen_from_seq (max_seq); +unsigned int nr;pmd_t pmdval; pte =pte_offset_map_rw_nolock (args->mm, pmd, start &PMD_MASK , &pmdval, &ptl);@@ -3492,11 +3493,13 @@ static bool walk_pte_range(pmd_t *pmd, unsigned long start, unsigned long end,lazy_mmu_mode_enable ();
mm/vmscan.c static bool walk_pte_range(pmd_t *pmd, unsigned long start, unsigned long end, · line 3502
Quoted 10 lines
mm/vmscan.c +4
-2restart: -for (i =pte_index (start), addr = start; addr != end; i++, addr +=PAGE_SIZE ) { +for (i =pte_index (start), addr = start; addr != end; i += nr, addr += nr *PAGE_SIZE ) {unsigned long pfn;struct folio *folio; -pte_t ptent =ptep_get (pte + i); +pte_t *cur_pte = pte + i; +pte_t ptent =ptep_get (cur_pte); + nr =1 ;
Looking at this again, we should get rid of "i" completely and instead
* rename pte to start_pte
* Add a new pte, which we increment in the loop
So we end up with something like
mm/vmscan.c +9 -8
@@ -3486,9 +3486,8 @@ static void walk_update_folio(struct lru_gen_mm_walk *walk, struct folio *folio,static bool walk_pte_range (pmd_t *pmd,unsigned long start,unsigned long end,struct mm_walk *args) { -int i;bool dirty; -pte_t *pte; +pte_t *start_pte, pte;spinlock_t *ptl;unsigned long addr;int total =0 ;
@@ -3499,29 +3498,31 @@ static bool walk_pte_range(pmd_t *pmd, unsigned long start, unsigned long end,struct pglist_data *pgdat =lruvec_pgdat (walk->lruvec);DEFINE_MAX_SEQ (walk->lruvec);int gen =lru_gen_from_seq (max_seq); +unsigned int nr;pmd_t pmdval; - pte =pte_offset_map_rw_nolock (args->mm, pmd, start &PMD_MASK , &pmdval, &ptl); -if (!pte) + start_pte =pte_offset_map_rw_nolock (args->mm, pmd, start &PMD_MASK , &pmdval, &ptl); +if (!start_pte)return false;if (!spin_trylock (ptl)) { -pte_unmap (pte); +pte_unmap (start_pte);return true; }if (unlikely (!pmd_same (pmdval,pmdp_get_lockless (pmd)))) { -pte_unmap_unlock (pte, ptl); +pte_unmap_unlock (start_pte, ptl);return false; }lazy_mmu_mode_enable (); restart: -for (i =pte_index (start), addr = start; addr != end; i++, addr +=PAGE_SIZE ) { +for (addr = start, pte = start_pte; addr != end; addr += nr *PAGE_SIZE , pte += nr) {unsigned long pfn;struct folio *folio; -pte_t ptent =ptep_get (pte + i); +pte_t ptent =ptep_get (pte); + nr =1 ; total++; walk->mm_stats[MM_LEAF_TOTAL ]++;
@@ -3533,7 +3534,16 @@ static bool walk_pte_range(pmd_t *pmd, unsigned long start, unsigned long end,if (!folio)continue ;
...
Quoted 27 lines
mm/vmscan.c +3
-2walk_update_folio (walk, last, gen, dirty);@@ -4166,7 +4178,7 @@ static void lru_gen_age_node(struct pglist_data *pgdat, struct scan_control *sc)* the PTE table to the Bloom filter. This forms a feedback loop between the * eviction and the aging. */ -bool lru_gen_look_around (struct page_vma_mapped_walk *pvmw) +bool lru_gen_look_around (struct page_vma_mapped_walk *pvmw,unsigned int nr) {int i;bool dirty;@@ -4184,12 +4196,13 @@ bool lru_gen_look_around(struct page_vma_mapped_walk *pvmw)struct lruvec *lruvec;struct lru_gen_mm_state *mm_state;unsigned long max_seq; +pte_t *cur_pte;int gen;lockdep_assert_held (pvmw->ptl);VM_WARN_ON_ONCE_FOLIO (folio_test_lru (folio), folio); -if (!ptep_test_and_clear_young_notify (vma, addr, pte)) +if (!test_and_clear_young_ptes_notify (vma, addr, pte, nr))return false;if (spin_is_contended (pvmw->ptl))@@ -4229,10 +4242,12 @@ bool lru_gen_look_around(struct page_vma_mapped_walk *pvmw)
mm/vmscan.c bool lru_gen_look_around(struct page_vma_mapped_walk *pvmw) · line 4250
Quoted 10 lines
mm/vmscan.c +4
-2pte -= (addr - start) /PAGE_SIZE ; -for (i =0 , addr = start; addr != end; i++, addr +=PAGE_SIZE ) { +for (i =0 , addr = start, cur_pte = pte; addr != end; + i += nr, cur_pte += nr, addr += nr *PAGE_SIZE ) {unsigned long pfn; -pte_t ptent =ptep_get (pte + i); +pte_t ptent =ptep_get (cur_pte); + nr =1 ;
Can't you just use pte and increment that, right?
"pte" is not used afterwards.
Signature · 3 lines
Cheers, David
Baolin Wang
reviewerRe: [PATCH v2 4/6] mm: add a batched helper to clear the young flag for large folios
In reply to David Hildenbrand (Arm)Quoted 50 lines · David Hildenbrand (Arm)
Quoted 49 lines · Baolin Wang
Currently, MGLRU will call
ptep_test_and_clear_young_notify()to check and clear the young flag for each PTE sequentially, which is inefficient for large folios reclamation.Moreover, on Arm64 architecture, which supports contiguous PTEs, the Arm64- specific
ptep_test_and_clear_young()already implements an optimization to clear the young flags for PTEs within a contiguous range. However, this is not sufficient. Similar to the Arm64 specificclear_flush_young_ptes(), we can extend this to perform batched operations for the entire large folio (which might exceed the contiguous range:CONT_PTE_SIZE).Thus, we can introduce a new batched helper:
test_and_clear_young_ptes()and its wrappertest_and_clear_young_ptes_notify()which are consistent with the existing functions, to perform batched checking of the young flags for large folios, which can help improve performance during large folio reclamation when MGLRU is enabled. And it will be overridden by the architecture that implements a more efficient batch operation in the following patches.Signed-off-by Baolin Wang <[email protected]>--- include/linux/pgtable.h | 38 ++++++++++++++++++++++++++++++++++++++ mm/internal.h | 16 +++++++++++----- 2 files changed, 49 insertions(+), 5 deletions(-)include/linux/pgtable.h +17
-0@@ -1103,6 +1103,44 @@ static inline int clear_flush_young_ptes(struct vm_area_struct *vma, }#endif +#ifndef test_and_clear_young_ptes +/** +* test_and_clear_young_ptes - Mark PTEs that map consecutive pages of the same +* folio as old +* @vma: The virtual memory area the pages are mapped into. +* @addr: Address the first page is mapped at. +* @ptep: Page table pointer for the first entry. +* @nr: Number of entries to clear access bit. +* +* May be overridden by the architecture; otherwise, implemented as a simple +* loop over ptep_test_and_clear_young(). +* +* Note that PTE bits in the PTE range besides the PFN can differ. For example, +* some PTEs might be write-protected. +* +* 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.
Quoted 8 lines
include/linux/pgtable.h static inline int clear_flush_young_ptes(struct vm_area_struct *vma, · line 1128
Quoted 6 lines
include/linux/pgtable.h +6
-0+* +* Returns: whether any PTE was young. +*/ +static inline int test_and_clear_young_ptes (struct vm_area_struct *vma, +unsigned long addr,pte_t *ptep, +unsigned int nr)Two tabs ...
Ah, yes, not sure why I missed this one :(
Quoted 1 line
What happened to using a boolen as return type and for "int young"?
As I replied to you previously [1], I’d like to do this in a follow-up patchset that converts all functions that check the young flag. Does that sound OK to you?
Baolin Wang
reviewerRe: [PATCH v2 5/6] mm: support batched checking of the young flag for MGLRU
In reply to David Hildenbrand (Arm)Quoted 24 lines · David Hildenbrand (Arm)
Quoted 23 lines · Baolin Wang
Use the batched helper
test_and_clear_young_ptes_notify()to check and clear the young flag to improve the performance during large folio reclamation when MGLRU is enabled.Meanwhile, we can also support batched checking the young and dirty flag when MGLRU walks the mm's pagetable to update the folios' generation counter. Since MGLRU also checks the PTE dirty bit, use
folio_pte_batch_flags()withFPB_MERGE_YOUNG_DIRTYset to detect batches of PTEs for a large folio.Then we can remove the
ptep_test_and_clear_young_notify()since it has no users now.Note that we also update the 'young' counter and 'mm_stats[MM_LEAF_YOUNG]' counter with the batched count in the
lru_gen_look_around()andwalk_pte_range(). However, the batched operations may inflate these two counters, because in a large folio not all PTEs may have been accessed. (Additionally, tracking how many PTEs have been accessed within a large folio is not very meaningful, since the mm core actually tracks access/dirty on a per-folio basis, not per page). The impact analysis is as follows:1. The 'mm_stats[MM_LEAF_YOUNG]' counter has no functional impact and is mainly for debugging.
Quoted 8 lines
Quoted 5 lines
2. The 'young' counter is used to decide whether to place the current PMD entry into the bloom filters by
suitable_to_scan()(so that next time we can check whether it has been accessed again), which may set the hash bit in the bloom filters for a PMD entry that hasn’t seen much access. However, bloom filters inherently allow some error, so this effect appears negligible.Doesn't checkpatch complain about long lines in the patch description?
Will update the commit message.
Quoted 38 lines
Quoted 3 lines
Reviewed-by Rik van Riel <[email protected]>Signed-off-by Baolin Wang <[email protected]>---
...
Quoted 19 lines
index
a5f0a264ad56..a1b3967afe41100644mm/internal.h +0
-6@@ -1843,10 +1843,4 @@ static inline int pmdp_test_and_clear_young_notify(struct vm_area_struct *vma,#endif /* CONFIG_MMU_NOTIFIER */ -static inline int ptep_test_and_clear_young_notify (struct vm_area_struct *vma, -unsigned long addr,pte_t *ptep) -{ -return test_and_clear_young_ptes_notify (vma, addr, ptep,1 ); -} -#endif /* __MM_INTERNAL_H */ mm/rmap.c +0
-0mm/rmap.c static bool folio_referenced_one(struct folio *folio, · line 967
Quoted 10 lines
mm/rmap.c +7
-0@@ -958,25 +958,21 @@ static bool folio_referenced_one(struct folio *folio,return false; } +if (pvmw.pte &&folio_test_large (folio)) { +const unsigned long end_addr =pmd_addr_end (address, vma->vm_end); +const unsigned int max_nr = (end_addr - address) >>PAGE_SHIFT ; +pte_t pteval =ptep_get (pvmw.pte); + + nr =folio_pte_batch (folio, pvmw.pte, pteval, max_nr); + ptes += nr;Could we move that "ptes += nr;" just before the "
pra->mapcount-= nr;"?
Quoted 1 line
Would make the whole thing look less weird (only incrementing "ptes" with large folios).
OK. Sounds reasonable.
Quoted 123 lines
Quoted 51 lines
mm/rmap.c +7
-14+ } +if (lru_gen_enabled () && pvmw.pte) { -if (lru_gen_look_around (&pvmw)) +if (lru_gen_look_around (&pvmw, nr)) referenced++; }else if (pvmw.pte) { -if (folio_test_large (folio)) { -unsigned long end_addr =pmd_addr_end (address, vma->vm_end); -unsigned int max_nr = (end_addr - address) >>PAGE_SHIFT ; -pte_t pteval =ptep_get (pvmw.pte); - - nr =folio_pte_batch (folio, pvmw.pte, - pteval, max_nr); - } - - ptes += nr;if (clear_flush_young_ptes_notify (vma, address, pvmw.pte, nr)) referenced++; -/* Skip the batched PTEs */ - pvmw.pte += nr -1 ; - pvmw.address += (nr -1 ) *PAGE_SIZE ; }else if (IS_ENABLED (CONFIG_TRANSPARENT_HUGEPAGE )) {if (pmdp_clear_flush_young_notify (vma, address, pvmw.pmd))@@ -995,6 +991,10 @@ static bool folio_referenced_one(struct folio *folio,page_vma_mapped_walk_done (&pvmw);break ; } + +/* Skip the batched PTEs */ + pvmw.pte += nr -1 ; + pvmw.address += (nr -1 ) *PAGE_SIZE ; }if (referenced)mm/vmscan.c +1
-0@@ -3474,6 +3474,7 @@ static bool walk_pte_range(pmd_t *pmd, unsigned long start, unsigned long end,struct pglist_data *pgdat =lruvec_pgdat (walk->lruvec);DEFINE_MAX_SEQ (walk->lruvec);int gen =lru_gen_from_seq (max_seq); +unsigned int nr;pmd_t pmdval; pte =pte_offset_map_rw_nolock (args->mm, pmd, start &PMD_MASK , &pmdval, &ptl);@@ -3492,11 +3493,13 @@ static bool walk_pte_range(pmd_t *pmd, unsigned long start, unsigned long end,lazy_mmu_mode_enable ();mm/vmscan.c static bool walk_pte_range(pmd_t *pmd, unsigned long start, unsigned long end, · line 3502
Quoted 10 lines
mm/vmscan.c +4
-2restart: -for (i =pte_index (start), addr = start; addr != end; i++, addr +=PAGE_SIZE ) { +for (i =pte_index (start), addr = start; addr != end; i += nr, addr += nr *PAGE_SIZE ) {unsigned long pfn;struct folio *folio; -pte_t ptent =ptep_get (pte + i); +pte_t *cur_pte = pte + i; +pte_t ptent =ptep_get (cur_pte); + nr =1 ;Looking at this again, we should get rid of "i" completely and instead
* rename pte tostart_pte
* Add a new pte, which we increment in the loopSo we end up with something like
mm/vmscan.c +9
-8@@ -3486,9 +3486,8 @@ static void walk_update_folio(struct lru_gen_mm_walk *walk, struct folio *folio,static bool walk_pte_range (pmd_t *pmd,unsigned long start,unsigned long end,struct mm_walk *args) { -int i;bool dirty; -pte_t *pte; +pte_t *start_pte, pte;spinlock_t *ptl;unsigned long addr;int total =0 ;@@ -3499,29 +3498,31 @@ static bool walk_pte_range(pmd_t *pmd, unsigned long start, unsigned long end,struct pglist_data *pgdat =lruvec_pgdat (walk->lruvec);DEFINE_MAX_SEQ (walk->lruvec);int gen =lru_gen_from_seq (max_seq); +unsigned int nr;pmd_t pmdval; - pte =pte_offset_map_rw_nolock (args->mm, pmd, start &PMD_MASK , &pmdval, &ptl); -if (!pte) + start_pte =pte_offset_map_rw_nolock (args->mm, pmd, start &PMD_MASK , &pmdval, &ptl); +if (!start_pte)return false;if (!spin_trylock (ptl)) { -pte_unmap (pte); +pte_unmap (start_pte);return true; }if (unlikely (!pmd_same (pmdval,pmdp_get_lockless (pmd)))) { -pte_unmap_unlock (pte, ptl); +pte_unmap_unlock (start_pte, ptl);return false; }lazy_mmu_mode_enable (); restart: -for (i =pte_index (start), addr = start; addr != end; i++, addr +=PAGE_SIZE ) { +for (addr = start, pte = start_pte; addr != end; addr += nr *PAGE_SIZE , pte += nr) {unsigned long pfn;struct folio *folio; -pte_t ptent =ptep_get (pte + i); +pte_t ptent =ptep_get (pte); + nr =1 ; total++; walk->mm_stats[MM_LEAF_TOTAL ]++;
mm/vmscan.c static bool walk_pte_range(pmd_t *pmd, unsigned long start, unsigned long end, · line 3535
Quoted 2 lines
mm/vmscan.c +0
-0@@ -3533,7 +3534,16 @@ static bool walk_pte_range(pmd_t *pmd, unsigned long start, unsigned long end,if (!folio)continue ;
Thanks for the code. I considered simplifying the logic this way, but this logic would be incorrect. Because the 'start' can be updated by the get_next_vma() below, when we goto restart, we will get a new 'i' value by 'pte_index(start)', so I kept the 'i' variable.
Quoted 36 lines
mm/vmscan.c +0
-0> walk_update_folio(walk, last, gen, dirty); > @@ -4166,7 +4178,7 @@ static void lru_gen_age_node(struct pglist_data *pgdat, struct scan_control *sc)Quoted 34 lines
mm/vmscan.c +6
-4* the PTE table to the Bloom filter. This forms a feedback loop between the * eviction and the aging. */ -bool lru_gen_look_around (struct page_vma_mapped_walk *pvmw) +bool lru_gen_look_around (struct page_vma_mapped_walk *pvmw,unsigned int nr) {int i;bool dirty;@@ -4184,12 +4196,13 @@ bool lru_gen_look_around(struct page_vma_mapped_walk *pvmw)struct lruvec *lruvec;struct lru_gen_mm_state *mm_state;unsigned long max_seq; +pte_t *cur_pte;int gen;lockdep_assert_held (pvmw->ptl);VM_WARN_ON_ONCE_FOLIO (folio_test_lru (folio), folio); -if (!ptep_test_and_clear_young_notify (vma, addr, pte)) +if (!test_and_clear_young_ptes_notify (vma, addr, pte, nr))return false;if (spin_is_contended (pvmw->ptl))@@ -4229,10 +4242,12 @@ bool lru_gen_look_around(struct page_vma_mapped_walk *pvmw) pte -= (addr - start) /PAGE_SIZE ; -for (i =0 , addr = start; addr != end; i++, addr +=PAGE_SIZE ) { +for (i =0 , addr = start, cur_pte = pte; addr != end; + i += nr, cur_pte += nr, addr += nr *PAGE_SIZE ) {unsigned long pfn; -pte_t ptent =ptep_get (pte + i); +pte_t ptent =ptep_get (cur_pte);
Quoted 5 lines
mm/vmscan.c static bool walk_pte_range(pmd_t *pmd, unsigned long start, unsigned long end, · line 3525
Quoted 1 line
mm/vmscan.c +1
-0+ nr =1 ;Can't you just use pte and increment that, right?
"pte" is not used afterwards.
Yes. Will do. Thanks for your comments.
David Hildenbrand (Arm)
maintainerRe: [PATCH v2 4/6] mm: add a batched helper to clear the young flag for large folios
In reply to Baolin WangQuoted 80 lines · Baolin Wang
Quoted 66 lines · David Hildenbrand (Arm)
Quoted 65 lines · Baolin Wang
Currently, MGLRU will call
ptep_test_and_clear_young_notify()to check and
clear the young flag for each PTE sequentially, which is inefficient for large folios reclamation.Moreover, on Arm64 architecture, which supports contiguous PTEs, the Arm64-
specificptep_test_and_clear_young()already implements an optimization to
clear the young flags for PTEs within a contiguous range. However, this is not
sufficient. Similar to the Arm64 specificclear_flush_young_ptes(), we can
extend this to perform batched operations for the entire large folio (which
might exceed the contiguous range:CONT_PTE_SIZE).Thus, we can introduce a new batched helper:
test_and_clear_young_ptes()and
its wrappertest_and_clear_young_ptes_notify()which are consistent with the
existing functions, to perform batched checking of the young flags for large
folios, which can help improve performance during large folio reclamation when
MGLRU is enabled. And it will be overridden by the architecture that implements
a more efficient batch operation in the following patches.Signed-off-by Baolin Wang <[email protected]>---
include/linux/pgtable.h| 38 ++++++++++++++++++++++++++++++++++++++ mm/internal.h | 16 +++++++++++-----2 files changed, 49 insertions(+), 5 deletions(-)include/linux/pgtable.h +0
-0@@ -1103,6 +1103,44 @@ static inline int clear_flush_young_ptes(struct vm_area_struct *vma, } #endif+#ifndef
test_and_clear_young_ptes
+/**
+ *test_and_clear_young_ptes- Mark PTEs that map consecutive pages of the same
+ * folio as old
+ * @vma: The virtual memory area the pages are mapped into.
+ * @addr: Address the first page is mapped at.
+ * @ptep: Page table pointer for the first entry.
+ * @nr: Number of entries to clear access bit.
+ *
+ * May be overridden by the architecture; otherwise, implemented as a simple
+ * loop overptep_test_and_clear_young().
+ *
+ * Note that PTE bits in the PTE range besides the PFN can differ. For example,
+ * some PTEs might be write-protected.
+ *
+ * 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.Quoted 8 lines
Quoted 6 lines
+ *
+ * Returns: whether any PTE was young.
+ */
+static inline int test_and_clear_young_ptes(structvm_area_struct*vma, + unsigned long addr,pte_t*ptep,
+ unsigned int nr)Two tabs ...
Ah, yes, not sure why I missed this one :(
Quoted 7 lines
Quoted 1 line
What happened to using a boolen as return type and for "int young"?
As I replied to you previously [1], I’d like to do this in a follow-up patchset that converts all functions that check the young flag. Does that sound OK to you?
[1] https://lore.kernel.org/all/32c538ce-6af8-48a8-86fc-
[email protected]/
Oh, missed that. Works for me.
Signature · 3 lines
Cheers, David
David Hildenbrand (Arm)
maintainerRe: [PATCH v2 5/6] mm: support batched checking of the young flag for MGLRU
In reply to Baolin WangQuoted 12 lines
Quoted 11 lines
unsigned long pfn;
struct folio *folio;
-pte_tptent =ptep_get(pte + i);
+pte_tptent =ptep_get(pte);
+ nr = 1;
total++; walk->mm_stats[MM_LEAF_TOTAL]++;
@@ -3533,7 +3534,16 @@ static bool walk_pte_range(pmd_t *pmd, unsigned long start, unsigned long end,
if (!folio)
continue;
Quoted 4 lines
Thanks for the code. I considered simplifying the logic this way, but this logic would be incorrect. Because the 'start' can be updated by the
get_next_vma()below, when we goto restart, we will get a new 'i' value by 'pte_index(start)', so I kept the 'i' variable.
You're right, that's some horrible, horrible code.
Signature · 3 lines
Cheers, David