Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-15 23:51:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

tracing: fix recursive test level calculation

Browse Source 
The recursive tests to detect same level recursion in the ring buffers
did not account for the hard/softirq_counts to be shifted. Thus the
numbers could be larger than then mask to be tested.

This patch includes the shift for the calculation of the irq depth.

[ Impact: stop false positives in trace recursion detection ]

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt 2009-04-20 13:24:21 -04:00 committed by Steven Rostedt
parent 23de29de2d
commit 17487bfeb6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/trace/ring_buffer.c
View File

@ -1483,7 +1483,9 @@ rb_reserve_next_event(struct ring_buffer_per_cpu *cpu_buffer,
static int trace_irq_level(void)
{
return hardirq_count() + softirq_count() + in_nmi();
return (hardirq_count() >> HARDIRQ_SHIFT) +
(softirq_count() >> + SOFTIRQ_SHIFT) +
!!in_nmi();
}
static int trace_recursive_lock(void)