kevin/linux
1
Fork 0
Code

wifi: mac80211: handle HW restart during ROC

Browse Source 
If we have a HW restart in the middle of a ROC period,
then there are two cases:
 - if it's a software ROC, we really don't need to do
   anything, since the ROC work will still be queued
   and will run later, albeit with the interruption
   due to the restart;
 - if it's a hardware ROC, then it may have begun or
   not, if it did begin already we can only remove it
   and tell userspace about that.

In both cases, this fixes the warning that would appear
in ieee80211_start_next_roc() in this case.

In the case of some drivers such as iwlwifi, the part of
restarting is never going to happen since the driver will
cancel the ROC, but flushing the work to ensure nothing
is pending here will also result in no longer being able
to trigger the warning in this case.

Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240523120352.f1924b5411ea.Ifc02a45a5ce23868dc7e428bad8d0e6996dd10f4@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2024-05-23 12:03:52 +02:00
parent a0ca76e5b7
commit 6322e0e75a
3 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/mac80211/ieee80211_i.h
View File

@ -1978,6 +1978,7 @@ void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local);
void ieee80211_offchannel_return(struct ieee80211_local *local); void ieee80211_offchannel_return(struct ieee80211_local *local);
void ieee80211_roc_setup(struct ieee80211_local *local); void ieee80211_roc_setup(struct ieee80211_local *local);
void ieee80211_start_next_roc(struct ieee80211_local *local); void ieee80211_start_next_roc(struct ieee80211_local *local);
void ieee80211_reconfig_roc(struct ieee80211_local *local);
void ieee80211_roc_purge(struct ieee80211_local *local, void ieee80211_roc_purge(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata); struct ieee80211_sub_if_data *sdata);
int ieee80211_remain_on_channel(struct wiphy *wiphy, struct wireless_dev *wdev, int ieee80211_remain_on_channel(struct wiphy *wiphy, struct wireless_dev *wdev,

35
net/mac80211/offchannel.c
View File

@ -8,7 +8,7 @@
* Copyright 2006-2007 Jiri Benc <jbenc@suse.cz> * Copyright 2006-2007 Jiri Benc <jbenc@suse.cz>
* Copyright 2007, Michael Wu <flamingice@sourmilk.net> * Copyright 2007, Michael Wu <flamingice@sourmilk.net>
* Copyright 2009 Johannes Berg <johannes@sipsolutions.net> * Copyright 2009 Johannes Berg <johannes@sipsolutions.net>
* Copyright (C) 2019, 2022-2023 Intel Corporation * Copyright (C) 2019, 2022-2024 Intel Corporation
*/ */
#include <linux/export.h> #include <linux/export.h>
#include <net/mac80211.h> #include <net/mac80211.h>
@ -413,6 +413,39 @@ void ieee80211_start_next_roc(struct ieee80211_local *local)
} }
} }
void ieee80211_reconfig_roc(struct ieee80211_local *local)
{
struct ieee80211_roc_work *roc, *tmp;
/*
* In the software implementation can just continue with the
* interruption due to reconfig, roc_work is still queued if
* needed.
*/
if (!local->ops->remain_on_channel)
return;
/* flush work so nothing from the driver is still pending */
wiphy_work_flush(local->hw.wiphy, &local->hw_roc_start);
wiphy_work_flush(local->hw.wiphy, &local->hw_roc_done);
list_for_each_entry_safe(roc, tmp, &local->roc_list, list) {
if (!roc->started)
break;
if (!roc->hw_begun) {
/* it didn't start in HW yet, so we can restart it */
roc->started = false;
continue;
}
/* otherwise destroy it and tell userspace */
ieee80211_roc_notify_destroy(roc);
}
ieee80211_start_next_roc(local);
}
static void __ieee80211_roc_work(struct ieee80211_local *local) static void __ieee80211_roc_work(struct ieee80211_local *local)
{ {
struct ieee80211_roc_work *roc; struct ieee80211_roc_work *roc;

3
net/mac80211/util.c
View File

@ -2175,8 +2175,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
local->in_reconfig = false; local->in_reconfig = false;
barrier(); barrier();
/* Restart deferred ROCs */ ieee80211_reconfig_roc(local);
ieee80211_start_next_roc(local);
/* Requeue all works */ /* Requeue all works */
list_for_each_entry(sdata, &local->interfaces, list) list_for_each_entry(sdata, &local->interfaces, list)