mm/shrinker: Fix refcount leak in shrink_slab_memcg()
Subsystems (2)
PATCH 1/1 mm/shrinker: Fix refcount leak in shrink_slab_memcg()
When kmem is disabled for memcg, slab-backed shrinkers are skipped. However, shrink_slab_memcg() doesn't drop the reference acquired via shrinker_try_get() before continuing.
Add the missing shrinker_put().
--- mm/shrinker.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
mm/shrinker.c +3 -1
@@ -544,8 +544,10 @@ static unsigned long shrink_slab_memcg(gfp_t gfp_mask, int nid,/* Call non-slab shrinkers even though kmem is disabled */ if (!memcg_kmem_online () && - !(shrinker->flags &SHRINKER_NONSLAB )) + !(shrinker->flags &SHRINKER_NONSLAB )) { +shrinker_put (shrinker);continue ; + } ret =do_shrink_slab (&sc, shrinker, priority);if (ret ==SHRINK_EMPTY ) {
Signature · 1 line
2.43.0
Quoted 3 lines · Altan Hacigumus
When kmem is disabled for memcg, slab-backed shrinkers are skipped. However,
shrink_slab_memcg()doesn't drop the reference acquired viashrinker_try_get()before continuing.
Good catch!
Quoted 15 lines
Add the missing
shrinker_put().Fixes 50d09da8e119 ("mm: shrinker: make memcg slab shrink lockless")Signed-off-by Altan Hacigumus <[email protected]>--- mm/shrinker.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)mm/shrinker.c +0
-0
mm/shrinker.c static unsigned long shrink_slab_memcg(gfp_t gfp_mask, int nid, · line 547
Quoted 5 lines
mm/shrinker.c +1
-1@@ -544,8 +544,10 @@ static unsigned long shrink_slab_memcg(gfp_t gfp_mask, int nid,/* Call non-slab shrinkers even though kmem is disabled */ if (!memcg_kmem_online () && - !(shrinker->flags &SHRINKER_NONSLAB )) + !(shrinker->flags &SHRINKER_NONSLAB )) {
Since memcg_kmem_online() and shrinker->flags cannot be changed dynamically, it's best to remove this shrinker from the bitmap:
clear_bit(offset, unit->map);
Otherwise LGTM.
Thanks!
Quoted 6 lines
mm/shrinker.c +2
-0+shrinker_put (shrinker);continue ; + } ret =do_shrink_slab (&sc, shrinker, priority);if (ret ==SHRINK_EMPTY ) {
Sure, makes sense.
Will send a v2 with the bitmap clearing.
Thanks,
Altan
Quoted 49 lines · Qi Zheng
Quoted 3 lines · Altan Hacigumus
When kmem is disabled for memcg, slab-backed shrinkers are skipped. However,
shrink_slab_memcg()doesn't drop the reference acquired viashrinker_try_get()before continuing.Good catch!
mm/shrinker.c static unsigned long shrink_slab_memcg(gfp_t
Quoted 15 lines
Add the missing
shrinker_put().Fixes 50d09da8e119 ("mm: shrinker: make memcg slab shrink lockless")Signed-off-by Altan Hacigumus <[email protected]>--- mm/shrinker.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)mm/shrinker.c +0
-0@@ -544,8 +544,10 @@ static unsigned long shrink_slab_memcg(gfp_t
gfp_mask, int nid,mm/shrinker.c static unsigned long shrink_slab_memcg(gfp_t · line 544
Quoted 2 lines
mm/shrinker.c +0
-0/* Call non-slab shrinkers even though kmem is disabled */
mm/shrinker.c static unsigned long shrink_slab_memcg(gfp_t gfp_mask, int nid, · line 547
Quoted 3 lines
mm/shrinker.c +1
-1if (!memcg_kmem_online () && - !(shrinker->flags &SHRINKER_NONSLAB )) + !(shrinker->flags &SHRINKER_NONSLAB )) {Since
memcg_kmem_online()andshrinker->flagscannot be changed dynamically, it's best to remove this shrinker from the bitmap:clear_bit(offset, unit->map);Otherwise LGTM.
Acked-by Qi Zheng <[email protected]>Thanks!
Quoted 6 lines
mm/shrinker.c +2
-0+shrinker_put (shrinker);continue ; + } ret =do_shrink_slab (&sc, shrinker, priority);if (ret ==SHRINK_EMPTY ) {
Sure, makes sense.
Will send a v2 with the bitmap clearing.
Thanks,
Altan
Quoted 47 lines · Qi Zheng
Quoted 3 lines · Altan Hacigumus
When kmem is disabled for memcg, slab-backed shrinkers are skipped. However,
shrink_slab_memcg()doesn't drop the reference acquired viashrinker_try_get()before continuing.Good catch!
Quoted 15 lines
Add the missing
shrinker_put().Fixes 50d09da8e119 ("mm: shrinker: make memcg slab shrink lockless")Signed-off-by Altan Hacigumus <[email protected]>--- mm/shrinker.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)mm/shrinker.c +0
-0mm/shrinker.c static unsigned long shrink_slab_memcg(gfp_t gfp_mask, int nid, · line 547
Quoted 5 lines
mm/shrinker.c +1
-1@@ -544,8 +544,10 @@ static unsigned long shrink_slab_memcg(gfp_t gfp_mask, int nid,/* Call non-slab shrinkers even though kmem is disabled */ if (!memcg_kmem_online () && - !(shrinker->flags &SHRINKER_NONSLAB )) + !(shrinker->flags &SHRINKER_NONSLAB )) {Since
memcg_kmem_online()andshrinker->flagscannot be changed dynamically, it's best to remove this shrinker from the bitmap:clear_bit(offset, unit->map);Otherwise LGTM.
Acked-by Qi Zheng <[email protected]>Thanks!
Quoted 6 lines
mm/shrinker.c +2
-0+shrinker_put (shrinker);continue ; + } ret =do_shrink_slab (&sc, shrinker, priority);if (ret ==SHRINK_EMPTY ) {
PATCH v2 1/1 mm/shrinker: Fix refcount leak in shrink_slab_memcg()
In reply to Altan HacigumusWhen kmem is disabled for memcg, slab-backed shrinkers are skipped. However, shrink_slab_memcg() doesn't drop the reference acquired via shrinker_try_get() before continuing.
Add the missing shrinker_put().
Also, since memcg_kmem_online() and shrinker flags cannot change dynamically, remove the shrinker from the bitmap to avoid unnecessary future scans.
---
Changes in v2:
- Use clear_bit() to remove shrinker from bitmap instead of just skipping
--- mm/shrinker.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
mm/shrinker.c +4 -1
@@ -544,8 +544,11 @@ static unsigned long shrink_slab_memcg(gfp_t gfp_mask, int nid,/* Call non-slab shrinkers even though kmem is disabled */ if (!memcg_kmem_online () && - !(shrinker->flags &SHRINKER_NONSLAB )) + !(shrinker->flags &SHRINKER_NONSLAB )) { +clear_bit (offset, unit->map); +shrinker_put (shrinker);continue ; + } ret =do_shrink_slab (&sc, shrinker, priority);if (ret ==SHRINK_EMPTY ) {
Signature · 1 line
2.43.0
Quoted 4 lines · Altan Hacigumus
When kmem is disabled for memcg, slab-backed shrinkers are skipped. However,
shrink_slab_memcg()doesn't drop the reference acquired viashrinker_try_get()before continuing.
Quoted 8 lines
Add the missing
shrinker_put().Also, since
memcg_kmem_online()and shrinker flags cannot change dynamically, remove the shrinker from the bitmap to avoid unnecessary future scans.Fixes 50d09da8e119 ("mm: shrinker: make memcg slab shrink lockless")Suggested-by Qi Zheng <[email protected]>
You identified and fixed this issue independently, not based on my suggestion, so this tag is unnecessary. ;)
(I guess Andrew can help remove this tag)
Thanks,
Qi
Quoted 27 lines
Acked-by Qi Zheng <[email protected]>Signed-off-by Altan Hacigumus <[email protected]>---
Changes in v2:
- Useclear_bit()to remove shrinker from bitmap instead of just skipping--- mm/shrinker.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)mm/shrinker.c +4
-1@@ -544,8 +544,11 @@ static unsigned long shrink_slab_memcg(gfp_t gfp_mask, int nid,/* Call non-slab shrinkers even though kmem is disabled */ if (!memcg_kmem_online () && - !(shrinker->flags &SHRINKER_NONSLAB )) + !(shrinker->flags &SHRINKER_NONSLAB )) { +clear_bit (offset, unit->map); +shrinker_put (shrinker);continue ; + } ret =do_shrink_slab (&sc, shrinker, priority);if (ret ==SHRINK_EMPTY ) {
Quoted 14 lines · Altan Hacigumus
When kmem is disabled for memcg, slab-backed shrinkers are skipped. However,
shrink_slab_memcg()doesn't drop the reference acquired viashrinker_try_get()before continuing.Add the missing
shrinker_put().Also, since
memcg_kmem_online()and shrinker flags cannot change dynamically, remove the shrinker from the bitmap to avoid unnecessary future scans.
Quoted 5 lines
Fixes 50d09da8e119 ("mm: shrinker: make memcg slab shrink lockless")Suggested-by Qi Zheng <[email protected]>Acked-by Qi Zheng <[email protected]>Signed-off-by Altan Hacigumus <[email protected]>
Quoted 9 lines · Muchun Song
Quoted 9 lines · Altan Hacigumus
When kmem is disabled for memcg, slab-backed shrinkers are skipped. However,
shrink_slab_memcg()doesn't drop the reference acquired viashrinker_try_get()before continuing.
Quoted 7 lines
Quoted 7 lines
Add the missing
shrinker_put().Also, since
memcg_kmem_online()and shrinker flags cannot change dynamically, remove the shrinker from the bitmap to avoid unnecessary future scans.Fixes 50d09da8e119 ("mm: shrinker: make memcg slab shrink lockless")
Sorry for noticing this late but 50d09da8e119 was introduced back in 6.6. Is there a reason this change is not CC'ed to [email protected] ?
Quoted 9 lines
Quoted 4 lines
Suggested-by Qi Zheng <[email protected]>Acked-by Qi Zheng <[email protected]>Signed-off-by Altan Hacigumus <[email protected]>Reviewed-by Muchun Song <[email protected]>
Quoted 17 lines · Suren Baghdasaryan
Quoted 15 lines · Muchun Song
Quoted 15 lines · Altan Hacigumus
When kmem is disabled for memcg, slab-backed shrinkers are skipped. However,
shrink_slab_memcg()doesn't drop the reference acquired viashrinker_try_get()before continuing.Add the missing
shrinker_put().Also, since
memcg_kmem_online()and shrinker flags cannot change dynamically, remove the shrinker from the bitmap to avoid unnecessary future scans.
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Fixes 50d09da8e119 ("mm: shrinker: make memcg slab shrink lockless")Sorry for noticing this late but
50d09da8e119was introduced back in 6.6. Is there a reason this change is not CC'ed to [email protected] ?
Right, no particular reason; it should be fine for stable.
Thanks,
Altan