net: move inet_dport/inet_num in sock_common

commit 68835aba4d9b (net: optimize INET input path further)
moved some fields used for tcp/udp sockets lookup in the first cache
line of struct sock_common.

This patch moves inet_dport/inet_num as well, filling a 32bit hole
on 64 bit arches and reducing number of cache line misses in lookups.

Also change INET_MATCH()/INET_TW_MATCH() to perform the ports match
before addresses match, as this check is more discriminant.

Remove the hash check from MATCH() macros because we dont need to
re validate the hash value after taking a refcount on socket, and
use likely/unlikely compiler hints, as the sk_hash/hash check
makes the following conditional tests 100% predicted by cpu.

Introduce skc_addrpair/skc_portpair pair values to better
document the alignment requirements of the port/addr pairs
used in the various MATCH() macros, and remove some casts.

The namespace check can also be done at last.

This slightly improves TCP/UDP lookup times.

IP/TCP early demux needs inet->rx_dst_ifindex and
TCP needs inet->min_ttl, lets group them together in same cache line.

With help from Ben Hutchings & Joe Perches.

Idea of this patch came after Ling Ma proposal to move skc_hash
to the beginning of struct sock_common, and should allow him
to submit a final version of his patch. My tests show an improvement
doing so.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Ben Hutchings <bhutchings@solarflare.com>
Cc: Joe Perches <joe@perches.com>
Cc: Ling Ma <ling.ma.program@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 42 insertions, 21 deletions

diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 7880af970208..fa3ae8148710 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -237,12 +237,14 @@ struct sock *__inet_lookup_established(struct net *net,
         rcu_read_lock();
 begin:
         sk_nulls_for_each_rcu(sk, node, &head->chain) {
-                if (INET_MATCH(sk, net, hash, acookie,
-                                        saddr, daddr, ports, dif)) {
+                if (sk->sk_hash != hash)
+                        continue;
+                if (likely(INET_MATCH(sk, net, acookie,
+                                      saddr, daddr, ports, dif))) {
                         if (unlikely(!atomic_inc_not_zero(&sk->sk_refcnt)))
                                 goto begintw;
-                        if (unlikely(!INET_MATCH(sk, net, hash, acookie,
-                                saddr, daddr, ports, dif))) {
+                        if (unlikely(!INET_MATCH(sk, net, acookie,
+                                                 saddr, daddr, ports, dif))) {
                                 sock_put(sk);
                                 goto begin;
                         }
@@ -260,14 +262,18 @@ begin:
 begintw:
         /* Must check for a TIME_WAIT'er before going to listener hash. */
         sk_nulls_for_each_rcu(sk, node, &head->twchain) {
-                if (INET_TW_MATCH(sk, net, hash, acookie,
-                                        saddr, daddr, ports, dif)) {
+                if (sk->sk_hash != hash)
+                        continue;
+                if (likely(INET_TW_MATCH(sk, net, acookie,
+                                         saddr, daddr, ports,
+                                         dif))) {
                         if (unlikely(!atomic_inc_not_zero(&sk->sk_refcnt))) {
                                 sk = NULL;
                                 goto out;
                         }
-                        if (unlikely(!INET_TW_MATCH(sk, net, hash, acookie,
-                                 saddr, daddr, ports, dif))) {
+                        if (unlikely(!INET_TW_MATCH(sk, net, acookie,
+                                                    saddr, daddr, ports,
+                                                    dif))) {
                                 sock_put(sk);
                                 goto begintw;
                         }
@@ -314,10 +320,12 @@ static int __inet_check_established(struct inet_timewait_death_row *death_row,
 
         /* Check TIME-WAIT sockets first. */
         sk_nulls_for_each(sk2, node, &head->twchain) {
-                tw = inet_twsk(sk2);
+                if (sk2->sk_hash != hash)
+                        continue;
 
-                if (INET_TW_MATCH(sk2, net, hash, acookie,
-                                        saddr, daddr, ports, dif)) {
+                if (likely(INET_TW_MATCH(sk2, net, acookie,
+                                         saddr, daddr, ports, dif))) {
+                        tw = inet_twsk(sk2);
                         if (twsk_unique(sk, sk2, twp))
                                 goto unique;
                         else
@@ -328,8 +336,10 @@ static int __inet_check_established(struct inet_timewait_death_row *death_row,
 
         /* And established part... */
         sk_nulls_for_each(sk2, node, &head->chain) {
-                if (INET_MATCH(sk2, net, hash, acookie,
-                                        saddr, daddr, ports, dif))
+                if (sk2->sk_hash != hash)
+                        continue;
+                if (likely(INET_MATCH(sk2, net, acookie,
+                                      saddr, daddr, ports, dif)))
                         goto not_unique;
         }
 
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
index 73f1a00a96af..dea17fd28e50 100644
--- a/net/ipv6/inet6_hashtables.c
+++ b/net/ipv6/inet6_hashtables.c
@@ -87,11 +87,13 @@ struct sock *__inet6_lookup_established(struct net *net,
         rcu_read_lock();
 begin:
         sk_nulls_for_each_rcu(sk, node, &head->chain) {
-                /* For IPV6 do the cheaper port and family tests first. */
-                if (INET6_MATCH(sk, net, hash, saddr, daddr, ports, dif)) {
+                if (sk->sk_hash != hash)
+                        continue;
+                if (likely(INET6_MATCH(sk, net, saddr, daddr, ports, dif))) {
                         if (unlikely(!atomic_inc_not_zero(&sk->sk_refcnt)))
                                 goto begintw;
-                        if (!INET6_MATCH(sk, net, hash, saddr, daddr, ports, dif)) {
+                        if (unlikely(!INET6_MATCH(sk, net, saddr, daddr,
+                                                  ports, dif))) {
                                 sock_put(sk);
                                 goto begin;
                         }
@@ -104,12 +106,16 @@ begin:
 begintw:
         /* Must check for a TIME_WAIT'er before going to listener hash. */
         sk_nulls_for_each_rcu(sk, node, &head->twchain) {
-                if (INET6_TW_MATCH(sk, net, hash, saddr, daddr, ports, dif)) {
+                if (sk->sk_hash != hash)
+                        continue;
+                if (likely(INET6_TW_MATCH(sk, net, saddr, daddr,
+                                          ports, dif))) {
                         if (unlikely(!atomic_inc_not_zero(&sk->sk_refcnt))) {
                                 sk = NULL;
                                 goto out;
                         }
-                        if (!INET6_TW_MATCH(sk, net, hash, saddr, daddr, ports, dif)) {
+                        if (unlikely(!INET6_TW_MATCH(sk, net, saddr, daddr,
+                                                     ports, dif))) {
                                 sock_put(sk);
                                 goto begintw;
                         }
@@ -236,9 +242,12 @@ static int __inet6_check_established(struct inet_timewait_death_row *death_row,
 
         /* Check TIME-WAIT sockets first. */
         sk_nulls_for_each(sk2, node, &head->twchain) {
-                tw = inet_twsk(sk2);
+                if (sk2->sk_hash != hash)
+                        continue;
 
-                if (INET6_TW_MATCH(sk2, net, hash, saddr, daddr, ports, dif)) {
+                if (likely(INET6_TW_MATCH(sk2, net, saddr, daddr,
+                                          ports, dif))) {
+                        tw = inet_twsk(sk2);
                         if (twsk_unique(sk, sk2, twp))
                                 goto unique;
                         else
@@ -249,7 +258,9 @@ static int __inet6_check_established(struct inet_timewait_death_row *death_row,
 
         /* And established part... */
         sk_nulls_for_each(sk2, node, &head->chain) {
-                if (INET6_MATCH(sk2, net, hash, saddr, daddr, ports, dif))
+                if (sk2->sk_hash != hash)
+                        continue;
+                if (likely(INET6_MATCH(sk2, net, saddr, daddr, ports, dif)))
                         goto not_unique;
         }