[Devel,rh7,2/4] ms/kcov: don't trace the code coverage code

Submitted by Andrey Ryabinin on Oct. 14, 2016, 12:01 p.m.


Message ID 1476446489-4316-2-git-send-email-aryabinin@virtuozzo.com
State New
Series "Series without cover letter"
Headers show

Commit Message

Andrey Ryabinin Oct. 14, 2016, 12:01 p.m.
From: James Morse <james.morse@arm.com>

Kcov causes the compiler to add a call to __sanitizer_cov_trace_pc() in
every basic block.  Ftrace patches in a call to _mcount() to each
function it has annotated.

Letting these mechanisms annotate each other is a bad thing.  Break the
loop by adding 'notrace' to __sanitizer_cov_trace_pc() so that ftrace
won't try to patch this code.

This patch lets arm64 with KCOV and STACK_TRACER boot.

Signed-off-by: James Morse <james.morse@arm.com>
Acked-by: Dmitry Vyukov <dvyukov@google.com>
Cc: Alexander Potapenko <glider@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

(cherry picked from commit bdab42dfc974d15303afbf259f340f374a453974)
Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
 kernel/kcov.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/kernel/kcov.c b/kernel/kcov.c
index 9ea7a05..f963fca 100644
--- a/kernel/kcov.c
+++ b/kernel/kcov.c
@@ -44,7 +44,7 @@  struct kcov {
  * Entry point from instrumented code.
  * This is called once per basic-block/edge.
-void __sanitizer_cov_trace_pc(void)
+void notrace __sanitizer_cov_trace_pc(void)
 	struct task_struct *t;
 	enum kcov_mode mode;