Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "wifi: mac80211: fix BA session teardown race"

Browse source 
This reverts commit a2036d5d3c.
This commit is contained in:
Ksawlii 2024-11-24 00:23:53 +01:00
parent 038863cd84
commit c186dd147a
3 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/mac80211/agg-tx.c
View file

@ -491,7 +491,7 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)
{ {
struct tid_ampdu_tx *tid_tx; struct tid_ampdu_tx *tid_tx;
struct ieee80211_local *local = sta->local; struct ieee80211_local *local = sta->local;
struct ieee80211_sub_if_data *sdata = sta->sdata; struct ieee80211_sub_if_data *sdata;
struct ieee80211_ampdu_params params = { struct ieee80211_ampdu_params params = {
.sta = &sta->sta, .sta = &sta->sta,
.action = IEEE80211_AMPDU_TX_START, .action = IEEE80211_AMPDU_TX_START,
@ -521,6 +521,7 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)
*/ */
synchronize_net(); synchronize_net();
sdata = sta->sdata;
params.ssn = sta->tid_seq[tid] >> 4; params.ssn = sta->tid_seq[tid] >> 4;
ret = drv_ampdu_action(local, sdata, &params); ret = drv_ampdu_action(local, sdata, &params);
tid_tx->ssn = params.ssn; tid_tx->ssn = params.ssn;
@ -534,6 +535,9 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)
*/ */
set_bit(HT_AGG_STATE_DRV_READY, &tid_tx->state); set_bit(HT_AGG_STATE_DRV_READY, &tid_tx->state);
} else if (ret) { } else if (ret) {
if (!sdata)
return;
ht_dbg(sdata, ht_dbg(sdata,
"BA request denied - HW unavailable for %pM tid %d\n", "BA request denied - HW unavailable for %pM tid %d\n",
sta->sta.addr, tid); sta->sta.addr, tid);

3
net/mac80211/driver-ops.c
View file

@ -331,6 +331,9 @@ int drv_ampdu_action(struct ieee80211_local *local,
might_sleep(); might_sleep();
if (!sdata)
return -EIO;
sdata = get_bss_sdata(sdata); sdata = get_bss_sdata(sdata);
if (!check_sdata_in_driver(sdata)) if (!check_sdata_in_driver(sdata))
return -EIO; return -EIO;

14
net/mac80211/sta_info.c
View file

@ -1064,20 +1064,6 @@ static void __sta_info_destroy_part2(struct sta_info *sta)
* after _part1 and before _part2! * after _part1 and before _part2!
*/ */
/*
* There's a potential race in _part1 where we set WLAN_STA_BLOCK_BA
* but someone might have just gotten past a check, and not yet into
* queuing the work/creating the data/etc.
*
* Do another round of destruction so that the worker is certainly
* canceled before we later free the station.
*
* Since this is after synchronize_rcu()/synchronize_net() we're now
* certain that nobody can actually hold a reference to the STA and
* be calling e.g. ieee80211_start_tx_ba_session().
*/
ieee80211_sta_tear_down_BA_sessions(sta, AGG_STOP_DESTROY_STA);
might_sleep(); might_sleep();
lockdep_assert_held(&local->sta_mtx); lockdep_assert_held(&local->sta_mtx);