aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@infradead.org>2018-01-15 14:07:27 -0500
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2018-01-15 14:15:31 -0500
commit68e76e034b6b1c1ce2eece1ab8ae4008e14be470 (patch)
treed571907cdbaac852fdb24d92d7c0be3eada20d17
parenta0e3a18f4baf8e3754ac1e56f0ade924d0c0c721 (diff)
tracing: Prevent PROFILE_ALL_BRANCHES when FORTIFY_SOURCE=y
I regularly get 50 MB - 60 MB files during kernel randconfig builds. These large files mostly contain (many repeats of; e.g., 124,594): In file included from ../include/linux/string.h:6:0, from ../include/linux/uuid.h:20, from ../include/linux/mod_devicetable.h:13, from ../scripts/mod/devicetable-offsets.c:3: ../include/linux/compiler.h:64:4: warning: '______f' is static but declared in inline function 'strcpy' which is not static [enabled by default] ______f = { \ ^ ../include/linux/compiler.h:56:23: note: in expansion of macro '__trace_if' ^ ../include/linux/string.h:425:2: note: in expansion of macro 'if' if (p_size == (size_t)-1 && q_size == (size_t)-1) ^ This only happens when CONFIG_FORTIFY_SOURCE=y and CONFIG_PROFILE_ALL_BRANCHES=y, so prevent PROFILE_ALL_BRANCHES if FORTIFY_SOURCE=y. Link: http://lkml.kernel.org/r/9199446b-a141-c0c3-9678-a3f9107f2750@infradead.org Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-rw-r--r--kernel/trace/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 904c952ac383..f54dc62b599c 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -355,7 +355,7 @@ config PROFILE_ANNOTATED_BRANCHES
355 on if you need to profile the system's use of these macros. 355 on if you need to profile the system's use of these macros.
356 356
357config PROFILE_ALL_BRANCHES 357config PROFILE_ALL_BRANCHES
358 bool "Profile all if conditionals" 358 bool "Profile all if conditionals" if !FORTIFY_SOURCE
359 select TRACE_BRANCH_PROFILING 359 select TRACE_BRANCH_PROFILING
360 help 360 help
361 This tracer profiles all branch conditions. Every if () 361 This tracer profiles all branch conditions. Every if ()