Commit 0143ed32 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-constify-struct-net-parameter-of-socket-lookups' 

Eric Dumazet says:

====================
net: constify 'struct net' parameter of socket lookups

We should keep const qualifiers whenever possible.

This series should remove the need for Tom patch in :

Link: https://lore.kernel.org/netdev/20240731172332.683815-2-tom@herbertland.com/
====================

Link: https://patch.msgid.link/20240802134029.3748005-1-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 10a6545f 87d973e8

include/linux/filter.h

+2 −2
Original line number Diff line number Diff line
@@ -1616,7 +1616,7 @@ extern struct static_key_false bpf_sk_lookup_enabled; 
		_all_pass || _selected_sk ? SK_PASS : SK_DROP;		\

	 })



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

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

					const __be32 saddr, const __be16 sport,

					const __be32 daddr, const u16 dport,

					const int ifindex, struct sock **psk)
@@ -1653,7 +1653,7 @@ static inline bool bpf_sk_lookup_run_v4(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

+7 −7
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,
@@ -175,7 +175,7 @@ struct sock *inet6_lookup(struct net *net, struct inet_hashinfo *hashinfo, 


int inet6_hash(struct sock *sk);



static inline bool inet6_match(struct net *net, const struct sock *sk,

static inline bool inet6_match(const struct net *net, const struct sock *sk,

			       const struct in6_addr *saddr,

			       const struct in6_addr *daddr,

			       const __portpair ports,

include/net/inet_hashtables.h

+5 −5
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ int __inet_hash(struct sock *sk, struct sock *osk); 
int inet_hash(struct sock *sk);

void inet_unhash(struct sock *sk);



struct sock *__inet_lookup_listener(struct net *net,

struct sock *__inet_lookup_listener(const struct net *net,

				    struct inet_hashinfo *hashinfo,

				    struct sk_buff *skb, int doff,

				    const __be32 saddr, const __be16 sport,
@@ -351,7 +351,7 @@ static inline struct sock *inet_lookup_listener(struct net *net, 
				   ((__force __u64)(__be32)(__saddr)))

#endif /* __BIG_ENDIAN */



static inline bool inet_match(struct net *net, const struct sock *sk,

static inline bool inet_match(const struct net *net, const struct sock *sk,

			      const __addrpair cookie, const __portpair ports,

			      int dif, int sdif)

{
@@ -368,7 +368,7 @@ static inline bool inet_match(struct net *net, const struct sock *sk, 
/* Sockets in TCP_CLOSE state are _always_ taken out of the hash, so we need

 * not check it for lookups anymore, thanks Alexey. -DaveM

 */

struct sock *__inet_lookup_established(struct net *net,

struct sock *__inet_lookup_established(const struct net *net,

				       struct inet_hashinfo *hashinfo,

				       const __be32 saddr, const __be16 sport,

				       const __be32 daddr, const u16 hnum,
@@ -382,13 +382,13 @@ inet_ehashfn_t inet_ehashfn; 


INDIRECT_CALLABLE_DECLARE(inet_ehashfn_t udp_ehashfn);



struct sock *inet_lookup_reuseport(struct net *net, struct sock *sk,

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

				   struct sk_buff *skb, int doff,

				   __be32 saddr, __be16 sport,

				   __be32 daddr, unsigned short hnum,

				   inet_ehashfn_t *ehashfn);



struct sock *inet_lookup_run_sk_lookup(struct net *net,

struct sock *inet_lookup_run_sk_lookup(const struct net *net,

				       int protocol,

				       struct sk_buff *skb, int doff,

				       __be32 saddr, __be16 sport,

include/net/inet_sock.h

+2 −1
Original line number Diff line number Diff line
@@ -150,7 +150,8 @@ static inline bool inet_bound_dev_eq(bool l3mdev_accept, int bound_dev_if, 
	return bound_dev_if == dif || bound_dev_if == sdif;

}



static inline bool inet_sk_bound_dev_eq(struct net *net, int bound_dev_if,

static inline bool inet_sk_bound_dev_eq(const struct net *net,

					int bound_dev_if,

					int dif, int sdif)

{

#if IS_ENABLED(CONFIG_NET_L3_MASTER_DEV)

include/net/ipv6_stubs.h

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ extern const struct ipv6_stub *ipv6_stub __read_mostly; 
struct ipv6_bpf_stub {

	int (*inet6_bind)(struct sock *sk, struct sockaddr *uaddr, int addr_len,

			  u32 flags);

	struct sock *(*udp6_lib_lookup)(struct net *net,

	struct sock *(*udp6_lib_lookup)(const struct net *net,

				     const struct in6_addr *saddr, __be16 sport,

				     const struct in6_addr *daddr, __be16 dport,

				     int dif, int sdif, struct udp_table *tbl,