mm: thp: update split_queue_len correctly
Subsystems (2)
PATCH 1/1 mm: thp: update split_queue_len correctly
The deferred THPs are split on memory pressure through shrinker callback and splitting of THP during reclaim can fail for several reasons like unable to lock the THP, under writeback or unexpected number of pins on the THP. Such pages are put back on the deferred split list for consideration later. However kernel does not update the deferred queue size on putting back the pages whose split was failed. This patch fixes that.
--- mm/huge_memory.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
mm/huge_memory.c +3 -1
@@ -2809,7 +2809,7 @@ static unsigned long deferred_split_scan(struct shrinker *shrink,unsigned long flags;LIST_HEAD (list), *pos, *next;struct page *page; -int split =0 ; +unsigned long split =0 , num =0 ;#ifdef CONFIG_MEMCG if (sc->memcg)
@@ -2823,6 +2823,7 @@ static unsigned long deferred_split_scan(struct shrinker *shrink, page =compound_head (page);if (get_page_unless_zero (page)) {list_move (page_deferred_list (page), &list); + num++; }else {/* We lost race with put_compound_page() */ list_del_init (page_deferred_list (page));
@@ -2847,6 +2848,7 @@ static unsigned long deferred_split_scan(struct shrinker *shrink,spin_lock_irqsave (&ds_queue->split_queue_lock, flags);list_splice_tail (&list, &ds_queue->split_queue); + ds_queue->split_queue_len += (num - split);spin_unlock_irqrestore (&ds_queue->split_queue_lock, flags);/*
Signature · 1 line
2.34.0.rc2.393.gf8c9666880-goog
Quoted 8 lines · Shakeel Butt
The deferred THPs are split on memory pressure through shrinker callback and splitting of THP during reclaim can fail for several reasons like unable to lock the THP, under writeback or unexpected number of pins on the THP. Such pages are put back on the deferred split list for consideration later. However kernel does not update the deferred queue size on putting back the pages whose split was failed. This patch fixes that.
I forgot to add the user visible impact.
"Without this patch the split_queue_len can underflow. Shrinker will always get that there are some THPs to split even if there are not and waste some cpu to scan the empty list."
Quoted 29 lines · Shakeel Butt
The deferred THPs are split on memory pressure through shrinker callback and splitting of THP during reclaim can fail for several reasons like unable to lock the THP, under writeback or unexpected number of pins on the THP. Such pages are put back on the deferred split list for consideration later. However kernel does not update the deferred queue size on putting back the pages whose split was failed. This patch fixes that.
Fixes 364c1eebe453 ("mm: thp: extract split_queue_* into a struct")Signed-off-by Shakeel Butt <[email protected]>--- mm/huge_memory.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)mm/huge_memory.c +1
-1@@ -2809,7 +2809,7 @@ static unsigned long deferred_split_scan(struct shrinker *shrink,unsigned long flags;LIST_HEAD (list), *pos, *next;struct page *page; -int split =0 ; +unsigned long split =0 , num =0 ;#ifdef CONFIG_MEMCG if (sc->memcg)
mm/huge_memory.c static unsigned long deferred_split_scan(struct shrinker *shrink, · line 2826
Quoted 4 lines
mm/huge_memory.c +1
-0@@ -2823,6 +2823,7 @@ static unsigned long deferred_split_scan(struct shrinker *shrink, page =compound_head (page);if (get_page_unless_zero (page)) {list_move (page_deferred_list (page), &list); + num++;
Thanks for catching this. But I don't think "num" is needed, isn't the below code good enough?
mm/huge_memory.c +0 -0
@@ -2847,6 +2847,7 @@ static unsigned long deferred_split_scan(struct
shrinker *shrink,
spin_lock_irqsave(&ds_queue->split_queue_lock, flags);
list_splice_tail(&list, &ds_queue->split_queue);
+ ds_queue->split_queue_len -= split;
spin_unlock_irqrestore(&ds_queue->split_queue_lock, flags);
/*Quoted 14 lines
mm/huge_memory.c +1
-1}else {/* We lost race with put_compound_page() */ list_del_init (page_deferred_list (page));@@ -2847,6 +2848,7 @@ static unsigned long deferred_split_scan(struct shrinker *shrink,spin_lock_irqsave (&ds_queue->split_queue_lock, flags);list_splice_tail (&list, &ds_queue->split_queue); + ds_queue->split_queue_len += (num - split);spin_unlock_irqrestore (&ds_queue->split_queue_lock, flags);/* -- 2.34.0.rc2.393.gf8c9666880-goog
Quoted 28 lines · Yang Shi
Quoted 26 lines · Shakeel Butt
The deferred THPs are split on memory pressure through shrinker callback and splitting of THP during reclaim can fail for several reasons like unable to lock the THP, under writeback or unexpected number of pins on the THP. Such pages are put back on the deferred split list for consideration later. However kernel does not update the deferred queue size on putting back the pages whose split was failed. This patch fixes that.
Fixes 364c1eebe453 ("mm: thp: extract split_queue_* into a struct")Signed-off-by Shakeel Butt <[email protected]>--- mm/huge_memory.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)mm/huge_memory.c +1
-1@@ -2809,7 +2809,7 @@ static unsigned long deferred_split_scan(struct shrinker *shrink,unsigned long flags;LIST_HEAD (list), *pos, *next;struct page *page; -int split =0 ; +unsigned long split =0 , num =0 ;
Quoted 10 lines
mm/huge_memory.c static unsigned long deferred_split_scan(struct shrinker *shrink, · line 2826
Quoted 7 lines
mm/huge_memory.c +1
-0#ifdef CONFIG_MEMCG if (sc->memcg)@@ -2823,6 +2823,7 @@ static unsigned long deferred_split_scan(struct shrinker *shrink, page =compound_head (page);if (get_page_unless_zero (page)) {list_move (page_deferred_list (page), &list); + num++;Thanks for catching this. But I don't think "num" is needed, isn't the below code good enough?
Yes you are right. I will send the next version. I will at least change the type of split to unsigned long.
Quoted 29 lines
mm/huge_memory.c +1
-0@@ -2847,6 +2847,7 @@ static unsigned long deferred_split_scan(struct shrinker *shrink,spin_lock_irqsave (&ds_queue->split_queue_lock, flags);list_splice_tail (&list, &ds_queue->split_queue); + ds_queue->split_queue_len -= split;spin_unlock_irqrestore (&ds_queue->split_queue_lock, flags);/*Quoted 14 lines
mm/huge_memory.c +1
-1}else {/* We lost race with put_compound_page() */ list_del_init (page_deferred_list (page));@@ -2847,6 +2848,7 @@ static unsigned long deferred_split_scan(struct shrinker *shrink,spin_lock_irqsave (&ds_queue->split_queue_lock, flags);list_splice_tail (&list, &ds_queue->split_queue); + ds_queue->split_queue_len += (num - split);spin_unlock_irqrestore (&ds_queue->split_queue_lock, flags);/* -- 2.34.0.rc2.393.gf8c9666880-goog