wifi: mac80211: use wiphy_hrtimer_work for CAC timeout
PATCH v2 1/1 wifi: mac80211: use wiphy_hrtimer_work for CAC timeout
Prior initiating communication in a DFS channel, there should be a monitoring of RADAR in that channel for a minimum of 600 seconds if it is a Weather RADAR channel and 60 seconds for other DFS channels. This Channel Availability Check(CAC) is currently implemented by scheduling a work item for execution with a delay equal to an appropriate timeout. But this work item is observed to take more delay than specified (4-5 seconds in regular DFS channels and 25-30 seconds in Weather RADAR channels). Even though this delay is expected in case of delayed work queue as there is no guarantee that the work will be scheduled exactly after the specified delay, a delay of more than 20 seconds is too much for the AP to be in non-operational state.
Recently commit 7ceba45a6658 ("wifi: cfg80211: add an hrtimer based delayed work item") added an infrastructure to overcome this issue by supporting high resolution timers for mac80211 delayed work, which do not have this timeout latency. Switch the CAC timeout to use this infrastructure, so the CAC completion handling is triggered with tighter timing and reduced latency.
---
Changes in v2:
- Updated the commit message to imply that the change adds a performance improvement and not a correctness fix.
--- net/mac80211/cfg.c | 8 ++++---- net/mac80211/ieee80211_i.h | 2 +- net/mac80211/iface.c | 2 +- net/mac80211/link.c | 4 ++-- net/mac80211/util.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-)
net/mac80211/cfg.c +4 -4
@@ -1916,7 +1916,7 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev,if (sdata->wdev.links[link_id].cac_started) { chandef = link_conf->chanreq.oper; -wiphy_delayed_work_cancel (wiphy, &link->dfs_cac_timer_work); +wiphy_hrtimer_work_cancel (wiphy, &link->dfs_cac_timer_work);cfg80211_cac_event (sdata->dev, &chandef,NL80211_RADAR_CAC_ABORTED ,GFP_KERNEL , link_id);
@@ -3851,6 +3851,7 @@ static int ieee80211_start_radar_detection(struct wiphy *wiphy, u32 cac_time_ms, int link_id) {struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev); +ktime_t ktime =ktime_set (0 ,ms_to_ktime (cac_time_ms));struct ieee80211_chan_req chanreq = { .oper = *chandef };struct ieee80211_local *local = sdata->local;struct ieee80211_link_data *link_data;
@@ -3874,8 +3875,7 @@ static int ieee80211_start_radar_detection(struct wiphy *wiphy,if (err)return err; -wiphy_delayed_work_queue (wiphy, &link_data->dfs_cac_timer_work, -msecs_to_jiffies (cac_time_ms)); +wiphy_hrtimer_work_queue (wiphy, &link_data->dfs_cac_timer_work, ktime);return 0 ; }
@@ -3894,7 +3894,7 @@ static void ieee80211_end_cac(struct wiphy *wiphy,if (!link_data)continue ; -wiphy_delayed_work_cancel (wiphy, +wiphy_hrtimer_work_cancel (wiphy, &link_data->dfs_cac_timer_work);if (sdata->wdev.links[link_id].cac_started) {
net/mac80211/ieee80211_i.h +1 -1
@@ -1101,7 +1101,7 @@ struct ieee80211_link_data {int ap_power_level;/* in dBm */ bool radar_required; -struct wiphy_delayed_work dfs_cac_timer_work; +struct wiphy_hrtimer_work dfs_cac_timer_work;union {struct ieee80211_link_data_managed mgd;
net/mac80211/iface.c +1 -1
@@ -561,7 +561,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, bool going_dowiphy_work_cancel (local->hw.wiphy, &sdata->deflink.csa.finalize_work);wiphy_work_cancel (local->hw.wiphy, &sdata->deflink.color_change_finalize_work); -wiphy_delayed_work_cancel (local->hw.wiphy, +wiphy_hrtimer_work_cancel (local->hw.wiphy, &sdata->deflink.dfs_cac_timer_work);if (sdata->wdev.links[0 ].cac_started) {
net/mac80211/link.c +2 -2
@@ -116,7 +116,7 @@ void ieee80211_link_init(struct ieee80211_sub_if_data *sdata, ieee80211_color_change_finalize_work);wiphy_delayed_work_init (&link->color_collision_detect_work, ieee80211_color_collision_detection_work); -wiphy_delayed_work_init (&link->dfs_cac_timer_work, +wiphy_hrtimer_work_init (&link->dfs_cac_timer_work, ieee80211_dfs_cac_timer_work);if (!deflink) {
@@ -155,7 +155,7 @@ void ieee80211_link_stop(struct ieee80211_link_data *link) &link->csa.finalize_work);if (link->sdata->wdev.links[link->link_id].cac_started) { -wiphy_delayed_work_cancel (link->sdata->local->hw.wiphy, +wiphy_hrtimer_work_cancel (link->sdata->local->hw.wiphy, &link->dfs_cac_timer_work); cfg80211_cac_event(link->sdata->dev, &link->conf->chanreq.oper,
net/mac80211/util.c +1 -1
@@ -3597,7 +3597,7 @@ void ieee80211_dfs_cac_cancel(struct ieee80211_local *local,if (ctx && &ctx->conf != chanctx_conf)continue ; -wiphy_delayed_work_cancel (local->hw.wiphy, +wiphy_hrtimer_work_cancel (local->hw.wiphy, &link->dfs_cac_timer_work);if (!sdata->wdev.links[link_id].cac_started)
base-commit: c30e188bd2a886258be5facb970a804d8ef549b5
Signature · 1 line
2.34.1
Johannes Berg
maintainernet/mac80211/cfg.c static int ieee80211_start_radar_detection(struct wiphy *wiphy, · line 3878
Quoted 13 lines · Amith A
net/mac80211/cfg.c +2
-2struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev); +ktime_t ktime =ktime_set (0 ,ms_to_ktime (cac_time_ms));struct ieee80211_chan_req chanreq = { .oper = *chandef };struct ieee80211_local *local = sdata->local;struct ieee80211_link_data *link_data;@@ -3874,8 +3875,7 @@ static int ieee80211_start_radar_detection(struct wiphy *wiphy,if (err)return err; -wiphy_delayed_work_queue (wiphy, &link_data->dfs_cac_timer_work, -msecs_to_jiffies (cac_time_ms)); +wiphy_hrtimer_work_queue (wiphy, &link_data->dfs_cac_timer_work, ktime);
This is really questionable on multiple counts (at least the variable name, the ktime_set call arguments), I've fixed it to just do ms_to_ktime(cac_time_ms) in the argument ...
johannes