Skip to content

Commit 91ea62d

Browse files
author
Peter Zijlstra
committed
softirq: Avoid bad tracing / lockdep interaction
Similar to commit: 1a63dcd ("softirq: Reorder trace_softirqs_on to prevent lockdep splat") __local_bh_enable_ip() can also call into tracing with inconsistent state. Unlike that commit we don't need to bother about the tracepoint because 'cnt-1' never matches preempt_count() (by construction). Reported-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Tested-by: Heiko Carstens <hca@linux.ibm.com> Link: https://lkml.kernel.org/r/20201218154519.GW3092@hirez.programming.kicks-ass.net
1 parent 441fa34 commit 91ea62d

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

kernel/softirq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ void __local_bh_enable_ip(unsigned long ip, unsigned int cnt)
185185
* Keep preemption disabled until we are done with
186186
* softirq processing:
187187
*/
188-
preempt_count_sub(cnt - 1);
188+
__preempt_count_sub(cnt - 1);
189189

190190
if (unlikely(!in_interrupt() && local_softirq_pending())) {
191191
/*

0 commit comments

Comments
 (0)