]> git.baikalelectronics.ru Git - kernel.git/commit
s390/ftrace: fix endless recursion in function_graph tracer
authorSven Schnelle <svens@linux.ibm.com>
Mon, 9 Dec 2019 08:03:12 +0000 (09:03 +0100)
committerVasily Gorbik <gor@linux.ibm.com>
Wed, 18 Dec 2019 22:29:26 +0000 (23:29 +0100)
commite9ac1db8b51c51d3bfa86d21a0a2bd8cdff6fafb
tree7d7e00a80b7725e5664d44809f83b5674723528d
parent498b47670c5ee1c0b4be596eefcfb035b76ac53e
s390/ftrace: fix endless recursion in function_graph tracer

The following sequence triggers a kernel stack overflow on s390x:

mount -t tracefs tracefs /sys/kernel/tracing
cd /sys/kernel/tracing
echo function_graph > current_tracer
[crash]

This is because preempt_count_{add,sub} are in the list of traced
functions, which can be demonstrated by:

echo preempt_count_add >set_ftrace_filter
echo function_graph > current_tracer
[crash]

The stack overflow happens because get_tod_clock_monotonic() gets called
by ftrace but itself calls preempt_{disable,enable}(), which leads to a
endless recursion. Fix this by using preempt_{disable,enable}_notrace().

Fixes: 48e693f5b1f3 ("s390/time: ensure get_clock_monotonic() returns monotonic values")
Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Reviewed-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
arch/s390/include/asm/timex.h