Commit 7516b27c authored by Felix Fietkau's avatar Felix Fietkau Committed by Paolo Abeni
Browse files

net: create tcp_gro_header_pull helper function 



Pull the code out of tcp_gro_receive in order to access the tcp header
from tcp4/6_gro_receive.

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 80e85fbd

include/net/tcp.h

+3 −1
Original line number Diff line number Diff line
@@ -2191,8 +2191,10 @@ void tcp_v4_destroy_sock(struct sock *sk); 


struct sk_buff *tcp_gso_segment(struct sk_buff *skb,

				netdev_features_t features);

struct tcphdr *tcp_gro_pull_header(struct sk_buff *skb);

struct sk_buff *tcp_gro_lookup(struct list_head *head, struct tcphdr *th);

struct sk_buff *tcp_gro_receive(struct list_head *head, struct sk_buff *skb);

struct sk_buff *tcp_gro_receive(struct list_head *head, struct sk_buff *skb,

				struct tcphdr *th);

INDIRECT_CALLABLE_DECLARE(int tcp4_gro_complete(struct sk_buff *skb, int thoff));

INDIRECT_CALLABLE_DECLARE(struct sk_buff *tcp4_gro_receive(struct list_head *head, struct sk_buff *skb));

INDIRECT_CALLABLE_DECLARE(int tcp6_gro_complete(struct sk_buff *skb, int thoff));

net/ipv4/tcp_offload.c

+34 −21
Original line number Diff line number Diff line
@@ -266,40 +266,46 @@ struct sk_buff *tcp_gro_lookup(struct list_head *head, struct tcphdr *th) 
	return NULL;

}



struct sk_buff *tcp_gro_receive(struct list_head *head, struct sk_buff *skb)

struct tcphdr *tcp_gro_pull_header(struct sk_buff *skb)

{

	struct sk_buff *pp = NULL;

	struct sk_buff *p;

	unsigned int thlen, hlen, off;

	struct tcphdr *th;

	struct tcphdr *th2;

	unsigned int len;

	unsigned int thlen;

	__be32 flags;

	unsigned int mss = 1;

	unsigned int hlen;

	unsigned int off;

	int flush = 1;

	int i;



	off = skb_gro_offset(skb);

	hlen = off + sizeof(*th);

	th = skb_gro_header(skb, hlen, off);

	if (unlikely(!th))

		goto out;

		return NULL;



	thlen = th->doff * 4;

	if (thlen < sizeof(*th))

		goto out;

		return NULL;



	hlen = off + thlen;

	if (!skb_gro_may_pull(skb, hlen)) {

		th = skb_gro_header_slow(skb, hlen, off);

		if (unlikely(!th))

			goto out;

			return NULL;

	}



	skb_gro_pull(skb, thlen);



	return th;

}



struct sk_buff *tcp_gro_receive(struct list_head *head, struct sk_buff *skb,

				struct tcphdr *th)

{

	unsigned int thlen = th->doff * 4;

	struct sk_buff *pp = NULL;

	struct sk_buff *p;

	struct tcphdr *th2;

	unsigned int len;

	__be32 flags;

	unsigned int mss = 1;

	int flush = 1;

	int i;



	len = skb_gro_len(skb);

	flags = tcp_flag_word(th);
@@ -376,7 +382,6 @@ struct sk_buff *tcp_gro_receive(struct list_head *head, struct sk_buff *skb) 
	if (p && (!NAPI_GRO_CB(skb)->same_flow || flush))

		pp = p;



out:

	NAPI_GRO_CB(skb)->flush |= (flush != 0);



	return pp;
@@ -405,17 +410,25 @@ EXPORT_SYMBOL(tcp_gro_complete); 
INDIRECT_CALLABLE_SCOPE

struct sk_buff *tcp4_gro_receive(struct list_head *head, struct sk_buff *skb)

{

	struct tcphdr *th;



	/* Don't bother verifying checksum if we're going to flush anyway. */

	if (!NAPI_GRO_CB(skb)->flush &&

	    skb_gro_checksum_validate(skb, IPPROTO_TCP,

				      inet_gro_compute_pseudo)) {

				      inet_gro_compute_pseudo))

		goto flush;



	th = tcp_gro_pull_header(skb);

	if (!th)

		goto flush;



	return tcp_gro_receive(head, skb, th);



flush:

	NAPI_GRO_CB(skb)->flush = 1;

	return NULL;

}



	return tcp_gro_receive(head, skb);

}



INDIRECT_CALLABLE_SCOPE int tcp4_gro_complete(struct sk_buff *skb, int thoff)

{

	const struct iphdr *iph = ip_hdr(skb);

net/ipv6/tcpv6_offload.c

+13 −5
Original line number Diff line number Diff line
@@ -16,17 +16,25 @@ 
INDIRECT_CALLABLE_SCOPE

struct sk_buff *tcp6_gro_receive(struct list_head *head, struct sk_buff *skb)

{

	struct tcphdr *th;



	/* Don't bother verifying checksum if we're going to flush anyway. */

	if (!NAPI_GRO_CB(skb)->flush &&

	    skb_gro_checksum_validate(skb, IPPROTO_TCP,

				      ip6_gro_compute_pseudo)) {

				      ip6_gro_compute_pseudo))

		goto flush;



	th = tcp_gro_pull_header(skb);

	if (!th)

		goto flush;



	return tcp_gro_receive(head, skb, th);



flush:

	NAPI_GRO_CB(skb)->flush = 1;

	return NULL;

}



	return tcp_gro_receive(head, skb);

}



INDIRECT_CALLABLE_SCOPE int tcp6_gro_complete(struct sk_buff *skb, int thoff)

{

	const struct ipv6hdr *iph = ipv6_hdr(skb);