dev: Pass netdevice_tracker to dev_get_by_flags_rcu().

This is a follow-up for commit eb1ac9ff6c4a5 ("ipv6: anycast: Don't
hold RTNL for IPV6_JOIN_ANYCAST.").

We should not add a new device lookup API without netdevice_tracker.

Let's pass netdevice_tracker to dev_get_by_flags_rcu() and rename it
with netdev_ prefix to match other newer APIs.

Note that we always use GFP_ATOMIC for netdev_hold() as it's expected
to be called under RCU.

Suggested-by: Jakub Kicinski <kuba@kernel.org>
Link: https://lore.kernel.org/netdev/20250708184053.102109f6@kernel.org/
Signed-off-by: Kuniyuki Iwashima <kuniyu@google.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250711051120.2866855-1-kuniyu@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index a80d21a146123dd46fdb9701e67d7dc712b3491a..ec23cee5245d770f2900f12c02b3a77592216435 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -3332,8 +3332,6 @@ int dev_get_iflink(const struct net_device *dev);
 int dev_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb);
 int dev_fill_forward_path(const struct net_device *dev, const u8 *daddr,
                          struct net_device_path_stack *stack);
-struct net_device *dev_get_by_flags_rcu(struct net *net, unsigned short flags,
-                                       unsigned short mask);
 struct net_device *dev_get_by_name(struct net *net, const char *name);
 struct net_device *dev_get_by_name_rcu(struct net *net, const char *name);
 struct net_device *__dev_get_by_name(struct net *net, const char *name);
@@ -3396,6 +3394,8 @@ struct net_device *netdev_get_by_index(struct net *net, int ifindex,
                                       netdevice_tracker *tracker, gfp_t gfp);
 struct net_device *netdev_get_by_name(struct net *net, const char *name,
                                      netdevice_tracker *tracker, gfp_t gfp);
+struct net_device *netdev_get_by_flags_rcu(struct net *net, netdevice_tracker *tracker,
+                                          unsigned short flags, unsigned short mask);
 struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
 void netdev_copy_name(struct net_device *dev, char *name);
 

diff --git a/net/core/dev.c b/net/core/dev.c
index e365b099484ec423435b4019f00dd18cc92f583f..19ddc3e6990a7d8d1ba5396b375efcee87d01fb5 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1267,8 +1267,9 @@ struct net_device *dev_getfirstbyhwtype(struct net *net, unsigned short type)
 EXPORT_SYMBOL(dev_getfirstbyhwtype);
 
 /**
- * dev_get_by_flags_rcu - find any device with given flags
+ * netdev_get_by_flags_rcu - find any device with given flags
  * @net: the applicable net namespace
+ * @tracker: tracking object for the acquired reference
  * @if_flags: IFF_* values
  * @mask: bitmask of bits in if_flags to check
  *
@@ -1277,21 +1278,21 @@ EXPORT_SYMBOL(dev_getfirstbyhwtype);
  * Context: rcu_read_lock() must be held.
  * Returns: NULL if a device is not found or a pointer to the device.
  */
-struct net_device *dev_get_by_flags_rcu(struct net *net, unsigned short if_flags,
-                                       unsigned short mask)
+struct net_device *netdev_get_by_flags_rcu(struct net *net, netdevice_tracker *tracker,
+                                          unsigned short if_flags, unsigned short mask)
 {
        struct net_device *dev;
 
        for_each_netdev_rcu(net, dev) {
                if (((READ_ONCE(dev->flags) ^ if_flags) & mask) == 0) {
-                       dev_hold(dev);
+                       netdev_hold(dev, tracker, GFP_ATOMIC);
                        return dev;
                }
        }
 
        return NULL;
 }
-EXPORT_IPV6_MOD(dev_get_by_flags_rcu);
+EXPORT_IPV6_MOD(netdev_get_by_flags_rcu);
 
 /**
  *     dev_valid_name - check if name is okay for network device

diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c
index 53cf68e0242bfd0136d9edb368526477bde5c38c..f8a8e46286b8ee6e39d2d4c2e4149d528d7aef18 100644 (file)
--- a/net/ipv6/anycast.c
+++ b/net/ipv6/anycast.c
@@ -69,6 +69,7 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
        struct ipv6_pinfo *np = inet6_sk(sk);
        struct ipv6_ac_socklist *pac = NULL;
        struct net *net = sock_net(sk);
+       netdevice_tracker dev_tracker;
        struct net_device *dev = NULL;
        struct inet6_dev *idev;
        int err = 0, ishost;
@@ -79,7 +80,7 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
                return -EINVAL;
 
        if (ifindex)
-               dev = dev_get_by_index(net, ifindex);
+               dev = netdev_get_by_index(net, ifindex, &dev_tracker, GFP_KERNEL);
 
        if (ipv6_chk_addr_and_flags(net, addr, dev, true, 0, IFA_F_TENTATIVE)) {
                err = -EINVAL;
@@ -104,7 +105,7 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
                rt = rt6_lookup(net, addr, NULL, 0, NULL, 0);
                if (rt) {
                        dev = dst_dev(&rt->dst);
-                       dev_hold(dev);
+                       netdev_hold(dev, &dev_tracker, GFP_ATOMIC);
                        ip6_rt_put(rt);
                } else if (ishost) {
                        rcu_read_unlock();
@@ -112,8 +113,8 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
                        goto error;
                } else {
                        /* router, no matching interface: just pick one */
-                       dev = dev_get_by_flags_rcu(net, IFF_UP,
-                                                  IFF_UP | IFF_LOOPBACK);
+                       dev = netdev_get_by_flags_rcu(net, &dev_tracker, IFF_UP,
+                                                     IFF_UP | IFF_LOOPBACK);
                }
                rcu_read_unlock();
        }
@@ -159,7 +160,7 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
 error_idev:
        in6_dev_put(idev);
 error:
-       dev_put(dev);
+       netdev_put(dev, &dev_tracker);
 
        if (pac)
                sock_kfree_s(sk, pac, sizeof(*pac));