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

gro: inline tcp6_gro_receive() 



FDO/LTO are unable to inline tcp6_gro_receive() from ipv6_gro_receive()

Make sure tcp6_check_fraglist_gro() is only called only when needed,
so that compiler can leave it out-of-line.

$ scripts/bloat-o-meter -t vmlinux.1 vmlinux.2
add/remove: 2/0 grow/shrink: 3/1 up/down: 1123/-253 (870)
Function                                     old     new   delta
ipv6_gro_receive                            1069    1846    +777
tcp6_check_fraglist_gro                        -     272    +272
ipv6_offload_init                            218     274     +56
__pfx_tcp6_check_fraglist_gro                  -      16     +16
ipv6_gro_complete                            433     435      +2
tcp6_gro_receive                             959     706    -253
Total: Before=22592662, After=22593532, chg +0.00%

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


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

include/net/gro.h

+1 −2
Original line number Diff line number Diff line
@@ -405,8 +405,7 @@ INDIRECT_CALLABLE_DECLARE(struct sk_buff *udp4_gro_receive(struct list_head *, 
							   struct sk_buff *));

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



INDIRECT_CALLABLE_DECLARE(struct sk_buff *udp6_gro_receive(struct list_head *,

							   struct sk_buff *));

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

INDIRECT_CALLABLE_DECLARE(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
@@ -2325,7 +2325,6 @@ struct sk_buff *tcp_gro_receive(struct list_head *head, struct sk_buff *skb, 
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));

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

#ifdef CONFIG_INET

void tcp_gro_complete(struct sk_buff *skb);

#else

net/ipv6/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ obj-$(CONFIG_IPV6_FOU) += fou6.o 


obj-y += addrconf_core.o exthdrs_core.o ip6_checksum.o ip6_icmp.o

obj-$(CONFIG_INET) += output_core.o protocol.o \

			ip6_offload.o tcpv6_offload.o exthdrs_offload.o

			ip6_offload.o exthdrs_offload.o



obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o

net/ipv6/ip6_offload.c

+13 −9
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <net/gso.h>



#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
@@ -30,13 +31,6 @@ 
#define INDIRECT_CALL_L4(f, f2, f1, ...) INDIRECT_CALL_1(f, f2, __VA_ARGS__)

#endif



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

({								\

	unlikely(gro_recursion_inc_test(skb)) ?			\

		NAPI_GRO_CB(skb)->flush |= 1, NULL :		\

		INDIRECT_CALL_L4(cb, f2, f1, head, skb);	\

})



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

{

	const struct net_offload *ops = NULL;
@@ -298,9 +292,19 @@ INDIRECT_CALLABLE_SCOPE struct sk_buff *ipv6_gro_receive(struct list_head *head, 


	skb_gro_postpull_rcsum(skb, iph, nlen);



	pp = indirect_call_gro_receive_l4(tcp6_gro_receive, udp6_gro_receive,

					 ops->callbacks.gro_receive, head, skb);

	if (unlikely(gro_recursion_inc_test(skb))) {

		flush = 1;

		goto out;

	}



	if (likely(proto == IPPROTO_TCP))

		pp = tcp6_gro_receive(head, skb);

#if IS_BUILTIN(CONFIG_IPV6)

	else if (likely(proto == IPPROTO_UDP))

		pp = udp6_gro_receive(head, skb);

#endif

	else

		pp = ops->callbacks.gro_receive(head, skb);

out:

	skb_gro_flush_final(skb, pp, flush);

net/ipv6/tcpv6_offload.c

+4 −6
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ static void tcp6_check_fraglist_gro(struct list_head *head, struct sk_buff *skb, 
	struct net *net;

	int iif, sdif;



	if (likely(!(skb->dev->features & NETIF_F_GRO_FRAGLIST)))

		return;



	p = tcp_gro_lookup(head, th);

	if (p) {

		NAPI_GRO_CB(skb)->is_flist = NAPI_GRO_CB(p)->is_flist;
@@ -45,8 +42,8 @@ static void tcp6_check_fraglist_gro(struct list_head *head, struct sk_buff *skb, 
#endif /* IS_ENABLED(CONFIG_IPV6) */

}



INDIRECT_CALLABLE_SCOPE

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

static __always_inline struct sk_buff *tcp6_gro_receive(struct list_head *head,

							struct sk_buff *skb)

{

	struct tcphdr *th;
@@ -60,6 +57,7 @@ struct sk_buff *tcp6_gro_receive(struct list_head *head, struct sk_buff *skb) 
	if (!th)

		goto flush;



	if (unlikely(skb->dev->features & NETIF_F_GRO_FRAGLIST))

		tcp6_check_fraglist_gro(head, skb, th);



	return tcp_gro_receive(head, skb, th);