Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1737131 > unrolled thread
| Started by | Joel Fernandes <joelaf@google.com> |
|---|---|
| First post | 2017-09-22 04:00 +0200 |
| Last post | 2017-09-22 05:20 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH v6 0/2] tracing: Add trace events for preemption and irq disable/enable Joel Fernandes <joelaf@google.com> - 2017-09-22 04:00 +0200
[PATCH v6 1/2] tracing: Prepare to add preempt and irq trace events Joel Fernandes <joelaf@google.com> - 2017-09-22 04:00 +0200
Re: [PATCH v6 0/2] tracing: Add trace events for preemption and irq disable/enable Steven Rostedt <rostedt@goodmis.org> - 2017-09-22 05:20 +0200
| From | Joel Fernandes <joelaf@google.com> |
|---|---|
| Date | 2017-09-22 04:00 +0200 |
| Subject | [PATCH v6 0/2] tracing: Add trace events for preemption and irq disable/enable |
| Message-ID | <uslq1-8rR-3@gated-at.bofh.it> |
These patches add trace events support for preempt and irq disable/enable events. Changes since v5: - Use trace_*_rcuidle variants (thanks Steve!) Here's an example of how Android's systrace will be using it to show critical sections as a gantt chart: http://imgur.com/download/TZplEVp Links to earlier series: v5: https://lkml.org/lkml/2017/9/12/507 v4: https://lkml.org/lkml/2017/9/6/724 v3: https://lkml.org/lkml/2017/9/3/15 Joel Fernandes (2): tracing: Prepare to add preempt and irq trace events tracing: Add support for preempt and irq enable/disable events include/linux/ftrace.h | 3 +- include/linux/irqflags.h | 4 +- include/trace/events/preemptirq.h | 66 ++++++++++++++ kernel/trace/Kconfig | 9 ++ kernel/trace/Makefile | 1 + kernel/trace/trace_irqsoff.c | 176 +++++++++++++++++++++++++++++++------- 6 files changed, 226 insertions(+), 33 deletions(-) create mode 100644 include/trace/events/preemptirq.h Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Peter Zilstra <peterz@infradead.org> -- 2.14.1.821.g8fa685d3b7-goog
[toc] | [next] | [standalone]
| From | Joel Fernandes <joelaf@google.com> |
|---|---|
| Date | 2017-09-22 04:00 +0200 |
| Subject | [PATCH v6 1/2] tracing: Prepare to add preempt and irq trace events |
| Message-ID | <uslq1-8rR-13@gated-at.bofh.it> |
| In reply to | #1737131 |
In preparation of adding irqsoff and preemptsoff enable and disable trace
events, move required functions and code to make it easier to add these events
in a later patch. This patch is just code movement and no functional change.
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: kernel-team@android.com
Signed-off-by: Joel Fernandes <joelaf@google.com>
---
kernel/trace/trace_irqsoff.c | 121 ++++++++++++++++++++++++++++++++-----------
1 file changed, 91 insertions(+), 30 deletions(-)
diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c
index 7758bc0617cb..26c688740742 100644
--- a/kernel/trace/trace_irqsoff.c
+++ b/kernel/trace/trace_irqsoff.c
@@ -16,6 +16,7 @@
#include "trace.h"
+#if defined(CONFIG_IRQSOFF_TRACER) || defined(CONFIG_PREEMPT_TRACER)
static struct trace_array *irqsoff_trace __read_mostly;
static int tracer_enabled __read_mostly;
@@ -432,19 +433,17 @@ stop_critical_timing(unsigned long ip, unsigned long parent_ip)
}
/* start and stop critical timings used to for stoppage (in idle) */
-void start_critical_timings(void)
+static inline void start_critical_timings_tracer(void)
{
if (preempt_trace() || irq_trace())
start_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
}
-EXPORT_SYMBOL_GPL(start_critical_timings);
-void stop_critical_timings(void)
+static inline void stop_critical_timings_tracer(void)
{
if (preempt_trace() || irq_trace())
stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
}
-EXPORT_SYMBOL_GPL(stop_critical_timings);
#ifdef CONFIG_IRQSOFF_TRACER
#ifdef CONFIG_PROVE_LOCKING
@@ -462,64 +461,44 @@ void time_hardirqs_off(unsigned long a0, unsigned long a1)
#else /* !CONFIG_PROVE_LOCKING */
-/*
- * Stubs:
- */
-
-void trace_softirqs_on(unsigned long ip)
-{
-}
-
-void trace_softirqs_off(unsigned long ip)
-{
-}
-
-inline void print_irqtrace_events(struct task_struct *curr)
-{
-}
-
/*
* We are only interested in hardirq on/off events:
*/
-void trace_hardirqs_on(void)
+static inline void tracer_hardirqs_on(void)
{
if (!preempt_trace() && irq_trace())
stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
}
-EXPORT_SYMBOL(trace_hardirqs_on);
-void trace_hardirqs_off(void)
+static inline void tracer_hardirqs_off(void)
{
if (!preempt_trace() && irq_trace())
start_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
}
-EXPORT_SYMBOL(trace_hardirqs_off);
-__visible void trace_hardirqs_on_caller(unsigned long caller_addr)
+static inline void tracer_hardirqs_on_caller(unsigned long caller_addr)
{
if (!preempt_trace() && irq_trace())
stop_critical_timing(CALLER_ADDR0, caller_addr);
}
-EXPORT_SYMBOL(trace_hardirqs_on_caller);
-__visible void trace_hardirqs_off_caller(unsigned long caller_addr)
+static inline void tracer_hardirqs_off_caller(unsigned long caller_addr)
{
if (!preempt_trace() && irq_trace())
start_critical_timing(CALLER_ADDR0, caller_addr);
}
-EXPORT_SYMBOL(trace_hardirqs_off_caller);
#endif /* CONFIG_PROVE_LOCKING */
#endif /* CONFIG_IRQSOFF_TRACER */
#ifdef CONFIG_PREEMPT_TRACER
-void trace_preempt_on(unsigned long a0, unsigned long a1)
+static inline void tracer_preempt_on(unsigned long a0, unsigned long a1)
{
if (preempt_trace() && !irq_trace())
stop_critical_timing(a0, a1);
}
-void trace_preempt_off(unsigned long a0, unsigned long a1)
+static inline void tracer_preempt_off(unsigned long a0, unsigned long a1)
{
if (preempt_trace() && !irq_trace())
start_critical_timing(a0, a1);
@@ -781,3 +760,85 @@ __init static int init_irqsoff_tracer(void)
return 0;
}
core_initcall(init_irqsoff_tracer);
+#else /* IRQSOFF_TRACER || PREEMPTOFF_TRACER */
+static inline void start_critical_timings_tracer(void) { }
+static inline void stop_critical_timings_tracer(void) { }
+#endif
+
+#ifndef CONFIG_IRQSOFF_TRACER
+static inline void tracer_hardirqs_on(void) { }
+static inline void tracer_hardirqs_off(void) { }
+static inline void tracer_hardirqs_on_caller(unsigned long caller_addr) { }
+static inline void tracer_hardirqs_off_caller(unsigned long caller_addr) { }
+#endif
+
+#ifndef CONFIG_PREEMPT_TRACER
+static inline void tracer_preempt_on(unsigned long a0, unsigned long a1) { }
+static inline void tracer_preempt_off(unsigned long a0, unsigned long a1) { }
+#endif
+
+void start_critical_timings(void)
+{
+ start_critical_timings_tracer();
+}
+EXPORT_SYMBOL_GPL(start_critical_timings);
+
+void stop_critical_timings(void)
+{
+ stop_critical_timings_tracer();
+}
+EXPORT_SYMBOL_GPL(stop_critical_timings);
+
+#if defined(CONFIG_TRACE_IRQFLAGS) && !defined(CONFIG_PROVE_LOCKING)
+void trace_hardirqs_on(void)
+{
+ tracer_hardirqs_on();
+}
+EXPORT_SYMBOL(trace_hardirqs_on);
+
+void trace_hardirqs_off(void)
+{
+ tracer_hardirqs_off();
+}
+EXPORT_SYMBOL(trace_hardirqs_off);
+
+__visible void trace_hardirqs_on_caller(unsigned long caller_addr)
+{
+ tracer_hardirqs_on_caller(caller_addr);
+}
+EXPORT_SYMBOL(trace_hardirqs_on_caller);
+
+__visible void trace_hardirqs_off_caller(unsigned long caller_addr)
+{
+ tracer_hardirqs_off_caller(caller_addr);
+}
+EXPORT_SYMBOL(trace_hardirqs_off_caller);
+
+/*
+ * Stubs:
+ */
+
+void trace_softirqs_on(unsigned long ip)
+{
+}
+
+void trace_softirqs_off(unsigned long ip)
+{
+}
+
+inline void print_irqtrace_events(struct task_struct *curr)
+{
+}
+#endif
+
+#ifdef CONFIG_PREEMPT_TRACER
+void trace_preempt_on(unsigned long a0, unsigned long a1)
+{
+ tracer_preempt_on(a0, a1);
+}
+
+void trace_preempt_off(unsigned long a0, unsigned long a1)
+{
+ tracer_preempt_off(a0, a1);
+}
+#endif
--
2.14.1.821.g8fa685d3b7-goog
[toc] | [prev] | [next] | [standalone]
| From | Steven Rostedt <rostedt@goodmis.org> |
|---|---|
| Date | 2017-09-22 05:20 +0200 |
| Subject | Re: [PATCH v6 0/2] tracing: Add trace events for preemption and irq disable/enable |
| Message-ID | <usmFr-10u-3@gated-at.bofh.it> |
| In reply to | #1737131 |
Peter, Do you have any qualms with this patch set? -- Steve On Thu, 21 Sep 2017 18:50:22 -0700 Joel Fernandes <joelaf@google.com> wrote: > These patches add trace events support for preempt and irq disable/enable > events. > > Changes since v5: > - Use trace_*_rcuidle variants (thanks Steve!) > > Here's an example of how Android's systrace will be using it to show critical > sections as a gantt chart: http://imgur.com/download/TZplEVp > > Links to earlier series: > v5: https://lkml.org/lkml/2017/9/12/507 > v4: https://lkml.org/lkml/2017/9/6/724 > v3: https://lkml.org/lkml/2017/9/3/15 > > Joel Fernandes (2): > tracing: Prepare to add preempt and irq trace events > tracing: Add support for preempt and irq enable/disable events > > include/linux/ftrace.h | 3 +- > include/linux/irqflags.h | 4 +- > include/trace/events/preemptirq.h | 66 ++++++++++++++ > kernel/trace/Kconfig | 9 ++ > kernel/trace/Makefile | 1 + > kernel/trace/trace_irqsoff.c | 176 +++++++++++++++++++++++++++++++------- > 6 files changed, 226 insertions(+), 33 deletions(-) > create mode 100644 include/trace/events/preemptirq.h > > Cc: Steven Rostedt <rostedt@goodmis.org> > Cc: Peter Zilstra <peterz@infradead.org>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web