On Tue, 2022-05-17 at 10:37 -0700, Jakub Kicinski wrote:
> >
> > Then at the very least we'd need some kind of type that we can assign to
> > disambiguate, because today e.g. we have a netdev notifier (and other
> > code) that could get a non-wireless netdev and check like this:
> >
> > static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
> > unsigned long state, void *ptr)
> > {
> > struct net_device *dev = netdev_notifier_info_to_dev(ptr);
> > struct wireless_dev *wdev = dev->ieee80211_ptr;
> > [...]
> > if (!wdev)
> > return NOTIFY_DONE;
>
> Can we use enum netdev_ml_priv_type netdev::ml_priv and
> netdev::ml_priv_type for this?
>
Hm, yeah, I guess we can. I think I'd prefer something along the lines
of the below, then we don't even need the ifdef.
johannes
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index eaf66e57d891..4bd81767c058 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1702,6 +1702,7 @@ enum netdev_priv_flags {
enum netdev_ml_priv_type {
ML_PRIV_NONE,
ML_PRIV_CAN,
+ ML_PRIV_WIFI,
};
/**
@@ -2127,7 +2128,6 @@ struct net_device {
#if IS_ENABLED(CONFIG_AX25)
void *ax25_ptr;
#endif
- struct wireless_dev *ieee80211_ptr;
struct wpan_dev *ieee802154_ptr;
#if IS_ENABLED(CONFIG_MPLS_ROUTING)
struct mpls_dev __rcu *mpls_ptr;
@@ -2235,7 +2235,10 @@ struct net_device {
possible_net_t nd_net;
/* mid-layer private */
- void *ml_priv;
+ union {
+ void *ml_priv;
+ struct wireless_dev *ieee80211_ptr;
+ };
enum netdev_ml_priv_type ml_priv_type;
union {
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index 83fb51b6e299..7b063adacaa6 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -307,11 +307,7 @@ static bool batadv_is_cfg80211_netdev(struct net_device *net_device)
if (!net_device)
return false;
- /* cfg80211 drivers have to set ieee80211_ptr */
- if (net_device->ieee80211_ptr)
- return true;
-
- return false;
+ return netdev_get_ml_priv(net_device, ML_PRIV_WIFI);
}
/**
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 4980c3a50475..50154f7879b6 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -1997,7 +1997,7 @@ int netdev_register_kobject(struct net_device *ndev)
*groups++ = &netstat_group;
#if IS_ENABLED(CONFIG_WIRELESS_EXT) || IS_ENABLED(CONFIG_CFG80211)
- if (ndev->ieee80211_ptr)
+ if (netdev_get_ml_priv(ndev, ML_PRIV_WIFI))
*groups++ = &wireless_group;
#if IS_ENABLED(CONFIG_WIRELESS_EXT)
else if (ndev->wireless_handlers)
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 3e5d12040726..9024bd9f7d46 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -1369,6 +1369,12 @@ int cfg80211_register_netdevice(struct net_device *dev)
lockdep_assert_held(&rdev->wiphy.mtx);
+ /*
+ * This lets us identify our netdevs in the future,
+ * the driver already set dev->ieee80211_ptr.
+ */
+ netdev_set_ml_priv(dev, wdev, ML_PRIV_WIFI);
+
/* we'll take care of this */
wdev->registered = true;
wdev->registering = true;
@@ -1390,7 +1396,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
unsigned long state, void *ptr)
{
struct net_device *dev = netdev_notifier_info_to_dev(ptr);
- struct wireless_dev *wdev = dev->ieee80211_ptr;
+ struct wireless_dev *wdev = netdev_get_ml_priv(dev, ML_PRIV_WIFI);
struct cfg80211_registered_device *rdev;
struct cfg80211_sched_scan_request *pos, *tmp;
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 8d528b5945d0..3a5a7183b959 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -182,9 +182,12 @@ __cfg80211_rdev_from_attrs(struct net *netns, struct nlattr **attrs)
netdev = __dev_get_by_index(netns, ifindex);
if (netdev) {
- if (netdev->ieee80211_ptr)
- tmp = wiphy_to_rdev(
- netdev->ieee80211_ptr->wiphy);
+ struct wireless_dev *wdev;
+
+ wdev = netdev_get_ml_priv(netdev, ML_PRIV_WIFI);
+
+ if (wdev)
+ tmp = wiphy_to_rdev(wdev->wiphy);
else
tmp = NULL;
@@ -2972,15 +2975,17 @@ static int nl80211_dump_wiphy_parse(struct sk_buff *skb,
struct net_device *netdev;
struct cfg80211_registered_device *rdev;
int ifidx = nla_get_u32(tb[NL80211_ATTR_IFINDEX]);
+ struct wireless_dev *wdev;
netdev = __dev_get_by_index(sock_net(skb->sk), ifidx);
if (!netdev) {
ret = -ENODEV;
goto out;
}
- if (netdev->ieee80211_ptr) {
- rdev = wiphy_to_rdev(
- netdev->ieee80211_ptr->wiphy);
+
+ wdev = netdev_is_wireless(netdev, ML_PRIV_WIFI);
+ if (wdev) {
+ rdev = wiphy_to_rdev(wdev->wiphy);
state->filter_wiphy = rdev->wiphy_idx;
}
}
@@ -3364,8 +3369,9 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
int ifindex = nla_get_u32(info->attrs[NL80211_ATTR_IFINDEX]);
netdev = __dev_get_by_index(genl_info_net(info), ifindex);
- if (netdev && netdev->ieee80211_ptr)
- rdev = wiphy_to_rdev(netdev->ieee80211_ptr->wiphy);
+ wdev = netdev_is_wireless(netdev);
+ if (wdev)
+ rdev = wiphy_to_rdev(wdev->wiphy);
else
netdev = NULL;
}
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index b9678801d848..e1bd3f624e1b 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -2715,6 +2715,7 @@ static struct cfg80211_registered_device *
cfg80211_get_dev_from_ifindex(struct net *net, int ifindex)
{
struct cfg80211_registered_device *rdev;
+ struct wireless_dev *wdev;
struct net_device *dev;
ASSERT_RTNL();
@@ -2722,8 +2723,9 @@ cfg80211_get_dev_from_ifindex(struct net *net, int ifindex)
dev = dev_get_by_index(net, ifindex);
if (!dev)
return ERR_PTR(-ENODEV);
- if (dev->ieee80211_ptr)
- rdev = wiphy_to_rdev(dev->ieee80211_ptr->wiphy);
+ wdev = netdev_get_ml_priv(dev, ML_PRIV_WIFI);
+ if (wdev)
+ rdev = wiphy_to_rdev(wdev->wiphy);
else
rdev = ERR_PTR(-ENODEV);
dev_put(dev);
diff --git a/net/wireless/wext-proc.c b/net/wireless/wext-proc.c
index cadcf8613af2..a7d903729d2e 100644
--- a/net/wireless/wext-proc.c
+++ b/net/wireless/wext-proc.c
@@ -40,7 +40,7 @@ static void wireless_seq_printf_stats(struct seq_file *seq,
stats = &nullstats;
#endif
#ifdef CONFIG_CFG80211
- if (dev->ieee80211_ptr)
+ if (netdev_get_ml_priv(dev, ML_PRIV_WIFI))
stats = &nullstats;
#endif
}
