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

tcp: move tcp_v6_early_demux() to net/ipv6/ip6_input.c 



tcp_v6_early_demux() has a single caller : ip6_rcv_finish_core().

Move it to net/ipv6/ip6_input.c and mark it static, for possible
compiler/linker optimizations.

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


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

include/net/tcp.h

+0 −1
Original line number Diff line number Diff line
@@ -1142,7 +1142,6 @@ static inline int tcp_v6_sdif(const struct sk_buff *skb) 
extern const struct inet_connection_sock_af_ops ipv6_specific;



INDIRECT_CALLABLE_DECLARE(int tcp_v6_rcv(struct sk_buff *skb));

void tcp_v6_early_demux(struct sk_buff *skb);



#endif

net/ipv6/ip6_input.c

+40 −0
Original line number Diff line number Diff line
@@ -44,6 +44,46 @@ 
#include <net/xfrm.h>

#include <net/inet_ecn.h>

#include <net/dst_metadata.h>

#include <net/inet6_hashtables.h>



static void tcp_v6_early_demux(struct sk_buff *skb)

{

	struct net *net = dev_net_rcu(skb->dev);

	const struct ipv6hdr *hdr;

	const struct tcphdr *th;

	struct sock *sk;



	if (skb->pkt_type != PACKET_HOST)

		return;



	if (!pskb_may_pull(skb, skb_transport_offset(skb) +

				sizeof(struct tcphdr)))

		return;



	hdr = ipv6_hdr(skb);

	th = tcp_hdr(skb);



	if (th->doff < sizeof(struct tcphdr) / 4)

		return;



	/* Note : We use inet6_iif() here, not tcp_v6_iif() */

	sk = __inet6_lookup_established(net, &hdr->saddr, th->source,

					&hdr->daddr, ntohs(th->dest),

					inet6_iif(skb), inet6_sdif(skb));

	if (sk) {

		skb->sk = sk;

		skb->destructor = sock_edemux;

		if (sk_fullsock(sk)) {

			struct dst_entry *dst = rcu_dereference(sk->sk_rx_dst);



			if (dst)

				dst = dst_check(dst, sk->sk_rx_dst_cookie);

			if (dst &&

			    sk->sk_rx_dst_ifindex == skb->skb_iif)

				skb_dst_set_noref(skb, dst);

		}

	}

}



static void ip6_rcv_finish_core(struct net *net, struct sock *sk,

				struct sk_buff *skb)

net/ipv6/tcp_ipv6.c

+0 −38
Original line number Diff line number Diff line
@@ -1972,44 +1972,6 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb) 
	goto discard_it;

}



void tcp_v6_early_demux(struct sk_buff *skb)

{

	struct net *net = dev_net_rcu(skb->dev);

	const struct ipv6hdr *hdr;

	const struct tcphdr *th;

	struct sock *sk;



	if (skb->pkt_type != PACKET_HOST)

		return;



	if (!pskb_may_pull(skb, skb_transport_offset(skb) + sizeof(struct tcphdr)))

		return;



	hdr = ipv6_hdr(skb);

	th = tcp_hdr(skb);



	if (th->doff < sizeof(struct tcphdr) / 4)

		return;



	/* Note : We use inet6_iif() here, not tcp_v6_iif() */

	sk = __inet6_lookup_established(net, &hdr->saddr, th->source,

					&hdr->daddr, ntohs(th->dest),

					inet6_iif(skb), inet6_sdif(skb));

	if (sk) {

		skb->sk = sk;

		skb->destructor = sock_edemux;

		if (sk_fullsock(sk)) {

			struct dst_entry *dst = rcu_dereference(sk->sk_rx_dst);



			if (dst)

				dst = dst_check(dst, sk->sk_rx_dst_cookie);

			if (dst &&

			    sk->sk_rx_dst_ifindex == skb->skb_iif)

				skb_dst_set_noref(skb, dst);

		}

	}

}



static struct timewait_sock_ops tcp6_timewait_sock_ops = {

	.twsk_obj_size	= sizeof(struct tcp6_timewait_sock),

};