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

gro: remove rcu_read_lock/rcu_read_unlock from gro_receive handlers 



All gro_receive() handlers are called from dev_gro_receive()
while rcu_read_lock() has been called.

There is no point stacking more rcu_read_lock()

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1aad9634

drivers/net/geneve.c

+1 −4
Original line number Diff line number Diff line
@@ -517,18 +517,15 @@ static struct sk_buff *geneve_gro_receive(struct sock *sk, 


	type = gh->proto_type;



	rcu_read_lock();

	ptype = gro_find_receive_by_type(type);

	if (!ptype)

		goto out_unlock;

		goto out;



	skb_gro_pull(skb, gh_len);

	skb_gro_postpull_rcsum(skb, gh, gh_len);

	pp = call_gro_receive(ptype->callbacks.gro_receive, head, skb);

	flush = 0;



out_unlock:

	rcu_read_unlock();

out:

	skb_gro_flush_final(skb, pp, flush);

net/8021q/vlan_core.c

+1 −4
Original line number Diff line number Diff line
@@ -476,10 +476,9 @@ static struct sk_buff *vlan_gro_receive(struct list_head *head, 


	type = vhdr->h_vlan_encapsulated_proto;



	rcu_read_lock();

	ptype = gro_find_receive_by_type(type);

	if (!ptype)

		goto out_unlock;

		goto out;



	flush = 0;
@@ -501,8 +500,6 @@ static struct sk_buff *vlan_gro_receive(struct list_head *head, 
					    ipv6_gro_receive, inet_gro_receive,

					    head, skb);



out_unlock:

	rcu_read_unlock();

out:

	skb_gro_flush_final(skb, pp, flush);

net/ethernet/eth.c

+1 −4
Original line number Diff line number Diff line
@@ -436,11 +436,10 @@ struct sk_buff *eth_gro_receive(struct list_head *head, struct sk_buff *skb) 


	type = eh->h_proto;



	rcu_read_lock();

	ptype = gro_find_receive_by_type(type);

	if (ptype == NULL) {

		flush = 1;

		goto out_unlock;

		goto out;

	}



	skb_gro_pull(skb, sizeof(*eh));
@@ -450,8 +449,6 @@ struct sk_buff *eth_gro_receive(struct list_head *head, struct sk_buff *skb) 
					    ipv6_gro_receive, inet_gro_receive,

					    head, skb);



out_unlock:

	rcu_read_unlock();

out:

	skb_gro_flush_final(skb, pp, flush);

net/ipv4/af_inet.c

+4 −8
Original line number Diff line number Diff line
@@ -1452,19 +1452,18 @@ struct sk_buff *inet_gro_receive(struct list_head *head, struct sk_buff *skb) 


	proto = iph->protocol;



	rcu_read_lock();

	ops = rcu_dereference(inet_offloads[proto]);

	if (!ops || !ops->callbacks.gro_receive)

		goto out_unlock;

		goto out;



	if (*(u8 *)iph != 0x45)

		goto out_unlock;

		goto out;



	if (ip_is_fragment(iph))

		goto out_unlock;

		goto out;



	if (unlikely(ip_fast_csum((u8 *)iph, 5)))

		goto out_unlock;

		goto out;



	id = ntohl(*(__be32 *)&iph->id);

	flush = (u16)((ntohl(*(__be32 *)iph) ^ skb_gro_len(skb)) | (id & ~IP_DF));
@@ -1541,9 +1540,6 @@ struct sk_buff *inet_gro_receive(struct list_head *head, struct sk_buff *skb) 
	pp = indirect_call_gro_receive(tcp4_gro_receive, udp4_gro_receive,

				       ops->callbacks.gro_receive, head, skb);



out_unlock:

	rcu_read_unlock();



out:

	skb_gro_flush_final(skb, pp, flush);

net/ipv4/fou.c

+3 −9
Original line number Diff line number Diff line
@@ -247,17 +247,14 @@ static struct sk_buff *fou_gro_receive(struct sock *sk, 
	/* Flag this frame as already having an outer encap header */

	NAPI_GRO_CB(skb)->is_fou = 1;



	rcu_read_lock();

	offloads = NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads;

	ops = rcu_dereference(offloads[proto]);

	if (!ops || !ops->callbacks.gro_receive)

		goto out_unlock;

		goto out;



	pp = call_gro_receive(ops->callbacks.gro_receive, head, skb);



out_unlock:

	rcu_read_unlock();



out:

	return pp;

}
@@ -439,17 +436,14 @@ static struct sk_buff *gue_gro_receive(struct sock *sk, 
	/* Flag this frame as already having an outer encap header */

	NAPI_GRO_CB(skb)->is_fou = 1;



	rcu_read_lock();

	offloads = NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads;

	ops = rcu_dereference(offloads[proto]);

	if (WARN_ON_ONCE(!ops || !ops->callbacks.gro_receive))

		goto out_unlock;

		goto out;



	pp = call_gro_receive(ops->callbacks.gro_receive, head, skb);

	flush = 0;



out_unlock:

	rcu_read_unlock();

out:

	skb_gro_flush_final_remcsum(skb, pp, flush, &grc);