Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f114163 authored by Steffen Klassert's avatar Steffen Klassert
Browse files

net: Add a skb_gro_flush_final helper. 



Add a skb_gro_flush_final helper to prepare for  consuming
skbs in call_gro_receive. We will extend this helper to not
touch the skb if the skb is consumed by a gro callback with
a followup patch. We need this to handle the upcomming IPsec
ESP callbacks as they reinject the skb to the napi_gro_receive
asynchronous. The handler is used in all gro_receive functions
that can call the ESP gro handlers.

Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent b0fcee82

include/linux/netdevice.h

+5 −0
Original line number Diff line number Diff line
@@ -2661,6 +2661,11 @@ static inline void skb_gro_remcsum_cleanup(struct sk_buff *skb, 
	remcsum_unadjust((__sum16 *)ptr, grc->delta);

}



static inline void skb_gro_flush_final(struct sk_buff *skb, struct sk_buff **pp, int flush)

{

	NAPI_GRO_CB(skb)->flush |= flush;

}



static inline int dev_hard_header(struct sk_buff *skb, struct net_device *dev,

				  unsigned short type,

				  const void *daddr, const void *saddr,

net/ethernet/eth.c

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ struct sk_buff **eth_gro_receive(struct sk_buff **head, 
out_unlock:

	rcu_read_unlock();

out:

	NAPI_GRO_CB(skb)->flush |= flush;

	skb_gro_flush_final(skb, pp, flush);



	return pp;

}

net/ipv4/af_inet.c

+1 −1
Original line number Diff line number Diff line
@@ -1423,7 +1423,7 @@ struct sk_buff **inet_gro_receive(struct sk_buff **head, struct sk_buff *skb) 
	rcu_read_unlock();



out:

	NAPI_GRO_CB(skb)->flush |= flush;

	skb_gro_flush_final(skb, pp, flush);



	return pp;

}

net/ipv6/ip6_offload.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ static struct sk_buff **ipv6_gro_receive(struct sk_buff **head, 
	rcu_read_unlock();



out:

	NAPI_GRO_CB(skb)->flush |= flush;

	skb_gro_flush_final(skb, pp, flush);



	return pp;

}