From: Greg Kroah-Hartman Date: Wed, 12 May 2021 18:49:02 +0000 (+0200) Subject: drop mm-slub-enable-slub_debug-static-key-when-creating-c.patch from everywhere X-Git-Tag: v5.4.119~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a1f2b1fa94cf8fbe17ca85fea73d931e15fa2777;p=thirdparty%2Fkernel%2Fstable-queue.git drop mm-slub-enable-slub_debug-static-key-when-creating-c.patch from everywhere --- diff --git a/queue-5.10/mm-slub-enable-slub_debug-static-key-when-creating-c.patch b/queue-5.10/mm-slub-enable-slub_debug-static-key-when-creating-c.patch deleted file mode 100644 index d55411aa203..00000000000 --- a/queue-5.10/mm-slub-enable-slub_debug-static-key-when-creating-c.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 689f91dbd37dff44ea786a3964d2b9f49cf87b00 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 29 Apr 2021 22:54:42 -0700 -Subject: mm, slub: enable slub_debug static key when creating cache with - explicit debug flags - -From: Vlastimil Babka - -[ Upstream commit 1f0723a4c0df36cbdffc6fac82cd3c5d57e06d66 ] - -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/20210315141824.26099-1-dsterba@suse.com/ - -Link: https://lkml.kernel.org/r/20210315153415.24404-1-vbabka@suse.cz -Fixes: ca0cab65ea2b ("mm, slub: introduce static key for slub_debug()") -Signed-off-by: Vlastimil Babka -Reported-by: Oliver Glitta -Acked-by: David Rientjes -Cc: Christoph Lameter -Cc: Pekka Enberg -Cc: Joonsoo Kim -Cc: "Paul E. McKenney" -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Signed-off-by: Sasha Levin ---- - mm/slub.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/mm/slub.c b/mm/slub.c -index 05a501b67cd5..e4f7978d43c2 100644 ---- a/mm/slub.c -+++ b/mm/slub.c -@@ -3779,6 +3779,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(); --- -2.30.2 - diff --git a/queue-5.10/series b/queue-5.10/series index 89381ebe89b..d95b8ad5efb 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -515,7 +515,6 @@ perf-session-add-swap-operation-for-event-time_conv.patch ia64-fix-efi_debug-build.patch kfifo-fix-ternary-sign-extension-bugs.patch mm-sl-b.c-remove-ctor-argument-from-kmem_cache_flags.patch -mm-slub-enable-slub_debug-static-key-when-creating-c.patch mm-memcontrol-slab-fix-obtain-a-reference-to-a-freei.patch mm-sparse-add-the-missing-sparse_buffer_fini-in-erro.patch mm-memory-failure-unnecessary-amount-of-unmapping.patch diff --git a/queue-5.11/mm-slub-enable-slub_debug-static-key-when-creating-c.patch b/queue-5.11/mm-slub-enable-slub_debug-static-key-when-creating-c.patch deleted file mode 100644 index 19917f7d041..00000000000 --- a/queue-5.11/mm-slub-enable-slub_debug-static-key-when-creating-c.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 7d4433acc6460258d2e7b64dd0a201927f0a5e09 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 29 Apr 2021 22:54:42 -0700 -Subject: mm, slub: enable slub_debug static key when creating cache with - explicit debug flags - -From: Vlastimil Babka - -[ Upstream commit 1f0723a4c0df36cbdffc6fac82cd3c5d57e06d66 ] - -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/20210315141824.26099-1-dsterba@suse.com/ - -Link: https://lkml.kernel.org/r/20210315153415.24404-1-vbabka@suse.cz -Fixes: ca0cab65ea2b ("mm, slub: introduce static key for slub_debug()") -Signed-off-by: Vlastimil Babka -Reported-by: Oliver Glitta -Acked-by: David Rientjes -Cc: Christoph Lameter -Cc: Pekka Enberg -Cc: Joonsoo Kim -Cc: "Paul E. McKenney" -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Signed-off-by: Sasha Levin ---- - mm/slub.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/mm/slub.c b/mm/slub.c -index d62db41710bf..0d231c0e21b3 100644 ---- a/mm/slub.c -+++ b/mm/slub.c -@@ -3794,6 +3794,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(); --- -2.30.2 - diff --git a/queue-5.11/series b/queue-5.11/series index ded73ba8c5f..1350bdffaeb 100644 --- a/queue-5.11/series +++ b/queue-5.11/series @@ -587,7 +587,6 @@ perf-session-add-swap-operation-for-event-time_conv.patch ia64-fix-efi_debug-build.patch kfifo-fix-ternary-sign-extension-bugs.patch mm-sl-b.c-remove-ctor-argument-from-kmem_cache_flags.patch -mm-slub-enable-slub_debug-static-key-when-creating-c.patch mm-memcontrol-slab-fix-obtain-a-reference-to-a-freei.patch mm-sparse-add-the-missing-sparse_buffer_fini-in-erro.patch mm-memory-failure-unnecessary-amount-of-unmapping.patch diff --git a/queue-5.12/mm-slub-enable-slub_debug-static-key-when-creating-c.patch b/queue-5.12/mm-slub-enable-slub_debug-static-key-when-creating-c.patch deleted file mode 100644 index b6cb24f6457..00000000000 --- a/queue-5.12/mm-slub-enable-slub_debug-static-key-when-creating-c.patch +++ /dev/null @@ -1,75 +0,0 @@ -From b6053f7a8300ec89984740a13fbcf0668eb4977f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 29 Apr 2021 22:54:42 -0700 -Subject: mm, slub: enable slub_debug static key when creating cache with - explicit debug flags - -From: Vlastimil Babka - -[ Upstream commit 1f0723a4c0df36cbdffc6fac82cd3c5d57e06d66 ] - -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/20210315141824.26099-1-dsterba@suse.com/ - -Link: https://lkml.kernel.org/r/20210315153415.24404-1-vbabka@suse.cz -Fixes: ca0cab65ea2b ("mm, slub: introduce static key for slub_debug()") -Signed-off-by: Vlastimil Babka -Reported-by: Oliver Glitta -Acked-by: David Rientjes -Cc: Christoph Lameter -Cc: Pekka Enberg -Cc: Joonsoo Kim -Cc: "Paul E. McKenney" -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Signed-off-by: Sasha Levin ---- - mm/slub.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/mm/slub.c b/mm/slub.c -index 3021ce9bf1b3..0fa68cfa648b 100644 ---- a/mm/slub.c -+++ b/mm/slub.c -@@ -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(); --- -2.30.2 - diff --git a/queue-5.12/series b/queue-5.12/series index 9cb77613b5e..f4927218487 100644 --- a/queue-5.12/series +++ b/queue-5.12/series @@ -663,7 +663,6 @@ perf-session-add-swap-operation-for-event-time_conv.patch ia64-ensure-proper-numa-distance-and-possible-map-in.patch ia64-fix-efi_debug-build.patch kfifo-fix-ternary-sign-extension-bugs.patch -mm-slub-enable-slub_debug-static-key-when-creating-c.patch mm-memcontrol-slab-fix-obtain-a-reference-to-a-freei.patch mm-sparse-add-the-missing-sparse_buffer_fini-in-erro.patch mm-memory-failure-unnecessary-amount-of-unmapping.patch