On 1/23/2026 8:02 AM, Ziyi Guo wrote: > ath10k_wmi_event_peer_sta_ps_state_chg() uses lockdep_assert_held() to > assert that ar->data_lock should be held by the caller, but neither > ath10k_wmi_10_2_op_rx() nor ath10k_wmi_10_4_op_rx() acquire this lock > before calling this function. > > The field arsta->peer_ps_state is documented as protected by > ar->data_lock in core.h, and other accessors (ath10k_peer_ps_state_disable, > ath10k_dbg_sta_read_peer_ps_state) properly acquire this lock. > > Add spin_lock_bh()/spin_unlock_bh() around the peer_ps_state update, > following the pattern used by other WMI event handlers in the driver. > > Signed-off-by: Ziyi Guo <[email protected]> > --- > drivers/net/wireless/ath/ath10k/wmi.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/net/wireless/ath/ath10k/wmi.c > b/drivers/net/wireless/ath/ath10k/wmi.c > index b4aad6604d6d..40259504927c 100644 > --- a/drivers/net/wireless/ath/ath10k/wmi.c > +++ b/drivers/net/wireless/ath/ath10k/wmi.c > @@ -5305,7 +5305,9 @@ ath10k_wmi_event_peer_sta_ps_state_chg(struct ath10k > *ar, struct sk_buff *skb) > } > > arsta = (struct ath10k_sta *)sta->drv_priv; > + spin_lock_bh(&ar->data_lock); > arsta->peer_ps_state = __le32_to_cpu(ev->peer_ps_state); > + spin_unlock_bh(&ar->data_lock); > > exit: > rcu_read_unlock();
this solution is inconsistent with the lockdep_assert_held(). either the locking should be done by the callers or the lockdep_assert_held() should be removed in conjunction with the new locking you are adding. /jeff
