]> www.infradead.org Git - users/dwmw2/linux.git/commit
lockdep: Fix wait context check on softirq for PREEMPT_RT
authorRyo Takakura <ryotkkr98@gmail.com>
Fri, 21 Mar 2025 14:33:22 +0000 (07:33 -0700)
committerIngo Molnar <mingo@kernel.org>
Tue, 25 Mar 2025 09:46:44 +0000 (10:46 +0100)
commit61c39d8c83e2077f33e0a2c8980a76a7f323f0ce
treeb4177d29e64dffe1040a02f90763f4ec6011dfa0
parent0e1ff67d164be45e8ddfea5aaf5803224ede0805
lockdep: Fix wait context check on softirq for PREEMPT_RT

Since:

  0c1d7a2c2d32 ("lockdep: Remove softirq accounting on PREEMPT_RT.")

the wait context test for mutex usage within "in softirq context" fails
as it references @softirq_context:

    | wait context tests |
    --------------------------------------------------------------------------
                                   | rcu  | raw  | spin |mutex |
    --------------------------------------------------------------------------
                 in hardirq context:  ok  |  ok  |  ok  |  ok  |
  in hardirq context (not threaded):  ok  |  ok  |  ok  |  ok  |
                 in softirq context:  ok  |  ok  |  ok  |FAILED|

As a fix, add lockdep map for BH disabled section. This fixes the
issue by letting us catch cases when local_bh_disable() gets called
with preemption disabled where local_lock doesn't get acquired.
In the case of "in softirq context" selftest, local_bh_disable() was
being called with preemption disable as it's early in the boot.

[ boqun: Move the lockdep annotations into __local_bh_*() to avoid false
         positives because of unpaired local_bh_disable() reported by
 Borislav Petkov and Peter Zijlstra, and make bh_lock_map
 only exist for PREEMPT_RT. ]

[ mingo: Restored authorship and improved the bh_lock_map definition. ]

Signed-off-by: Ryo Takakura <ryotkkr98@gmail.com>
Signed-off-by: Boqun Feng <boqun.feng@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20250321143322.79651-1-boqun.feng@gmail.com
kernel/softirq.c