|
|
Message-Id: <20190523124216.40208-3-glider@google.com>
Date: Thu, 23 May 2019 14:42:15 +0200
From: Alexander Potapenko <glider@...gle.com>
To: akpm@...ux-foundation.org, cl@...ux.com, keescook@...omium.org
Cc: kernel-hardening@...ts.openwall.com, linux-mm@...ck.org,
linux-security-module@...r.kernel.org, Dmitry Vyukov <dvyukov@...gle.com>,
James Morris <jmorris@...ei.org>, Jann Horn <jannh@...gle.com>, Kostya Serebryany <kcc@...gle.com>,
Laura Abbott <labbott@...hat.com>, Mark Rutland <mark.rutland@....com>,
Masahiro Yamada <yamada.masahiro@...ionext.com>, Matthew Wilcox <willy@...radead.org>,
Nick Desaulniers <ndesaulniers@...gle.com>, Randy Dunlap <rdunlap@...radead.org>,
Sandeep Patil <sspatil@...roid.com>, "Serge E. Hallyn" <serge@...lyn.com>,
Souptick Joarder <jrdr.linux@...il.com>
Subject: [PATCH 2/3] mm: init: report memory auto-initialization features at
boot time
Print the currently enabled stack and heap initialization modes.
The possible options for stack are:
- "all" for CONFIG_INIT_STACK_ALL;
- "byref_all" for CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL;
- "byref" for CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF;
- "__user" for CONFIG_GCC_PLUGIN_STRUCTLEAK_USER;
- "off" otherwise.
Depending on the values of init_on_alloc and init_on_free boottime
options we also report "heap alloc" and "heap free" as "on"/"off".
In the init_on_free mode initializing pages at boot time may take some
time, so print a notice about that as well.
Signed-off-by: Alexander Potapenko <glider@...gle.com>
Suggested-by: Kees Cook <keescook@...omium.org>
To: Andrew Morton <akpm@...ux-foundation.org>
To: Christoph Lameter <cl@...ux.com>
Cc: Dmitry Vyukov <dvyukov@...gle.com>
Cc: James Morris <jmorris@...ei.org>
Cc: Jann Horn <jannh@...gle.com>
Cc: Kostya Serebryany <kcc@...gle.com>
Cc: Laura Abbott <labbott@...hat.com>
Cc: Mark Rutland <mark.rutland@....com>
Cc: Masahiro Yamada <yamada.masahiro@...ionext.com>
Cc: Matthew Wilcox <willy@...radead.org>
Cc: Nick Desaulniers <ndesaulniers@...gle.com>
Cc: Randy Dunlap <rdunlap@...radead.org>
Cc: Sandeep Patil <sspatil@...roid.com>
Cc: "Serge E. Hallyn" <serge@...lyn.com>
Cc: Souptick Joarder <jrdr.linux@...il.com>
Cc: kernel-hardening@...ts.openwall.com
Cc: linux-mm@...ck.org
Cc: linux-security-module@...r.kernel.org
---
init/main.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/init/main.c b/init/main.c
index 5a2c69b4d7b3..90f721c58e61 100644
--- a/init/main.c
+++ b/init/main.c
@@ -519,6 +519,29 @@ static inline void initcall_debug_enable(void)
}
#endif
+/* Report memory auto-initialization states for this boot. */
+void __init report_meminit(void)
+{
+ const char *stack;
+
+ if (IS_ENABLED(CONFIG_INIT_STACK_ALL))
+ stack = "all";
+ else if (IS_ENABLED(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL))
+ stack = "byref_all";
+ else if (IS_ENABLED(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF))
+ stack = "byref";
+ else if (IS_ENABLED(CONFIG_GCC_PLUGIN_STRUCTLEAK_USER))
+ stack = "__user";
+ else
+ stack = "off";
+
+ pr_info("mem auto-init: stack:%s, heap alloc:%s, heap free:%s\n",
+ stack, want_init_on_alloc(GFP_KERNEL) ? "on" : "off",
+ want_init_on_free() ? "on" : "off");
+ if (want_init_on_free())
+ pr_info("Clearing system memory may take some time...\n");
+}
+
/*
* Set up kernel memory allocators
*/
@@ -529,6 +552,7 @@ static void __init mm_init(void)
* bigger than MAX_ORDER unless SPARSEMEM.
*/
page_ext_init_flatmem();
+ report_meminit();
mem_init();
kmem_cache_init();
pgtable_init();
--
2.21.0.1020.gf2820cf01a-goog
Powered by blists - more mailing lists
Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.