diff options
| author | Pavankumar Kondeti <pkondeti@codeaurora.org> | 2016-12-09 21:50:17 +0530 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-07-31 13:37:55 -0400 |
| commit | e532444e22eb20c2adf9be6499a568643d79f990 (patch) | |
| tree | 0fcf4eb3143f6b9253b12d1a4d39f69933eebbf0 /kernel | |
| parent | cf86f4f6c5a829be963faef70905d01240b70e5e (diff) | |
tracing: Use SOFTIRQ_OFFSET for softirq dectection for more accurate results
[ Upstream commit c59f29cb144a6a0dfac16ede9dc8eafc02dc56ca ]
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: Sasha Levin <alexander.levin@verizon.com>
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 a4c0ae70c6dd..591b3b4f5337 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1638,7 +1638,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); } |