diff options
| author | Marco Elver <elver@google.com> | 2020-02-15 00:10:35 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-03-21 11:44:41 +0300 |
| commit | f5d2313bd3c540be405c4977a63840cd6d0167b5 (patch) | |
| tree | 25a8bfd1f857fc11aab179fb67ac36071e9c1503 /kernel/trace/Makefile | |
| parent | 703b321501c95c658275fd76775282fe45989641 (diff) | |
| download | linux-f5d2313bd3c540be405c4977a63840cd6d0167b5.tar.xz | |
kcsan, trace: Make KCSAN compatible with tracing
Previously the system would lock up if ftrace was enabled together with
KCSAN. This is due to recursion on reporting if the tracer code is
instrumented with KCSAN.
To avoid this for all types of tracing, disable KCSAN instrumentation
for all of kernel/trace.
Furthermore, since KCSAN relies on udelay() to introduce delay, we have
to disable ftrace for udelay() (currently done for x86) in case KCSAN is
used together with lockdep and ftrace. The reason is that it may corrupt
lockdep IRQ flags tracing state due to a peculiar case of recursion
(details in Makefile comment).
Reported-by: Qian Cai <cai@lca.pw>
Tested-by: Qian Cai <cai@lca.pw>
Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Marco Elver <elver@google.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/Makefile')
| -rw-r--r-- | kernel/trace/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile index f9dcd19165fa..6b601d88bf71 100644 --- a/kernel/trace/Makefile +++ b/kernel/trace/Makefile @@ -6,6 +6,9 @@ ifdef CONFIG_FUNCTION_TRACER ORIG_CFLAGS := $(KBUILD_CFLAGS) KBUILD_CFLAGS = $(subst $(CC_FLAGS_FTRACE),,$(ORIG_CFLAGS)) +# Avoid recursion due to instrumentation. +KCSAN_SANITIZE := n + ifdef CONFIG_FTRACE_SELFTEST # selftest needs instrumentation CFLAGS_trace_selftest_dynamic.o = $(CC_FLAGS_FTRACE) |