Commit 8150f3a4 authored Aug 22, 2025 by Kuniyuki Iwashima Committed by Jakub Kicinski Aug 25, 2025

tcp: Remove hashinfo test for inet6?_lookup_run_sk_lookup().



Commit 6c886db2 ("net: remove duplicate sk_lookup helpers")
started to check if hashinfo == net->ipv4.tcp_death_row.hashinfo
in __inet_lookup_listener() and inet6_lookup_listener() and
stopped invoking BPF sk_lookup prog for DCCP.

DCCP has gone and the condition is always true.

Let's remove the hashinfo test.

Signed-off-by: Kuniyuki Iwashima <kuniyu@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20250822190803.540788-4-kuniyu@google.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parent 2d842b6c

net/ipv4/inet_hashtables.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -436,8 +436,7 @@ struct sock __inet_lookup_listener(const struct net net,
		unsigned int hash2;

		/* Lookup redirect from BPF */
		if (static_branch_unlikely(&bpf_sk_lookup_enabled) &&
		hashinfo == net->ipv4.tcp_death_row.hashinfo) {
		if (static_branch_unlikely(&bpf_sk_lookup_enabled)) {
		result = inet_lookup_run_sk_lookup(net, IPPROTO_TCP, skb, doff,
		saddr, sport, daddr, hnum, dif,
		inet_ehashfn);

net/ipv6/inet6_hashtables.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -211,8 +211,7 @@ struct sock inet6_lookup_listener(const struct net net,
		unsigned int hash2;

		/* Lookup redirect from BPF */
		if (static_branch_unlikely(&bpf_sk_lookup_enabled) &&
		hashinfo == net->ipv4.tcp_death_row.hashinfo) {
		if (static_branch_unlikely(&bpf_sk_lookup_enabled)) {
		result = inet6_lookup_run_sk_lookup(net, IPPROTO_TCP, skb, doff,
		saddr, sport, daddr, hnum, dif,
		inet6_ehashfn);