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

tcp: move tcp_v4_early_demux() to net/ipv4/ip_input.c 



tcp_v4_early_demux() has a single caller : ip_rcv_finish_core().

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

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@google.com>
Link: https://patch.msgid.link/20260306131130.654991-1-edumazet@google.com


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

include/net/tcp.h

+0 −1
Original line number Diff line number Diff line
@@ -363,7 +363,6 @@ int tcp_v4_err(struct sk_buff *skb, u32); 


void tcp_shutdown(struct sock *sk, int how);



int tcp_v4_early_demux(struct sk_buff *skb);

int tcp_v4_rcv(struct sk_buff *skb);



void tcp_remove_empty_skb(struct sock *sk);

net/ipv4/ip_input.c

+39 −0
Original line number Diff line number Diff line
@@ -319,6 +319,45 @@ static bool ip_can_use_hint(const struct sk_buff *skb, const struct iphdr *iph, 
	       ip_hdr(hint)->tos == iph->tos;

}



static int tcp_v4_early_demux(struct sk_buff *skb)

{

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

	const struct iphdr *iph;

	const struct tcphdr *th;

	struct sock *sk;



	if (skb->pkt_type != PACKET_HOST)

		return 0;



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

				sizeof(struct tcphdr)))

		return 0;



	iph = ip_hdr(skb);

	th = tcp_hdr(skb);



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

		return 0;



	sk = __inet_lookup_established(net, iph->saddr, th->source,

				       iph->daddr, ntohs(th->dest),

				       skb->skb_iif, inet_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, 0);

			if (dst &&

			    sk->sk_rx_dst_ifindex == skb->skb_iif)

				skb_dst_set_noref(skb, dst);

		}

	}

	return 0;

}



static int ip_rcv_finish_core(struct net *net,

			      struct sk_buff *skb, struct net_device *dev,

			      const struct sk_buff *hint)

net/ipv4/tcp_ipv4.c

+0 −38
Original line number Diff line number Diff line
@@ -1914,44 +1914,6 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) 
}

EXPORT_SYMBOL(tcp_v4_do_rcv);



int tcp_v4_early_demux(struct sk_buff *skb)

{

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

	const struct iphdr *iph;

	const struct tcphdr *th;

	struct sock *sk;



	if (skb->pkt_type != PACKET_HOST)

		return 0;



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

		return 0;



	iph = ip_hdr(skb);

	th = tcp_hdr(skb);



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

		return 0;



	sk = __inet_lookup_established(net, iph->saddr, th->source,

				       iph->daddr, ntohs(th->dest),

				       skb->skb_iif, inet_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, 0);

			if (dst &&

			    sk->sk_rx_dst_ifindex == skb->skb_iif)

				skb_dst_set_noref(skb, dst);

		}

	}

	return 0;

}



bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb,

		     enum skb_drop_reason *reason)

{