Commit b8d9b7da authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

gro: inline tcp6_gro_complete() 



Remove one function call from GRO stack for native IPv6 + TCP packets.

$ scripts/bloat-o-meter -t vmlinux.2 vmlinux.3
add/remove: 0/0 grow/shrink: 1/1 up/down: 298/-5 (293)
Function                                     old     new   delta
ipv6_gro_complete                            435     733    +298
tcp6_gro_complete                            311     306      -5
Total: Before=22593532, After=22593825, chg +0.00%

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20260120164903.1912995-4-edumazet@google.com


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

include/net/gro.h

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ INDIRECT_CALLABLE_DECLARE(struct sk_buff *udp4_gro_receive(struct list_head *, 
INDIRECT_CALLABLE_DECLARE(int udp4_gro_complete(struct sk_buff *, int));



struct sk_buff *udp6_gro_receive(struct list_head *, struct sk_buff *);

INDIRECT_CALLABLE_DECLARE(int udp6_gro_complete(struct sk_buff *, int));

int udp6_gro_complete(struct sk_buff *, int);



#define indirect_call_gro_receive_inet(cb, f2, f1, head, skb)	\

({								\

include/net/tcp.h

+0 −1
Original line number Diff line number Diff line
@@ -2324,7 +2324,6 @@ 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));

#ifdef CONFIG_INET

void tcp_gro_complete(struct sk_buff *skb);

#else

net/ipv6/ip6_offload.c

+9 −12
Original line number Diff line number Diff line
@@ -21,16 +21,6 @@ 
#include "ip6_offload.h"

#include "tcpv6_offload.c"



/* All GRO functions are always builtin, except UDP over ipv6, which lays in

 * ipv6 module, as it depends on UDPv6 lookup function, so we need special care

 * when ipv6 is built as a module

 */

#if IS_BUILTIN(CONFIG_IPV6)

#define INDIRECT_CALL_L4(f, f2, f1, ...) INDIRECT_CALL_2(f, f2, f1, __VA_ARGS__)

#else

#define INDIRECT_CALL_L4(f, f2, f1, ...) INDIRECT_CALL_1(f, f2, __VA_ARGS__)

#endif



static int ipv6_gro_pull_exthdrs(struct sk_buff *skb, int off, int proto)

{

	const struct net_offload *ops = NULL;
@@ -383,11 +373,18 @@ INDIRECT_CALLABLE_SCOPE int ipv6_gro_complete(struct sk_buff *skb, int nhoff) 
	}



	nhoff += sizeof(*iph) + ipv6_exthdrs_len(iph, &ops);



	if (likely(ops == &net_hotdata.tcpv6_offload))

		return tcp6_gro_complete(skb, nhoff);

#if IS_BUILTIN(CONFIG_IPV6)

	if (ops == &net_hotdata.udpv6_offload)

		return udp6_gro_complete(skb, nhoff);

#endif



	if (WARN_ON(!ops || !ops->callbacks.gro_complete))

		goto out;



	err = INDIRECT_CALL_L4(ops->callbacks.gro_complete, tcp6_gro_complete,

			       udp6_gro_complete, skb, nhoff);

	err = ops->callbacks.gro_complete(skb, nhoff);



out:

	return err;

net/ipv6/tcpv6_offload.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static __always_inline struct sk_buff *tcp6_gro_receive(struct list_head *head, 
	return NULL;

}



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

static __always_inline int tcp6_gro_complete(struct sk_buff *skb, int thoff)

{

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

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

net/ipv6/udp_offload.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ struct sk_buff *udp6_gro_receive(struct list_head *head, struct sk_buff *skb) 
	return NULL;

}



INDIRECT_CALLABLE_SCOPE int udp6_gro_complete(struct sk_buff *skb, int nhoff)

int udp6_gro_complete(struct sk_buff *skb, int nhoff)

{

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

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