iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mac80211: call synchronize_net once in the restart flow

Browse Source 
Currently the restart flow enables RX back, and then proceeds
to tear down RX and TX aggregations.
The TX aggregation tear down calls synchronize_net(), which
waits for packet receiving to be done.
This is done for every session, while RX processing is already
active, and in some reproductions it takes up to 3 seconds.
Add a call once in the restart_work, before we have traffic
active again, and remove the subsequent calls when tearing
down the aggregation.
This requires to move down the code that turns off the
reconfig flag in order to be able to test it in
_ieee80211_stop_tx_ba_session().

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Sara Sharon 2017-10-29 11:51:08 +02:00 committed by Johannes Berg
parent 9fef654433
commit 2316380f84
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/mac80211/agg-tx.c
View File

@ -392,7 +392,8 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
* telling the driver. New packets will not go through since * telling the driver. New packets will not go through since
* the aggregation session is no longer OPERATIONAL. * the aggregation session is no longer OPERATIONAL.
*/ */
synchronize_net(); if (!local->in_reconfig)
synchronize_net();
tid_tx->stop_initiator = reason == AGG_STOP_PEER_REQUEST ? tid_tx->stop_initiator = reason == AGG_STOP_PEER_REQUEST ?
WLAN_BACK_RECIPIENT : WLAN_BACK_RECIPIENT :

3
net/mac80211/main.c
View File

@ -263,6 +263,9 @@ static void ieee80211_restart_work(struct work_struct *work)
flush_delayed_work(&local->roc_work); flush_delayed_work(&local->roc_work);
flush_work(&local->hw_roc_done); flush_work(&local->hw_roc_done);
/* wait for all packet processing to be done */
synchronize_net();
ieee80211_reconfig(local); ieee80211_reconfig(local);
rtnl_unlock(); rtnl_unlock();
} }

19
net/mac80211/util.c
View File

@ -2110,15 +2110,6 @@ int ieee80211_reconfig(struct ieee80211_local *local)
cfg80211_sched_scan_stopped_rtnl(local->hw.wiphy, 0); cfg80211_sched_scan_stopped_rtnl(local->hw.wiphy, 0);
wake_up: wake_up:
if (local->in_reconfig) {
local->in_reconfig = false;
barrier();
/* Restart deferred ROCs */
mutex_lock(&local->mtx);
ieee80211_start_next_roc(local);
mutex_unlock(&local->mtx);
}
if (local->monitors == local->open_count && local->monitors > 0) if (local->monitors == local->open_count && local->monitors > 0)
ieee80211_add_virtual_monitor(local); ieee80211_add_virtual_monitor(local);
@ -2146,6 +2137,16 @@ int ieee80211_reconfig(struct ieee80211_local *local)
mutex_unlock(&local->sta_mtx); mutex_unlock(&local->sta_mtx);
} }
if (local->in_reconfig) {
local->in_reconfig = false;
barrier();
/* Restart deferred ROCs */
mutex_lock(&local->mtx);
ieee80211_start_next_roc(local);
mutex_unlock(&local->mtx);
}
ieee80211_wake_queues_by_reason(hw, IEEE80211_MAX_QUEUE_MAP, ieee80211_wake_queues_by_reason(hw, IEEE80211_MAX_QUEUE_MAP,
IEEE80211_QUEUE_STOP_REASON_SUSPEND, IEEE80211_QUEUE_STOP_REASON_SUSPEND,
false); false);