wifi: mac80211: stop warning after reconfig failures

If we have a reconfig failure in the driver, then we need
to shut down the network interface(s) at the network stack
level through cfg80211, which can result in a lot of those
"Failed check-sdata-in-driver check, ..." warnings, since
interfaces are considered to not be in the driver when the
reconfiguration fails, but we still need to go through all
the shutdown flow.

Avoid many of these warnings by storing the fact that the
stack experienced a reconfiguration failure and not doing
the warning in that case.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230604120651.3750c4ae6e76.I9e80d6026f59263c008a1a68f6cd6891ca0b93b0@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index 45d3e53c7383291465efdf2d3014343ec7a5aa11..c4505593ba7a6f6594e2bfb04c5ba18d8f443d64 100644 (file)
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -2,7 +2,7 @@
 /*
 * Portions of this file
 * Copyright(c) 2016 Intel Deutschland GmbH
-* Copyright (C) 2018 - 2019, 2021 Intel Corporation
+* Copyright (C) 2018 - 2019, 2021 - 2023 Intel Corporation
 */
 
 #ifndef __MAC80211_DRIVER_OPS
@@ -13,9 +13,11 @@
 #include "trace.h"
 
 #define check_sdata_in_driver(sdata)   ({                                      \
-       !WARN_ONCE(!(sdata->flags & IEEE80211_SDATA_IN_DRIVER),                 \
-                  "%s: Failed check-sdata-in-driver check, flags: 0x%x\n",     \
-                  sdata->dev ? sdata->dev->name : sdata->name, sdata->flags);  \
+       WARN_ONCE(!sdata->local->reconfig_failure &&                            \
+                 !(sdata->flags & IEEE80211_SDATA_IN_DRIVER),                  \
+                 "%s: Failed check-sdata-in-driver check, flags: 0x%x\n",      \
+                 sdata->dev ? sdata->dev->name : sdata->name, sdata->flags);   \
+       !!(sdata->flags & IEEE80211_SDATA_IN_DRIVER);                           \
 })
 
 static inline struct ieee80211_sub_if_data *

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index c80e552b61976fb1c9d6c4f1423f48bffdd53601..865210726d54aee3e075641349146e1b2417198c 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1394,6 +1394,9 @@ struct ieee80211_local {
        /* device is during a HW reconfig */
        bool in_reconfig;
 
+       /* reconfiguration failed ... suppress some warnings etc. */
+       bool reconfig_failure;
+
        /* wowlan is enabled -- don't reconfig on resume */
        bool wowlan;
 

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index f1e01f7a9b2eb8d010cc6a973eee9963b1a4bcf9..2e2115af38f5612b350be658989f85dcc68cd381 100644 (file)
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1281,6 +1281,9 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
        }
 
        if (local->open_count == 0) {
+               /* here we can consider everything in good order (again) */
+               local->reconfig_failure = false;
+
                res = drv_start(local);
                if (res)
                        goto err_del_bss;

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 3f24b6e59652cf5bb23490ba9b2dc8efd936c51c..a027b9e241605dfec6022c507d957dde38f0e948 100644 (file)
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -2373,6 +2373,7 @@ static void ieee80211_handle_reconfig_failure(struct ieee80211_local *local)
        local->resuming = false;
        local->suspended = false;
        local->in_reconfig = false;
+       local->reconfig_failure = true;
 
        ieee80211_flush_completed_scan(local, true);