diff options
| author | Pavankumar Kondeti <pkondeti@codeaurora.org> | 2016-12-09 21:50:17 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-21 08:12:23 +0200 |
| commit | da89aa5b8c67b130181e56b3382506a319818091 (patch) | |
| tree | 9a505151d76c119aefd6e965c7a988cc3df6eedd /kernel | |
| parent | 9abcd35a85b1658ed30fcdc706db2f49ada66b65 (diff) | |
| download | linux-stable-da89aa5b8c67b130181e56b3382506a319818091.tar.gz linux-stable-da89aa5b8c67b130181e56b3382506a319818091.tar.bz2 linux-stable-da89aa5b8c67b130181e56b3382506a319818091.zip | |
tracing: Use SOFTIRQ_OFFSET for softirq dectection for more accurate results
commit c59f29cb144a6a0dfac16ede9dc8eafc02dc56ca upstream.
The 's' flag is supposed to indicate that a softirq is running. This
can be detected by testing the preempt_count with SOFTIRQ_OFFSET.
The current code tests the preempt_count with SOFTIRQ_MASK, which
would be true even when softirqs are disabled but not serving a
softirq.
Link: http://lkml.kernel.org/r/1481300417-3564-1-git-send-email-pkondeti@codeaurora.org
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 02773a1b5ab8..5b83ac63e7e9 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1587,7 +1587,7 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags, TRACE_FLAG_IRQS_NOSUPPORT | #endif ((pc & HARDIRQ_MASK) ? TRACE_FLAG_HARDIRQ : 0) | - ((pc & SOFTIRQ_MASK) ? TRACE_FLAG_SOFTIRQ : 0) | + ((pc & SOFTIRQ_OFFSET) ? TRACE_FLAG_SOFTIRQ : 0) | (tif_need_resched() ? TRACE_FLAG_NEED_RESCHED : 0) | (test_preempt_need_resched() ? TRACE_FLAG_PREEMPT_RESCHED : 0); } |