summaryrefslogtreecommitdiff
path: root/kernel/trace/trace.c
diff options
context:
space:
mode:
authorPavankumar Kondeti <pkondeti@codeaurora.org>2016-12-09 21:50:17 +0530
committerPavankumar Kondeti <pkondeti@codeaurora.org>2017-01-18 07:05:59 +0530
commitf4f127a9ba71c5d6920c10609b076d41e408b369 (patch)
tree33e3f52f8e882f4f09f435c5190974323aa174f0 /kernel/trace/trace.c
parent4b3736890b25b8af6a8468f13ef8a310c7468a92 (diff)
tracing: Use SOFTIRQ_OFFSET for softirq dectection for more accurate results
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 Change-Id: I084531ce806e0f7d42a38be0a7ad45977c43d158 Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Git-commit: c59f29cb144a6a0dfac16ede9dc8eafc02dc56ca Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r--kernel/trace/trace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index ae68222c5a74..1d0f1a1ac44c 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1685,7 +1685,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);
}