tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ndisc: ndisc_send_redirect() cleanup

ndisc_send_redirect() is always called under rcu_read_lock().

It can use dev_net_rcu() and avoid one redundant
rcu_read_lock()/rcu_read_unlock() pair.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Link: https://patch.msgid.link/20250214140705.2105890-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Eric Dumazet and committed by
Jakub Kicinski 0784d83d 7f89ec6c

+3 -5
+3 -5
net/ipv6/ndisc.c
··· 1680 1680 void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target) 1681 1681 { 1682 1682 struct net_device *dev = skb->dev; 1683 - struct net *net = dev_net(dev); 1683 + struct net *net = dev_net_rcu(dev); 1684 1684 struct sock *sk = net->ipv6.ndisc_sk; 1685 1685 int optlen = 0; 1686 1686 struct inet_peer *peer; ··· 1695 1695 ops_data_buf[NDISC_OPS_REDIRECT_DATA_SPACE], *ops_data = NULL; 1696 1696 bool ret; 1697 1697 1698 - if (netif_is_l3_master(skb->dev)) { 1699 - dev = dev_get_by_index_rcu(dev_net(skb->dev), IPCB(skb)->iif); 1698 + if (netif_is_l3_master(dev)) { 1699 + dev = dev_get_by_index_rcu(net, IPCB(skb)->iif); 1700 1700 if (!dev) 1701 1701 return; 1702 1702 } ··· 1734 1734 goto release; 1735 1735 } 1736 1736 1737 - rcu_read_lock(); 1738 1737 peer = inet_getpeer_v6(net->ipv6.peers, &ipv6_hdr(skb)->saddr); 1739 1738 ret = inet_peer_xrlim_allow(peer, 1*HZ); 1740 - rcu_read_unlock(); 1741 1739 1742 1740 if (!ret) 1743 1741 goto release;