Commit 1c0310ad authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Andrew Morton

lib/stackdepot, mm: rename stack_depot_want_early_init

Rename stack_depot_want_early_init to stack_depot_request_early_init.

The old name is confusing, as it hints at returning some kind of intention
of stack depot.  The new name reflects that this function requests an
action from stack depot instead.

No functional changes.

[akpm@linux-foundation.org: update mm/kmemleak.c]
Link: https://lkml.kernel.org/r/359f31bf67429a06e630b4395816a967214ef753.1676063693.git.andreyknvl@google.comSigned-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Reviewed-by: default avatarAlexander Potapenko <glider@google.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 4a6b5314
...@@ -31,26 +31,26 @@ typedef u32 depot_stack_handle_t; ...@@ -31,26 +31,26 @@ typedef u32 depot_stack_handle_t;
* enabled as part of mm_init(), for subsystems where it's known at compile time * enabled as part of mm_init(), for subsystems where it's known at compile time
* that stack depot will be used. * that stack depot will be used.
* *
* Another alternative is to call stack_depot_want_early_init(), when the * Another alternative is to call stack_depot_request_early_init(), when the
* decision to use stack depot is taken e.g. when evaluating kernel boot * decision to use stack depot is taken e.g. when evaluating kernel boot
* parameters, which precedes the enablement point in mm_init(). * parameters, which precedes the enablement point in mm_init().
* *
* stack_depot_init() and stack_depot_want_early_init() can be called regardless * stack_depot_init() and stack_depot_request_early_init() can be called
* of CONFIG_STACKDEPOT and are no-op when disabled. The actual save/fetch/print * regardless of CONFIG_STACKDEPOT and are no-op when disabled. The actual
* functions should only be called from code that makes sure CONFIG_STACKDEPOT * save/fetch/print functions should only be called from code that makes sure
* is enabled. * CONFIG_STACKDEPOT is enabled.
*/ */
#ifdef CONFIG_STACKDEPOT #ifdef CONFIG_STACKDEPOT
int stack_depot_init(void); int stack_depot_init(void);
void __init stack_depot_want_early_init(void); void __init stack_depot_request_early_init(void);
/* This is supposed to be called only from mm_init() */ /* This is supposed to be called only from mm_init() */
int __init stack_depot_early_init(void); int __init stack_depot_early_init(void);
#else #else
static inline int stack_depot_init(void) { return 0; } static inline int stack_depot_init(void) { return 0; }
static inline void stack_depot_want_early_init(void) { } static inline void stack_depot_request_early_init(void) { }
static inline int stack_depot_early_init(void) { return 0; } static inline int stack_depot_early_init(void) { return 0; }
#endif #endif
......
...@@ -71,7 +71,7 @@ struct stack_record { ...@@ -71,7 +71,7 @@ struct stack_record {
unsigned long entries[]; /* Variable-sized array of entries. */ unsigned long entries[]; /* Variable-sized array of entries. */
}; };
static bool __stack_depot_want_early_init __initdata = IS_ENABLED(CONFIG_STACKDEPOT_ALWAYS_INIT); static bool __stack_depot_early_init_requested __initdata = IS_ENABLED(CONFIG_STACKDEPOT_ALWAYS_INIT);
static bool __stack_depot_early_init_passed __initdata; static bool __stack_depot_early_init_passed __initdata;
static void *stack_slabs[STACK_ALLOC_MAX_SLABS]; static void *stack_slabs[STACK_ALLOC_MAX_SLABS];
...@@ -107,12 +107,12 @@ static int __init is_stack_depot_disabled(char *str) ...@@ -107,12 +107,12 @@ static int __init is_stack_depot_disabled(char *str)
} }
early_param("stack_depot_disable", is_stack_depot_disabled); early_param("stack_depot_disable", is_stack_depot_disabled);
void __init stack_depot_want_early_init(void) void __init stack_depot_request_early_init(void)
{ {
/* Too late to request early init now */ /* Too late to request early init now. */
WARN_ON(__stack_depot_early_init_passed); WARN_ON(__stack_depot_early_init_passed);
__stack_depot_want_early_init = true; __stack_depot_early_init_requested = true;
} }
int __init stack_depot_early_init(void) int __init stack_depot_early_init(void)
...@@ -128,7 +128,7 @@ int __init stack_depot_early_init(void) ...@@ -128,7 +128,7 @@ int __init stack_depot_early_init(void)
if (kasan_enabled() && !stack_hash_order) if (kasan_enabled() && !stack_hash_order)
stack_hash_order = STACK_HASH_ORDER_MAX; stack_hash_order = STACK_HASH_ORDER_MAX;
if (!__stack_depot_want_early_init || stack_depot_disable) if (!__stack_depot_early_init_requested || stack_depot_disable)
return 0; return 0;
if (stack_hash_order) if (stack_hash_order)
......
...@@ -2071,7 +2071,7 @@ static int __init kmemleak_boot_config(char *str) ...@@ -2071,7 +2071,7 @@ static int __init kmemleak_boot_config(char *str)
kmemleak_disable(); kmemleak_disable();
else if (strcmp(str, "on") == 0) { else if (strcmp(str, "on") == 0) {
kmemleak_skip_disable = 1; kmemleak_skip_disable = 1;
stack_depot_want_early_init(); stack_depot_request_early_init();
} }
else else
return -EINVAL; return -EINVAL;
......
...@@ -48,7 +48,7 @@ static int __init early_page_owner_param(char *buf) ...@@ -48,7 +48,7 @@ static int __init early_page_owner_param(char *buf)
int ret = kstrtobool(buf, &page_owner_enabled); int ret = kstrtobool(buf, &page_owner_enabled);
if (page_owner_enabled) if (page_owner_enabled)
stack_depot_want_early_init(); stack_depot_request_early_init();
return ret; return ret;
} }
......
...@@ -1592,7 +1592,7 @@ static int __init setup_slub_debug(char *str) ...@@ -1592,7 +1592,7 @@ static int __init setup_slub_debug(char *str)
} else { } else {
slab_list_specified = true; slab_list_specified = true;
if (flags & SLAB_STORE_USER) if (flags & SLAB_STORE_USER)
stack_depot_want_early_init(); stack_depot_request_early_init();
} }
} }
...@@ -1611,7 +1611,7 @@ static int __init setup_slub_debug(char *str) ...@@ -1611,7 +1611,7 @@ static int __init setup_slub_debug(char *str)
out: out:
slub_debug = global_flags; slub_debug = global_flags;
if (slub_debug & SLAB_STORE_USER) if (slub_debug & SLAB_STORE_USER)
stack_depot_want_early_init(); stack_depot_request_early_init();
if (slub_debug != 0 || slub_debug_string) if (slub_debug != 0 || slub_debug_string)
static_branch_enable(&slub_debug_enabled); static_branch_enable(&slub_debug_enabled);
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment