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.com
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Reviewed-by: Alexander Potapenko <glider@google.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/stackdepot.h b/include/linux/stackdepot.h
index 1296a6eeaec0a89f74d10790d127279c8ec1d520..c4e3abc16b16ad3238b3968313573c5f2ed385d2 100644 (file)
--- a/include/linux/stackdepot.h
+++ b/include/linux/stackdepot.h
@@ -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
  * 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
  * parameters, which precedes the enablement point in mm_init().
  *
- * stack_depot_init() and stack_depot_want_early_init() can be called regardless
- * of CONFIG_STACKDEPOT and are no-op when disabled. The actual save/fetch/print
- * functions should only be called from code that makes sure CONFIG_STACKDEPOT
- * is enabled.
+ * stack_depot_init() and stack_depot_request_early_init() can be called
+ * regardless of CONFIG_STACKDEPOT and are no-op when disabled. The actual
+ * save/fetch/print functions should only be called from code that makes sure
+ * CONFIG_STACKDEPOT is enabled.
  */
 #ifdef CONFIG_STACKDEPOT
 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() */
 int __init stack_depot_early_init(void);
 #else
 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; }
 #endif

diff --git a/lib/stackdepot.c b/lib/stackdepot.c
index 83787e46a3ab3ad0b614ab4cbb019d539bfdfb56..136706efe339da4ed741c1cfee3121b9e011e064 100644 (file)
--- a/lib/stackdepot.c
+++ b/lib/stackdepot.c
@@ -71,7 +71,7 @@ struct stack_record {
        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 void *stack_slabs[STACK_ALLOC_MAX_SLABS];
@@ -107,12 +107,12 @@ static int __init is_stack_depot_disabled(char *str)
 }
 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);
 
-       __stack_depot_want_early_init = true;
+       __stack_depot_early_init_requested = true;
 }
 
 int __init stack_depot_early_init(void)
@@ -128,7 +128,7 @@ int __init stack_depot_early_init(void)
        if (kasan_enabled() && !stack_hash_order)
                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;
 
        if (stack_hash_order)

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index d9b242cfdb1c96efa25681433bc7e29c487957d1..a2d34226e3c8c3acc3a8736fdf01e709edab495d 100644 (file)
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -2071,7 +2071,7 @@ static int __init kmemleak_boot_config(char *str)
                kmemleak_disable();
        else if (strcmp(str, "on") == 0) {
                kmemleak_skip_disable = 1;
-               stack_depot_want_early_init();
+               stack_depot_request_early_init();
        }
        else
                return -EINVAL;

diff --git a/mm/page_owner.c b/mm/page_owner.c
index 80dc8f4050faa6f1a6da2f87e8a4bafbc7266a24..220cdeddc29504fe83f0188f71f29030f0abb501 100644 (file)
--- a/mm/page_owner.c
+++ b/mm/page_owner.c
@@ -48,7 +48,7 @@ static int __init early_page_owner_param(char *buf)
        int ret = kstrtobool(buf, &page_owner_enabled);
 
        if (page_owner_enabled)
-               stack_depot_want_early_init();
+               stack_depot_request_early_init();
 
        return ret;
 }

diff --git a/mm/slub.c b/mm/slub.c
index 67020074ecb4040f4e072e0d9bfadf446e751720..f8dba33e4d15ff71f4c72fc53a8f2285729c3cca 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1592,7 +1592,7 @@ static int __init setup_slub_debug(char *str)
                } else {
                        slab_list_specified = true;
                        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)
 out:
        slub_debug = global_flags;
        if (slub_debug & SLAB_STORE_USER)
-               stack_depot_want_early_init();
+               stack_depot_request_early_init();
        if (slub_debug != 0 || slub_debug_string)
                static_branch_enable(&slub_debug_enabled);
        else