Johannes Berg 1e65261481 mac80211: agg-tx: don't schedule_and_wake_txq() under sta->lock ... [ Upstream commit 06c41bda0e ] 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 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. Fixes: ba8c3d6f16 ("mac80211: add an intermediate software queue implementation") Reported-by: Chris Murphy <lists@colorremedies.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Link: https://lore.kernel.org/r/iwlwifi.20211202152554.f519884c8784.I555fef8e67d93fff3d9a304886c4a9f8b322e591@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>		2021-12-22 09:29:37 +01:00
..
aead_api.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
aead_api.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
aes_ccm.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
aes_cmac.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
aes_cmac.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
aes_gcm.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
aes_gmac.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
aes_gmac.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
agg-rx.c	mac80211: add missing null return check from call to ieee80211_get_sband	2019-07-31 10:51:17 +02:00
agg-tx.c	mac80211: agg-tx: don't schedule_and_wake_txq() under sta->lock	2021-12-22 09:29:37 +01:00
cfg.c	mac80211: clear sta->fast_rx when STA removed from 4-addr VLAN	2021-04-21 12:56:15 +02:00
chan.c	treewide: Add SPDX license identifier for missed files	2019-05-21 10:50:45 +02:00
debug.h
debugfs.c	mac80211: AMPDU handling for rekeys with Extended Key ID	2019-07-26 13:29:10 +02:00
debugfs.h
debugfs_key.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-22 08:59:24 -04:00
debugfs_key.h
debugfs_netdev.c	mac80211: fix txq null pointer dereference	2019-10-01 17:56:19 +02:00
debugfs_netdev.h
debugfs_sta.c	mac80211: drop data frames without key on encrypted links	2020-04-01 11:02:01 +02:00
debugfs_sta.h
driver-ops.c	mac80211: fix station rate table updates on assoc	2021-02-10 09:25:29 +01:00
driver-ops.h	mac80211: mark TX-during-stop for TX in in_reconfig	2021-12-22 09:29:34 +01:00
ethtool.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 432	2019-06-05 17:37:16 +02:00
fils_aead.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
fils_aead.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
he.c	mac80211: fix possible NULL pointerderef in obss pd code	2019-08-21 10:58:32 +02:00
ht.c	mac80211: add support for the ADDBA extension element	2019-07-29 16:40:22 +02:00
ibss.c	mac80211: fix double free in ibss_leave	2021-03-30 14:35:29 +02:00
ieee80211_i.h	mac80211: remove warning in ieee80211_get_sband()	2021-06-30 08:47:45 -04:00
iface.c	mac80211: Fix monitor MTU limit so that A-MSDUs get through	2021-09-22 12:26:32 +02:00
Kconfig	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2019-07-08 20:57:08 -07:00
key.c	mac80211: prevent mixed key and fragment cache attacks	2021-06-03 08:59:01 +02:00
key.h	mac80211: prevent mixed key and fragment cache attacks	2021-06-03 08:59:01 +02:00
led.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
led.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
main.c	mac80211: bail out if cipher schemes are invalid	2021-05-14 09:44:28 +02:00
Makefile
mesh.c	mac80211: fix channel switch trigger from unknown mesh peer	2020-05-02 08:48:58 +02:00
mesh.h	mac80211: implement HE support for mesh	2019-07-26 16:14:12 +02:00
mesh_hwmp.c	mac80211: fix potential overflow when multiplying to u32 integers	2021-03-04 10:26:17 +01:00
mesh_pathtbl.c	mac80211: check return value of rhashtable_init	2021-10-17 10:42:34 +02:00
mesh_plink.c	mac80211: implement HE support for mesh	2019-07-26 16:14:12 +02:00
mesh_ps.c	mac80211: mesh: fix potentially unaligned access	2021-10-06 15:42:32 +02:00
mesh_sync.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
michael.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
michael.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
mlme.c	mac80211: track only QoS data frames for admission control	2021-12-22 09:29:35 +01:00
ocb.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
offchannel.c	mac80211: pass the vif to cancel_remain_on_channel	2019-07-26 13:08:28 +02:00
pm.c
rate.c	mac80211: fix station rate table updates on assoc	2021-02-10 09:25:29 +01:00
rate.h	mac80211: populate debugfs only after cfg80211 init	2020-04-29 16:33:18 +02:00
rc80211_minstrel.c	mac80211: minstrel: fix tx status processing corner case	2020-11-24 13:29:23 +01:00
rc80211_minstrel.h	mac80211: minstrel: remove deferred sampling code	2020-11-24 13:29:23 +01:00
rc80211_minstrel_debugfs.c
rc80211_minstrel_ht.c	mac80211: populate debugfs only after cfg80211 init	2020-04-29 16:33:18 +02:00
rc80211_minstrel_ht.h	mac80211: minstrel_ht: improve rate probing for devices with static fallback	2019-08-21 11:10:13 +02:00
rc80211_minstrel_ht_debugfs.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
rx.c	mac80211: do not access the IV when it was stripped	2021-12-08 09:01:09 +01:00
scan.c	mac80211: fix scan when operating on DFS channels in ETSI domains	2019-10-07 22:10:50 +02:00
spectmgmt.c	mac80211: 160MHz with extended NSS BW in CSA	2021-02-13 13:52:55 +01:00
sta_info.c	mac80211: remove iwlwifi specific workaround NDPs of null_response	2021-07-14 16:53:32 +02:00
sta_info.h	mac80211: prevent attacks on TKIP/WEP as well	2021-06-03 08:59:01 +02:00
status.c	mac80211: add ieee80211_is_any_nullfunc()	2020-05-10 10:31:32 +02:00
tdls.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-17 15:55:34 -07:00
tkip.c	mac80211: Fix TKIP replay protection immediately after key setup	2020-02-05 21:22:46 +00:00
tkip.h	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2019-07-08 20:57:08 -07:00
trace.c
trace.h	mac80211: pass the vif to cancel_remain_on_channel	2019-07-26 13:08:28 +02:00
trace_msg.h	mac80211: Increase MAX_MSG_LEN	2019-03-29 11:20:36 +01:00
tx.c	mac80211: limit injected vht mcs/nss in ieee80211_parse_tx_radiotap	2021-10-06 15:42:32 +02:00
util.c	mac80211: fix wrong 160/80+80 MHz setting	2020-03-05 16:43:41 +01:00
vht.c	mac80211: don't set set TDLS STA bandwidth wider than possible	2020-12-30 11:51:25 +01:00
wep.c	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2019-07-08 20:57:08 -07:00
wep.h	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2019-07-08 20:57:08 -07:00
wme.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
wme.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
wpa.c	mac80211: fix use-after-free in CCMP/GCMP RX	2021-10-06 15:42:31 +02:00
wpa.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00