Commit 9b49f57c authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

net: gro: convert four dev_net() calls 



tcp4_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.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20250301201424.2046477-5-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e7b9ecce

net/ipv4/tcp_offload.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);