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

Commit 6c886db2e78c ("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>

diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index fef71dd725217a4c936950dcb69c3100cc6ef4f0..374adb8a2640d78514df831f83806a312750c3c2 100644 (file)
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -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);

diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
index dbb10774764ac8187727c41fb3e92420ff544833..d6c3db31dcab2f08e494f47179b4103527b0b267 100644 (file)
--- a/net/ipv6/inet6_hashtables.c
+++ b/net/ipv6/inet6_hashtables.c
@@ -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);