Commit 6c886db2 authored by Lorenz Bauer's avatar Lorenz Bauer Committed by Martin KaFai Lau
Browse files

net: remove duplicate sk_lookup helpers 



Now that inet[6]_lookup_reuseport are parameterised on the ehashfn
we can remove two sk_lookup helpers.

Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: default avatarLorenz Bauer <lmb@isovalent.com>
Link: https://lore.kernel.org/r/20230720-so-reuseport-v6-6-7021b683cdae@isovalent.com


Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parent 2a617763

include/net/inet6_hashtables.h

+9 −0
Original line number Diff line number Diff line
@@ -73,6 +73,15 @@ struct sock *inet6_lookup_listener(struct net *net, 
				   const unsigned short hnum,

				   const int dif, const int sdif);



struct sock *inet6_lookup_run_sk_lookup(struct net *net,

					int protocol,

					struct sk_buff *skb, int doff,

					const struct in6_addr *saddr,

					const __be16 sport,

					const struct in6_addr *daddr,

					const u16 hnum, const int dif,

					inet6_ehashfn_t *ehashfn);



static inline struct sock *__inet6_lookup(struct net *net,

					  struct inet_hashinfo *hashinfo,

					  struct sk_buff *skb, int doff,

include/net/inet_hashtables.h

+7 −0
Original line number Diff line number Diff line
@@ -393,6 +393,13 @@ struct sock *inet_lookup_reuseport(struct net *net, struct sock *sk, 
				   __be32 daddr, unsigned short hnum,

				   inet_ehashfn_t *ehashfn);



struct sock *inet_lookup_run_sk_lookup(struct net *net,

				       int protocol,

				       struct sk_buff *skb, int doff,

				       __be32 saddr, __be16 sport,

				       __be32 daddr, u16 hnum, const int dif,

				       inet_ehashfn_t *ehashfn);



static inline struct sock *

	inet_lookup_established(struct net *net, struct inet_hashinfo *hashinfo,

				const __be32 saddr, const __be16 sport,

net/ipv4/inet_hashtables.c

+13 −13
Original line number Diff line number Diff line
@@ -403,25 +403,23 @@ static struct sock *inet_lhash2_lookup(struct net *net, 
	return result;

}



static inline struct sock *inet_lookup_run_bpf(struct net *net,

					       struct inet_hashinfo *hashinfo,

struct sock *inet_lookup_run_sk_lookup(struct net *net,

				       int protocol,

				       struct sk_buff *skb, int doff,

				       __be32 saddr, __be16 sport,

					       __be32 daddr, u16 hnum, const int dif)

				       __be32 daddr, u16 hnum, const int dif,

				       inet_ehashfn_t *ehashfn)

{

	struct sock *sk, *reuse_sk;

	bool no_reuseport;



	if (hashinfo != net->ipv4.tcp_death_row.hashinfo)

		return NULL; /* only TCP is supported */



	no_reuseport = bpf_sk_lookup_run_v4(net, IPPROTO_TCP, saddr, sport,

	no_reuseport = bpf_sk_lookup_run_v4(net, protocol, saddr, sport,

					    daddr, hnum, dif, &sk);

	if (no_reuseport || IS_ERR_OR_NULL(sk))

		return sk;



	reuse_sk = inet_lookup_reuseport(net, sk, skb, doff, saddr, sport, daddr, hnum,

					 inet_ehashfn);

					 ehashfn);

	if (reuse_sk)

		sk = reuse_sk;

	return sk;
@@ -439,9 +437,11 @@ struct sock *__inet_lookup_listener(struct net *net, 
	unsigned int hash2;



	/* Lookup redirect from BPF */

	if (static_branch_unlikely(&bpf_sk_lookup_enabled)) {

		result = inet_lookup_run_bpf(net, hashinfo, skb, doff,

					     saddr, sport, daddr, hnum, dif);

	if (static_branch_unlikely(&bpf_sk_lookup_enabled) &&

	    hashinfo == net->ipv4.tcp_death_row.hashinfo) {

		result = inet_lookup_run_sk_lookup(net, IPPROTO_TCP, skb, doff,

						   saddr, sport, daddr, hnum, dif,

						   inet_ehashfn);

		if (result)

			goto done;

	}

net/ipv4/udp.c

+5 −27
Original line number Diff line number Diff line
@@ -465,30 +465,6 @@ static struct sock *udp4_lib_lookup2(struct net *net, 
	return result;

}



static struct sock *udp4_lookup_run_bpf(struct net *net,

					struct udp_table *udptable,

					struct sk_buff *skb,

					__be32 saddr, __be16 sport,

					__be32 daddr, u16 hnum, const int dif)

{

	struct sock *sk, *reuse_sk;

	bool no_reuseport;



	if (udptable != net->ipv4.udp_table)

		return NULL; /* only UDP is supported */



	no_reuseport = bpf_sk_lookup_run_v4(net, IPPROTO_UDP, saddr, sport,

					    daddr, hnum, dif, &sk);

	if (no_reuseport || IS_ERR_OR_NULL(sk))

		return sk;



	reuse_sk = inet_lookup_reuseport(net, sk, skb, sizeof(struct udphdr),

					 saddr, sport, daddr, hnum, udp_ehashfn);

	if (reuse_sk)

		sk = reuse_sk;

	return sk;

}



/* UDP is nearly always wildcards out the wazoo, it makes no sense to try

 * harder than this. -DaveM

 */
@@ -513,9 +489,11 @@ struct sock *__udp4_lib_lookup(struct net *net, __be32 saddr, 
		goto done;



	/* Lookup redirect from BPF */

	if (static_branch_unlikely(&bpf_sk_lookup_enabled)) {

		sk = udp4_lookup_run_bpf(net, udptable, skb,

					 saddr, sport, daddr, hnum, dif);

	if (static_branch_unlikely(&bpf_sk_lookup_enabled) &&

	    udptable == net->ipv4.udp_table) {

		sk = inet_lookup_run_sk_lookup(net, IPPROTO_UDP, skb, sizeof(struct udphdr),

					       saddr, sport, daddr, hnum, dif,

					       udp_ehashfn);

		if (sk) {

			result = sk;

			goto done;

net/ipv6/inet6_hashtables.c

+16 −15
Original line number Diff line number Diff line
@@ -177,31 +177,30 @@ static struct sock *inet6_lhash2_lookup(struct net *net, 
	return result;

}



static inline struct sock *inet6_lookup_run_bpf(struct net *net,

						struct inet_hashinfo *hashinfo,

struct sock *inet6_lookup_run_sk_lookup(struct net *net,

					int protocol,

					struct sk_buff *skb, int doff,

					const struct in6_addr *saddr,

					const __be16 sport,

					const struct in6_addr *daddr,

						const u16 hnum, const int dif)

					const u16 hnum, const int dif,

					inet6_ehashfn_t *ehashfn)

{

	struct sock *sk, *reuse_sk;

	bool no_reuseport;



	if (hashinfo != net->ipv4.tcp_death_row.hashinfo)

		return NULL; /* only TCP is supported */



	no_reuseport = bpf_sk_lookup_run_v6(net, IPPROTO_TCP, saddr, sport,

	no_reuseport = bpf_sk_lookup_run_v6(net, protocol, saddr, sport,

					    daddr, hnum, dif, &sk);

	if (no_reuseport || IS_ERR_OR_NULL(sk))

		return sk;



	reuse_sk = inet6_lookup_reuseport(net, sk, skb, doff,

					  saddr, sport, daddr, hnum, inet6_ehashfn);

					  saddr, sport, daddr, hnum, ehashfn);

	if (reuse_sk)

		sk = reuse_sk;

	return sk;

}

EXPORT_SYMBOL_GPL(inet6_lookup_run_sk_lookup);



struct sock *inet6_lookup_listener(struct net *net,

		struct inet_hashinfo *hashinfo,
@@ -215,9 +214,11 @@ struct sock *inet6_lookup_listener(struct net *net, 
	unsigned int hash2;



	/* Lookup redirect from BPF */

	if (static_branch_unlikely(&bpf_sk_lookup_enabled)) {

		result = inet6_lookup_run_bpf(net, hashinfo, skb, doff,

					      saddr, sport, daddr, hnum, dif);

	if (static_branch_unlikely(&bpf_sk_lookup_enabled) &&

	    hashinfo == net->ipv4.tcp_death_row.hashinfo) {

		result = inet6_lookup_run_sk_lookup(net, IPPROTO_TCP, skb, doff,

						    saddr, sport, daddr, hnum, dif,

						    inet6_ehashfn);

		if (result)

			goto done;

	}