From: Nicolas Boichat <drinkcat@chromium.org>
To: linux-kernel@vger.kernel.org
Cc: Steven Rostedt <rostedt@goodmis.org>,
Ingo Molnar <mingo@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>,
Kees Cook <keescook@chromium.org>, Jason Gunthorpe <jgg@ziepe.ca>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Peter Zijlstra <peterz@infradead.org>,
Vinod Koul <vkoul@kernel.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Alexey Dobriyan <adobriyan@gmail.com>,
Tiezhu Yang <yangtiezhu@loongson.cn>,
Nicolas Boichat <drinkcat@chromium.org>,
Thomas Gleixner <tglx@linutronix.de>,
"Guilherme G . Piccoli" <gpiccoli@canonical.com>,
Will Deacon <will@kernel.org>,
dianders@chromium.org, groeck@chromium.org
Subject: [PATCH] kernel/trace: Add TRACING_ALLOW_PRINTK config option
Date: Wed, 24 Jun 2020 16:45:24 +0800 [thread overview]
Message-ID: <20200624084524.259560-1-drinkcat@chromium.org> (raw)
trace_printk is only meant as a debugging tool, and should never be
compiled into production code without source code changes, as
indicated by the warning that shows up on boot if any trace_printk
is called:
** NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE **
** **
** trace_printk() being used. Allocating extra memory. **
** **
** This means that this is a DEBUG kernel and it is **
** unsafe for production use. **
If this option is set to n, the kernel will generate a build-time
error if trace_printk is used.
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
---
include/linux/kernel.h | 17 ++++++++++++++++-
kernel/trace/Kconfig | 9 +++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 196607aaf653082..b6addc6ba669e85 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -721,10 +721,15 @@ do { \
#define trace_printk(fmt, ...) \
do { \
char _______STR[] = __stringify((__VA_ARGS__)); \
+ \
+ __static_assert( \
+ IS_ENABLED(CONFIG_TRACING_ALLOW_PRINTK),\
+ "trace_printk called, please enable CONFIG_TRACING_ALLOW_PRINTK."); \
+ \
if (sizeof(_______STR) > 3) \
do_trace_printk(fmt, ##__VA_ARGS__); \
else \
- trace_puts(fmt); \
+ do_trace_puts(fmt); \
} while (0)
#define do_trace_printk(fmt, args...) \
@@ -773,6 +778,13 @@ int __trace_printk(unsigned long ip, const char *fmt, ...);
*/
#define trace_puts(str) ({ \
+ __static_assert( \
+ IS_ENABLED(CONFIG_TRACING_ALLOW_PRINTK), \
+ "trace_puts called, please enable CONFIG_TRACING_ALLOW_PRINTK."); \
+ do_trace_puts(str); \
+})
+
+#define do_trace_puts(str) ({ \
static const char *trace_printk_fmt __used \
__attribute__((section("__trace_printk_fmt"))) = \
__builtin_constant_p(str) ? str : NULL; \
@@ -794,6 +806,9 @@ extern void trace_dump_stack(int skip);
*/
#define ftrace_vprintk(fmt, vargs) \
do { \
+ __static_assert( \
+ IS_ENABLED(CONFIG_TRACING_ALLOW_PRINTK), \
+ "ftrace_vprintk called, please enable CONFIG_TRACING_ALLOW_PRINTK."); \
if (__builtin_constant_p(fmt)) { \
static const char *trace_printk_fmt __used \
__attribute__((section("__trace_printk_fmt"))) = \
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index a4020c0b4508c99..89ffddebe1864aa 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -111,6 +111,15 @@ config GENERIC_TRACER
bool
select TRACING
+config TRACING_ALLOW_PRINTK
+ bool "Allow trace_printk"
+ default y if DEBUG_KERNEL
+ depends on TRACING
+ help
+ trace_printk is only meant as a debugging tool. If this option is
+ set to n, the kernel will generate a build-time error if trace_printk
+ is used.
+
#
# Minimum requirements an architecture has to meet for us to
# be able to offer generic tracing facilities:
--
2.27.0.111.gc72c7da667-goog
next reply other threads:[~2020-06-24 8:45 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-24 8:45 Nicolas Boichat [this message]
2020-06-24 13:57 ` Jason Gunthorpe
2020-06-25 1:13 ` Nicolas Boichat
2020-06-24 16:04 ` Steven Rostedt
2020-06-24 17:25 ` Alexei Starovoitov
2020-06-25 2:00 ` Nicolas Boichat
2020-06-25 3:59 ` Alexei Starovoitov
2020-06-26 22:14 ` Steven Rostedt
2020-06-28 17:27 ` Alexei Starovoitov
2020-06-28 18:46 ` Steven Rostedt
2020-06-28 19:00 ` Steven Rostedt
2020-06-28 19:21 ` Alexei Starovoitov
2020-06-28 19:43 ` Steven Rostedt
2020-06-28 22:02 ` Alexei Starovoitov
2020-06-28 22:28 ` Steven Rostedt
2020-06-28 23:43 ` Steven Rostedt
2020-06-30 5:16 ` Alexei Starovoitov
2020-06-30 12:39 ` Steven Rostedt
2020-06-25 1:32 ` Nicolas Boichat
2020-06-24 17:37 ` kernel test robot
2020-06-24 19:07 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200624084524.259560-1-drinkcat@chromium.org \
--to=drinkcat@chromium.org \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dianders@chromium.org \
--cc=gpiccoli@canonical.com \
--cc=groeck@chromium.org \
--cc=jgg@ziepe.ca \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=vkoul@kernel.org \
--cc=will@kernel.org \
--cc=yangtiezhu@loongson.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®