Commit 50805466 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

inet: consolidate INET_TW_MATCH 



TCP listener refactoring, part 2 :

We can use a generic lookup, sockets being in whatever state, if
we are sure all relevant fields are at the same place in all socket
types (ESTABLISH, TIME_WAIT, SYN_RECV)

This patch removes these macros :

 inet_addrpair, inet_addrpair, tw_addrpair, tw_portpair

And adds :

 sk_portpair, sk_addrpair, sk_daddr, sk_rcv_saddr

Then, INET_TW_MATCH() is really the same than INET_MATCH()

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7b4371ea

include/linux/ipv6.h

+2 −2
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ static inline struct raw6_sock *raw6_sk(const struct sock *sk) 
#endif /* IS_ENABLED(CONFIG_IPV6) */



#define INET6_MATCH(__sk, __net, __saddr, __daddr, __ports, __dif)	\

	((inet_sk(__sk)->inet_portpair == (__ports))		&&	\

	(((__sk)->sk_portpair == (__ports))			&&	\

	 ((__sk)->sk_family == AF_INET6)			&&	\

	 ipv6_addr_equal(&inet6_sk(__sk)->daddr, (__saddr))	&&	\

	 ipv6_addr_equal(&inet6_sk(__sk)->rcv_saddr, (__daddr))	&&	\
@@ -379,7 +379,7 @@ static inline struct raw6_sock *raw6_sk(const struct sock *sk) 
	 net_eq(sock_net(__sk), (__net)))



#define INET6_TW_MATCH(__sk, __net, __saddr, __daddr, __ports, __dif)	   \

	((inet_twsk(__sk)->tw_portpair == (__ports))			&& \

	(((__sk)->sk_portpair == (__ports))				&& \

	 ((__sk)->sk_family == AF_INET6)				&& \

	 ipv6_addr_equal(&inet6_twsk(__sk)->tw_v6_daddr, (__saddr))	&& \

	 ipv6_addr_equal(&inet6_twsk(__sk)->tw_v6_rcv_saddr, (__daddr)) && \

include/net/inet_hashtables.h

+8 −18
Original line number Diff line number Diff line
@@ -302,35 +302,25 @@ static inline struct sock *inet_lookup_listener(struct net *net, 
				   ((__force __u64)(__be32)(__saddr)));

#endif /* __BIG_ENDIAN */

#define INET_MATCH(__sk, __net, __cookie, __saddr, __daddr, __ports, __dif)	\

	((inet_sk(__sk)->inet_portpair == (__ports))		&&	\

	 (inet_sk(__sk)->inet_addrpair == (__cookie))		&&	\

	 (!(__sk)->sk_bound_dev_if	||				\

	   ((__sk)->sk_bound_dev_if == (__dif))) 		&& 	\

	 net_eq(sock_net(__sk), (__net)))

#define INET_TW_MATCH(__sk, __net, __cookie, __saddr, __daddr, __ports, __dif)\

	((inet_twsk(__sk)->tw_portpair == (__ports))	&&		\

	 (inet_twsk(__sk)->tw_addrpair == (__cookie))	&&		\

	(((__sk)->sk_portpair == (__ports))			&&	\

	 ((__sk)->sk_addrpair == (__cookie))			&&	\

	 (!(__sk)->sk_bound_dev_if	||				\

	   ((__sk)->sk_bound_dev_if == (__dif))) 		&& 	\

	 net_eq(sock_net(__sk), (__net)))

#else /* 32-bit arch */

#define INET_ADDR_COOKIE(__name, __saddr, __daddr)

#define INET_MATCH(__sk, __net, __cookie, __saddr, __daddr, __ports, __dif) \

	((inet_sk(__sk)->inet_portpair == (__ports))	&&		\

	 (inet_sk(__sk)->inet_daddr	== (__saddr))	&&		\

	 (inet_sk(__sk)->inet_rcv_saddr	== (__daddr))	&&		\

	 (!(__sk)->sk_bound_dev_if	||				\

	   ((__sk)->sk_bound_dev_if == (__dif))) 	&&		\

	 net_eq(sock_net(__sk), (__net)))

#define INET_TW_MATCH(__sk, __net, __cookie, __saddr, __daddr, __ports, __dif) \

	((inet_twsk(__sk)->tw_portpair == (__ports))	&&		\

	 (inet_twsk(__sk)->tw_daddr	== (__saddr))	&&		\

	 (inet_twsk(__sk)->tw_rcv_saddr	== (__daddr))	&&		\

	(((__sk)->sk_portpair == (__ports))		&&		\

	 ((__sk)->sk_daddr	== (__saddr))		&&		\

	 ((__sk)->sk_rcv_saddr	== (__daddr))		&&		\

	 (!(__sk)->sk_bound_dev_if	||				\

	   ((__sk)->sk_bound_dev_if == (__dif))) 	&&		\

	 net_eq(sock_net(__sk), (__net)))

#endif /* 64-bit arch */



#define INET_TW_MATCH(__sk, __net, __cookie, __saddr, __daddr, __ports, __dif)\

	INET_MATCH(__sk, __net, __cookie, __saddr, __daddr, __ports, __dif)



/*

 * Sockets in TCP_CLOSE state are _always_ taken out of the hash, so we need

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

include/net/inet_sock.h

+0 −2
Original line number Diff line number Diff line
@@ -146,10 +146,8 @@ struct inet_sock { 
	/* Socket demultiplex comparisons on incoming packets. */

#define inet_daddr		sk.__sk_common.skc_daddr

#define inet_rcv_saddr		sk.__sk_common.skc_rcv_saddr

#define inet_addrpair		sk.__sk_common.skc_addrpair

#define inet_dport		sk.__sk_common.skc_dport

#define inet_num		sk.__sk_common.skc_num

#define inet_portpair		sk.__sk_common.skc_portpair



	__be32			inet_saddr;

	__s16			uc_ttl;

include/net/inet_timewait_sock.h

+0 −8
Original line number Diff line number Diff line
@@ -112,10 +112,8 @@ struct inet_timewait_sock { 
#define tw_net			__tw_common.skc_net

#define tw_daddr        	__tw_common.skc_daddr

#define tw_rcv_saddr    	__tw_common.skc_rcv_saddr

#define tw_addrpair		__tw_common.skc_addrpair

#define tw_dport		__tw_common.skc_dport

#define tw_num			__tw_common.skc_num

#define tw_portpair		__tw_common.skc_portpair



	int			tw_timeout;

	volatile unsigned char	tw_substate;
@@ -189,12 +187,6 @@ static inline struct inet_timewait_sock *inet_twsk(const struct sock *sk) 
	return (struct inet_timewait_sock *)sk;

}



static inline __be32 sk_rcv_saddr(const struct sock *sk)

{

/* both inet_sk() and inet_twsk() store rcv_saddr in skc_rcv_saddr */

	return sk->__sk_common.skc_rcv_saddr;

}



void inet_twsk_put(struct inet_timewait_sock *tw);



int inet_twsk_unhash(struct inet_timewait_sock *tw);

include/net/sock.h

+4 −0
Original line number Diff line number Diff line
@@ -300,6 +300,10 @@ struct sock { 
#define sk_dontcopy_begin	__sk_common.skc_dontcopy_begin

#define sk_dontcopy_end		__sk_common.skc_dontcopy_end

#define sk_hash			__sk_common.skc_hash

#define sk_portpair		__sk_common.skc_portpair

#define sk_addrpair		__sk_common.skc_addrpair

#define sk_daddr		__sk_common.skc_daddr

#define sk_rcv_saddr		__sk_common.skc_rcv_saddr

#define sk_family		__sk_common.skc_family

#define sk_state		__sk_common.skc_state

#define sk_reuse		__sk_common.skc_reuse

CRA Git | Maintained and supported by SUSTech CRA and CCSE