Commit 186b1ea7 authored by Richard Gobert's avatar Richard Gobert Committed by Jakub Kicinski
Browse files

net: gro: use cb instead of skb->network_header 



This patch converts references of skb->network_header to napi_gro_cb's
network_offset and inner_network_offset.

Signed-off-by: default avatarRichard Gobert <richardbgobert@gmail.com>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Link: https://lore.kernel.org/r/20240509190819.2985-2-richardbgobert@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 9af9b891

include/net/gro.h

+7 −2
Original line number Diff line number Diff line
@@ -181,12 +181,17 @@ static inline void *skb_gro_header(struct sk_buff *skb, unsigned int hlen, 
	return ptr;

}



static inline int skb_gro_receive_network_offset(const struct sk_buff *skb)

{

	return NAPI_GRO_CB(skb)->network_offsets[NAPI_GRO_CB(skb)->encap_mark];

}



static inline void *skb_gro_network_header(const struct sk_buff *skb)

{

	if (skb_gro_may_pull(skb, skb_gro_offset(skb)))

		return skb_gro_header_fast(skb, skb_network_offset(skb));

		return skb_gro_header_fast(skb, skb_gro_receive_network_offset(skb));



	return skb_network_header(skb);

	return skb->data + skb_gro_receive_network_offset(skb);

}



static inline __wsum inet_gro_compute_pseudo(const struct sk_buff *skb,

net/ipv4/af_inet.c

+0 −4
Original line number Diff line number Diff line
@@ -1569,10 +1569,6 @@ struct sk_buff *inet_gro_receive(struct list_head *head, struct sk_buff *skb) 


	NAPI_GRO_CB(skb)->is_atomic = !!(iph->frag_off & htons(IP_DF));

	NAPI_GRO_CB(skb)->flush |= flush;

	skb_set_network_header(skb, off);

	/* The above will be needed by the transport layer if there is one

	 * immediately following this IP hdr.

	 */

	NAPI_GRO_CB(skb)->inner_network_offset = off;



	/* Note : No need to call skb_gro_postpull_rcsum() here,

net/ipv4/tcp_offload.c

+2 −1
Original line number Diff line number Diff line
@@ -463,7 +463,8 @@ struct sk_buff *tcp4_gro_receive(struct list_head *head, struct sk_buff *skb) 


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

{

	const struct iphdr *iph = ip_hdr(skb);

	const u16 offset = NAPI_GRO_CB(skb)->network_offsets[skb->encapsulation];

	const struct iphdr *iph = (struct iphdr *)(skb->data + offset);

	struct tcphdr *th = tcp_hdr(skb);



	if (unlikely(NAPI_GRO_CB(skb)->is_flist)) {

net/ipv6/ip6_offload.c

+2 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static int ipv6_gro_pull_exthdrs(struct sk_buff *skb, int off, int proto) 
		off += len;

	}



	skb_gro_pull(skb, off - skb_network_offset(skb));

	skb_gro_pull(skb, off - skb_gro_receive_network_offset(skb));

	return proto;

}
@@ -236,7 +236,6 @@ INDIRECT_CALLABLE_SCOPE struct sk_buff *ipv6_gro_receive(struct list_head *head, 
	if (unlikely(!iph))

		goto out;



	skb_set_network_header(skb, off);

	NAPI_GRO_CB(skb)->inner_network_offset = off;



	flush += ntohs(iph->payload_len) != skb->len - hlen;
@@ -260,7 +259,7 @@ INDIRECT_CALLABLE_SCOPE struct sk_buff *ipv6_gro_receive(struct list_head *head, 
	NAPI_GRO_CB(skb)->proto = proto;



	flush--;

	nlen = skb_network_header_len(skb);

	nlen = skb_gro_offset(skb) - off;



	list_for_each_entry(p, head, list) {

		const struct ipv6hdr *iph2;

net/ipv6/tcpv6_offload.c

+2 −1
Original line number Diff line number Diff line
@@ -72,7 +72,8 @@ struct sk_buff *tcp6_gro_receive(struct list_head *head, struct sk_buff *skb) 


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

{

	const struct ipv6hdr *iph = ipv6_hdr(skb);

	const u16 offset = NAPI_GRO_CB(skb)->network_offsets[skb->encapsulation];

	const struct ipv6hdr *iph = (struct ipv6hdr *)(skb->data + offset);

	struct tcphdr *th = tcp_hdr(skb);



	if (unlikely(NAPI_GRO_CB(skb)->is_flist)) {