diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2020-12-18 16:39:14 +0100 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2020-12-18 16:53:13 +0100 |
| commit | 91ea62d58bd661827c328a2c6c02a87fa4aae88b (patch) | |
| tree | 531563294d9ea18a4b4797b91fafee39d3a5f720 /kernel/softirq.c | |
| parent | jump_label/static_call: Add MAINTAINERS (diff) | |
| download | linux-91ea62d58bd661827c328a2c6c02a87fa4aae88b.tar.xz linux-91ea62d58bd661827c328a2c6c02a87fa4aae88b.zip | |
softirq: Avoid bad tracing / lockdep interaction
Similar to commit:
1a63dcd8765b ("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
Diffstat (limited to 'kernel/softirq.c')
| -rw-r--r-- | kernel/softirq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index 09229ad82209..0f1d3a32d53b 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -185,7 +185,7 @@ void __local_bh_enable_ip(unsigned long ip, unsigned int cnt) * Keep preemption disabled until we are done with * softirq processing: */ - preempt_count_sub(cnt - 1); + __preempt_count_sub(cnt - 1); if (unlikely(!in_interrupt() && local_softirq_pending())) { /* |