diff mbox series

[4/6] wifi: cfg80211: Schedule regulatory check on BSS STA channel change

Message ID 20231113112844.15d7a0ee3fda.I1879d259d8d756159c8060f61f4bce172e6d323e@changeid
State New
Headers show
Series cfg80211/mac80211 patches from our internal tree 2023-11-13 | expand

Commit Message

Greenman, Gregory Nov. 13, 2023, 9:35 a.m. UTC 
From: Andrei Otcheretianski <andrei.otcheretianski@intel.com>

Due to different relaxation policies it may be needed to re-check
channels after a BSS station interface is disconnected or performed a
channel switch.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
---
 include/net/cfg80211.h | 11 +++++++++++
 net/wireless/nl80211.c | 16 ++++++++++++++++
 net/wireless/reg.c     |  2 +-
 net/wireless/reg.h     |  5 +++++
 net/wireless/sme.c     |  2 ++
 5 files changed, 35 insertions(+), 1 deletion(-)

Comments

Johannes Berg Nov. 24, 2023, 7:13 p.m. UTC | #1 
On Mon, 2023-11-13 at 11:35 +0200, gregory.greenman@intel.com wrote:
> 
> @@ -9302,6 +9302,17 @@ bool cfg80211_valid_disable_subchannel_bitmap(u16 *bitmap,
>   * case disconnect instead.
>   * Also note that the wdev mutex must be held.
>   */
> +
>  void cfg80211_links_removed(struct net_device *dev, u16 link_mask);

What happened there?
 
> +/**
> + * cfg80211_schedule_channels_check - schedule regulatory check if needed
> + * @netdev: the device to check
> + *
> + * In case the device supports NO_IR or DFS relaxations, schedule regulatory
> + * channels check, as previous concurrent operation conditions may not
> + * hold anymore.
> + */

...

> +void cfg80211_schedule_channels_check(struct net_device *netdev)
> +{
> +	struct wireless_dev *wdev = netdev->ieee80211_ptr;
> +	struct wiphy *wiphy = wdev->wiphy;
> +
> +	/* Schedule channels check if NO_IR or DFS relaxations are supported */
> +	if (wdev->iftype == NL80211_IFTYPE_STATION &&
> +	    (wiphy_ext_feature_isset(wiphy,
> +				     NL80211_EXT_FEATURE_DFS_CONCURRENT) ||
> +	    (IS_ENABLED(CONFIG_CFG80211_REG_RELAX_NO_IR) &&
> +	     wiphy->regulatory_flags & REGULATORY_ENABLE_RELAX_NO_IR)))
> +		reg_check_channels();
> +}

That ... doesn't even use the netdev pointer, apart from going to the
wiphy? Why not have a wiphy argument instead?

johannes
Andrei Otcheretianski Nov. 26, 2023, 8:58 a.m. UTC | #2 
> cfg80211_valid_disable_subchannel_bitmap(u16 *bitmap,
> >   * case disconnect instead.
> >   * Also note that the wdev mutex must be held.
> >   */
> > +
> >  void cfg80211_links_removed(struct net_device *dev, u16 link_mask);
> 
> What happened there?

No idea, it wasn't in the original patch.. Will recheck with Gregory and fix it.

> 
> > +void cfg80211_schedule_channels_check(struct net_device *netdev) {
> > +	struct wireless_dev *wdev = netdev->ieee80211_ptr;
> > +	struct wiphy *wiphy = wdev->wiphy;
> > +
> > +	/* Schedule channels check if NO_IR or DFS relaxations are
> supported */
> > +	if (wdev->iftype == NL80211_IFTYPE_STATION &&
> > +	    (wiphy_ext_feature_isset(wiphy,
> > +
> NL80211_EXT_FEATURE_DFS_CONCURRENT) ||
> > +	    (IS_ENABLED(CONFIG_CFG80211_REG_RELAX_NO_IR) &&
> > +	     wiphy->regulatory_flags &
> REGULATORY_ENABLE_RELAX_NO_IR)))
> > +		reg_check_channels();
> > +}
> 
> That ... doesn't even use the netdev pointer, apart from going to the wiphy?
> Why not have a wiphy argument instead?

We do need wdev here, I will change it to be wireless device instead

> 
> johannes
Johannes Berg Nov. 26, 2023, 1:19 p.m. UTC | #3 
> 
> > 
> > > +void cfg80211_schedule_channels_check(struct net_device *netdev) {
> > > +	struct wireless_dev *wdev = netdev->ieee80211_ptr;
> > > +	struct wiphy *wiphy = wdev->wiphy;
> > > +
> > > +	/* Schedule channels check if NO_IR or DFS relaxations are
> > supported */
> > > +	if (wdev->iftype == NL80211_IFTYPE_STATION &&
> > > +	    (wiphy_ext_feature_isset(wiphy,
> 
> We do need wdev here, 
> 

Oh right, I missed that, sorry.

> I will change it to be wireless device instead
> 

No need I guess, if we're only going to check for it being a station?
Would we ever have a reason to call this for a p2p/nan device? I guess
not, since that doesn't affect regulatory in the same way?

johannes
Andrei Otcheretianski Nov. 28, 2023, 8:26 a.m. UTC | #4 
> > > > +void cfg80211_schedule_channels_check(struct net_device *netdev)
> {
> > > > +	struct wireless_dev *wdev = netdev->ieee80211_ptr;
> > > > +	struct wiphy *wiphy = wdev->wiphy;
> > > > +
> > > > +	/* Schedule channels check if NO_IR or DFS relaxations are
> > > supported */
> > > > +	if (wdev->iftype == NL80211_IFTYPE_STATION &&
> > > > +	    (wiphy_ext_feature_isset(wiphy,
> >
> > We do need wdev here,
> >
> 
> Oh right, I missed that, sorry.
> 
> > I will change it to be wireless device instead
> >
> 
> No need I guess, if we're only going to check for it being a station?
> Would we ever have a reason to call this for a p2p/nan device? I guess
> not, since that doesn't affect regulatory in the same way?

No, I don't think P2P/NAN devices can anyhow affect regulatory, for sure not for concurrent DFS case.

> 
> johannes
diff mbox series

Patch

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index c467d11283f7..8477f65f54ce 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -9302,6 +9302,17 @@  bool cfg80211_valid_disable_subchannel_bitmap(u16 *bitmap,
  * case disconnect instead.
  * Also note that the wdev mutex must be held.
  */
+
 void cfg80211_links_removed(struct net_device *dev, u16 link_mask);
 
+/**
+ * cfg80211_schedule_channels_check - schedule regulatory check if needed
+ * @netdev: the device to check
+ *
+ * In case the device supports NO_IR or DFS relaxations, schedule regulatory
+ * channels check, as previous concurrent operation conditions may not
+ * hold anymore.
+ */
+void cfg80211_schedule_channels_check(struct net_device *netdev);
+
 #endif /* __NET_CFG80211_H */
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index c693ebddd053..413dc2a652a7 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -19310,6 +19310,7 @@  void cfg80211_ch_switch_notify(struct net_device *dev,
 		break;
 	}
 
+	cfg80211_schedule_channels_check(dev);
 	cfg80211_sched_dfs_chan_update(rdev);
 
 	nl80211_ch_switch_notify(rdev, dev, link_id, chandef, GFP_KERNEL,
@@ -20067,6 +20068,21 @@  void cfg80211_update_owe_info_event(struct net_device *netdev,
 }
 EXPORT_SYMBOL(cfg80211_update_owe_info_event);
 
+void cfg80211_schedule_channels_check(struct net_device *netdev)
+{
+	struct wireless_dev *wdev = netdev->ieee80211_ptr;
+	struct wiphy *wiphy = wdev->wiphy;
+
+	/* Schedule channels check if NO_IR or DFS relaxations are supported */
+	if (wdev->iftype == NL80211_IFTYPE_STATION &&
+	    (wiphy_ext_feature_isset(wiphy,
+				     NL80211_EXT_FEATURE_DFS_CONCURRENT) ||
+	    (IS_ENABLED(CONFIG_CFG80211_REG_RELAX_NO_IR) &&
+	     wiphy->regulatory_flags & REGULATORY_ENABLE_RELAX_NO_IR)))
+		reg_check_channels();
+}
+EXPORT_SYMBOL(cfg80211_schedule_channels_check);
+
 /* initialisation/exit functions */
 
 int __init nl80211_init(void)
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 552c05bbad47..a3210d151653 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2481,7 +2481,7 @@  static void reg_check_chans_work(struct work_struct *work)
 	rtnl_unlock();
 }
 
-static void reg_check_channels(void)
+void reg_check_channels(void)
 {
 	/*
 	 * Give usermode a chance to do something nicer (move to another
diff --git a/net/wireless/reg.h b/net/wireless/reg.h
index a703e53c23ee..a02ef5609f52 100644
--- a/net/wireless/reg.h
+++ b/net/wireless/reg.h
@@ -181,6 +181,11 @@  bool reg_dfs_domain_same(struct wiphy *wiphy1, struct wiphy *wiphy2);
  */
 int reg_reload_regdb(void);
 
+/**
+ * reg_check_channels - schedule regulatory enforcement
+ */
+void reg_check_channels(void);
+
 extern const u8 shipped_regdb_certs[];
 extern unsigned int shipped_regdb_certs_len;
 extern const u8 extra_regdb_certs[];
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index acfe66da7109..c1a880c4af1c 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -1394,6 +1394,8 @@  void __cfg80211_disconnected(struct net_device *dev, const u8 *ie,
 #endif
 
 	schedule_work(&cfg80211_disconnect_work);
+
+	cfg80211_schedule_channels_check(dev);
 }
 
 void cfg80211_disconnected(struct net_device *dev, u16 reason,