mm: don't be stuck to rmap lock on reclaim path
Subsystems (8)
PATCH v3 1/1 mm: don't be stuck to rmap lock on reclaim path
The rmap locks(i_mmap_rwsem and anon_vma->root->rwsem) could be contented under memory pressure if processes keep working on their vmas(e.g., fork, mmap, munmap). It makes reclaim path stuck. In our real workload traces, we see kswapd is waiting the lock for 300ms+(a sec as worst case) and it makes other processes entering direct reclaim, which were also stuck on the lock.
This patch makes LRU aging path try_lock mode like shink_page_list so the reclaim context will keep working with next LRU pages without being stuck.
Since this patch introduces a new "contended" field as out-param along with try_lock in-param in rmap_walk_control, it's not immutable any longer if the try_lock is set so remove const keywords on rmap related functions. Since rmap walking is already expensive operation, I doubt the const would help sizable benefit( And we didn't have it until 5.17).
In a heavy app workload in Android, trace shows following statistics. It almost removes rmap lock contention from reclaim path.
From Martin Liu
Before:
max_dur(ms) min_dur(ms) max-min(dur)ms avg_dur(ms) sum_dur(ms) count blocked_function
1632 0 1631 151.542173 31672 209 page_lock_anon_vma_read
601 0 601 145.544681 28817 198 rmap_walk_fileAfter:
max_dur(ms) min_dur(ms) max-min(dur)ms avg_dur(ms) sum_dur(ms) count blocked_function
NaN NaN NaN NaN NaN 0.0 NaN
0 0 0 0.127645 1 12 rmap_walk_file
---
* from v2 - https://lore.kernel.org/all/[email protected]/
* add test result - akpm@
* from v1 - https://lore.kernel.org/all/[email protected]/
* remove const keyword from page_idle_clear_pte_refs - willy@
include/linux/fs.h | 5 +++++ include/linux/ksm.h | 4 ++-- include/linux/rmap.h | 28 +++++++++++++++++------- mm/ksm.c | 10 +++++++-- mm/memory-failure.c | 2 +- mm/page_idle.c | 7 ++---- mm/rmap.c | 52 ++++++++++++++++++++++++++++++++++---------- mm/vmscan.c | 6 ++++- 8 files changed, 84 insertions(+), 30 deletions(-)
include/linux/fs.h +5 -0
@@ -477,6 +477,11 @@ static inline void i_mmap_unlock_write(struct address_space *mapping)up_write (&mapping->i_mmap_rwsem); } +static inline int i_mmap_trylock_read (struct address_space *mapping) +{ +return down_read_trylock (&mapping->i_mmap_rwsem); +} +static inline void i_mmap_lock_read (struct address_space *mapping) {down_read (&mapping->i_mmap_rwsem);
include/linux/ksm.h +2 -2
@@ -51,7 +51,7 @@ static inline void ksm_exit(struct mm_struct *mm)struct page *ksm_might_need_to_copy (struct page *page,struct vm_area_struct *vma,unsigned long address); -void rmap_walk_ksm (struct folio *folio,const struct rmap_walk_control *rwc); +void rmap_walk_ksm (struct folio *folio,struct rmap_walk_control *rwc);void folio_migrate_ksm (struct folio *newfolio,struct folio *folio);#else /* !CONFIG_KSM */
@@ -79,7 +79,7 @@ static inline struct page *ksm_might_need_to_copy(struct page *page, }static inline void rmap_walk_ksm (struct folio *folio, -const struct rmap_walk_control *rwc) +struct rmap_walk_control *rwc) { }
include/linux/rmap.h +20 -8
@@ -128,6 +128,11 @@ static inline void anon_vma_lock_read(struct anon_vma *anon_vma)down_read (&anon_vma->root->rwsem); } +static inline int anon_vma_trylock_read (struct anon_vma *anon_vma) +{ +return down_read_trylock (&anon_vma->root->rwsem); +} +static inline void anon_vma_unlock_read (struct anon_vma *anon_vma) {up_read (&anon_vma->root->rwsem);
@@ -366,17 +371,14 @@ int pfn_mkclean_range(unsigned long pfn, unsigned long nr_pages, pgoff_t pgoff,void remove_migration_ptes (struct folio *src,struct folio *dst,bool locked); -/* -* Called by memory-failure.c to kill processes. -*/ -struct anon_vma *folio_lock_anon_vma_read (struct folio *folio); -void page_unlock_anon_vma_read (struct anon_vma *anon_vma);int page_mapped_in_vma (struct page *page,struct vm_area_struct *vma);/* * rmap_walk_control: To control rmap traversing for specific needs * * arg: passed to rmap_one() and invalid_vma() +* try_lock: bail out if the rmap lock is contended +* contended: indicate the rmap traversal bailed out due to lock contention * rmap_one: executed on each vma where page is mapped * done: for checking traversing termination condition * anon_lock: for getting anon_lock by optimized way rather than default
@@ -384,6 +386,8 @@ int page_mapped_in_vma(struct page *page, struct vm_area_struct *vma);*/ struct rmap_walk_control {void *arg; +bool try_lock; +bool contended;/* * Return false if page table scanning in rmap_walk should be stopped. * Otherwise, return true.
@@ -391,12 +395,20 @@ struct rmap_walk_control {bool (*rmap_one)(struct folio *folio,struct vm_area_struct *vma,unsigned long addr,void *arg);int (*done)(struct folio *folio); -struct anon_vma *(*anon_lock)(struct folio *folio); +struct anon_vma *(*anon_lock)(struct folio *folio, +struct rmap_walk_control *rwc); bool (*invalid_vma)(struct vm_area_struct *vma, void *arg); }; -void rmap_walk (struct folio *folio,const struct rmap_walk_control *rwc); -void rmap_walk_locked (struct folio *folio,const struct rmap_walk_control *rwc); +void rmap_walk (struct folio *folio,struct rmap_walk_control *rwc); +void rmap_walk_locked (struct folio *folio,struct rmap_walk_control *rwc); + +/* +* Called by memory-failure.c to kill processes. +*/ +struct anon_vma *folio_lock_anon_vma_read (struct folio *folio, +struct rmap_walk_control *rwc); +void page_unlock_anon_vma_read (struct anon_vma *anon_vma);#else /* !CONFIG_MMU */
mm/ksm.c +8 -2
@@ -2614,7 +2614,7 @@ struct page *ksm_might_need_to_copy(struct page *page,return new_page; } -void rmap_walk_ksm (struct folio *folio,const struct rmap_walk_control *rwc) +void rmap_walk_ksm (struct folio *folio,struct rmap_walk_control *rwc) {struct stable_node *stable_node;struct rmap_item *rmap_item;
@@ -2638,7 +2638,13 @@ void rmap_walk_ksm(struct folio *folio, const struct rmap_walk_control *rwc)struct vm_area_struct *vma;cond_resched (); -anon_vma_lock_read (anon_vma); +if (!anon_vma_trylock_read (anon_vma)) { +if (rwc->try_lock) { + rwc->contended = true; +return ; + } +anon_vma_lock_read (anon_vma); + }anon_vma_interval_tree_foreach (vmac, &anon_vma->rb_root, 0, ULONG_MAX) {unsigned long addr;
mm/memory-failure.c +1 -1
@@ -485,7 +485,7 @@ static void collect_procs_anon(struct page *page, struct list_head *to_kill,struct anon_vma *av;pgoff_t pgoff; - av =folio_lock_anon_vma_read (folio); + av =folio_lock_anon_vma_read (folio,NULL );if (av ==NULL )/* Not actually mapped anymore */ return ;
mm/page_idle.c +2 -5
@@ -86,11 +86,8 @@ static bool page_idle_clear_pte_refs_one(struct folio *folio,static void page_idle_clear_pte_refs (struct page *page) {struct folio *folio =page_folio (page); -/* -* Since rwc.arg is unused, rwc is effectively immutable, so we -* can make it static const to save some cycles and stack. -*/ -static const struct rmap_walk_control rwc = { + +static struct rmap_walk_control rwc = { .rmap_one = page_idle_clear_pte_refs_one, .anon_lock = folio_lock_anon_vma_read, };
mm/rmap.c +41 -11
131 lines not on this page · raw message
mm/vmscan.c +5 -1
@@ -1391,6 +1391,10 @@ static enum page_references folio_check_references(struct folio *folio,if (vm_flags &VM_LOCKED )return PAGEREF_ACTIVATE ; +/* page_referenced didn't work due to lock contention */ +if (referenced_ptes ==-1 ) +return PAGEREF_KEEP ; +if (referenced_ptes) {/* * All mapped folios start out with page table
@@ -2492,7 +2496,7 @@ static void shrink_active_list(unsigned long nr_to_scan, }if (folio_referenced (folio,0 , sc->target_mem_cgroup, - &vm_flags)) { + &vm_flags) >0 ) {/* * Identify referenced, file-backed active pages and * give them one more trip around the active list. So
Signature · 1 line
2.36.0.512.ge40c2bad7a-goog
Johannes Weiner
maintainerHi Minchan,
The patch looks reasonable to me, but one thing stands out:
mm/vmscan.c static enum page_references folio_check_references(struct folio *folio, · line 1400
Quoted 11 lines · Minchan Kim
mm/vmscan.c +4
-0@@ -1391,6 +1391,10 @@ static enum page_references folio_check_references(struct folio *folio,if (vm_flags &VM_LOCKED )return PAGEREF_ACTIVATE ; +/* page_referenced didn't work due to lock contention */ +if (referenced_ptes ==-1 ) +return PAGEREF_KEEP ; +if (referenced_ptes) {/* * All mapped folios start out with page table
This means contended inactive pages get rotated.
mm/vmscan.c static void shrink_active_list(unsigned long nr_to_scan, · line 2502
Quoted 9 lines
mm/vmscan.c +1
-1@@ -2492,7 +2496,7 @@ static void shrink_active_list(unsigned long nr_to_scan, }if (folio_referenced (folio,0 , sc->target_mem_cgroup, - &vm_flags)) { + &vm_flags) >0 ) {/* * Identify referenced, file-backed active pages and * give them one more trip around the active list. So
This means contended active pages do NOT get rotated.
It's a bit of an arbitrary choice what to do with reclaim candidates for which you can get no reference information, but staying consistent is likely a good idea. My preference would be to just rotate contended pages throughout rather than risk dropping the workingset on the floor.
/* Referenced or rmap lock contention: rotate */
if (folio_referenced() != 0) {
...What do you think?
Quoted 36 lines · Johannes Weiner
Hi Minchan,
The patch looks reasonable to me, but one thing stands out:
mm/vmscan.c static enum page_references folio_check_references(struct folio *folio, · line 1400
Quoted 11 lines · Minchan Kim
mm/vmscan.c +4
-0@@ -1391,6 +1391,10 @@ static enum page_references folio_check_references(struct folio *folio,if (vm_flags &VM_LOCKED )return PAGEREF_ACTIVATE ; +/* page_referenced didn't work due to lock contention */ +if (referenced_ptes ==-1 ) +return PAGEREF_KEEP ; +if (referenced_ptes) {/* * All mapped folios start out with page table This means contended inactive pages get rotated.
mm/vmscan.c static void shrink_active_list(unsigned long nr_to_scan, · line 2502
Quoted 9 lines
mm/vmscan.c +1
-1@@ -2492,7 +2496,7 @@ static void shrink_active_list(unsigned long nr_to_scan, }if (folio_referenced (folio,0 , sc->target_mem_cgroup, - &vm_flags)) { + &vm_flags) >0 ) {/* * Identify referenced, file-backed active pages and * give them one more trip around the active list. So This means contended active pages do NOT get rotated.
It's a bit of an arbitrary choice what to do with reclaim candidates for which you can get no reference information, but staying consistent is likely a good idea. My preference would be to just rotate contended pages throughout rather than risk dropping the workingset on the floor.
Quoted 5 lines
/* Referenced or rmap lock contention: rotate */ if (folio_referenced() != 0) { ...What do you think?
Sure, it's good start before adding more heuristic later.
Thanks for the review. I will post v4.