All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] mm/shrinker: do not hold RCU lock in shrinker_debugfs_count_show()
@ 2026-06-10 23:20 Shakeel Butt
  2026-06-11  0:22 ` SeongJae Park
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Shakeel Butt @ 2026-06-10 23:20 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Dave Chinner, Roman Gushchin, Muchun Song, Qi Zheng,
	Meta kernel team, linux-mm, linux-kernel, Zenghui Yu, Nhat Pham

Reading the debugfs "count" file of a memcg-aware shrinker can sleep
inside an RCU read-side critical section:

  BUG: sleeping function called from invalid context at kernel/cgroup/rstat.c:421
  RCU nest depth: 1, expected: 0
   css_rstat_flush
   mem_cgroup_flush_stats
   zswap_shrinker_count
   shrinker_debugfs_count_show

shrinker_debugfs_count_show() invokes the ->count_objects() callback
under rcu_read_lock(). The zswap callback flushes memcg stats via
css_rstat_flush(), which may sleep, so it must not run under RCU.

The RCU lock is not needed here. mem_cgroup_iter() takes RCU internally
and returns a memcg holding a css reference (dropped on the next
iteration or by mem_cgroup_iter_break()), so the memcg stays alive
without it. The shrinker is kept alive by the open debugfs file:
shrinker_free() removes the debugfs entries via
debugfs_remove_recursive(), which waits for in-flight readers to drain,
before call_rcu(..., shrinker_free_rcu_cb). The sibling "scan" handler
already invokes the sleeping ->scan_objects() callback with no RCU
section.

Drop the rcu_read_lock()/rcu_read_unlock().

Fixes: 5035ebc644ae ("mm: shrinkers: introduce debugfs interface for memory shrinkers")
Reported-by: Zenghui Yu <zenghui.yu@linux.dev>
Closes: https://lore.kernel.org/all/c052a064-cddb-494f-a0d8-f8a10b4b1c4d@linux.dev/
Suggested-by: Nhat Pham <nphamcs@gmail.com>
Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev>
---
 mm/shrinker_debug.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mm/shrinker_debug.c b/mm/shrinker_debug.c
index affa64437302..cda4e86428c8 100644
--- a/mm/shrinker_debug.c
+++ b/mm/shrinker_debug.c
@@ -57,8 +57,6 @@ static int shrinker_debugfs_count_show(struct seq_file *m, void *v)
 	if (!count_per_node)
 		return -ENOMEM;
 
-	rcu_read_lock();
-
 	memcg_aware = shrinker->flags & SHRINKER_MEMCG_AWARE;
 
 	memcg = mem_cgroup_iter(NULL, NULL, NULL);
@@ -88,8 +86,6 @@ static int shrinker_debugfs_count_show(struct seq_file *m, void *v)
 		}
 	} while ((memcg = mem_cgroup_iter(NULL, memcg, NULL)) != NULL);
 
-	rcu_read_unlock();
-
 	kfree(count_per_node);
 	return ret;
 }
-- 
2.53.0-Meta



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] mm/shrinker: do not hold RCU lock in shrinker_debugfs_count_show()
  2026-06-10 23:20 [PATCH] mm/shrinker: do not hold RCU lock in shrinker_debugfs_count_show() Shakeel Butt
@ 2026-06-11  0:22 ` SeongJae Park
  2026-06-11  0:26   ` SeongJae Park
  2026-06-11  3:30 ` Qi Zheng
  2026-06-11  6:19 ` Zenghui Yu
  2 siblings, 1 reply; 6+ messages in thread
From: SeongJae Park @ 2026-06-11  0:22 UTC (permalink / raw)
  To: Shakeel Butt
  Cc: SeongJae Park, Andrew Morton, Dave Chinner, Roman Gushchin,
	Muchun Song, Qi Zheng, Meta kernel team, linux-mm, linux-kernel,
	Zenghui Yu, Nhat Pham

On Wed, 10 Jun 2026 16:20:48 -0700 Shakeel Butt <shakeel.butt@linux.dev> wrote:

> Reading the debugfs "count" file of a memcg-aware shrinker can sleep
> inside an RCU read-side critical section:
> 
>   BUG: sleeping function called from invalid context at kernel/cgroup/rstat.c:421
>   RCU nest depth: 1, expected: 0
>    css_rstat_flush
>    mem_cgroup_flush_stats
>    zswap_shrinker_count
>    shrinker_debugfs_count_show
> 
> shrinker_debugfs_count_show() invokes the ->count_objects() callback
> under rcu_read_lock(). The zswap callback flushes memcg stats via
> css_rstat_flush(), which may sleep, so it must not run under RCU.
> 
> The RCU lock is not needed here. mem_cgroup_iter() takes RCU internally
> and returns a memcg holding a css reference (dropped on the next
> iteration or by mem_cgroup_iter_break()), so the memcg stays alive
> without it. The shrinker is kept alive by the open debugfs file:
> shrinker_free() removes the debugfs entries via
> debugfs_remove_recursive(), which waits for in-flight readers to drain,
> before call_rcu(..., shrinker_free_rcu_cb). The sibling "scan" handler
> already invokes the sleeping ->scan_objects() callback with no RCU
> section.
> 
> Drop the rcu_read_lock()/rcu_read_unlock().

All make sense to me, thank you for the nice description and the fix!

> 
> Fixes: 5035ebc644ae ("mm: shrinkers: introduce debugfs interface for memory shrinkers")
> Reported-by: Zenghui Yu <zenghui.yu@linux.dev>
> Closes: https://lore.kernel.org/all/c052a064-cddb-494f-a0d8-f8a10b4b1c4d@linux.dev/
> Suggested-by: Nhat Pham <nphamcs@gmail.com>
> Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev>

Reviewed-by: SeongJae Park <sj@kernel.org>


Thanks,
SJ

[...]


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] mm/shrinker: do not hold RCU lock in shrinker_debugfs_count_show()
  2026-06-11  0:22 ` SeongJae Park
@ 2026-06-11  0:26   ` SeongJae Park
  2026-06-11  0:43     ` Shakeel Butt
  0 siblings, 1 reply; 6+ messages in thread
From: SeongJae Park @ 2026-06-11  0:26 UTC (permalink / raw)
  To: SeongJae Park
  Cc: Shakeel Butt, Andrew Morton, Dave Chinner, Roman Gushchin,
	Muchun Song, Qi Zheng, Meta kernel team, linux-mm, linux-kernel,
	Zenghui Yu, Nhat Pham

On Wed, 10 Jun 2026 17:22:51 -0700 SeongJae Park <sj@kernel.org> wrote:

> On Wed, 10 Jun 2026 16:20:48 -0700 Shakeel Butt <shakeel.butt@linux.dev> wrote:
> 
> > Reading the debugfs "count" file of a memcg-aware shrinker can sleep
> > inside an RCU read-side critical section:
> > 
> >   BUG: sleeping function called from invalid context at kernel/cgroup/rstat.c:421
> >   RCU nest depth: 1, expected: 0
> >    css_rstat_flush
> >    mem_cgroup_flush_stats
> >    zswap_shrinker_count
> >    shrinker_debugfs_count_show
> > 
> > shrinker_debugfs_count_show() invokes the ->count_objects() callback
> > under rcu_read_lock(). The zswap callback flushes memcg stats via
> > css_rstat_flush(), which may sleep, so it must not run under RCU.
> > 
> > The RCU lock is not needed here. mem_cgroup_iter() takes RCU internally
> > and returns a memcg holding a css reference (dropped on the next
> > iteration or by mem_cgroup_iter_break()), so the memcg stays alive
> > without it. The shrinker is kept alive by the open debugfs file:
> > shrinker_free() removes the debugfs entries via
> > debugfs_remove_recursive(), which waits for in-flight readers to drain,
> > before call_rcu(..., shrinker_free_rcu_cb). The sibling "scan" handler
> > already invokes the sleeping ->scan_objects() callback with no RCU
> > section.
> > 
> > Drop the rcu_read_lock()/rcu_read_unlock().
> 
> All make sense to me, thank you for the nice description and the fix!
> 
> > 
> > Fixes: 5035ebc644ae ("mm: shrinkers: introduce debugfs interface for memory shrinkers")

Forgot asking this, sorry.  Are you intentionally not adding Cc: stable@ here?
I think the user impact is arguably minor enough to not Cc-ing stable@, but
just thought it would be good to make the intention clear.

> > Reported-by: Zenghui Yu <zenghui.yu@linux.dev>
> > Closes: https://lore.kernel.org/all/c052a064-cddb-494f-a0d8-f8a10b4b1c4d@linux.dev/
> > Suggested-by: Nhat Pham <nphamcs@gmail.com>
> > Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev>
> 
> Reviewed-by: SeongJae Park <sj@kernel.org>


Thanks,
SJ

[...]


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] mm/shrinker: do not hold RCU lock in shrinker_debugfs_count_show()
  2026-06-11  0:26   ` SeongJae Park
@ 2026-06-11  0:43     ` Shakeel Butt
  0 siblings, 0 replies; 6+ messages in thread
From: Shakeel Butt @ 2026-06-11  0:43 UTC (permalink / raw)
  To: SeongJae Park
  Cc: Andrew Morton, Dave Chinner, Roman Gushchin, Muchun Song,
	Qi Zheng, Meta kernel team, linux-mm, linux-kernel, Zenghui Yu,
	Nhat Pham

On Wed, Jun 10, 2026 at 05:26:47PM -0700, SeongJae Park wrote:
> On Wed, 10 Jun 2026 17:22:51 -0700 SeongJae Park <sj@kernel.org> wrote:
> 
> > On Wed, 10 Jun 2026 16:20:48 -0700 Shakeel Butt <shakeel.butt@linux.dev> wrote:
> > 
> > > Reading the debugfs "count" file of a memcg-aware shrinker can sleep
> > > inside an RCU read-side critical section:
> > > 
> > >   BUG: sleeping function called from invalid context at kernel/cgroup/rstat.c:421
> > >   RCU nest depth: 1, expected: 0
> > >    css_rstat_flush
> > >    mem_cgroup_flush_stats
> > >    zswap_shrinker_count
> > >    shrinker_debugfs_count_show
> > > 
> > > shrinker_debugfs_count_show() invokes the ->count_objects() callback
> > > under rcu_read_lock(). The zswap callback flushes memcg stats via
> > > css_rstat_flush(), which may sleep, so it must not run under RCU.
> > > 
> > > The RCU lock is not needed here. mem_cgroup_iter() takes RCU internally
> > > and returns a memcg holding a css reference (dropped on the next
> > > iteration or by mem_cgroup_iter_break()), so the memcg stays alive
> > > without it. The shrinker is kept alive by the open debugfs file:
> > > shrinker_free() removes the debugfs entries via
> > > debugfs_remove_recursive(), which waits for in-flight readers to drain,
> > > before call_rcu(..., shrinker_free_rcu_cb). The sibling "scan" handler
> > > already invokes the sleeping ->scan_objects() callback with no RCU
> > > section.
> > > 
> > > Drop the rcu_read_lock()/rcu_read_unlock().
> > 
> > All make sense to me, thank you for the nice description and the fix!
> > 
> > > 
> > > Fixes: 5035ebc644ae ("mm: shrinkers: introduce debugfs interface for memory shrinkers")
> 
> Forgot asking this, sorry.  Are you intentionally not adding Cc: stable@ here?
> I think the user impact is arguably minor enough to not Cc-ing stable@, but
> just thought it would be good to make the intention clear.
> 

Haha I was just being lazy to think through if this should be CCed to stable or
not and letting others/reviewers do that for me :P

> > > Reported-by: Zenghui Yu <zenghui.yu@linux.dev>
> > > Closes: https://lore.kernel.org/all/c052a064-cddb-494f-a0d8-f8a10b4b1c4d@linux.dev/
> > > Suggested-by: Nhat Pham <nphamcs@gmail.com>
> > > Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev>
> > 
> > Reviewed-by: SeongJae Park <sj@kernel.org>

Thanks.


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] mm/shrinker: do not hold RCU lock in shrinker_debugfs_count_show()
  2026-06-10 23:20 [PATCH] mm/shrinker: do not hold RCU lock in shrinker_debugfs_count_show() Shakeel Butt
  2026-06-11  0:22 ` SeongJae Park
@ 2026-06-11  3:30 ` Qi Zheng
  2026-06-11  6:19 ` Zenghui Yu
  2 siblings, 0 replies; 6+ messages in thread
From: Qi Zheng @ 2026-06-11  3:30 UTC (permalink / raw)
  To: Shakeel Butt, Andrew Morton
  Cc: Dave Chinner, Roman Gushchin, Muchun Song, Meta kernel team,
	linux-mm, linux-kernel, Zenghui Yu, Nhat Pham



On 6/11/26 7:20 AM, Shakeel Butt wrote:
> Reading the debugfs "count" file of a memcg-aware shrinker can sleep
> inside an RCU read-side critical section:
> 
>    BUG: sleeping function called from invalid context at kernel/cgroup/rstat.c:421
>    RCU nest depth: 1, expected: 0
>     css_rstat_flush
>     mem_cgroup_flush_stats
>     zswap_shrinker_count
>     shrinker_debugfs_count_show
> 
> shrinker_debugfs_count_show() invokes the ->count_objects() callback
> under rcu_read_lock(). The zswap callback flushes memcg stats via
> css_rstat_flush(), which may sleep, so it must not run under RCU.
> 
> The RCU lock is not needed here. mem_cgroup_iter() takes RCU internally
> and returns a memcg holding a css reference (dropped on the next
> iteration or by mem_cgroup_iter_break()), so the memcg stays alive
> without it. The shrinker is kept alive by the open debugfs file:
> shrinker_free() removes the debugfs entries via
> debugfs_remove_recursive(), which waits for in-flight readers to drain,
> before call_rcu(..., shrinker_free_rcu_cb). The sibling "scan" handler
> already invokes the sleeping ->scan_objects() callback with no RCU
> section.
> 
> Drop the rcu_read_lock()/rcu_read_unlock().
> 
> Fixes: 5035ebc644ae ("mm: shrinkers: introduce debugfs interface for memory shrinkers")
> Reported-by: Zenghui Yu <zenghui.yu@linux.dev>
> Closes: https://lore.kernel.org/all/c052a064-cddb-494f-a0d8-f8a10b4b1c4d@linux.dev/
> Suggested-by: Nhat Pham <nphamcs@gmail.com>
> Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev>
> ---
>   mm/shrinker_debug.c | 4 ----
>   1 file changed, 4 deletions(-)
> 

LGTM, so:

Reviewed-by: Qi Zheng <qi.zheng@linux.dev>

Thanks!


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] mm/shrinker: do not hold RCU lock in shrinker_debugfs_count_show()
  2026-06-10 23:20 [PATCH] mm/shrinker: do not hold RCU lock in shrinker_debugfs_count_show() Shakeel Butt
  2026-06-11  0:22 ` SeongJae Park
  2026-06-11  3:30 ` Qi Zheng
@ 2026-06-11  6:19 ` Zenghui Yu
  2 siblings, 0 replies; 6+ messages in thread
From: Zenghui Yu @ 2026-06-11  6:19 UTC (permalink / raw)
  To: Shakeel Butt
  Cc: Andrew Morton, Dave Chinner, Roman Gushchin, Muchun Song,
	Qi Zheng, Meta kernel team, linux-mm, linux-kernel, Nhat Pham

On 6/11/26 7:20 AM, Shakeel Butt wrote:
> Reading the debugfs "count" file of a memcg-aware shrinker can sleep
> inside an RCU read-side critical section:
> 
>   BUG: sleeping function called from invalid context at kernel/cgroup/rstat.c:421
>   RCU nest depth: 1, expected: 0
>    css_rstat_flush
>    mem_cgroup_flush_stats
>    zswap_shrinker_count
>    shrinker_debugfs_count_show
> 
> shrinker_debugfs_count_show() invokes the ->count_objects() callback
> under rcu_read_lock(). The zswap callback flushes memcg stats via
> css_rstat_flush(), which may sleep, so it must not run under RCU.
> 
> The RCU lock is not needed here. mem_cgroup_iter() takes RCU internally
> and returns a memcg holding a css reference (dropped on the next
> iteration or by mem_cgroup_iter_break()), so the memcg stays alive
> without it. The shrinker is kept alive by the open debugfs file:
> shrinker_free() removes the debugfs entries via
> debugfs_remove_recursive(), which waits for in-flight readers to drain,
> before call_rcu(..., shrinker_free_rcu_cb). The sibling "scan" handler
> already invokes the sleeping ->scan_objects() callback with no RCU
> section.
> 
> Drop the rcu_read_lock()/rcu_read_unlock().
> 
> Fixes: 5035ebc644ae ("mm: shrinkers: introduce debugfs interface for memory shrinkers")
> Reported-by: Zenghui Yu <zenghui.yu@linux.dev>
> Closes: https://lore.kernel.org/all/c052a064-cddb-494f-a0d8-f8a10b4b1c4d@linux.dev/
> Suggested-by: Nhat Pham <nphamcs@gmail.com>
> Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev>
> ---
>  mm/shrinker_debug.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/mm/shrinker_debug.c b/mm/shrinker_debug.c
> index affa64437302..cda4e86428c8 100644
> --- a/mm/shrinker_debug.c
> +++ b/mm/shrinker_debug.c
> @@ -57,8 +57,6 @@ static int shrinker_debugfs_count_show(struct seq_file *m, void *v)
>  	if (!count_per_node)
>  		return -ENOMEM;
>  
> -	rcu_read_lock();
> -
>  	memcg_aware = shrinker->flags & SHRINKER_MEMCG_AWARE;
>  
>  	memcg = mem_cgroup_iter(NULL, NULL, NULL);
> @@ -88,8 +86,6 @@ static int shrinker_debugfs_count_show(struct seq_file *m, void *v)
>  		}
>  	} while ((memcg = mem_cgroup_iter(NULL, memcg, NULL)) != NULL);
>  
> -	rcu_read_unlock();
> -
>  	kfree(count_per_node);
>  	return ret;
>  }

Tested-by: Zenghui Yu (Huawei) <zenghui.yu@linux.dev>

Thanks for the fix!

Zenghui


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2026-06-11  6:20 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-06-10 23:20 [PATCH] mm/shrinker: do not hold RCU lock in shrinker_debugfs_count_show() Shakeel Butt
2026-06-11  0:22 ` SeongJae Park
2026-06-11  0:26   ` SeongJae Park
2026-06-11  0:43     ` Shakeel Butt
2026-06-11  3:30 ` Qi Zheng
2026-06-11  6:19 ` Zenghui Yu

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.