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

wifi: mac80211: move offchannel works to wiphy work

Browse Source 
Make the offchannel works wiphy works to have the
wiphy locked for executing them.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg
2023-08-28 13:59:42 +02:00
parent 730538edc8
commit 97c19e42b2
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac80211/ieee80211_i.h
View File

@@ -1589,9 +1589,9 @@ struct ieee80211_local {
/* /*
* Remain-on-channel support * Remain-on-channel support
*/ */
struct delayed_work roc_work; struct wiphy_delayed_work roc_work;
struct list_head roc_list; struct list_head roc_list;
struct work_struct hw_roc_start, hw_roc_done; struct wiphy_work hw_roc_start, hw_roc_done;
unsigned long hw_roc_start_time; unsigned long hw_roc_start_time;
u64 roc_cookie_counter; u64 roc_cookie_counter;

6
net/mac80211/main.c
View File

@@ -377,8 +377,8 @@ static void ieee80211_restart_work(struct work_struct *work)
ieee80211_scan_cancel(local); ieee80211_scan_cancel(local);
/* make sure any new ROC will consider local->in_reconfig */ /* make sure any new ROC will consider local->in_reconfig */
flush_delayed_work(&local->roc_work); wiphy_delayed_work_flush(local->hw.wiphy, &local->roc_work);
flush_work(&local->hw_roc_done); wiphy_work_flush(local->hw.wiphy, &local->hw_roc_done);
/* wait for all packet processing to be done */ /* wait for all packet processing to be done */
synchronize_net(); synchronize_net();
@@ -1501,11 +1501,11 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw)
ieee80211_remove_interfaces(local); ieee80211_remove_interfaces(local);
wiphy_lock(local->hw.wiphy); wiphy_lock(local->hw.wiphy);
wiphy_delayed_work_cancel(local->hw.wiphy, &local->roc_work);
wiphy_work_cancel(local->hw.wiphy, &local->radar_detected_work); wiphy_work_cancel(local->hw.wiphy, &local->radar_detected_work);
wiphy_unlock(local->hw.wiphy); wiphy_unlock(local->hw.wiphy);
rtnl_unlock(); rtnl_unlock();
cancel_delayed_work_sync(&local->roc_work);
cancel_work_sync(&local->restart_work); cancel_work_sync(&local->restart_work);
cancel_work_sync(&local->reconfig_filter); cancel_work_sync(&local->reconfig_filter);
flush_work(&local->sched_scan_stopped_work); flush_work(&local->sched_scan_stopped_work);

36
net/mac80211/offchannel.c
View File

@@ -230,7 +230,7 @@ static bool ieee80211_recalc_sw_work(struct ieee80211_local *local,
if (dur == LONG_MAX) if (dur == LONG_MAX)
return false; return false;
mod_delayed_work(local->workqueue, &local->roc_work, dur); wiphy_delayed_work_queue(local->hw.wiphy, &local->roc_work, dur);
return true; return true;
} }
@@ -258,7 +258,7 @@ static void ieee80211_handle_roc_started(struct ieee80211_roc_work *roc,
roc->notified = true; roc->notified = true;
} }
static void ieee80211_hw_roc_start(struct work_struct *work) static void ieee80211_hw_roc_start(struct wiphy *wiphy, struct wiphy_work *work)
{ {
struct ieee80211_local *local = struct ieee80211_local *local =
container_of(work, struct ieee80211_local, hw_roc_start); container_of(work, struct ieee80211_local, hw_roc_start);
@@ -285,7 +285,7 @@ void ieee80211_ready_on_channel(struct ieee80211_hw *hw)
trace_api_ready_on_channel(local); trace_api_ready_on_channel(local);
ieee80211_queue_work(hw, &local->hw_roc_start); wiphy_work_queue(hw->wiphy, &local->hw_roc_start);
} }
EXPORT_SYMBOL_GPL(ieee80211_ready_on_channel); EXPORT_SYMBOL_GPL(ieee80211_ready_on_channel);
@@ -338,7 +338,7 @@ static void _ieee80211_start_next_roc(struct ieee80211_local *local)
tmp->started = true; tmp->started = true;
tmp->abort = true; tmp->abort = true;
} }
ieee80211_queue_work(&local->hw, &local->hw_roc_done); wiphy_work_queue(local->hw.wiphy, &local->hw_roc_done);
return; return;
} }
@@ -368,8 +368,8 @@ static void _ieee80211_start_next_roc(struct ieee80211_local *local)
ieee80211_hw_config(local, 0); ieee80211_hw_config(local, 0);
} }
ieee80211_queue_delayed_work(&local->hw, &local->roc_work, wiphy_delayed_work_queue(local->hw.wiphy, &local->roc_work,
msecs_to_jiffies(min_dur)); msecs_to_jiffies(min_dur));
/* tell userspace or send frame(s) */ /* tell userspace or send frame(s) */
list_for_each_entry(tmp, &local->roc_list, list) { list_for_each_entry(tmp, &local->roc_list, list) {
@@ -407,8 +407,8 @@ void ieee80211_start_next_roc(struct ieee80211_local *local)
_ieee80211_start_next_roc(local); _ieee80211_start_next_roc(local);
} else { } else {
/* delay it a bit */ /* delay it a bit */
ieee80211_queue_delayed_work(&local->hw, &local->roc_work, wiphy_delayed_work_queue(local->hw.wiphy, &local->roc_work,
round_jiffies_relative(HZ/2)); round_jiffies_relative(HZ / 2));
} }
} }
@@ -451,7 +451,7 @@ static void __ieee80211_roc_work(struct ieee80211_local *local)
} }
} }
static void ieee80211_roc_work(struct work_struct *work) static void ieee80211_roc_work(struct wiphy *wiphy, struct wiphy_work *work)
{ {
struct ieee80211_local *local = struct ieee80211_local *local =
container_of(work, struct ieee80211_local, roc_work.work); container_of(work, struct ieee80211_local, roc_work.work);
@@ -461,7 +461,7 @@ static void ieee80211_roc_work(struct work_struct *work)
mutex_unlock(&local->mtx); mutex_unlock(&local->mtx);
} }
static void ieee80211_hw_roc_done(struct work_struct *work) static void ieee80211_hw_roc_done(struct wiphy *wiphy, struct wiphy_work *work)
{ {
struct ieee80211_local *local = struct ieee80211_local *local =
container_of(work, struct ieee80211_local, hw_roc_done); container_of(work, struct ieee80211_local, hw_roc_done);
@@ -482,7 +482,7 @@ void ieee80211_remain_on_channel_expired(struct ieee80211_hw *hw)
trace_api_remain_on_channel_expired(local); trace_api_remain_on_channel_expired(local);
ieee80211_queue_work(hw, &local->hw_roc_done); wiphy_work_queue(hw->wiphy, &local->hw_roc_done);
} }
EXPORT_SYMBOL_GPL(ieee80211_remain_on_channel_expired); EXPORT_SYMBOL_GPL(ieee80211_remain_on_channel_expired);
@@ -586,8 +586,8 @@ static int ieee80211_start_roc_work(struct ieee80211_local *local,
/* if not HW assist, just queue & schedule work */ /* if not HW assist, just queue & schedule work */
if (!local->ops->remain_on_channel) { if (!local->ops->remain_on_channel) {
list_add_tail(&roc->list, &local->roc_list); list_add_tail(&roc->list, &local->roc_list);
ieee80211_queue_delayed_work(&local->hw, wiphy_delayed_work_queue(local->hw.wiphy,
&local->roc_work, 0); &local->roc_work, 0);
} else { } else {
/* otherwise actually kick it off here /* otherwise actually kick it off here
* (for error handling) * (for error handling)
@@ -695,7 +695,7 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local,
if (!cookie) if (!cookie)
return -ENOENT; return -ENOENT;
flush_work(&local->hw_roc_start); wiphy_work_flush(local->hw.wiphy, &local->hw_roc_start);
mutex_lock(&local->mtx); mutex_lock(&local->mtx);
list_for_each_entry_safe(roc, tmp, &local->roc_list, list) { list_for_each_entry_safe(roc, tmp, &local->roc_list, list) {
@@ -745,7 +745,7 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local,
} else { } else {
/* go through work struct to return to the operating channel */ /* go through work struct to return to the operating channel */
found->abort = true; found->abort = true;
mod_delayed_work(local->workqueue, &local->roc_work, 0); wiphy_delayed_work_queue(local->hw.wiphy, &local->roc_work, 0);
} }
out_unlock: out_unlock:
@@ -994,9 +994,9 @@ int ieee80211_mgmt_tx_cancel_wait(struct wiphy *wiphy,
void ieee80211_roc_setup(struct ieee80211_local *local) void ieee80211_roc_setup(struct ieee80211_local *local)
{ {
INIT_WORK(&local->hw_roc_start, ieee80211_hw_roc_start); wiphy_work_init(&local->hw_roc_start, ieee80211_hw_roc_start);
INIT_WORK(&local->hw_roc_done, ieee80211_hw_roc_done); wiphy_work_init(&local->hw_roc_done, ieee80211_hw_roc_done);
INIT_DELAYED_WORK(&local->roc_work, ieee80211_roc_work); wiphy_delayed_work_init(&local->roc_work, ieee80211_roc_work);
INIT_LIST_HEAD(&local->roc_list); INIT_LIST_HEAD(&local->roc_list);
} }