Commit 10b2a44c authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

inet6: constify 'struct net' parameter of various lookup helpers 



Following helpers do not touch their struct net argument:

- bpf_sk_lookup_run_v6()
- __inet6_lookup_established()
- inet6_lookup_reuseport()
- inet6_lookup_listener()
- inet6_lookup_run_sk_lookup()
- __inet6_lookup()
- inet6_lookup()

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20240802134029.3748005-5-edumazet@google.com


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

include/linux/filter.h

+1 −1
Original line number Diff line number Diff line
@@ -1653,7 +1653,7 @@ static inline bool bpf_sk_lookup_run_v4(const struct net *net, int protocol, 
}



#if IS_ENABLED(CONFIG_IPV6)

static inline bool bpf_sk_lookup_run_v6(struct net *net, int protocol,

static inline bool bpf_sk_lookup_run_v6(const struct net *net, int protocol,

					const struct in6_addr *saddr,

					const __be16 sport,

					const struct in6_addr *daddr,

include/net/inet6_hashtables.h

+6 −6
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static inline unsigned int __inet6_ehashfn(const u32 lhash, 
 *

 * The sockhash lock must be held as a reader here.

 */

struct sock *__inet6_lookup_established(struct net *net,

struct sock *__inet6_lookup_established(const struct net *net,

					struct inet_hashinfo *hashinfo,

					const struct in6_addr *saddr,

					const __be16 sport,
@@ -56,7 +56,7 @@ inet6_ehashfn_t inet6_ehashfn; 


INDIRECT_CALLABLE_DECLARE(inet6_ehashfn_t udp6_ehashfn);



struct sock *inet6_lookup_reuseport(struct net *net, struct sock *sk,

struct sock *inet6_lookup_reuseport(const struct net *net, struct sock *sk,

				    struct sk_buff *skb, int doff,

				    const struct in6_addr *saddr,

				    __be16 sport,
@@ -64,7 +64,7 @@ struct sock *inet6_lookup_reuseport(struct net *net, struct sock *sk, 
				    unsigned short hnum,

				    inet6_ehashfn_t *ehashfn);



struct sock *inet6_lookup_listener(struct net *net,

struct sock *inet6_lookup_listener(const struct net *net,

				   struct inet_hashinfo *hashinfo,

				   struct sk_buff *skb, int doff,

				   const struct in6_addr *saddr,
@@ -73,7 +73,7 @@ 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,

struct sock *inet6_lookup_run_sk_lookup(const struct net *net,

					int protocol,

					struct sk_buff *skb, int doff,

					const struct in6_addr *saddr,
@@ -82,7 +82,7 @@ struct sock *inet6_lookup_run_sk_lookup(struct net *net, 
					const u16 hnum, const int dif,

					inet6_ehashfn_t *ehashfn);



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

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

					  struct inet_hashinfo *hashinfo,

					  struct sk_buff *skb, int doff,

					  const struct in6_addr *saddr,
@@ -167,7 +167,7 @@ static inline struct sock *__inet6_lookup_skb(struct inet_hashinfo *hashinfo, 
			      iif, sdif, refcounted);

}



struct sock *inet6_lookup(struct net *net, struct inet_hashinfo *hashinfo,

struct sock *inet6_lookup(const struct net *net, struct inet_hashinfo *hashinfo,

			  struct sk_buff *skb, int doff,

			  const struct in6_addr *saddr, const __be16 sport,

			  const struct in6_addr *daddr, const __be16 dport,

net/ipv6/inet6_hashtables.c

+7 −6
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ EXPORT_SYMBOL_GPL(inet6_ehashfn); 
 *

 * The sockhash lock must be held as a reader here.

 */

struct sock *__inet6_lookup_established(struct net *net,

struct sock *__inet6_lookup_established(const struct net *net,

					struct inet_hashinfo *hashinfo,

					   const struct in6_addr *saddr,

					   const __be16 sport,
@@ -126,7 +126,7 @@ static inline int compute_score(struct sock *sk, const struct net *net, 
 * Return: NULL if sk doesn't have SO_REUSEPORT set, otherwise a pointer to

 *         the selected sock or an error.

 */

struct sock *inet6_lookup_reuseport(struct net *net, struct sock *sk,

struct sock *inet6_lookup_reuseport(const struct net *net, struct sock *sk,

				    struct sk_buff *skb, int doff,

				    const struct in6_addr *saddr,

				    __be16 sport,
@@ -147,7 +147,7 @@ struct sock *inet6_lookup_reuseport(struct net *net, struct sock *sk, 
EXPORT_SYMBOL_GPL(inet6_lookup_reuseport);



/* called with rcu_read_lock() */

static struct sock *inet6_lhash2_lookup(struct net *net,

static struct sock *inet6_lhash2_lookup(const struct net *net,

		struct inet_listen_hashbucket *ilb2,

		struct sk_buff *skb, int doff,

		const struct in6_addr *saddr,
@@ -174,7 +174,7 @@ static struct sock *inet6_lhash2_lookup(struct net *net, 
	return result;

}



struct sock *inet6_lookup_run_sk_lookup(struct net *net,

struct sock *inet6_lookup_run_sk_lookup(const struct net *net,

					int protocol,

					struct sk_buff *skb, int doff,

					const struct in6_addr *saddr,
@@ -199,7 +199,7 @@ struct sock *inet6_lookup_run_sk_lookup(struct net *net, 
}

EXPORT_SYMBOL_GPL(inet6_lookup_run_sk_lookup);



struct sock *inet6_lookup_listener(struct net *net,

struct sock *inet6_lookup_listener(const struct net *net,

		struct inet_hashinfo *hashinfo,

		struct sk_buff *skb, int doff,

		const struct in6_addr *saddr,
@@ -243,7 +243,8 @@ struct sock *inet6_lookup_listener(struct net *net, 
}

EXPORT_SYMBOL_GPL(inet6_lookup_listener);



struct sock *inet6_lookup(struct net *net, struct inet_hashinfo *hashinfo,

struct sock *inet6_lookup(const struct net *net,

			  struct inet_hashinfo *hashinfo,

			  struct sk_buff *skb, int doff,

			  const struct in6_addr *saddr, const __be16 sport,

			  const struct in6_addr *daddr, const __be16 dport,