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

net: use net_eq() in INET_MATCH and INET_TW_MATCH 



We can avoid some useless instructions if !CONFIG_NET_NS

Because of RCU, we use INET_MATCH or INET_TW_MATCH twice for the found
socket, so thats six instructions less per incoming TCP packet.

Yet another tbench speedup :)

Signed-off-by: default avatarEric Dumazet <dada1@cosmosbay.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 98aa9c80

include/net/inet_hashtables.h

+4 −4
Original line number Diff line number Diff line
@@ -291,25 +291,25 @@ typedef __u64 __bitwise __addrpair; 
				   ((__force __u64)(__be32)(__saddr)));

#endif /* __BIG_ENDIAN */

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

	(((__sk)->sk_hash == (__hash)) && sock_net((__sk)) == (__net)	&&	\

	(((__sk)->sk_hash == (__hash)) && net_eq(sock_net(__sk), (__net)) &&	\

	 ((*((__addrpair *)&(inet_sk(__sk)->daddr))) == (__cookie))	&&	\

	 ((*((__portpair *)&(inet_sk(__sk)->dport))) == (__ports))	&&	\

	 (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))

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

	(((__sk)->sk_hash == (__hash)) && sock_net((__sk)) == (__net)	&&	\

	(((__sk)->sk_hash == (__hash)) && net_eq(sock_net(__sk), (__net)) &&	\

	 ((*((__addrpair *)&(inet_twsk(__sk)->tw_daddr))) == (__cookie)) &&	\

	 ((*((__portpair *)&(inet_twsk(__sk)->tw_dport))) == (__ports)) &&	\

	 (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))

#else /* 32-bit arch */

#define INET_ADDR_COOKIE(__name, __saddr, __daddr)

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

	(((__sk)->sk_hash == (__hash)) && sock_net((__sk)) == (__net)	&&	\

	(((__sk)->sk_hash == (__hash)) && net_eq(sock_net(__sk), (__net))	&&	\

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

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

	 ((*((__portpair *)&(inet_sk(__sk)->dport))) == (__ports))	&&	\

	 (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))

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

	(((__sk)->sk_hash == (__hash)) && sock_net((__sk)) == (__net)	&&	\

	(((__sk)->sk_hash == (__hash)) && net_eq(sock_net(__sk), (__net))	&&	\

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

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

	 ((*((__portpair *)&(inet_twsk(__sk)->tw_dport))) == (__ports)) &&	\

CRA Git | Maintained and supported by SUSTech CRA and CCSE