mm: vmscan: protect shrinker idr replace with CONFIG_MEMCG
Subsystems (3)
PATCH 1/1 mm: vmscan: protect shrinker idr replace with CONFIG_MEMCG
Since commit 0a432dcbeb32edcd211a5d8f7847d0da7642a8b4 ("mm: shrinker:
make shrinker not depend on memcg kmem"), shrinkers' idr is protected by CONFIG_MEMCG instead of CONFIG_MEMCG_KMEM, so it makes no sense to protect shrinker idr replace with CONFIG_MEMCG_KMEM.
--- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/vmscan.c +1 -1
@@ -422,7 +422,7 @@ void register_shrinker_prepared(struct shrinker *shrinker) {down_write (&shrinker_rwsem);list_add_tail (&shrinker->list, &shrinker_list); -#ifdef CONFIG_MEMCG_KMEM +#ifdef CONFIG_MEMCG if (shrinker->flags &SHRINKER_MEMCG_AWARE )idr_replace (&shrinker_idr, shrinker, shrinker->id);#endif
Signature · 1 line
1.8.3.1
Quoted 11 lines · Yang Shi
Since commit
0a432dcbeb32edcd211a5d8f7847d0da7642a8b4("mm: shrinker:
make shrinker not depend on memcg kmem"), shrinkers' idr is protected byCONFIG_MEMCGinstead ofCONFIG_MEMCG_KMEM, so it makes no sense to protect shrinker idr replace withCONFIG_MEMCG_KMEM.Cc Kirill Tkhai <[email protected]>Cc Johannes Weiner <[email protected]>Cc Michal Hocko <[email protected]>Cc Shakeel Butt <[email protected]>Cc Roman Gushchin <[email protected]>Signed-off-by Yang Shi <[email protected]>
It looks like that in CONFIG_SLOB case we do not even call some shrinkers for subordinate mem cgroups (i.e., we don't call deferred_split_shrinker), since they never become completely registered.
Quoted 18 lines
--- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)mm/vmscan.c +1
-1@@ -422,7 +422,7 @@ void register_shrinker_prepared(struct shrinker *shrinker) {down_write (&shrinker_rwsem);list_add_tail (&shrinker->list, &shrinker_list); -#ifdef CONFIG_MEMCG_KMEM +#ifdef CONFIG_MEMCG if (shrinker->flags &SHRINKER_MEMCG_AWARE )idr_replace (&shrinker_idr, shrinker, shrinker->id);#endif
Michal Hocko
reviewerQuoted 13 lines · Kirill Tkhai
Quoted 11 lines · Yang Shi
Since commit
0a432dcbeb32edcd211a5d8f7847d0da7642a8b4("mm: shrinker:
make shrinker not depend on memcg kmem"), shrinkers' idr is protected byCONFIG_MEMCGinstead ofCONFIG_MEMCG_KMEM, so it makes no sense to protect shrinker idr replace withCONFIG_MEMCG_KMEM.Cc Kirill Tkhai <[email protected]>Cc Johannes Weiner <[email protected]>Cc Michal Hocko <[email protected]>Cc Shakeel Butt <[email protected]>Cc Roman Gushchin <[email protected]>Signed-off-by Yang Shi <[email protected]>
Quoted 5 lines
It looks like that in
CONFIG_SLOBcase we do not even call some shrinkers for subordinate mem cgroups (i.e., we don't calldeferred_split_shrinker), since they never become completely registered.Fixes 0a432dcbeb32edcd211a5d8f7847d0da7642a8b4 ("mm: shrinker: make shrinker not depend on memcg kmem")
I am confused. Why the Fixes tag? Nothing should be really broken with KMEM config guard right?
This is a mere clean up AFAICS.
Quoted 20 lines
Reviewed-by Kirill Tkhai <[email protected]>Quoted 18 lines
--- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)mm/vmscan.c +1
-1@@ -422,7 +422,7 @@ void register_shrinker_prepared(struct shrinker *shrinker) {down_write (&shrinker_rwsem);list_add_tail (&shrinker->list, &shrinker_list); -#ifdef CONFIG_MEMCG_KMEM +#ifdef CONFIG_MEMCG if (shrinker->flags &SHRINKER_MEMCG_AWARE )idr_replace (&shrinker_idr, shrinker, shrinker->id);#endif
Signature · 2 lines
Michal Hocko SUSE Labs
Quoted 14 lines · Michal Hocko
Quoted 13 lines · Kirill Tkhai
Quoted 11 lines · Yang Shi
Since commit
0a432dcbeb32edcd211a5d8f7847d0da7642a8b4("mm: shrinker:
make shrinker not depend on memcg kmem"), shrinkers' idr is protected byCONFIG_MEMCGinstead ofCONFIG_MEMCG_KMEM, so it makes no sense to protect shrinker idr replace withCONFIG_MEMCG_KMEM.Cc Kirill Tkhai <[email protected]>Cc Johannes Weiner <[email protected]>Cc Michal Hocko <[email protected]>Cc Shakeel Butt <[email protected]>Cc Roman Gushchin <[email protected]>Signed-off-by Yang Shi <[email protected]>
Quoted 8 lines
Quoted 5 lines
It looks like that in
CONFIG_SLOBcase we do not even call some shrinkers for subordinate mem cgroups (i.e., we don't calldeferred_split_shrinker), since they never become completely registered.Fixes 0a432dcbeb32edcd211a5d8f7847d0da7642a8b4 ("mm: shrinker: make shrinker not depend on memcg kmem")I am confused. Why the Fixes tag? Nothing should be really broken with KMEM config guard right?
idr_replace() is disabled in CONFIG_MEMCG && CONFIG_SLOB case, and this is wrong.
0a432dcbeb32edcd211a5d8f7847d0da7642a8b4 goes in the series, which enables shrinker_idr infrastructure for huge_memory.c's deferred_split_shrinker in CONFIG_MEMCG case. Previously, all SHRINKER_MEMCG_AWARE shrinkers were based on LRUs, and they remain to base of CONFIG_MEMCG_KMEM. But deferred_split_shrinker is an exception.
In CONFIG_MEMCG && CONFIG_SLOB case, shrinker_idr contains only shrinker, and it is deferred_split_shrinker. But it is never actually called, since idr_replace() is never compiled. deferred_split_shrinker all the time is staying in half-registered state, and it's never called for subordinate mem cgroups.
So, this is a BUG, and this should go to stable.
Quoted 23 lines
This is a mere clean up AFAICS.
Quoted 20 lines
Reviewed-by Kirill Tkhai <[email protected]>Quoted 18 lines
--- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)mm/vmscan.c +1
-1@@ -422,7 +422,7 @@ void register_shrinker_prepared(struct shrinker *shrinker) {down_write (&shrinker_rwsem);list_add_tail (&shrinker->list, &shrinker_list); -#ifdef CONFIG_MEMCG_KMEM +#ifdef CONFIG_MEMCG if (shrinker->flags &SHRINKER_MEMCG_AWARE )idr_replace (&shrinker_idr, shrinker, shrinker->id);#endif
Quoted 33 lines · Kirill Tkhai
Quoted 14 lines · Michal Hocko
Quoted 13 lines · Kirill Tkhai
Quoted 11 lines · Yang Shi
Since commit
0a432dcbeb32edcd211a5d8f7847d0da7642a8b4("mm: shrinker:
make shrinker not depend on memcg kmem"), shrinkers' idr is protected byCONFIG_MEMCGinstead ofCONFIG_MEMCG_KMEM, so it makes no sense to protect shrinker idr replace withCONFIG_MEMCG_KMEM.Cc Kirill Tkhai <[email protected]>Cc Johannes Weiner <[email protected]>Cc Michal Hocko <[email protected]>Cc Shakeel Butt <[email protected]>Cc Roman Gushchin <[email protected]>Signed-off-by Yang Shi <[email protected]>Quoted 8 lines
Quoted 5 lines
It looks like that in
CONFIG_SLOBcase we do not even call some shrinkers for subordinate mem cgroups (i.e., we don't calldeferred_split_shrinker), since they never become completely registered.Fixes 0a432dcbeb32edcd211a5d8f7847d0da7642a8b4 ("mm: shrinker: make shrinker not depend on memcg kmem")I am confused. Why the Fixes tag? Nothing should be really broken with KMEM config guard right?
idr_replace()is disabled inCONFIG_MEMCG&&CONFIG_SLOBcase, and this is wrong.
0a432dcbeb32edcd211a5d8f7847d0da7642a8b4goes in the series, which enablesshrinker_idrinfrastructure for huge_memory.c'sdeferred_split_shrinkerinCONFIG_MEMCGcase. Previously, allSHRINKER_MEMCG_AWAREshrinkers were based on LRUs, and they remain to base ofCONFIG_MEMCG_KMEM. Butdeferred_split_shrinkeris an exception.
Quoted 7 lines
In
CONFIG_MEMCG&&CONFIG_SLOBcase,shrinker_idrcontains only shrinker, and it isdeferred_split_shrinker. But it is never actually called, sinceidr_replace()is never compiled.deferred_split_shrinkerall the time is staying in half-registered state, and it's never called for subordinate mem cgroups.So, this is a BUG, and this should go to stable.
The visible effect is that deferred_split_shrinker is never called from shrink_slab() for subordinate mem cgroups. It's called only for root_mem_cgroup.
Quoted 24 lines
Quoted 23 lines
This is a mere clean up AFAICS.
Quoted 20 lines
Reviewed-by Kirill Tkhai <[email protected]>Quoted 18 lines
--- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)mm/vmscan.c +1
-1@@ -422,7 +422,7 @@ void register_shrinker_prepared(struct shrinker *shrinker) {down_write (&shrinker_rwsem);list_add_tail (&shrinker->list, &shrinker_list); -#ifdef CONFIG_MEMCG_KMEM +#ifdef CONFIG_MEMCG if (shrinker->flags &SHRINKER_MEMCG_AWARE )idr_replace (&shrinker_idr, shrinker, shrinker->id);#endif
Quoted 37 lines · Kirill Tkhai
Quoted 36 lines · Kirill Tkhai
Quoted 13 lines · Michal Hocko
Quoted 12 lines · Kirill Tkhai
Quoted 11 lines · Yang Shi
Since commit
0a432dcbeb32edcd211a5d8f7847d0da7642a8b4("mm: shrinker:
make shrinker not depend on memcg kmem"), shrinkers' idr is protected byCONFIG_MEMCGinstead ofCONFIG_MEMCG_KMEM, so it makes no sense to protect shrinker idr replace withCONFIG_MEMCG_KMEM.Cc Kirill Tkhai <[email protected]>Cc Johannes Weiner <[email protected]>Cc Michal Hocko <[email protected]>Cc Shakeel Butt <[email protected]>Cc Roman Gushchin <[email protected]>Signed-off-by Yang Shi <[email protected]>Quoted 7 lines
Quoted 5 lines
It looks like that in
CONFIG_SLOBcase we do not even call some shrinkers for subordinate mem cgroups (i.e., we don't calldeferred_split_shrinker), since they never become completely registered.Fixes 0a432dcbeb32edcd211a5d8f7847d0da7642a8b4 ("mm: shrinker: make shrinker not depend on memcg kmem")I am confused. Why the Fixes tag? Nothing should be really broken with KMEM config guard right?
idr_replace()is disabled inCONFIG_MEMCG&&CONFIG_SLOBcase, and this is wrong.
0a432dcbeb32edcd211a5d8f7847d0da7642a8b4goes in the series, which enablesshrinker_idrinfrastructure for huge_memory.c'sdeferred_split_shrinkerinCONFIG_MEMCGcase. Previously, allSHRINKER_MEMCG_AWAREshrinkers were based on LRUs, and they remain to base ofCONFIG_MEMCG_KMEM. Butdeferred_split_shrinkeris an exception.In
CONFIG_MEMCG&&CONFIG_SLOBcase,shrinker_idrcontains only shrinker, and it isdeferred_split_shrinker. But it is never actually called, sinceidr_replace()is never compiled.deferred_split_shrinkerall the time is staying in half-registered state, and it's never called for subordinate mem cgroups.
Quoted 4 lines
Quoted 1 line
So, this is a BUG, and this should go to stable.
The visible effect is that
deferred_split_shrinkeris never called fromshrink_slab()for subordinate mem cgroups. It's called only forroot_mem_cgroup.
Thanks for noticing the SLOB case, I didn't realize it and thought it was just a cleanup too.
Will update the information and cc to stable list for v2.
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
This is a mere clean up AFAICS.
Quoted 20 lines
Reviewed-by Kirill Tkhai <[email protected]>Quoted 18 lines
--- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)mm/vmscan.c +1
-1@@ -422,7 +422,7 @@ void register_shrinker_prepared(struct shrinker *shrinker) {down_write (&shrinker_rwsem);list_add_tail (&shrinker->list, &shrinker_list); -#ifdef CONFIG_MEMCG_KMEM +#ifdef CONFIG_MEMCG if (shrinker->flags &SHRINKER_MEMCG_AWARE )idr_replace (&shrinker_idr, shrinker, shrinker->id);#endif
Michal Hocko
reviewerQuoted 33 lines · Kirill Tkhai
Quoted 14 lines · Michal Hocko
Quoted 13 lines · Kirill Tkhai
Quoted 11 lines · Yang Shi
Since commit
0a432dcbeb32edcd211a5d8f7847d0da7642a8b4("mm: shrinker:
make shrinker not depend on memcg kmem"), shrinkers' idr is protected byCONFIG_MEMCGinstead ofCONFIG_MEMCG_KMEM, so it makes no sense to protect shrinker idr replace withCONFIG_MEMCG_KMEM.Cc Kirill Tkhai <[email protected]>Cc Johannes Weiner <[email protected]>Cc Michal Hocko <[email protected]>Cc Shakeel Butt <[email protected]>Cc Roman Gushchin <[email protected]>Signed-off-by Yang Shi <[email protected]>Quoted 8 lines
Quoted 5 lines
It looks like that in
CONFIG_SLOBcase we do not even call some shrinkers for subordinate mem cgroups (i.e., we don't calldeferred_split_shrinker), since they never become completely registered.Fixes 0a432dcbeb32edcd211a5d8f7847d0da7642a8b4 ("mm: shrinker: make shrinker not depend on memcg kmem")I am confused. Why the Fixes tag? Nothing should be really broken with KMEM config guard right?
idr_replace()is disabled inCONFIG_MEMCG&&CONFIG_SLOBcase, and this is wrong.
0a432dcbeb32edcd211a5d8f7847d0da7642a8b4goes in the series, which enablesshrinker_idrinfrastructure for huge_memory.c'sdeferred_split_shrinkerinCONFIG_MEMCGcase. Previously, allSHRINKER_MEMCG_AWAREshrinkers were based on LRUs, and they remain to base ofCONFIG_MEMCG_KMEM. Butdeferred_split_shrinkeris an exception.
Quoted 7 lines
In
CONFIG_MEMCG&&CONFIG_SLOBcase,shrinker_idrcontains only shrinker, and it isdeferred_split_shrinker. But it is never actually called, sinceidr_replace()is never compiled.deferred_split_shrinkerall the time is staying in half-registered state, and it's never called for subordinate mem cgroups.So, this is a BUG, and this should go to stable.
OK, I see. The changelog should describe all that. Thanks for the clarification.
Quoted 24 lines
Quoted 23 lines
This is a mere clean up AFAICS.
Quoted 20 lines
Reviewed-by Kirill Tkhai <[email protected]>Quoted 18 lines
--- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)mm/vmscan.c +1
-1@@ -422,7 +422,7 @@ void register_shrinker_prepared(struct shrinker *shrinker) {down_write (&shrinker_rwsem);list_add_tail (&shrinker->list, &shrinker_list); -#ifdef CONFIG_MEMCG_KMEM +#ifdef CONFIG_MEMCG if (shrinker->flags &SHRINKER_MEMCG_AWARE )idr_replace (&shrinker_idr, shrinker, shrinker->id);#endif
Signature · 2 lines
Michal Hocko SUSE Labs
Quoted 11 lines · Yang Shi
Since commit
0a432dcbeb32edcd211a5d8f7847d0da7642a8b4("mm: shrinker:
make shrinker not depend on memcg kmem"), shrinkers' idr is protected byCONFIG_MEMCGinstead ofCONFIG_MEMCG_KMEM, so it makes no sense to protect shrinker idr replace withCONFIG_MEMCG_KMEM.Cc Kirill Tkhai <[email protected]>Cc Johannes Weiner <[email protected]>Cc Michal Hocko <[email protected]>Cc Shakeel Butt <[email protected]>Cc Roman Gushchin <[email protected]>Signed-off-by Yang Shi <[email protected]>
Quoted 19 lines
--- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)mm/vmscan.c +1
-1@@ -422,7 +422,7 @@ void register_shrinker_prepared(struct shrinker *shrinker) {down_write (&shrinker_rwsem);list_add_tail (&shrinker->list, &shrinker_list); -#ifdef CONFIG_MEMCG_KMEM +#ifdef CONFIG_MEMCG if (shrinker->flags &SHRINKER_MEMCG_AWARE )idr_replace (&shrinker_idr, shrinker, shrinker->id);#endif Signature · 1 line
1.8.3.1
Signature · 2 lines
Michal Hocko SUSE Labs