Skip to content

Commit 2a683d0

Browse files
q2venkuba-moo
authored andcommitted
dev: Pass netdevice_tracker to dev_get_by_flags_rcu().
This is a follow-up for commit eb1ac9f ("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>
1 parent f25a7ea commit 2a683d0

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

include/linux/netdevice.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3332,8 +3332,6 @@ int dev_get_iflink(const struct net_device *dev);
33323332
int dev_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb);
33333333
int dev_fill_forward_path(const struct net_device *dev, const u8 *daddr,
33343334
struct net_device_path_stack *stack);
3335-
struct net_device *dev_get_by_flags_rcu(struct net *net, unsigned short flags,
3336-
unsigned short mask);
33373335
struct net_device *dev_get_by_name(struct net *net, const char *name);
33383336
struct net_device *dev_get_by_name_rcu(struct net *net, const char *name);
33393337
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,
33963394
netdevice_tracker *tracker, gfp_t gfp);
33973395
struct net_device *netdev_get_by_name(struct net *net, const char *name,
33983396
netdevice_tracker *tracker, gfp_t gfp);
3397+
struct net_device *netdev_get_by_flags_rcu(struct net *net, netdevice_tracker *tracker,
3398+
unsigned short flags, unsigned short mask);
33993399
struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
34003400
void netdev_copy_name(struct net_device *dev, char *name);
34013401

net/core/dev.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,8 +1267,9 @@ struct net_device *dev_getfirstbyhwtype(struct net *net, unsigned short type)
12671267
EXPORT_SYMBOL(dev_getfirstbyhwtype);
12681268

12691269
/**
1270-
* dev_get_by_flags_rcu - find any device with given flags
1270+
* netdev_get_by_flags_rcu - find any device with given flags
12711271
* @net: the applicable net namespace
1272+
* @tracker: tracking object for the acquired reference
12721273
* @if_flags: IFF_* values
12731274
* @mask: bitmask of bits in if_flags to check
12741275
*
@@ -1277,21 +1278,21 @@ EXPORT_SYMBOL(dev_getfirstbyhwtype);
12771278
* Context: rcu_read_lock() must be held.
12781279
* Returns: NULL if a device is not found or a pointer to the device.
12791280
*/
1280-
struct net_device *dev_get_by_flags_rcu(struct net *net, unsigned short if_flags,
1281-
unsigned short mask)
1281+
struct net_device *netdev_get_by_flags_rcu(struct net *net, netdevice_tracker *tracker,
1282+
unsigned short if_flags, unsigned short mask)
12821283
{
12831284
struct net_device *dev;
12841285

12851286
for_each_netdev_rcu(net, dev) {
12861287
if (((READ_ONCE(dev->flags) ^ if_flags) & mask) == 0) {
1287-
dev_hold(dev);
1288+
netdev_hold(dev, tracker, GFP_ATOMIC);
12881289
return dev;
12891290
}
12901291
}
12911292

12921293
return NULL;
12931294
}
1294-
EXPORT_IPV6_MOD(dev_get_by_flags_rcu);
1295+
EXPORT_IPV6_MOD(netdev_get_by_flags_rcu);
12951296

12961297
/**
12971298
* dev_valid_name - check if name is okay for network device

net/ipv6/anycast.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
6969
struct ipv6_pinfo *np = inet6_sk(sk);
7070
struct ipv6_ac_socklist *pac = NULL;
7171
struct net *net = sock_net(sk);
72+
netdevice_tracker dev_tracker;
7273
struct net_device *dev = NULL;
7374
struct inet6_dev *idev;
7475
int err = 0, ishost;
@@ -79,7 +80,7 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
7980
return -EINVAL;
8081

8182
if (ifindex)
82-
dev = dev_get_by_index(net, ifindex);
83+
dev = netdev_get_by_index(net, ifindex, &dev_tracker, GFP_KERNEL);
8384

8485
if (ipv6_chk_addr_and_flags(net, addr, dev, true, 0, IFA_F_TENTATIVE)) {
8586
err = -EINVAL;
@@ -104,16 +105,16 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
104105
rt = rt6_lookup(net, addr, NULL, 0, NULL, 0);
105106
if (rt) {
106107
dev = dst_dev(&rt->dst);
107-
dev_hold(dev);
108+
netdev_hold(dev, &dev_tracker, GFP_ATOMIC);
108109
ip6_rt_put(rt);
109110
} else if (ishost) {
110111
rcu_read_unlock();
111112
err = -EADDRNOTAVAIL;
112113
goto error;
113114
} else {
114115
/* router, no matching interface: just pick one */
115-
dev = dev_get_by_flags_rcu(net, IFF_UP,
116-
IFF_UP | IFF_LOOPBACK);
116+
dev = netdev_get_by_flags_rcu(net, &dev_tracker, IFF_UP,
117+
IFF_UP | IFF_LOOPBACK);
117118
}
118119
rcu_read_unlock();
119120
}
@@ -159,7 +160,7 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
159160
error_idev:
160161
in6_dev_put(idev);
161162
error:
162-
dev_put(dev);
163+
netdev_put(dev, &dev_tracker);
163164

164165
if (pac)
165166
sock_kfree_s(sk, pac, sizeof(*pac));

0 commit comments

Comments
 (0)