Re: [PATCH 15/16] mac80211: agg-tx: don't schedule_and_wake_txq() under sta->lock
From: Toke Høiland-Jørgensen <hidden>
Date: 2021-11-29 13:56:39
From: Toke Høiland-Jørgensen <hidden>
Date: 2021-11-29 13:56:39
Luca Coelho [off-list ref] writes:
From: Johannes Berg <redacted> When we call ieee80211_agg_start_txq(), that will in turn call schedule_and_wake_txq(). Called from ieee80211_stop_tx_ba_cb() this is done under sta->lock, which leads to certain circular lock dependencies, as reported by Chris Murphy: https://lore.kernel.org/r/CAJCQCtSXJ5qA4bqSPY=oLRMbv-irihVvP7A2uGutEbXQVkoNaw@mail.gmail.com (local) In general, ieee80211_agg_start_txq() is usually not called with sta->lock held, only in this one place. But it's always called with sta->ampdu_mlme.mtx held, and that's therefore clearly sufficient. Change ieee80211_stop_tx_ba_cb() to also call it without the sta->lock held, by factoring it out of ieee80211_remove_tid_tx() (which is only called in this one place). This breaks the locking chain and makes it less likely that we'll have similar locking chain problems in the future. Reported-by: Chris Murphy <redacted> Signed-off-by: Johannes Berg <redacted> Signed-off-by: Luca Coelho <redacted>
Does this need a fixes: tag? -Toke