mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	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: Steffen Klassert <steffen.klassert@secunet.com>
This commit is contained in:
		
							parent
							
								
									b0fcee825c
								
							
						
					
					
						commit
						5f114163f2
					
				
					 4 changed files with 8 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -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,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue