lib: stackdepot: add support to disable stack depot

Add a kernel parameter stack_depot_disable to disable stack depot.  So
that stack hash table doesn't consume any memory when stack depot is
disabled.

The use case is CONFIG_PAGE_OWNER without page_owner=on.  Without this
patch, stackdepot will consume the memory for the hashtable.  By default,
it's 8M which is never trivial.

With this option, in CONFIG_PAGE_OWNER configured system, page_owner=off,
stack_depot_disable in kernel command line, we could save the wasted
memory for the hashtable.

[akpm@linux-foundation.org: fix CONFIG_STACKDEPOT=n build]

Link: https://lkml.kernel.org/r/1611749198-24316-2-git-send-email-vjitta@codeaurora.org
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
Signed-off-by: Vijayanand Jitta <vjitta@codeaurora.org>
Cc: Alexander Potapenko <glider@google.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Yogesh Lal <ylal@codeaurora.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index bab6a8b01202ebc07b8e8bb471363a662f2c9a49..04545725f187ffe787f3a226a328b1c951251f16 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -5182,6 +5182,12 @@
                        growing up) the main stack are reserved for no other
                        mapping. Default value is 256 pages.
 
+       stack_depot_disable= [KNL]
+                       Setting this to true through kernel command line will
+                       disable the stack depot thereby saving the static memory
+                       consumed by the stack hash table. By default this is set
+                       to false.
+
        stacktrace      [FTRACE]
                        Enabled the stack tracer on boot up.
 

diff --git a/include/linux/stackdepot.h b/include/linux/stackdepot.h
index 24d49c732341ab3f85bf18b7478cca921e0317a5..6bb4bc1a5f5459fc06b90548558a4745d0973b05 100644 (file)
--- a/include/linux/stackdepot.h
+++ b/include/linux/stackdepot.h
@@ -21,4 +21,13 @@ unsigned int stack_depot_fetch(depot_stack_handle_t handle,
 
 unsigned int filter_irq_stacks(unsigned long *entries, unsigned int nr_entries);
 
+#ifdef CONFIG_STACKDEPOT
+int stack_depot_init(void);
+#else
+static inline int stack_depot_init(void)
+{
+       return 0;
+}
+#endif /* CONFIG_STACKDEPOT */
+
 #endif

diff --git a/init/main.c b/init/main.c
index 261051070e3c9205068753f41dd47588e397264d..3648c9f948826a49d91f38586ea5099489fc22dc 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -97,6 +97,7 @@
 #include <linux/mem_encrypt.h>
 #include <linux/kcsan.h>
 #include <linux/init_syscalls.h>
+#include <linux/stackdepot.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -827,6 +828,7 @@ static void __init mm_init(void)
        init_mem_debugging_and_hardening();
        kfence_alloc_pool();
        report_meminit();
+       stack_depot_init();
        mem_init();
        /* page_owner must be initialized after buddy is ready */
        page_ext_init_flatmem_late();

diff --git a/lib/stackdepot.c b/lib/stackdepot.c
index 4b9715470e872233a5ffbbb8e675e7f0b1369686..cc21116512a73f1be0dc5d8c626b2a775404e122 100644 (file)
--- a/lib/stackdepot.c
+++ b/lib/stackdepot.c
@@ -31,6 +31,7 @@
 #include <linux/stackdepot.h>
 #include <linux/string.h>
 #include <linux/types.h>
+#include <linux/memblock.h>
 
 #define DEPOT_STACK_BITS (sizeof(depot_stack_handle_t) * 8)
 
@@ -145,9 +146,32 @@ static struct stack_record *depot_alloc_stack(unsigned long *entries, int size,
 #define STACK_HASH_MASK (STACK_HASH_SIZE - 1)
 #define STACK_HASH_SEED 0x9747b28c
 
-static struct stack_record *stack_table[STACK_HASH_SIZE] = {
-       [0 ...  STACK_HASH_SIZE - 1] = NULL
-};
+static bool stack_depot_disable;
+static struct stack_record **stack_table;
+
+static int __init is_stack_depot_disabled(char *str)
+{
+       kstrtobool(str, &stack_depot_disable);
+       if (stack_depot_disable) {
+               pr_info("Stack Depot is disabled\n");
+               stack_table = NULL;
+       }
+       return 0;
+}
+early_param("stack_depot_disable", is_stack_depot_disabled);
+
+int __init stack_depot_init(void)
+{
+       if (!stack_depot_disable) {
+               size_t size = (STACK_HASH_SIZE * sizeof(struct stack_record *));
+               int i;
+
+               stack_table = memblock_alloc(size, size);
+               for (i = 0; i < STACK_HASH_SIZE;  i++)
+                       stack_table[i] = NULL;
+       }
+       return 0;
+}
 
 /* Calculate hash for a stack */
 static inline u32 hash_stack(unsigned long *entries, unsigned int size)
@@ -241,7 +265,7 @@ depot_stack_handle_t stack_depot_save(unsigned long *entries,
        unsigned long flags;
        u32 hash;
 
-       if (unlikely(nr_entries == 0))
+       if (unlikely(nr_entries == 0) || stack_depot_disable)
                goto fast_exit;
 
        hash = hash_stack(entries, nr_entries);