]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
clocksource/drivers/arm_arch_timer: Avoid infinite recursion when ftrace is enabled
authorDing Tianhong <dingtianhong@huawei.com>
Wed, 30 Aug 2017 17:41:00 +0000 (19:41 +0200)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 15 Sep 2017 12:33:56 +0000 (14:33 +0200)
commit3376c19b81e0e4643eb18342f9ce7b652815d20c
treef599f6429a8fa6274ce088c593740e367ba8d564
parent582945ec835e4fafbf57c87750c2e28f9c954714
clocksource/drivers/arm_arch_timer: Avoid infinite recursion when ftrace is enabled

BugLink: https://bugs.launchpad.net/bugs/1713821
On platforms with an arch timer erratum workaround, it's possible for
arch_timer_reg_read_stable() to recurse into itself when certain
tracing options are enabled, leading to stack overflows and related
problems.

For example, when PREEMPT_TRACER and FUNCTION_GRAPH_TRACER are
selected, it's possible to trigger this with:

$ mount -t debugfs nodev /sys/kernel/debug/
$ echo function_graph > /sys/kernel/debug/tracing/current_tracer

The problem is that in such cases, preempt_disable() instrumentation
attempts to acquire a timestamp via trace_clock(), resulting in a call
back to arch_timer_reg_read_stable(), and hence recursion.

This patch changes arch_timer_reg_read_stable() to use
preempt_{disable,enable}_notrace(), which avoids this.

This problem is similar to the fixed by upstream commit 96b3d28bf4
("sched/clock: Prevent tracing recursion in sched_clock_cpu()").

Fixes: 6acc71ccac71 ("arm64: arch_timer: Allows a CPU-specific erratum to only affect a subset of CPUs")
Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
(cherry picked from commit adb4f11e0a8f4e29900adb2b7af28b6bbd5c1fa4)
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Colin King <colin.king@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
arch/arm64/include/asm/arch_timer.h