mm, slub: enable slub_debug static key when creating cache with explicit debug flags
Subsystems (3)
PATCH 1/1 mm, slub: enable slub_debug static key when creating cache with explicit debug flags
Commit ca0cab65ea2b ("mm, slub: introduce static key for slub_debug()") introduced a static key to optimize the case where no debugging is enabled for any cache. The static key is enabled when slub_debug boot parameter is passed, or CONFIG_SLUB_DEBUG_ON enabled.
However, some caches might be created with one or more debugging flags explicitly passed to kmem_cache_create(), and the commit missed this. Thus the debugging functionality would not be actually performed for these caches unless the static key gets enabled by boot param or config.
This patch fixes it by checking for debugging flags passed to kmem_cache_create() and enabling the static key accordingly.
Note such explicit debugging flags should not be used outside of debugging and testing as they will now enable the static key globally. btrfs_init_cachep() creates a cache with SLAB_RED_ZONE but that's a mistake that's being corrected [1]. rcu_torture_stats() creates a cache with SLAB_STORE_USER, but that is a testing module so it's OK and will start working as intended after this patch.
Also note that in case of backports to kernels before v5.12 that don't have 59450bbc12be ("mm, slab, slub: stop taking cpu hotplug lock"), static_branch_enable_cpuslocked() should be used.
[1] https://lore.kernel.org/linux-btrfs/[email protected]/
--- mm/slub.c | 9 +++++++++ 1 file changed, 9 insertions(+)
mm/slub.c +9 -0
@@ -3827,6 +3827,15 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)static int kmem_cache_open (struct kmem_cache *s,slab_flags_t flags) { +#ifdef CONFIG_SLUB_DEBUG +/* +* If no slub_debug was enabled globally, the static key is not yet +* enabled by setup_slub_debug(). Enable it if the cache is being +* created with any of the debugging flags passed explicitly. +*/ +if (flags &SLAB_DEBUG_FLAGS ) +static_branch_enable (&slub_debug_enabled); +#endif s->flags =kmem_cache_flags (s->size, flags, s->name);#ifdef CONFIG_SLAB_FREELIST_HARDENED s->random =get_random_long ();
Signature · 1 line
2.30.1
Quoted 19 lines · Vlastimil Babka
Commit
ca0cab65ea2b("mm, slub: introduce static key forslub_debug()") introduced a static key to optimize the case where no debugging is enabled for any cache. The static key is enabled whenslub_debugboot parameter is passed, orCONFIG_SLUB_DEBUG_ONenabled.However, some caches might be created with one or more debugging flags explicitly passed to
kmem_cache_create(), and the commit missed this. Thus the debugging functionality would not be actually performed for these caches unless the static key gets enabled by boot param or config.This patch fixes it by checking for debugging flags passed to
kmem_cache_create()and enabling the static key accordingly.Note such explicit debugging flags should not be used outside of debugging and testing as they will now enable the static key globally.
btrfs_init_cachep()creates a cache withSLAB_RED_ZONEbut that's a mistake that's being corrected [1].rcu_torture_stats()creates a cache withSLAB_STORE_USER, but that is a testing module so it's OK and will start working as intended after this patch.
Quoted 4 lines
Also note that in case of backports to kernels before v5.12 that don't have
59450bbc12be("mm, slab, slub: stop taking cpu hotplug lock"),static_branch_enable_cpuslocked()should be used.
Since this affects 5.9+, is the plan to propose backports to stable with static_branch_enable_cpuslocked() once this is merged? (I notice the absence of the stable tag here, which I believe is intended.)
Quoted 5 lines
[1] https://lore.kernel.org/linux-btrfs/[email protected]/
Reported-by Oliver Glitta <[email protected]>Fixes ca0cab65ea2b ("mm, slub: introduce static key for slub_debug()")Signed-off-by Vlastimil Babka <[email protected]>
Quoted 24 lines
--- mm/slub.c | 9 +++++++++ 1 file changed, 9 insertions(+)mm/slub.c +9
-0@@ -3827,6 +3827,15 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)static int kmem_cache_open (struct kmem_cache *s,slab_flags_t flags) { +#ifdef CONFIG_SLUB_DEBUG +/* +* If no slub_debug was enabled globally, the static key is not yet +* enabled by setup_slub_debug(). Enable it if the cache is being +* created with any of the debugging flags passed explicitly. +*/ +if (flags &SLAB_DEBUG_FLAGS ) +static_branch_enable (&slub_debug_enabled); +#endif s->flags =kmem_cache_flags (s->size, flags, s->name);#ifdef CONFIG_SLAB_FREELIST_HARDENED s->random =get_random_long ();
Quoted 21 lines · David Rientjes
Quoted 19 lines · Vlastimil Babka
Commit
ca0cab65ea2b("mm, slub: introduce static key forslub_debug()") introduced a static key to optimize the case where no debugging is enabled for any cache. The static key is enabled whenslub_debugboot parameter is passed, orCONFIG_SLUB_DEBUG_ONenabled.However, some caches might be created with one or more debugging flags explicitly passed to
kmem_cache_create(), and the commit missed this. Thus the debugging functionality would not be actually performed for these caches unless the static key gets enabled by boot param or config.This patch fixes it by checking for debugging flags passed to
kmem_cache_create()and enabling the static key accordingly.Note such explicit debugging flags should not be used outside of debugging and testing as they will now enable the static key globally.
btrfs_init_cachep()creates a cache withSLAB_RED_ZONEbut that's a mistake that's being corrected [1].rcu_torture_stats()creates a cache withSLAB_STORE_USER, but that is a testing module so it's OK and will start working as intended after this patch.
Quoted 8 lines
Quoted 4 lines
Also note that in case of backports to kernels before v5.12 that don't have
59450bbc12be("mm, slab, slub: stop taking cpu hotplug lock"),static_branch_enable_cpuslocked()should be used.Since this affects 5.9+, is the plan to propose backports to stable with
static_branch_enable_cpuslocked()once this is merged? (I notice the absence of the stable tag here, which I believe is intended.)
I was thinking about it, and since the rcutorture user is only in -next (AFAICS) and btrfs user was unintended, it didn't seem to meet stable criteria to me. But I won't mind if it's backported.
Quoted 7 lines
Quoted 5 lines
[1] https://lore.kernel.org/linux-btrfs/[email protected]/
Reported-by Oliver Glitta <[email protected]>Fixes ca0cab65ea2b ("mm, slub: introduce static key for slub_debug()")Signed-off-by Vlastimil Babka <[email protected]>Acked-by David Rientjes <[email protected]>
Thanks!
Quoted 25 lines
Quoted 24 lines
--- mm/slub.c | 9 +++++++++ 1 file changed, 9 insertions(+)mm/slub.c +9
-0@@ -3827,6 +3827,15 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)static int kmem_cache_open (struct kmem_cache *s,slab_flags_t flags) { +#ifdef CONFIG_SLUB_DEBUG +/* +* If no slub_debug was enabled globally, the static key is not yet +* enabled by setup_slub_debug(). Enable it if the cache is being +* created with any of the debugging flags passed explicitly. +*/ +if (flags &SLAB_DEBUG_FLAGS ) +static_branch_enable (&slub_debug_enabled); +#endif s->flags =kmem_cache_flags (s->size, flags, s->name);#ifdef CONFIG_SLAB_FREELIST_HARDENED s->random =get_random_long ();
Quoted 27 lines · Vlastimil Babka
Quoted 26 lines · David Rientjes
Quoted 23 lines · Vlastimil Babka
Commit
ca0cab65ea2b("mm, slub: introduce static key forslub_debug()") introduced a static key to optimize the case where no debugging is enabled for any cache. The static key is enabled whenslub_debugboot parameter is passed, orCONFIG_SLUB_DEBUG_ONenabled.However, some caches might be created with one or more debugging flags explicitly passed to
kmem_cache_create(), and the commit missed this. Thus the debugging functionality would not be actually performed for these caches unless the static key gets enabled by boot param or config.This patch fixes it by checking for debugging flags passed to
kmem_cache_create()and enabling the static key accordingly.Note such explicit debugging flags should not be used outside of debugging and testing as they will now enable the static key globally.
btrfs_init_cachep()creates a cache withSLAB_RED_ZONEbut that's a mistake that's being corrected [1].rcu_torture_stats()creates a cache withSLAB_STORE_USER, but that is a testing module so it's OK and will start working as intended after this patch.Also note that in case of backports to kernels before v5.12 that don't have
59450bbc12be("mm, slab, slub: stop taking cpu hotplug lock"),static_branch_enable_cpuslocked()should be used.
Quoted 7 lines
Quoted 3 lines
Since this affects 5.9+, is the plan to propose backports to stable with
static_branch_enable_cpuslocked()once this is merged? (I notice the absence of the stable tag here, which I believe is intended.)I was thinking about it, and since the rcutorture user is only in -next (AFAICS) and btrfs user was unintended, it didn't seem to meet stable criteria to me. But I won't mind if it's backported.
I had better ask... Should rcutorture be doing something different?
Thanx, Paul
Quoted 36 lines
Quoted 7 lines
Quoted 5 lines
[1] https://lore.kernel.org/linux-btrfs/[email protected]/
Reported-by Oliver Glitta <[email protected]>Fixes ca0cab65ea2b ("mm, slub: introduce static key for slub_debug()")Signed-off-by Vlastimil Babka <[email protected]>Acked-by David Rientjes <[email protected]>Thanks!
Quoted 25 lines
Quoted 24 lines
--- mm/slub.c | 9 +++++++++ 1 file changed, 9 insertions(+)mm/slub.c +9
-0@@ -3827,6 +3827,15 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)static int kmem_cache_open (struct kmem_cache *s,slab_flags_t flags) { +#ifdef CONFIG_SLUB_DEBUG +/* +* If no slub_debug was enabled globally, the static key is not yet +* enabled by setup_slub_debug(). Enable it if the cache is being +* created with any of the debugging flags passed explicitly. +*/ +if (flags &SLAB_DEBUG_FLAGS ) +static_branch_enable (&slub_debug_enabled); +#endif s->flags =kmem_cache_flags (s->size, flags, s->name);#ifdef CONFIG_SLAB_FREELIST_HARDENED s->random =get_random_long ();
Quoted 32 lines · Paul E. McKenney
Quoted 31 lines · Vlastimil Babka
Quoted 29 lines · David Rientjes
Quoted 19 lines · Vlastimil Babka
Commit
ca0cab65ea2b("mm, slub: introduce static key forslub_debug()") introduced a static key to optimize the case where no debugging is enabled for any cache. The static key is enabled whenslub_debugboot parameter is passed, orCONFIG_SLUB_DEBUG_ONenabled.However, some caches might be created with one or more debugging flags explicitly passed to
kmem_cache_create(), and the commit missed this. Thus the debugging functionality would not be actually performed for these caches unless the static key gets enabled by boot param or config.This patch fixes it by checking for debugging flags passed to
kmem_cache_create()and enabling the static key accordingly.Note such explicit debugging flags should not be used outside of debugging and testing as they will now enable the static key globally.
btrfs_init_cachep()creates a cache withSLAB_RED_ZONEbut that's a mistake that's being corrected [1].rcu_torture_stats()creates a cache withSLAB_STORE_USER, but that is a testing module so it's OK and will start working as intended after this patch.Quoted 4 lines
Also note that in case of backports to kernels before v5.12 that don't have
59450bbc12be("mm, slab, slub: stop taking cpu hotplug lock"),static_branch_enable_cpuslocked()should be used.Since this affects 5.9+, is the plan to propose backports to stable with
static_branch_enable_cpuslocked()once this is merged? (I notice the absence of the stable tag here, which I believe is intended.)
Quoted 7 lines
Quoted 3 lines
I was thinking about it, and since the rcutorture user is only in -next (AFAICS) and btrfs user was unintended, it didn't seem to meet stable criteria to me. But I won't mind if it's backported.
I had better ask... Should rcutorture be doing something different?
Thanx, Paul
No, I think it's fine if a testing module such as rcutorture flips the static key for the rest of the kernel's uptime. I only CC'd you as FYI in case you were wondering why you can't see any alloc/free stacks in its output :)
Quoted 37 lines · Vlastimil Babka
Quoted 36 lines · Paul E. McKenney
Quoted 34 lines · Vlastimil Babka
Quoted 21 lines · David Rientjes
Quoted 19 lines · Vlastimil Babka
Commit
ca0cab65ea2b("mm, slub: introduce static key forslub_debug()") introduced a static key to optimize the case where no debugging is enabled for any cache. The static key is enabled whenslub_debugboot parameter is passed, orCONFIG_SLUB_DEBUG_ONenabled.However, some caches might be created with one or more debugging flags explicitly passed to
kmem_cache_create(), and the commit missed this. Thus the debugging functionality would not be actually performed for these caches unless the static key gets enabled by boot param or config.This patch fixes it by checking for debugging flags passed to
kmem_cache_create()and enabling the static key accordingly.Note such explicit debugging flags should not be used outside of debugging and testing as they will now enable the static key globally.
btrfs_init_cachep()creates a cache withSLAB_RED_ZONEbut that's a mistake that's being corrected [1].rcu_torture_stats()creates a cache withSLAB_STORE_USER, but that is a testing module so it's OK and will start working as intended after this patch.Quoted 8 lines
Quoted 4 lines
Also note that in case of backports to kernels before v5.12 that don't have
59450bbc12be("mm, slab, slub: stop taking cpu hotplug lock"),static_branch_enable_cpuslocked()should be used.Since this affects 5.9+, is the plan to propose backports to stable with
static_branch_enable_cpuslocked()once this is merged? (I notice the absence of the stable tag here, which I believe is intended.)I was thinking about it, and since the rcutorture user is only in -next (AFAICS) and btrfs user was unintended, it didn't seem to meet stable criteria to me. But I won't mind if it's backported.
Quoted 7 lines
Quoted 3 lines
I had better ask... Should rcutorture be doing something different?
Thanx, Paul
No, I think it's fine if a testing module such as rcutorture flips the static key for the rest of the kernel's uptime. I only CC'd you as FYI in case you were wondering why you can't see any alloc/free stacks in its output :)
Ah, all of my recent tests have been for sufficient duration that all was well by the time that that code was invoked. But thank you for the heads up -- someone will hit this sooner or later, and I freely confess that I would have been clueless.
Thanx, Paul