net: first round to use dev_net_rcu()
Subsystems (7)
cover net: first round to use dev_net_rcu()
dev_net(dev) should either be protected by RTNL or RCU.
There is no LOCKDEP support yet for this helper.
Adding it would trigger too many splats.
Instead, add dev_net_rcu() and start to use it to either fix bugs or document points that were safely using dev_net().
Eric Dumazet (16):
net: add dev_net_rcu() helper
ipv4: add RCU protection to ip4_dst_hoplimit()
ipv4: use RCU protection in ip_dst_mtu_maybe_forward()
ipv4: use RCU protection in ipv4_default_advmss()
ipv4: use RCU protection in rt_is_expired()
tcp: convert to dev_net_rcu()
net: gro: convert four dev_net() calls
udp: convert to dev_net_rcu()
ipv4: icmp: convert to dev_net_rcu()
ipv6: icmp: convert to dev_net_rcu()
ipv6: input: convert to dev_net_rcu()
ipv6: output: convert to dev_net_rcu()
ipv6: use RCU protection in ip6_default_advmss()
net: filter: convert to dev_net_rcu()
flow_dissector: use rcu protection to fetch dev_net()
ipv4: use RCU protection in inet_select_addr()
include/linux/netdevice.h | 6 +++++ include/net/inet6_hashtables.h | 2 +- include/net/inet_hashtables.h | 2 +- include/net/ip.h | 13 ++++++++--- include/net/net_namespace.h | 2 +- include/net/route.h | 9 ++++++-- net/core/filter.c | 40 +++++++++++++++++----------------- net/core/flow_dissector.c | 21 +++++++++--------- net/ipv4/devinet.c | 3 ++- net/ipv4/icmp.c | 22 +++++++++---------- net/ipv4/route.c | 19 ++++++++++++---- net/ipv4/tcp_ipv4.c | 8 +++---- net/ipv4/tcp_metrics.c | 6 ++--- net/ipv4/tcp_offload.c | 2 +- net/ipv4/udp.c | 19 ++++++++-------- net/ipv4/udp_offload.c | 2 +- net/ipv6/icmp.c | 22 +++++++++---------- net/ipv6/ip6_input.c | 12 +++++----- net/ipv6/ip6_output.c | 4 ++-- net/ipv6/output_core.c | 2 +- net/ipv6/route.c | 7 +++++- net/ipv6/tcp_ipv6.c | 10 ++++----- net/ipv6/tcpv6_offload.c | 2 +- net/ipv6/udp.c | 18 +++++++-------- net/ipv6/udp_offload.c | 2 +- 25 files changed, 146 insertions(+), 109 deletions(-)
Signature · 1 line
2.48.1.362.g079036d154-goog
PATCH 1/16 net: add dev_net_rcu() helper
dev->nd_net can change, readers should either
use rcu_read_lock() or RTNL.
We currently use a generic helper, dev_net() with no debugging support. We probably have many hidden bugs.
Add dev_net_rcu() helper for callers using rcu_read_lock() protection.
--- include/linux/netdevice.h | 6 ++++++ include/net/net_namespace.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)
include/linux/netdevice.h +6 -0
@@ -2663,6 +2663,12 @@ struct net *dev_net(const struct net_device *dev)return read_pnet (&dev->nd_net); } +static inline +struct net *dev_net_rcu (const struct net_device *dev) +{ +return read_pnet_rcu (&dev->nd_net); +} +static inline void dev_net_set (struct net_device *dev,struct net *net) {
include/net/net_namespace.h +1 -1
@@ -398,7 +398,7 @@ static inline struct net *read_pnet(const possible_net_t *pnet)#endif } -static inline struct net *read_pnet_rcu (possible_net_t *pnet) +static inline struct net *read_pnet_rcu (const possible_net_t *pnet) {#ifdef CONFIG_NET_NS return rcu_dereference (pnet->net);
Signature · 1 line
2.48.1.362.g079036d154-goog
Re: [PATCH net 01/16] net: add dev_net_rcu() helper
From: Eric Dumazet <[email protected]>
Date: Fri, 31 Jan 2025 17:13:19 +0000
Quoted 10 lines
dev->nd_netcan change, readers should either
usercu_read_lock()or RTNL.We currently use a generic helper,
dev_net()with no debugging support. We probably have many hidden bugs.Add
dev_net_rcu()helper for callers usingrcu_read_lock()protection.Signed-off-by Eric Dumazet <[email protected]>
PATCH 2/16 ipv4: add RCU protection to ip4_dst_hoplimit()
In reply to Eric Dumazetip4_dst_hoplimit() must use RCU protection to make sure the net structure it reads does not disappear.
--- include/net/route.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
include/net/route.h +7 -2
@@ -382,10 +382,15 @@ static inline int inet_iif(const struct sk_buff *skb)static inline int ip4_dst_hoplimit (const struct dst_entry *dst) {int hoplimit =dst_metric_raw (dst,RTAX_HOPLIMIT ); -struct net *net =dev_net (dst->dev); -if (hoplimit ==0 ) +if (hoplimit ==0 ) { +const struct net *net; + +rcu_read_lock (); + net =dev_net_rcu (dst->dev); hoplimit =READ_ONCE (net->ipv4.sysctl_ip_default_ttl); +rcu_read_unlock (); + }return hoplimit; }
Signature · 1 line
2.48.1.362.g079036d154-goog
Re: [PATCH net 02/16] ipv4: add RCU protection to ip4_dst_hoplimit()
From: Eric Dumazet <[email protected]>
Date: Fri, 31 Jan 2025 17:13:20 +0000
Quoted 5 lines
ip4_dst_hoplimit()must use RCU protection to make sure the net structure it reads does not disappear.Fixes fa50d974d104 ("ipv4: Namespaceify ip_default_ttl sysctl knob")Signed-off-by Eric Dumazet <[email protected]>
PATCH 3/16 ipv4: use RCU protection in ip_dst_mtu_maybe_forward()
In reply to Eric Dumazetip_dst_mtu_maybe_forward() must use RCU protection to make sure the net structure it reads does not disappear.
--- include/net/ip.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
include/net/ip.h +10 -3
@@ -471,9 +471,12 @@ static inline unsigned int ip_dst_mtu_maybe_forward(const struct dst_entry *dst, bool forwarding) {const struct rtable *rt =dst_rtable (dst); -struct net *net =dev_net (dst->dev); -unsigned int mtu; +unsigned int mtu, res; +struct net *net; + +rcu_read_lock (); + net =dev_net_rcu (dst->dev);if (READ_ONCE (net->ipv4.sysctl_ip_fwd_use_pmtu) ||ip_mtu_locked (dst) || !forwarding) {
@@ -497,7 +500,11 @@ static inline unsigned int ip_dst_mtu_maybe_forward(const struct dst_entry *dst, out: mtu = min_t(unsigned int, mtu, IP_MAX_MTU); -return mtu -lwtunnel_headroom (dst->lwtstate, mtu); + res = mtu -lwtunnel_headroom (dst->lwtstate, mtu); + +rcu_read_unlock (); + +return res; } static inline unsigned int ip_skb_dst_mtu(struct sock *sk,
Signature · 1 line
2.48.1.362.g079036d154-goog
Re: [PATCH net 03/16] ipv4: use RCU protection in ip_dst_mtu_maybe_forward()
From: Eric Dumazet <[email protected]>
Date: Fri, 31 Jan 2025 17:13:21 +0000
Quoted 5 lines
ip_dst_mtu_maybe_forward()must use RCU protection to make sure the net structure it reads does not disappear.Fixes f87c10a8aa1e8 ("ipv4: introduce ip_dst_mtu_maybe_forward and protect forwarding path against pmtu spoofing")Signed-off-by Eric Dumazet <[email protected]>
PATCH 4/16 ipv4: use RCU protection in ipv4_default_advmss()
In reply to Eric Dumazetipv4_default_advmss() must use RCU protection to make sure the net structure it reads does not disappear.
--- net/ipv4/route.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
net/ipv4/route.c +8 -3
@@ -1307,10 +1307,15 @@ static void set_class_tag(struct rtable *rt, u32 tag)static unsigned int ipv4_default_advmss (const struct dst_entry *dst) { -struct net *net =dev_net (dst->dev);unsigned int header_size =sizeof (struct tcphdr ) +sizeof (struct iphdr ); - unsigned int advmss = max_t(unsigned int, ipv4_mtu(dst) - header_size, - net->ipv4.ip_rt_min_advmss); +unsigned int advmss; +struct net *net; + +rcu_read_lock (); + net =dev_net_rcu (dst->dev); + advmss = max_t(unsigned int, ipv4_mtu(dst) - header_size, + net->ipv4.ip_rt_min_advmss); +rcu_read_unlock ();return min (advmss,IPV4_MAX_PMTU - header_size); }
Signature · 1 line
2.48.1.362.g079036d154-goog
Re: [PATCH net 04/16] ipv4: use RCU protection in ipv4_default_advmss()
From: Eric Dumazet <[email protected]>
Date: Fri, 31 Jan 2025 17:13:22 +0000
Quoted 5 lines
ipv4_default_advmss()must use RCU protection to make sure the net structure it reads does not disappear.Fixes 2e9589ff809e ("ipv4: Namespaceify min_adv_mss sysctl knob")Signed-off-by Eric Dumazet <[email protected]>
PATCH 5/16 ipv4: use RCU protection in rt_is_expired()
In reply to Eric Dumazetrt_is_expired() must use RCU protection to make sure the net structure it reads does not disappear.
--- net/ipv4/route.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
net/ipv4/route.c +7 -1
@@ -390,7 +390,13 @@ static inline int ip_rt_proc_init(void)static inline bool rt_is_expired (const struct rtable *rth) { -return rth->rt_genid !=rt_genid_ipv4 (dev_net (rth->dst.dev)); +bool res; + +rcu_read_lock (); + res = rth->rt_genid !=rt_genid_ipv4 (dev_net_rcu (rth->dst.dev)); +rcu_read_unlock (); + +return res; }void rt_cache_flush (struct net *net)
Signature · 1 line
2.48.1.362.g079036d154-goog
Re: [PATCH net 05/16] ipv4: use RCU protection in rt_is_expired()
From: Eric Dumazet <[email protected]>
Date: Fri, 31 Jan 2025 17:13:23 +0000
Quoted 4 lines
rt_is_expired()must use RCU protection to make sure the net structure it reads does not disappear.Signed-off-by Eric Dumazet <[email protected]>
PATCH 6/16 tcp: convert to dev_net_rcu()
In reply to Eric DumazetTCP uses of dev_net() are safe, change them to dev_net_rcu() to get LOCKDEP support.
--- include/net/inet6_hashtables.h | 2 +- include/net/inet_hashtables.h | 2 +- net/ipv4/tcp_ipv4.c | 8 ++++---- net/ipv4/tcp_metrics.c | 6 +++--- net/ipv6/tcp_ipv6.c | 10 +++++----- 5 files changed, 14 insertions(+), 14 deletions(-)
include/net/inet6_hashtables.h +1 -1
@@ -150,7 +150,7 @@ static inline struct sock *__inet6_lookup_skb(struct inet_hashinfo *hashinfo, int iif, int sdif, bool *refcounted) { - struct net *net = dev_net(skb_dst(skb)->dev); + struct net *net = dev_net_rcu(skb_dst(skb)->dev);const struct ipv6hdr *ip6h =ipv6_hdr (skb);struct sock *sk;
include/net/inet_hashtables.h +1 -1
@@ -492,7 +492,7 @@ static inline struct sock *__inet_lookup_skb(struct inet_hashinfo *hashinfo,const int sdif, bool *refcounted) { - struct net *net = dev_net(skb_dst(skb)->dev); + struct net *net = dev_net_rcu(skb_dst(skb)->dev);const struct iphdr *iph =ip_hdr (skb);struct sock *sk;
net/ipv4/tcp_ipv4.c +4 -4
@@ -503,7 +503,7 @@ int tcp_v4_err(struct sk_buff *skb, u32 info)struct request_sock *fastopen;u32 seq, snd_una;int err; -struct net *net =dev_net (skb->dev); +struct net *net =dev_net_rcu (skb->dev); sk = __inet_lookup_established(net, net->ipv4.tcp_death_row.hashinfo, iph->daddr, th->dest, iph->saddr,
@@ -788,7 +788,7 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb, arg.iov[0 ].iov_base = (unsigned char *)&rep; arg.iov[0 ].iov_len =sizeof (rep.th); - net = sk ?sock_net (sk) :dev_net (skb_dst (skb)->dev); + net = sk ?sock_net (sk) :dev_net_rcu (skb_dst (skb)->dev);/* Invalid TCP option size or twice included auth */ if (tcp_parse_auth_options (tcp_hdr (skb), &md5_hash_location, &aoh))
@@ -1967,7 +1967,7 @@ EXPORT_SYMBOL(tcp_v4_do_rcv);int tcp_v4_early_demux (struct sk_buff *skb) { -struct net *net =dev_net (skb->dev); +struct net *net =dev_net_rcu (skb->dev);const struct iphdr *iph;const struct tcphdr *th;struct sock *sk;
@@ -2178,7 +2178,7 @@ static void tcp_v4_fill_cb(struct sk_buff *skb, const struct iphdr *iph,int tcp_v4_rcv (struct sk_buff *skb) { -struct net *net =dev_net (skb->dev); +struct net *net =dev_net_rcu (skb->dev);enum skb_drop_reason drop_reason;int sdif =inet_sdif (skb);int dif =inet_iif (skb);
net/ipv4/tcp_metrics.c +3 -3
@@ -170,7 +170,7 @@ static struct tcp_metrics_block *tcpm_new(struct dst_entry *dst,bool reclaim = false;spin_lock_bh (&tcp_metrics_lock); - net =dev_net (dst->dev); + net =dev_net_rcu (dst->dev);/* While waiting for the spin-lock the cache might have been populated * with this entry and so we have to check again.
@@ -273,7 +273,7 @@ static struct tcp_metrics_block *__tcp_get_metrics_req(struct request_sock *req,return NULL ; } - net =dev_net (dst->dev); + net =dev_net_rcu (dst->dev); hash ^=net_hash_mix (net); hash =hash_32 (hash, tcp_metrics_hash_log);
@@ -318,7 +318,7 @@ static struct tcp_metrics_block *tcp_get_metrics(struct sock *sk,else return NULL ; - net =dev_net (dst->dev); + net =dev_net_rcu (dst->dev); hash ^=net_hash_mix (net); hash =hash_32 (hash, tcp_metrics_hash_log);
net/ipv6/tcp_ipv6.c +5 -5
@@ -376,7 +376,7 @@ static int tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, {const struct ipv6hdr *hdr = (const struct ipv6hdr *)skb->data;const struct tcphdr *th = (struct tcphdr *)(skb->data+offset); -struct net *net =dev_net (skb->dev); +struct net *net =dev_net_rcu (skb->dev);struct request_sock *fastopen;struct ipv6_pinfo *np;struct tcp_sock *tp;
@@ -868,7 +868,7 @@ static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32struct tcphdr *t1;struct sk_buff *buff;struct flowi6 fl6; -struct net *net = sk ?sock_net (sk) :dev_net (skb_dst (skb)->dev); +struct net *net = sk ?sock_net (sk) :dev_net_rcu (skb_dst (skb)->dev);struct sock *ctl_sk = net->ipv6.tcp_sk;unsigned int tot_len =sizeof (struct tcphdr );__be32 mrst =0 , *topt;
@@ -1039,7 +1039,7 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb,if (!sk && !ipv6_unicast_destination (skb))return ; - net = sk ?sock_net (sk) :dev_net (skb_dst (skb)->dev); + net = sk ?sock_net (sk) :dev_net_rcu (skb_dst (skb)->dev);/* Invalid TCP option size or twice included auth */ if (tcp_parse_auth_options (th, &md5_hash_location, &aoh))return ;
@@ -1744,6 +1744,7 @@ static void tcp_v6_fill_cb(struct sk_buff *skb, const struct ipv6hdr *hdr, INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb) { +struct net *net =dev_net_rcu (skb->dev);enum skb_drop_reason drop_reason;int sdif =inet6_sdif (skb);int dif =inet6_iif (skb);
@@ -1753,7 +1754,6 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb)bool refcounted;int ret;u32 isn; -struct net *net =dev_net (skb->dev); drop_reason =SKB_DROP_REASON_NOT_SPECIFIED ;if (skb->pkt_type !=PACKET_HOST )
@@ -2004,7 +2004,7 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb)void tcp_v6_early_demux (struct sk_buff *skb) { -struct net *net =dev_net (skb->dev); +struct net *net =dev_net_rcu (skb->dev);const struct ipv6hdr *hdr;const struct tcphdr *th;struct sock *sk;
Signature · 1 line
2.48.1.362.g079036d154-goog
Re: [PATCH net 06/16] tcp: convert to dev_net_rcu()
From: Eric Dumazet <[email protected]>
Date: Fri, 31 Jan 2025 17:13:24 +0000
Quoted 4 lines
TCP uses of
dev_net()are safe, change them todev_net_rcu()to get LOCKDEP support.Signed-off-by Eric Dumazet <[email protected]>
PATCH 7/16 net: gro: convert four dev_net() calls
In reply to Eric Dumazettcp4_check_fraglist_gro(), tcp6_check_fraglist_gro(), udp4_gro_lookup_skb() and udp6_gro_lookup_skb()
assume RCU is held so that the net structure does not disappear.
Use dev_net_rcu() instead of dev_net() to get LOCKDEP support.
--- net/ipv4/tcp_offload.c | 2 +- net/ipv4/udp_offload.c | 2 +- net/ipv6/tcpv6_offload.c | 2 +- net/ipv6/udp_offload.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
net/ipv4/tcp_offload.c +1 -1
@@ -425,7 +425,7 @@ static void tcp4_check_fraglist_gro(struct list_head *head, struct sk_buff *skb,inet_get_iif_sdif (skb, &iif, &sdif); iph =skb_gro_network_header (skb); - net =dev_net (skb->dev); + net =dev_net_rcu (skb->dev); sk = __inet_lookup_established(net, net->ipv4.tcp_death_row.hashinfo, iph->saddr, th->source, iph->daddr, ntohs(th->dest),
net/ipv4/udp_offload.c +1 -1
@@ -630,7 +630,7 @@ static struct sock *udp4_gro_lookup_skb(struct sk_buff *skb, __be16 sport, __be16 dport) {const struct iphdr *iph =skb_gro_network_header (skb); -struct net *net =dev_net (skb->dev); +struct net *net =dev_net_rcu (skb->dev);int iif, sdif;inet_get_iif_sdif (skb, &iif, &sdif);
net/ipv6/tcpv6_offload.c +1 -1
@@ -35,7 +35,7 @@ static void tcp6_check_fraglist_gro(struct list_head *head, struct sk_buff *skb,inet6_get_iif_sdif (skb, &iif, &sdif); hdr =skb_gro_network_header (skb); - net =dev_net (skb->dev); + net =dev_net_rcu (skb->dev); sk = __inet6_lookup_established(net, net->ipv4.tcp_death_row.hashinfo, &hdr->saddr, th->source, &hdr->daddr, ntohs(th->dest),
net/ipv6/udp_offload.c +1 -1
@@ -117,7 +117,7 @@ static struct sock *udp6_gro_lookup_skb(struct sk_buff *skb, __be16 sport, __be16 dport) {const struct ipv6hdr *iph =skb_gro_network_header (skb); -struct net *net =dev_net (skb->dev); +struct net *net =dev_net_rcu (skb->dev);int iif, sdif;inet6_get_iif_sdif (skb, &iif, &sdif);
Signature · 1 line
2.48.1.362.g079036d154-goog
Re: [PATCH net 07/16] net: gro: convert four dev_net() calls
From: Eric Dumazet <[email protected]>
Date: Fri, 31 Jan 2025 17:13:25 +0000
Quoted 7 lines
tcp4_check_fraglist_gro(),tcp6_check_fraglist_gro(),udp4_gro_lookup_skb()andudp6_gro_lookup_skb()
assume RCU is held so that the net structure does not disappear.Use
dev_net_rcu()instead ofdev_net()to get LOCKDEP support.Signed-off-by Eric Dumazet <[email protected]>
PATCH 8/16 udp: convert to dev_net_rcu()
In reply to Eric DumazetTCP uses of dev_net() are safe, change them to dev_net_rcu() to get LOCKDEP support.
--- net/ipv4/udp.c | 19 ++++++++++--------- net/ipv6/udp.c | 18 +++++++++--------- 2 files changed, 19 insertions(+), 18 deletions(-)
net/ipv4/udp.c +10 -9
@@ -750,7 +750,7 @@ static inline struct sock *__udp4_lib_lookup_skb(struct sk_buff *skb, {const struct iphdr *iph =ip_hdr (skb); -return __udp4_lib_lookup (dev_net (skb->dev), iph->saddr, sport, +return __udp4_lib_lookup (dev_net_rcu (skb->dev), iph->saddr, sport, iph->daddr, dport,inet_iif (skb),inet_sdif (skb), udptable, skb); }
@@ -760,7 +760,7 @@ struct sock *udp4_lib_lookup_skb(const struct sk_buff *skb, {const u16 offset =NAPI_GRO_CB (skb)->network_offsets[skb->encapsulation];const struct iphdr *iph = (struct iphdr *)(skb->data + offset); -struct net *net =dev_net (skb->dev); +struct net *net =dev_net_rcu (skb->dev);int iif, sdif;inet_get_iif_sdif (skb, &iif, &sdif);
@@ -934,13 +934,13 @@ int __udp4_lib_err(struct sk_buff *skb, u32 info, struct udp_table *udptable)struct inet_sock *inet;const struct iphdr *iph = (const struct iphdr *)skb->data;struct udphdr *uh = (struct udphdr *)(skb->data+(iph->ihl<<2 )); +struct net *net =dev_net_rcu (skb->dev);const int type =icmp_hdr (skb)->type;const int code =icmp_hdr (skb)->code;bool tunnel = false;struct sock *sk;int harderr;int err; -struct net *net =dev_net (skb->dev); sk = __udp4_lib_lookup(net, iph->daddr, uh->dest, iph->saddr, uh->source, skb->dev->ifindex,
@@ -1025,7 +1025,7 @@ int __udp4_lib_err(struct sk_buff *skb, u32 info, struct udp_table *udptable)int udp_err (struct sk_buff *skb,u32 info) { -return __udp4_lib_err (skb, info,dev_net (skb->dev)->ipv4.udp_table); +return __udp4_lib_err (skb, info,dev_net_rcu (skb->dev)->ipv4.udp_table); }/*
@@ -2466,7 +2466,7 @@ static int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)udp_post_segment_fix_csum (skb); ret =udp_queue_rcv_one_skb (sk, skb);if (ret >0 ) -ip_protocol_deliver_rcu (dev_net (skb->dev), skb, ret); +ip_protocol_deliver_rcu (dev_net_rcu (skb->dev), skb, ret); }return 0 ; }
@@ -2632,12 +2632,12 @@ static int udp_unicast_rcv_skb(struct sock *sk, struct sk_buff *skb,int __udp4_lib_rcv (struct sk_buff *skb,struct udp_table *udptable,int proto) { +struct net *net =dev_net_rcu (skb->dev); +struct rtable *rt =skb_rtable (skb);struct sock *sk =NULL ;struct udphdr *uh;unsigned short ulen; -struct rtable *rt =skb_rtable (skb);__be32 saddr, daddr; -struct net *net =dev_net (skb->dev);bool refcounted;int drop_reason;
@@ -2804,7 +2804,7 @@ static struct sock *__udp4_lib_demux_lookup(struct net *net,int udp_v4_early_demux (struct sk_buff *skb) { -struct net *net =dev_net (skb->dev); +struct net *net =dev_net_rcu (skb->dev);struct in_device *in_dev =NULL ;const struct iphdr *iph;const struct udphdr *uh;
@@ -2873,7 +2873,8 @@ int udp_v4_early_demux(struct sk_buff *skb)int udp_rcv (struct sk_buff *skb) { -return __udp4_lib_rcv (skb,dev_net (skb->dev)->ipv4.udp_table,IPPROTO_UDP ); +return __udp4_lib_rcv (skb,dev_net_rcu (skb->dev)->ipv4.udp_table, +IPPROTO_UDP ); }void udp_destroy_sock (struct sock *sk)
net/ipv6/udp.c +9 -9
@@ -410,7 +410,7 @@ static struct sock *__udp6_lib_lookup_skb(struct sk_buff *skb, {const struct ipv6hdr *iph =ipv6_hdr (skb); -return __udp6_lib_lookup (dev_net (skb->dev), &iph->saddr, sport, +return __udp6_lib_lookup (dev_net_rcu (skb->dev), &iph->saddr, sport, &iph->daddr, dport,inet6_iif (skb),inet6_sdif (skb), udptable, skb); }
@@ -420,7 +420,7 @@ struct sock *udp6_lib_lookup_skb(const struct sk_buff *skb, {const u16 offset =NAPI_GRO_CB (skb)->network_offsets[skb->encapsulation];const struct ipv6hdr *iph = (struct ipv6hdr *)(skb->data + offset); -struct net *net =dev_net (skb->dev); +struct net *net =dev_net_rcu (skb->dev);int iif, sdif;inet6_get_iif_sdif (skb, &iif, &sdif);
@@ -702,16 +702,16 @@ int __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt, u8 type, u8 code, int offset, __be32 info, struct udp_table *udptable) { - struct ipv6_pinfo *np; const struct ipv6hdr *hdr = (const struct ipv6hdr *)skb->data;const struct in6_addr *saddr = &hdr->saddr;const struct in6_addr *daddr =seg6_get_daddr (skb, opt) ? : &hdr->daddr;struct udphdr *uh = (struct udphdr *)(skb->data+offset); +struct net *net =dev_net_rcu (skb->dev); +struct ipv6_pinfo *np;bool tunnel = false;struct sock *sk;int harderr;int err; -struct net *net =dev_net (skb->dev); sk =__udp6_lib_lookup (net, daddr, uh->dest, saddr, uh->source,inet6_iif (skb),inet6_sdif (skb), udptable,NULL );
@@ -818,7 +818,7 @@ static __inline__ int udpv6_err(struct sk_buff *skb, u8 code, int offset, __be32 info) { return __udp6_lib_err(skb, opt, type, code, offset, info, - dev_net(skb->dev)->ipv4.udp_table); + dev_net_rcu(skb->dev)->ipv4.udp_table); }static int udpv6_queue_rcv_one_skb (struct sock *sk,struct sk_buff *skb)
@@ -929,7 +929,7 @@ static int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)udp_post_segment_fix_csum (skb); ret =udpv6_queue_rcv_one_skb (sk, skb);if (ret >0 ) -ip6_protocol_deliver_rcu (dev_net (skb->dev), skb, ret, +ip6_protocol_deliver_rcu (dev_net_rcu (skb->dev), skb, ret, true); }return 0 ;
@@ -1072,7 +1072,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, {enum skb_drop_reason reason =SKB_DROP_REASON_NOT_SPECIFIED ;const struct in6_addr *saddr, *daddr; -struct net *net =dev_net (skb->dev); +struct net *net =dev_net_rcu (skb->dev);struct sock *sk =NULL ;struct udphdr *uh;bool refcounted;
@@ -1220,7 +1220,7 @@ static struct sock *__udp6_lib_demux_lookup(struct net *net,void udp_v6_early_demux (struct sk_buff *skb) { -struct net *net =dev_net (skb->dev); +struct net *net =dev_net_rcu (skb->dev);const struct udphdr *uh;struct sock *sk;struct dst_entry *dst;
@@ -1262,7 +1262,7 @@ void udp_v6_early_demux(struct sk_buff *skb) INDIRECT_CALLABLE_SCOPE int udpv6_rcv(struct sk_buff *skb) { -return __udp6_lib_rcv (skb,dev_net (skb->dev)->ipv4.udp_table,IPPROTO_UDP ); +return __udp6_lib_rcv (skb,dev_net_rcu (skb->dev)->ipv4.udp_table,IPPROTO_UDP ); }/*
Signature · 1 line
2.48.1.362.g079036d154-goog
Re: [PATCH net 08/16] udp: convert to dev_net_rcu()
From: Eric Dumazet <[email protected]>
Date: Fri, 31 Jan 2025 17:13:26 +0000
Quoted 1 line
TCP uses of
dev_net()are safe, change them todev_net_rcu()
s/TCP/UDP/
Quoted 3 lines
to get LOCKDEP support.
Signed-off-by Eric Dumazet <[email protected]>
[...]
net/ipv6/udp.c int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, · line 1075
Quoted 6 lines
net/ipv6/udp.c +1
-1@@ -1072,7 +1072,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, {enum skb_drop_reason reason =SKB_DROP_REASON_NOT_SPECIFIED ;const struct in6_addr *saddr, *daddr; -struct net *net =dev_net (skb->dev); +struct net *net =dev_net_rcu (skb->dev);
if v2 is needed for chagelog, this line is longer than saddr/daddr one.
Quoted 3 lines
net/ipv4/udp.c +0
-0struct sock *sk =NULL ;struct udphdr *uh;bool refcounted;
Re: [PATCH net 08/16] udp: convert to dev_net_rcu()
Quoted 15 lines · Kuniyuki Iwashima
From: Eric Dumazet <[email protected]>
Date: Fri, 31 Jan 2025 17:13:26 +0000Quoted 1 line
TCP uses of
dev_net()are safe, change them todev_net_rcu()s/TCP/UDP/
Quoted 3 lines
to get LOCKDEP support.
Signed-off-by Eric Dumazet <[email protected]>Reviewed-by Kuniyuki Iwashima <[email protected]>[...]
Quoted 8 lines
net/ipv6/udp.c int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, · line 1075
Quoted 6 lines
net/ipv6/udp.c +1
-1@@ -1072,7 +1072,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, {enum skb_drop_reason reason =SKB_DROP_REASON_NOT_SPECIFIED ;const struct in6_addr *saddr, *daddr; -struct net *net =dev_net (skb->dev); +struct net *net =dev_net_rcu (skb->dev);if v2 is needed for chagelog, this line is longer than saddr/daddr one.
ACK, I will change this in v2.
PATCH 9/16 ipv4: icmp: convert to dev_net_rcu()
In reply to Eric DumazetICMP uses of dev_net() are safe, change them to dev_net_rcu() to get LOCKDEP support.
--- net/ipv4/icmp.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
net/ipv4/icmp.c +11 -11
@@ -401,7 +401,7 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb) {struct ipcm_cookie ipc;struct rtable *rt =skb_rtable (skb); -struct net *net =dev_net (rt->dst.dev); +struct net *net =dev_net_rcu (rt->dst.dev);bool apply_ratelimit = false;struct flowi4 fl4;struct sock *sk;
@@ -611,9 +611,9 @@ void __icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info, goto out;if (rt->dst.dev) - net =dev_net (rt->dst.dev); + net =dev_net_rcu (rt->dst.dev);else if (skb_in->dev) - net =dev_net (skb_in->dev); + net =dev_net_rcu (skb_in->dev);else goto out;
@@ -834,7 +834,7 @@ static void icmp_socket_deliver(struct sk_buff *skb, u32 info)* avoid additional coding at protocol handlers. */ if (!pskb_may_pull (skb, iph->ihl *4 +8 )) { -__ICMP_INC_STATS (dev_net (skb->dev),ICMP_MIB_INERRORS ); +__ICMP_INC_STATS (dev_net_rcu (skb->dev),ICMP_MIB_INERRORS );return ; }
@@ -868,7 +868,7 @@ static enum skb_drop_reason icmp_unreach(struct sk_buff *skb)struct net *net;u32 info =0 ; - net =dev_net (skb_dst (skb)->dev); + net =dev_net_rcu (skb_dst (skb)->dev);/* * Incomplete header ?
@@ -979,7 +979,7 @@ static enum skb_drop_reason icmp_unreach(struct sk_buff *skb)static enum skb_drop_reason icmp_redirect (struct sk_buff *skb) {if (skb->len <sizeof (struct iphdr )) { -__ICMP_INC_STATS (dev_net (skb->dev),ICMP_MIB_INERRORS ); +__ICMP_INC_STATS (dev_net_rcu (skb->dev),ICMP_MIB_INERRORS );return SKB_DROP_REASON_PKT_TOO_SMALL ; }
@@ -1011,7 +1011,7 @@ static enum skb_drop_reason icmp_echo(struct sk_buff *skb)struct icmp_bxm icmp_param;struct net *net; - net =dev_net (skb_dst (skb)->dev); + net =dev_net_rcu (skb_dst (skb)->dev);/* should there be an ICMP stat for ignored echos? */ if (READ_ONCE (net->ipv4.sysctl_icmp_echo_ignore_all))return SKB_NOT_DROPPED_YET ;
@@ -1040,9 +1040,9 @@ static enum skb_drop_reason icmp_echo(struct sk_buff *skb)bool icmp_build_probe (struct sk_buff *skb,struct icmphdr *icmphdr) { +struct net *net =dev_net_rcu (skb->dev);struct icmp_ext_hdr *ext_hdr, _ext_hdr;struct icmp_ext_echo_iio *iio, _iio; -struct net *net =dev_net (skb->dev);struct inet6_dev *in6_dev;struct in_device *in_dev;struct net_device *dev;
@@ -1181,7 +1181,7 @@ static enum skb_drop_reason icmp_timestamp(struct sk_buff *skb)return SKB_NOT_DROPPED_YET ; out_err: -__ICMP_INC_STATS (dev_net (skb_dst (skb)->dev),ICMP_MIB_INERRORS ); +__ICMP_INC_STATS (dev_net_rcu (skb_dst (skb)->dev),ICMP_MIB_INERRORS );return SKB_DROP_REASON_PKT_TOO_SMALL ; }
@@ -1198,7 +1198,7 @@ int icmp_rcv(struct sk_buff *skb) {enum skb_drop_reason reason =SKB_DROP_REASON_NOT_SPECIFIED ;struct rtable *rt =skb_rtable (skb); -struct net *net =dev_net (rt->dst.dev); +struct net *net =dev_net_rcu (rt->dst.dev);struct icmphdr *icmph;if (!xfrm4_policy_check (NULL ,XFRM_POLICY_IN , skb)) {
@@ -1371,9 +1371,9 @@ int icmp_err(struct sk_buff *skb, u32 info)struct iphdr *iph = (struct iphdr *)skb->data;int offset = iph->ihl<<2 ;struct icmphdr *icmph = (struct icmphdr *)(skb->data + offset); +struct net *net =dev_net_rcu (skb->dev);int type =icmp_hdr (skb)->type;int code =icmp_hdr (skb)->code; -struct net *net =dev_net (skb->dev);/* * Use ping_err to handle all icmp errors except those
Signature · 1 line
2.48.1.362.g079036d154-goog
Re: [PATCH net 09/16] ipv4: icmp: convert to dev_net_rcu()
From: Eric Dumazet <[email protected]>
Date: Fri, 31 Jan 2025 17:13:27 +0000
Quoted 4 lines
ICMP uses of
dev_net()are safe, change them todev_net_rcu()to get LOCKDEP support.Signed-off-by Eric Dumazet <[email protected]>
PATCH 10/16 ipv6: icmp: convert to dev_net_rcu()
In reply to Eric DumazetICMP uses of dev_net() are safe, change them to dev_net_rcu() to get LOCKDEP support.
--- net/ipv6/icmp.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
net/ipv6/icmp.c +11 -11
@@ -76,7 +76,7 @@ static int icmpv6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, {/* icmpv6_notify checks 8 bytes can be pulled, icmp6hdr is 8 bytes */ struct icmp6hdr *icmp6 = (struct icmp6hdr *) (skb->data + offset); -struct net *net =dev_net (skb->dev); +struct net *net =dev_net_rcu (skb->dev);if (type ==ICMPV6_PKT_TOOBIG )ip6_update_pmtu (skb, net, info, skb->dev->ifindex,0 ,sock_net_uid (net,NULL ));
@@ -473,7 +473,7 @@ void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,if (!skb->dev)return ; - net =dev_net (skb->dev); + net =dev_net_rcu (skb->dev); mark =IP6_REPLY_MARK (net, skb->mark);/* * Make sure we respect the rules
@@ -679,8 +679,8 @@ int ip6_err_gen_icmpv6_unreach(struct sk_buff *skb, int nhs, int type,skb_pull (skb2, nhs);skb_reset_network_header (skb2); - rt =rt6_lookup (dev_net (skb->dev), &ipv6_hdr (skb2)->saddr,NULL ,0 , - skb,0 ); + rt =rt6_lookup (dev_net_rcu (skb->dev), &ipv6_hdr (skb2)->saddr, +NULL ,0 , skb,0 );if (rt && rt->dst.dev) skb2->dev = rt->dst.dev;
@@ -717,7 +717,7 @@ EXPORT_SYMBOL(ip6_err_gen_icmpv6_unreach);static enum skb_drop_reason icmpv6_echo_reply (struct sk_buff *skb) { -struct net *net =dev_net (skb->dev); +struct net *net =dev_net_rcu (skb->dev);struct sock *sk;struct inet6_dev *idev;struct ipv6_pinfo *np;
@@ -832,7 +832,7 @@ enum skb_drop_reason icmpv6_notify(struct sk_buff *skb, u8 type, u8 code, __be32 info) {struct inet6_skb_parm *opt =IP6CB (skb); -struct net *net =dev_net (skb->dev); +struct net *net =dev_net_rcu (skb->dev);const struct inet6_protocol *ipprot;enum skb_drop_reason reason;int inner_offset;
@@ -889,7 +889,7 @@ enum skb_drop_reason icmpv6_notify(struct sk_buff *skb, u8 type,static int icmpv6_rcv (struct sk_buff *skb) {enum skb_drop_reason reason =SKB_DROP_REASON_NOT_SPECIFIED ; -struct net *net =dev_net (skb->dev); +struct net *net =dev_net_rcu (skb->dev);struct net_device *dev =icmp6_dev (skb);struct inet6_dev *idev =__in6_dev_get (dev);const struct in6_addr *saddr, *daddr;
@@ -921,7 +921,7 @@ static int icmpv6_rcv(struct sk_buff *skb)skb_set_network_header (skb, nh); } -__ICMP6_INC_STATS (dev_net (dev), idev,ICMP6_MIB_INMSGS ); +__ICMP6_INC_STATS (dev_net_rcu (dev), idev,ICMP6_MIB_INMSGS ); saddr = &ipv6_hdr (skb)->saddr; daddr = &ipv6_hdr (skb)->daddr;
@@ -939,7 +939,7 @@ static int icmpv6_rcv(struct sk_buff *skb) type = hdr->icmp6_type; -ICMP6MSGIN_INC_STATS (dev_net (dev), idev, type); +ICMP6MSGIN_INC_STATS (dev_net_rcu (dev), idev, type);switch (type) {case ICMPV6_ECHO_REQUEST :
@@ -1034,9 +1034,9 @@ static int icmpv6_rcv(struct sk_buff *skb) csum_error: reason =SKB_DROP_REASON_ICMP_CSUM ; -__ICMP6_INC_STATS (dev_net (dev), idev,ICMP6_MIB_CSUMERRORS ); +__ICMP6_INC_STATS (dev_net_rcu (dev), idev,ICMP6_MIB_CSUMERRORS ); discard_it: -__ICMP6_INC_STATS (dev_net (dev), idev,ICMP6_MIB_INERRORS ); +__ICMP6_INC_STATS (dev_net_rcu (dev), idev,ICMP6_MIB_INERRORS ); drop_no_count:kfree_skb_reason (skb, reason);return 0 ;
Signature · 1 line
2.48.1.362.g079036d154-goog
Re: [PATCH net 10/16] ipv6: icmp: convert to dev_net_rcu()
From: Eric Dumazet <[email protected]>
Date: Fri, 31 Jan 2025 17:13:28 +0000
Quoted 4 lines
ICMP uses of
dev_net()are safe, change them todev_net_rcu()to get LOCKDEP support.Signed-off-by Eric Dumazet <[email protected]>
PATCH 11/16 ipv6: input: convert to dev_net_rcu()
In reply to Eric Dumazetdev_net() calls from net/ipv6/ip6_input.c seem to
happen under RCU protection.
Convert them to dev_net_rcu() to ensure LOCKDEP support.
--- net/ipv6/ip6_input.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/ipv6/ip6_input.c +6 -6
@@ -301,7 +301,7 @@ static struct sk_buff *ip6_rcv_core(struct sk_buff *skb, struct net_device *dev,int ipv6_rcv (struct sk_buff *skb,struct net_device *dev,struct packet_type *pt,struct net_device *orig_dev) { -struct net *net =dev_net (skb->dev); +struct net *net =dev_net_rcu (skb->dev); skb =ip6_rcv_core (skb, dev, net);if (skb ==NULL )
@@ -330,7 +330,7 @@ void ipv6_list_rcv(struct list_head *head, struct packet_type *pt,list_for_each_entry_safe (skb, next, head, list) {struct net_device *dev = skb->dev; -struct net *net =dev_net (dev); +struct net *net =dev_net_rcu (dev);skb_list_del_init (skb); skb =ip6_rcv_core (skb, dev, net);
@@ -488,7 +488,7 @@ static int ip6_input_finish(struct net *net, struct sock *sk, struct sk_buff *skint ip6_input (struct sk_buff *skb) {return NF_HOOK (NFPROTO_IPV6 ,NF_INET_LOCAL_IN , -dev_net (skb->dev),NULL , skb, skb->dev,NULL , +dev_net_rcu (skb->dev),NULL , skb, skb->dev,NULL , ip6_input_finish); }EXPORT_SYMBOL_GPL (ip6_input);
@@ -500,14 +500,14 @@ int ip6_mc_input(struct sk_buff *skb)struct net_device *dev;bool deliver; -__IP6_UPD_PO_STATS (dev_net (skb_dst (skb)->dev), +__IP6_UPD_PO_STATS (dev_net_rcu (skb_dst (skb)->dev),__in6_dev_get_safely (skb->dev),IPSTATS_MIB_INMCAST , skb->len);/* skb->dev passed may be master dev for vrfs. */ if (sdif) {rcu_read_lock (); - dev =dev_get_by_index_rcu (dev_net (skb->dev), sdif); + dev =dev_get_by_index_rcu (dev_net_rcu (skb->dev), sdif);if (!dev) {rcu_read_unlock ();kfree_skb (skb);
@@ -526,7 +526,7 @@ int ip6_mc_input(struct sk_buff *skb)/* * IPv6 multicast router mode is now supported ;) */ -if (atomic_read (&dev_net (skb->dev)->ipv6.devconf_all->mc_forwarding) && +if (atomic_read (&dev_net_rcu (skb->dev)->ipv6.devconf_all->mc_forwarding) && !(ipv6_addr_type (&hdr->daddr) & (IPV6_ADDR_LOOPBACK |IPV6_ADDR_LINKLOCAL )) &&likely (!(IP6CB (skb)->flags &IP6SKB_FORWARDED ))) {
Signature · 1 line
2.48.1.362.g079036d154-goog
Re: [PATCH net 11/16] ipv6: input: convert to dev_net_rcu()
From: Eric Dumazet <[email protected]>
Date: Fri, 31 Jan 2025 17:13:29 +0000
Quoted 6 lines
dev_net()calls fromnet/ipv6/ip6_input.cseem to
happen under RCU protection.Convert them to
dev_net_rcu()to ensure LOCKDEP support.Signed-off-by Eric Dumazet <[email protected]>
PATCH 12/16 ipv6: output: convert to dev_net_rcu()
In reply to Eric Dumazetdev_net() calls from net/ipv6/ip6_output.c and net/ipv6/output_core.c are happening under RCU protection.
Convert them to dev_net_rcu() to ensure LOCKDEP support.
--- net/ipv6/ip6_output.c | 4 ++-- net/ipv6/output_core.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
net/ipv6/ip6_output.c +2 -2
@@ -393,7 +393,7 @@ static int ip6_call_ra_chain(struct sk_buff *skb, int sel) sk->sk_bound_dev_if == skb->dev->ifindex)) {if (inet6_test_bit (RTALERT_ISOLATE , sk) && - !net_eq (sock_net (sk),dev_net (skb->dev))) { + !net_eq (sock_net (sk),dev_net_rcu (skb->dev))) {continue ; }if (last) {
@@ -503,7 +503,7 @@ int ip6_forward(struct sk_buff *skb)struct dst_entry *dst =skb_dst (skb);struct ipv6hdr *hdr =ipv6_hdr (skb);struct inet6_skb_parm *opt =IP6CB (skb); -struct net *net =dev_net (dst->dev); +struct net *net =dev_net_rcu (dst->dev);struct inet6_dev *idev;SKB_DR (reason);u32 mtu;
net/ipv6/output_core.c +1 -1
@@ -113,7 +113,7 @@ int ip6_dst_hoplimit(struct dst_entry *dst)if (idev) hoplimit =READ_ONCE (idev->cnf.hop_limit);else - hoplimit =READ_ONCE (dev_net (dev)->ipv6.devconf_all->hop_limit); + hoplimit =READ_ONCE (dev_net_rcu (dev)->ipv6.devconf_all->hop_limit);rcu_read_unlock (); }return hoplimit;
Signature · 1 line
2.48.1.362.g079036d154-goog
PATCH 12/16 ipv6: output: convert to dev_net_rcu()
From: Eric Dumazet <[email protected]>
Date: Fri, 31 Jan 2025 17:13:30 +0000
Quoted 7 lines
dev_net()calls fromnet/ipv6/ip6_output.candnet/ipv6/output_core.care happening under RCU protection.Convert them to
dev_net_rcu()to ensure LOCKDEP support.Signed-off-by Eric Dumazet <[email protected]>
PATCH 13/16 ipv6: use RCU protection in ip6_default_advmss()
In reply to Eric Dumazetip6_default_advmss() needs rcu protection to make sure the net structure it reads does not disappear.
--- net/ipv6/route.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/ipv6/route.c +6 -1
@@ -3196,13 +3196,18 @@ static unsigned int ip6_default_advmss(const struct dst_entry *dst) {struct net_device *dev = dst->dev;unsigned int mtu =dst_mtu (dst); -struct net *net =dev_net (dev); +struct net *net; mtu -=sizeof (struct ipv6hdr ) +sizeof (struct tcphdr ); +rcu_read_lock (); + + net =dev_net_rcu (dev);if (mtu < net->ipv6.sysctl.ip6_rt_min_advmss) mtu = net->ipv6.sysctl.ip6_rt_min_advmss; +rcu_read_unlock (); +/* * Maximal non-jumbo IPv6 payload is IPV6_MAXPLEN and * corresponding MSS is IPV6_MAXPLEN - tcp_header_size.
Signature · 1 line
2.48.1.362.g079036d154-goog
Re: [PATCH net 13/16] ipv6: use RCU protection in ip6_default_advmss()
From: Eric Dumazet <[email protected]>
Date: Fri, 31 Jan 2025 17:13:31 +0000
Quoted 4 lines
ip6_default_advmss()needs rcu protection to make sure the net structure it reads does not disappear.Signed-off-by Eric Dumazet <[email protected]>
PATCH 14/16 net: filter: convert to dev_net_rcu()
In reply to Eric DumazetAll calls to dev_net() from net/core/filter.c are currently done under rcu_read_lock().
Convert them to dev_net_rcu() to ensure LOCKDEP support.
--- net/core/filter.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-)
net/core/filter.c +20 -20
@@ -2244,7 +2244,7 @@ static int __bpf_redirect_neigh_v6(struct sk_buff *skb, struct net_device *dev, struct bpf_nh_params *nh) {const struct ipv6hdr *ip6h =ipv6_hdr (skb); -struct net *net =dev_net (dev); +struct net *net =dev_net_rcu (dev);int err, ret =NET_XMIT_DROP ;if (!nh) {
@@ -2348,7 +2348,7 @@ static int __bpf_redirect_neigh_v4(struct sk_buff *skb, struct net_device *dev, struct bpf_nh_params *nh) {const struct iphdr *ip4h =ip_hdr (skb); -struct net *net =dev_net (dev); +struct net *net =dev_net_rcu (dev);int err, ret =NET_XMIT_DROP ;if (!nh) {
@@ -2438,7 +2438,7 @@ BPF_CALL_3(bpf_clone_redirect, struct sk_buff *, skb, u32, ifindex, u64, flags)if (unlikely (flags & (~(BPF_F_INGRESS ) |BPF_F_REDIRECT_INTERNAL )))return -EINVAL ; - dev =dev_get_by_index_rcu (dev_net (skb->dev), ifindex); + dev =dev_get_by_index_rcu (dev_net_rcu (skb->dev), ifindex);if (unlikely (!dev))return -EINVAL ;
@@ -2482,7 +2482,7 @@ static struct net_device *skb_get_peer_dev(struct net_device *dev)int skb_do_redirect (struct sk_buff *skb) {struct bpf_redirect_info *ri =bpf_net_ctx_get_ri (); -struct net *net =dev_net (skb->dev); +struct net *net =dev_net_rcu (skb->dev);struct net_device *dev;u32 flags = ri->flags;
@@ -2497,7 +2497,7 @@ int skb_do_redirect(struct sk_buff *skb) dev =skb_get_peer_dev (dev);if (unlikely (!dev || !(dev->flags &IFF_UP ) || -net_eq (net,dev_net (dev)))) +net_eq (net,dev_net_rcu (dev)))) goto out_drop; skb->dev = dev;dev_sw_netstats_rx_add (dev, skb->len);
@@ -4425,7 +4425,7 @@ __xdp_do_redirect_frame(struct bpf_redirect_info *ri, struct net_device *dev,break ;case BPF_MAP_TYPE_UNSPEC :if (map_id ==INT_MAX ) { - fwd =dev_get_by_index_rcu (dev_net (dev), ri->tgt_index); + fwd =dev_get_by_index_rcu (dev_net_rcu (dev), ri->tgt_index);if (unlikely (!fwd)) { err = -EINVAL ;break ;
@@ -4550,7 +4550,7 @@ int xdp_do_generic_redirect(struct net_device *dev, struct sk_buff *skb, ri->map_type =BPF_MAP_TYPE_UNSPEC ;if (map_type ==BPF_MAP_TYPE_UNSPEC && map_id ==INT_MAX ) { - fwd =dev_get_by_index_rcu (dev_net (dev), ri->tgt_index); + fwd =dev_get_by_index_rcu (dev_net_rcu (dev), ri->tgt_index);if (unlikely (!fwd)) { err = -EINVAL ; goto err;
@@ -6203,12 +6203,12 @@ BPF_CALL_4(bpf_xdp_fib_lookup, struct xdp_buff *, ctx,switch (params->family) {#if IS_ENABLED (CONFIG_INET )case AF_INET : -return bpf_ipv4_fib_lookup (dev_net (ctx->rxq->dev), params, +return bpf_ipv4_fib_lookup (dev_net_rcu (ctx->rxq->dev), params, flags, true);#endif #if IS_ENABLED (CONFIG_IPV6 )case AF_INET6 : -return bpf_ipv6_fib_lookup (dev_net (ctx->rxq->dev), params, +return bpf_ipv6_fib_lookup (dev_net_rcu (ctx->rxq->dev), params, flags, true);#endif }
@@ -6228,7 +6228,7 @@ static const struct bpf_func_proto bpf_xdp_fib_lookup_proto = { BPF_CALL_4(bpf_skb_fib_lookup, struct sk_buff *, skb, struct bpf_fib_lookup *, params, int, plen, u32, flags) { -struct net *net =dev_net (skb->dev); +struct net *net =dev_net_rcu (skb->dev);int rc = -EAFNOSUPPORT ;bool check_mtu = false;
@@ -6283,7 +6283,7 @@ static const struct bpf_func_proto bpf_skb_fib_lookup_proto = {static struct net_device *__dev_via_ifindex (struct net_device *dev_curr,u32 ifindex) { -struct net *netns =dev_net (dev_curr); +struct net *netns =dev_net_rcu (dev_curr);/* Non-redirect use-cases can use ifindex=0 and save ifindex lookup */ if (ifindex ==0 )
@@ -6806,7 +6806,7 @@ bpf_skc_lookup(struct sk_buff *skb, struct bpf_sock_tuple *tuple, u32 len,int ifindex;if (skb->dev) { - caller_net =dev_net (skb->dev); + caller_net =dev_net_rcu (skb->dev); ifindex = skb->dev->ifindex; }else { caller_net =sock_net (skb->sk);
@@ -6906,7 +6906,7 @@ BPF_CALL_5(bpf_tc_skc_lookup_tcp, struct sk_buff *, skb, {struct net_device *dev = skb->dev;int ifindex = dev->ifindex, sdif =dev_sdif (dev); -struct net *caller_net =dev_net (dev); +struct net *caller_net =dev_net_rcu (dev); return (unsigned long)__bpf_skc_lookup(skb, tuple, len, caller_net, ifindex, IPPROTO_TCP, netns_id,
@@ -6930,7 +6930,7 @@ BPF_CALL_5(bpf_tc_sk_lookup_tcp, struct sk_buff *, skb, {struct net_device *dev = skb->dev;int ifindex = dev->ifindex, sdif =dev_sdif (dev); -struct net *caller_net =dev_net (dev); +struct net *caller_net =dev_net_rcu (dev); return (unsigned long)__bpf_sk_lookup(skb, tuple, len, caller_net, ifindex, IPPROTO_TCP, netns_id,
@@ -6954,7 +6954,7 @@ BPF_CALL_5(bpf_tc_sk_lookup_udp, struct sk_buff *, skb, {struct net_device *dev = skb->dev;int ifindex = dev->ifindex, sdif =dev_sdif (dev); -struct net *caller_net =dev_net (dev); +struct net *caller_net =dev_net_rcu (dev); return (unsigned long)__bpf_sk_lookup(skb, tuple, len, caller_net, ifindex, IPPROTO_UDP, netns_id,
@@ -6992,7 +6992,7 @@ BPF_CALL_5(bpf_xdp_sk_lookup_udp, struct xdp_buff *, ctx, {struct net_device *dev = ctx->rxq->dev;int ifindex = dev->ifindex, sdif =dev_sdif (dev); -struct net *caller_net =dev_net (dev); +struct net *caller_net =dev_net_rcu (dev); return (unsigned long)__bpf_sk_lookup(NULL, tuple, len, caller_net, ifindex, IPPROTO_UDP, netns_id,
@@ -7016,7 +7016,7 @@ BPF_CALL_5(bpf_xdp_skc_lookup_tcp, struct xdp_buff *, ctx, {struct net_device *dev = ctx->rxq->dev;int ifindex = dev->ifindex, sdif =dev_sdif (dev); -struct net *caller_net =dev_net (dev); +struct net *caller_net =dev_net_rcu (dev); return (unsigned long)__bpf_skc_lookup(NULL, tuple, len, caller_net, ifindex, IPPROTO_TCP, netns_id,
@@ -7040,7 +7040,7 @@ BPF_CALL_5(bpf_xdp_sk_lookup_tcp, struct xdp_buff *, ctx, {struct net_device *dev = ctx->rxq->dev;int ifindex = dev->ifindex, sdif =dev_sdif (dev); -struct net *caller_net =dev_net (dev); +struct net *caller_net =dev_net_rcu (dev); return (unsigned long)__bpf_sk_lookup(NULL, tuple, len, caller_net, ifindex, IPPROTO_TCP, netns_id,
@@ -7510,7 +7510,7 @@ BPF_CALL_3(bpf_sk_assign, struct sk_buff *, skb, struct sock *, sk, u64, flags)return -EINVAL ;if (!skb_at_tc_ingress (skb))return -EOPNOTSUPP ; -if (unlikely (dev_net (skb->dev) !=sock_net (sk))) +if (unlikely (dev_net_rcu (skb->dev) !=sock_net (sk)))return -ENETUNREACH ;if (sk_unhashed (sk))return -EOPNOTSUPP ;
@@ -11985,7 +11985,7 @@ __bpf_kfunc int bpf_sk_assign_tcp_reqsk(struct __sk_buff *s, struct sock *sk,if (!skb_at_tc_ingress (skb))return -EINVAL ; - net =dev_net (skb->dev); + net =dev_net_rcu (skb->dev);if (net !=sock_net (sk))return -ENETUNREACH ;
Signature · 1 line
2.48.1.362.g079036d154-goog
Re: [PATCH net 14/16] net: filter: convert to dev_net_rcu()
From: Eric Dumazet <[email protected]>
Date: Fri, 31 Jan 2025 17:13:32 +0000
Quoted 7 lines
All calls to
dev_net()fromnet/core/filter.care currently done underrcu_read_lock().Convert them to
dev_net_rcu()to ensure LOCKDEP support.Signed-off-by Eric Dumazet <[email protected]>
PATCH 15/16 flow_dissector: use rcu protection to fetch dev_net()
In reply to Eric Dumazet__skb_flow_dissect() can be called from arbitrary contexts.
It must extend its rcu protection section to include the call to dev_net(), which can become dev_net_rcu().
This makes sure the net structure can not disappear under us.
--- net/core/flow_dissector.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
net/core/flow_dissector.c +11 -10
@@ -1108,10 +1108,12 @@ bool __skb_flow_dissect(const struct net *net,FLOW_DISSECTOR_KEY_BASIC , target_container); +rcu_read_lock (); +if (skb) {if (!net) {if (skb->dev) - net =dev_net (skb->dev); + net =dev_net_rcu (skb->dev);else if (skb->sk) net =sock_net (skb->sk); }
@@ -1122,7 +1124,6 @@ bool __skb_flow_dissect(const struct net *net,enum netns_bpf_attach_type type =NETNS_BPF_FLOW_DISSECTOR ;struct bpf_prog_array *run_array; -rcu_read_lock (); run_array =rcu_dereference (init_net.bpf.run_array[type]);if (!run_array) run_array =rcu_dereference (net->bpf.run_array[type]);
@@ -1150,17 +1151,17 @@ bool __skb_flow_dissect(const struct net *net, prog =READ_ONCE (run_array->items[0 ].prog); result =bpf_flow_dissect (prog, &ctx, n_proto, nhoff, hlen, flags); -if (result ==BPF_FLOW_DISSECTOR_CONTINUE ) - goto dissect_continue; -__skb_flow_bpf_to_target (&flow_keys, flow_dissector, - target_container); -rcu_read_unlock (); -return result ==BPF_OK ; +if (result !=BPF_FLOW_DISSECTOR_CONTINUE ) { +__skb_flow_bpf_to_target (&flow_keys, flow_dissector, + target_container); +rcu_read_unlock (); +return result ==BPF_OK ; + } } -dissect_continue: -rcu_read_unlock (); } +rcu_read_unlock (); +if (dissector_uses_key (flow_dissector,FLOW_DISSECTOR_KEY_ETH_ADDRS )) {struct ethhdr *eth =eth_hdr (skb);
Signature · 1 line
2.48.1.362.g079036d154-goog
Re: [PATCH net 15/16] flow_dissector: use rcu protection to fetch dev_net()
From: Eric Dumazet <[email protected]>
Date: Fri, 31 Jan 2025 17:13:33 +0000
Quoted 8 lines
__skb_flow_dissect()can be called from arbitrary contexts.It must extend its rcu protection section to include the call to
dev_net(), which can becomedev_net_rcu().This makes sure the net structure can not disappear under us.
Fixes 3cbf4ffba5ee ("net: plumb network namespace into __skb_flow_dissect")
The correct tag seems to be
, which moves dev_net() out of rcu_read_lock().
otherwise looks good to me
Re: [PATCH net 15/16] flow_dissector: use rcu protection to fetch dev_net()
Quoted 8 lines · Kuniyuki Iwashima
From: Eric Dumazet <[email protected]>
Date: Fri, 31 Jan 2025 17:13:33 +0000Quoted 5 lines
__skb_flow_dissect()can be called from arbitrary contexts.It must extend its rcu protection section to include the call to
dev_net(), which can becomedev_net_rcu().
Quoted 7 lines
Quoted 3 lines
This makes sure the net structure can not disappear under us.
Fixes 3cbf4ffba5ee ("net: plumb network namespace into __skb_flow_dissect")The correct tag seems to be
Fixes 9b52e3f267a6 ("flow_dissector: handle no-skb use case")
Yes, you are correct, thanks !
Jakub Kicinski
maintainerQuoted 1 line · On Fri, 31 Jan 2025 17:13:18 +0000 Eric Dumazet wrote:
ipv4: use RCU protection in
inet_select_addr()
patchwork thinks it's an incomplete series due to lack of this patch on the list. I'm afraid a repost will be needed :(
Signature · 1 line
pw-bot: cr
Quoted 6 lines · Jakub Kicinski
Quoted 1 line · On Fri, 31 Jan 2025 17:13:18 +0000 Eric Dumazet wrote:
ipv4: use RCU protection in
inet_select_addr()patchwork thinks it's an incomplete series due to lack of this patch on the list. I'm afraid a repost will be needed :(
Interesting, I wonder what happened...
I will send a v2, here what it looks like:
commit 52a1dc65d01230876fbacc7f8fe63ee7a758603f (HEAD)
Author: Eric Dumazet <[email protected]> Date: Fri Jan 31 16:47:50 2025 +0000
ipv4: use RCU protection in inet_select_addr()
inet_select_addr() must use RCU protection to make sure the net structure it reads does not disappear.
namespace.")
net/ipv4/devinet.c +0 -0
100644
net/ipv4/devinet.c +0 -0
@@ -1371,10 +1371,11 @@ __be32 inet_select_addr(const struct
net_device *dev, __be32 dst, int scope)
__be32 addr = 0;
unsigned char localnet_scope = RT_SCOPE_HOST;
struct in_device *in_dev;
- struct net *net = dev_net(dev);
+ struct net *net;
int master_idx;
rcu_read_lock();
+ net = dev_net_rcu(dev);
in_dev = __in_dev_get_rcu(dev);
if (!in_dev)
goto no_in_dev;