Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1258022

[PATCH 4/8] clocksource/drivers/prima2: Prevent ftrace recursion

Show all headers | View raw

From: Jisheng Zhang <jszhang@marvell.com>

Currently prima2 timer can be used as a scheduler clock. We properly
marked sirfsoc_read_sched_clock() as notrace but we then call another
function sirfsoc_timer_read() that _wasn't_ notrace.

Having a traceable function in the sched_clock() path leads to a recursion
within ftrace and a kernel crash.

Fix this by adding notrace attribute to the sirfsoc_timer_read() function.

Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/clocksource/timer-prima2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clocksource/timer-prima2.c b/drivers/clocksource/timer-prima2.c
index 78de982..2854c66 100644
--- a/drivers/clocksource/timer-prima2.c
+++ b/drivers/clocksource/timer-prima2.c
@@ -73,7 +73,7 @@ static irqreturn_t sirfsoc_timer_interrupt(int irq, void *dev_id)
 }
 
 /* read 64-bit timer counter */
-static cycle_t sirfsoc_timer_read(struct clocksource *cs)
+static cycle_t notrace sirfsoc_timer_read(struct clocksource *cs)
 {
 	u64 cycles;
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 1/8] clocksource/drivers/arm_global_timer: Prevent ftrace recursion Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-10-28 14:20 +0100
  [PATCH 3/8] clocksource/drivers/samsung_pwm_timer: Prevent ftrace recursion Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-10-28 14:20 +0100
  [PATCH 5/8] clocksource/drivers/vf_pit_timer: Prevent ftrace recursion Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-10-28 14:20 +0100
  [PATCH 8/8] clocksource/drivers/sh_mtu2: Fix multiple shutdown call issue Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-10-28 14:20 +0100
  [PATCH 4/8] clocksource/drivers/prima2: Prevent ftrace recursion Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-10-28 14:30 +0100

csiph-web