All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/3] clocksource: exynos_mct: Fix ftrace
@ 2014-06-04 17:30 ` Doug Anderson
  0 siblings, 0 replies; 43+ messages in thread
From: Doug Anderson @ 2014-06-04 17:30 UTC (permalink / raw)
  To: Kukjin Kim, Tomasz Figa
  Cc: Daniel Lezcano, Vincent Guittot, Chirantan Ekbote, David Riley,
	olof, linux-samsung-soc, Doug Anderson, tglx, linux-kernel,
	linux-arm-kernel

In (93bfb76 clocksource: exynos_mct: register sched_clock callback) we
supported using the MCT as a scheduler clock.  We properly marked
exynos4_read_sched_clock() as notrace.  However, we then went and
called another function that _wasn't_ notrace.  That means if you do:

  cd /sys/kernel/debug/tracing/
  echo function_graph > current_tracer

You'll get a crash.

Fix this (but still let other readers of the MCT be trace-enabled) by
adding an extra function.  It's important to keep other users of MCT
traceable because the MCT is actually quite slow.

Signed-off-by: Doug Anderson <dianders@chromium.org>
---
 drivers/clocksource/exynos_mct.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c
index 8d64200..ba3a683 100644
--- a/drivers/clocksource/exynos_mct.c
+++ b/drivers/clocksource/exynos_mct.c
@@ -165,7 +165,7 @@ static void exynos4_mct_frc_start(u32 hi, u32 lo)
 	exynos4_mct_write(reg, EXYNOS4_MCT_G_TCON);
 }
 
-static cycle_t exynos4_frc_read(struct clocksource *cs)
+static inline cycle_t notrace _exynos4_frc_read(void)
 {
 	unsigned int lo, hi;
 	u32 hi2 = __raw_readl(reg_base + EXYNOS4_MCT_G_CNT_U);
@@ -179,6 +179,11 @@ static cycle_t exynos4_frc_read(struct clocksource *cs)
 	return ((cycle_t)hi << 32) | lo;
 }
 
+static cycle_t exynos4_frc_read(struct clocksource *cs)
+{
+	return _exynos4_frc_read();
+}
+
 static void exynos4_frc_resume(struct clocksource *cs)
 {
 	exynos4_mct_frc_start(0, 0);
@@ -195,7 +200,7 @@ struct clocksource mct_frc = {
 
 static u64 notrace exynos4_read_sched_clock(void)
 {
-	return exynos4_frc_read(&mct_frc);
+	return _exynos4_frc_read();
 }
 
 static void __init exynos4_clocksource_init(void)
-- 
2.0.0.526.g5318336


^ permalink raw reply related	[flat|nested] 43+ messages in thread

end of thread, other threads:[~2014-06-19 17:07 UTC | newest]

Thread overview: 43+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-04 17:30 [PATCH 1/3] clocksource: exynos_mct: Fix ftrace Doug Anderson
2014-06-04 17:30 ` Doug Anderson
2014-06-04 17:30 ` Doug Anderson
2014-06-04 17:30 ` [PATCH 2/3] clocksource: exynos_mct: cache mct upper count Doug Anderson
2014-06-04 17:30   ` Doug Anderson
2014-06-04 17:30   ` Doug Anderson
2014-06-05  7:55   ` Vincent Guittot
2014-06-05  7:55     ` Vincent Guittot
2014-06-05 17:14     ` Doug Anderson
2014-06-05 17:14       ` Doug Anderson
2014-06-04 17:30 ` [PATCH 3/3] clocksource: exynos_mct: Optimize register reads with ldmia Doug Anderson
2014-06-04 17:30   ` Doug Anderson
2014-06-04 17:30   ` Doug Anderson
2014-06-04 18:05   ` Thomas Gleixner
2014-06-04 18:05     ` Thomas Gleixner
2014-06-04 18:49     ` Doug Anderson
2014-06-04 18:49       ` Doug Anderson
2014-06-04 18:49       ` Doug Anderson
2014-06-05 11:18       ` Tomasz Figa
2014-06-05 11:18         ` Tomasz Figa
2014-06-05 11:18         ` Tomasz Figa
2014-06-05 18:21         ` Doug Anderson
2014-06-05 18:21           ` Doug Anderson
2014-06-05 18:21           ` Doug Anderson
2014-06-12 16:53     ` Doug Anderson
2014-06-12 16:53       ` Doug Anderson
2014-06-12 16:53       ` Doug Anderson
2014-06-15 21:18 ` [PATCH 1/3] clocksource: exynos_mct: Fix ftrace Daniel Lezcano
2014-06-15 21:18   ` Daniel Lezcano
2014-06-16  4:40   ` Doug Anderson
2014-06-16  4:40     ` Doug Anderson
2014-06-16  4:40     ` Doug Anderson
2014-06-16  8:52     ` Daniel Lezcano
2014-06-16  8:52       ` Daniel Lezcano
2014-06-16  8:52       ` Daniel Lezcano
2014-06-16 16:35       ` Doug Anderson
2014-06-16 16:35         ` Doug Anderson
2014-06-16 16:35         ` Doug Anderson
2014-06-17 12:13 ` Daniel Lezcano
2014-06-17 12:13   ` Daniel Lezcano
2014-06-19 17:07   ` Doug Anderson
2014-06-19 17:07     ` Doug Anderson
2014-06-19 17:07     ` Doug Anderson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.