Commit 80690a85 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'gro-remove-redundant-rcu_read_lock' 

Eric Dumazet says:

====================
gro: remove redundant rcu_read_lock

Recent trees got an increase of rcu_read_{lock|unlock} costs,
it is time to get rid of the not needed pairs.
====================

Link: https://lore.kernel.org/r/20211123225608.2155163-1-eric.dumazet@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 1aad9634 627b94f7

drivers/net/geneve.c

+1 −7
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);
@@ -548,13 +545,10 @@ static int geneve_gro_complete(struct sock *sk, struct sk_buff *skb, 
	gh_len = geneve_hlen(gh);

	type = gh->proto_type;



	rcu_read_lock();

	ptype = gro_find_complete_by_type(type);

	if (ptype)

		err = ptype->callbacks.gro_complete(skb, nhoff + gh_len);



	rcu_read_unlock();



	skb_set_inner_mac_header(skb, nhoff + gh_len);



	return err;

net/8021q/vlan_core.c

+1 −6
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);
@@ -516,14 +513,12 @@ static int vlan_gro_complete(struct sk_buff *skb, int nhoff) 
	struct packet_offload *ptype;

	int err = -ENOENT;



	rcu_read_lock();

	ptype = gro_find_complete_by_type(type);

	if (ptype)

		err = INDIRECT_CALL_INET(ptype->callbacks.gro_complete,

					 ipv6_gro_complete, inet_gro_complete,

					 skb, nhoff + sizeof(*vhdr));



	rcu_read_unlock();

	return err;

}

net/ethernet/eth.c

+1 −6
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);
@@ -469,14 +466,12 @@ int eth_gro_complete(struct sk_buff *skb, int nhoff) 
	if (skb->encapsulation)

		skb_set_inner_mac_header(skb, nhoff);



	rcu_read_lock();

	ptype = gro_find_complete_by_type(type);

	if (ptype != NULL)

		err = INDIRECT_CALL_INET(ptype->callbacks.gro_complete,

					 ipv6_gro_complete, inet_gro_complete,

					 skb, nhoff + sizeof(*eh));



	rcu_read_unlock();

	return err;

}

EXPORT_SYMBOL(eth_gro_complete);

net/ipv4/af_inet.c

+6 −13
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);
@@ -1616,10 +1612,9 @@ int inet_gro_complete(struct sk_buff *skb, int nhoff) 
	csum_replace2(&iph->check, iph->tot_len, newlen);

	iph->tot_len = newlen;



	rcu_read_lock();

	ops = rcu_dereference(inet_offloads[proto]);

	if (WARN_ON(!ops || !ops->callbacks.gro_complete))

		goto out_unlock;

		goto out;



	/* Only need to add sizeof(*iph) to get to the next hdr below

	 * because any hdr with option will have been flushed in
@@ -1629,9 +1624,7 @@ int inet_gro_complete(struct sk_buff *skb, int nhoff) 
			      tcp4_gro_complete, udp4_gro_complete,

			      skb, nhoff + sizeof(*iph));



out_unlock:

	rcu_read_unlock();



out:

	return err;

}

net/ipv4/fou.c

+7 −18
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;

}
@@ -269,19 +266,16 @@ static int fou_gro_complete(struct sock *sk, struct sk_buff *skb, 
	const struct net_offload *ops;

	int err = -ENOSYS;



	rcu_read_lock();

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

	ops = rcu_dereference(offloads[proto]);

	if (WARN_ON(!ops || !ops->callbacks.gro_complete))

		goto out_unlock;

		goto out;



	err = ops->callbacks.gro_complete(skb, nhoff);



	skb_set_inner_mac_header(skb, nhoff);



out_unlock:

	rcu_read_unlock();



out:

	return err;

}
@@ -439,17 +433,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);
@@ -486,18 +477,16 @@ static int gue_gro_complete(struct sock *sk, struct sk_buff *skb, int nhoff) 
		return err;

	}



	rcu_read_lock();

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

	ops = rcu_dereference(offloads[proto]);

	if (WARN_ON(!ops || !ops->callbacks.gro_complete))

		goto out_unlock;

		goto out;



	err = ops->callbacks.gro_complete(skb, nhoff + guehlen);



	skb_set_inner_mac_header(skb, nhoff + guehlen);



out_unlock:

	rcu_read_unlock();

out:

	return err;

}