The patch titled
Subject: mm: slub: Fix slub_debug disablement for list of slabs
has been removed from the -mm tree. Its filename was
mm-slub-fix-slub_debug-disablement-for-list-of-slabs.patch
This patch was dropped because an alternative patch was merged
------------------------------------------------------
From: Vijayanand Jitta <vjitta@xxxxxxxxxxxxxx>
Subject: mm: slub: Fix slub_debug disablement for list of slabs
Consider the scenario where CONFIG_SLUB_DEBUG_ON is set and we would want
to disable slub_debug for few slabs. Using boot parameter with
slub_debug=-,slab_name syntax doesn't work as expected i.e; only disabling
debugging for the specified list of slabs, instead it disables debugging
for all slabs. Fix this.
Link: https://lkml.kernel.org/r/1626176750-13099-1-git-send-email-vjitta@xxxxxxxxxxxxxx
Signed-off-by: Vijayanand Jitta <vjitta@xxxxxxxxxxxxxx>
Cc: Christoph Lameter <cl@xxxxxxxxx>
Cc: Pekka Enberg <penberg@xxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/slub.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/mm/slub.c~mm-slub-fix-slub_debug-disablement-for-list-of-slabs
+++ a/mm/slub.c
@@ -1404,6 +1404,7 @@ static int __init setup_slub_debug(char
char *slab_list;
bool global_slub_debug_changed = false;
bool slab_list_specified = false;
+ bool slab_list_debug_disable = true;
slub_debug = DEBUG_DEFAULT_FLAGS;
if (*str++ != '=' || !*str)
@@ -1411,7 +1412,6 @@ static int __init setup_slub_debug(char
* No options specified. Switch on full debugging.
*/
goto out;
-
saved_str = str;
while (str) {
str = parse_slub_debug_flags(str, &flags, &slab_list, true);
@@ -1420,6 +1420,8 @@ static int __init setup_slub_debug(char
slub_debug = flags;
global_slub_debug_changed = true;
} else {
+ if (flags || !IS_ENABLED(CONFIG_SLUB_DEBUG_ON))
+ slab_list_debug_disable = false;
slab_list_specified = true;
}
}
@@ -1431,7 +1433,7 @@ static int __init setup_slub_debug(char
* long as there is no option specifying flags without a slab list.
*/
if (slab_list_specified) {
- if (!global_slub_debug_changed)
+ if (!global_slub_debug_changed && !slab_list_debug_disable)
slub_debug = 0;
slub_debug_string = saved_str;
}
_
Patches currently in -mm which might be from vjitta@xxxxxxxxxxxxxx are
