Commit 8928756d authored by Felix Fietkau's avatar Felix Fietkau Committed by Paolo Abeni
Browse files

net: move skb_gro_receive_list from udp to core 



This helper function will be used for TCP fraglist GRO support

Acked-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent b1de3c0d

include/net/gro.h

+1 −0
Original line number Diff line number Diff line
@@ -438,6 +438,7 @@ static inline __wsum ip6_gro_compute_pseudo(const struct sk_buff *skb, 
}



int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb);

int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb);



/* Pass the currently batched GRO_NORMAL SKBs up to the stack. */

static inline void gro_normal_list(struct napi_struct *napi)

net/core/gro.c

+27 −0
Original line number Diff line number Diff line
@@ -231,6 +231,33 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb) 
	return 0;

}



int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb)

{

	if (unlikely(p->len + skb->len >= 65536))

		return -E2BIG;



	if (NAPI_GRO_CB(p)->last == p)

		skb_shinfo(p)->frag_list = skb;

	else

		NAPI_GRO_CB(p)->last->next = skb;



	skb_pull(skb, skb_gro_offset(skb));



	NAPI_GRO_CB(p)->last = skb;

	NAPI_GRO_CB(p)->count++;

	p->data_len += skb->len;



	/* sk ownership - if any - completely transferred to the aggregated packet */

	skb->destructor = NULL;

	skb->sk = NULL;

	p->truesize += skb->truesize;

	p->len += skb->len;



	NAPI_GRO_CB(skb)->same_flow = 1;



	return 0;

}





static void napi_gro_complete(struct napi_struct *napi, struct sk_buff *skb)

{

net/ipv4/udp_offload.c

+0 −27
Original line number Diff line number Diff line
@@ -433,33 +433,6 @@ static struct sk_buff *udp4_ufo_fragment(struct sk_buff *skb, 
	return segs;

}



static int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb)

{

	if (unlikely(p->len + skb->len >= 65536))

		return -E2BIG;



	if (NAPI_GRO_CB(p)->last == p)

		skb_shinfo(p)->frag_list = skb;

	else

		NAPI_GRO_CB(p)->last->next = skb;



	skb_pull(skb, skb_gro_offset(skb));



	NAPI_GRO_CB(p)->last = skb;

	NAPI_GRO_CB(p)->count++;

	p->data_len += skb->len;



	/* sk ownership - if any - completely transferred to the aggregated packet */

	skb->destructor = NULL;

	skb->sk = NULL;

	p->truesize += skb->truesize;

	p->len += skb->len;



	NAPI_GRO_CB(skb)->same_flow = 1;



	return 0;

}





#define UDP_GRO_CNT_MAX 64

static struct sk_buff *udp_gro_receive_segment(struct list_head *head,