2005-08-10 04:59:20 +02:00
|
|
|
/*
|
|
|
|
* INET An implementation of the TCP/IP protocol suite for the LINUX
|
|
|
|
* operating system. INET is implemented using the BSD Socket
|
|
|
|
* interface as the means of communication with the user level.
|
|
|
|
*
|
|
|
|
* Authors: Lotsa people, from code originally in tcp
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version
|
|
|
|
* 2 of the License, or (at your option) any later version.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _INET_HASHTABLES_H
|
|
|
|
#define _INET_HASHTABLES_H
|
|
|
|
|
2005-08-10 05:09:30 +02:00
|
|
|
|
2005-08-10 05:07:13 +02:00
|
|
|
#include <linux/interrupt.h>
|
2005-08-10 05:09:06 +02:00
|
|
|
#include <linux/ipv6.h>
|
2005-08-10 05:00:51 +02:00
|
|
|
#include <linux/list.h>
|
|
|
|
#include <linux/slab.h>
|
2005-08-10 05:09:06 +02:00
|
|
|
#include <linux/socket.h>
|
2005-08-10 05:00:51 +02:00
|
|
|
#include <linux/spinlock.h>
|
2005-08-10 04:59:20 +02:00
|
|
|
#include <linux/types.h>
|
2005-08-10 05:08:09 +02:00
|
|
|
#include <linux/wait.h>
|
2005-08-10 04:59:20 +02:00
|
|
|
|
2005-08-10 05:10:42 +02:00
|
|
|
#include <net/inet_connection_sock.h>
|
2005-12-27 05:43:12 +01:00
|
|
|
#include <net/inet_sock.h>
|
2005-08-10 05:11:41 +02:00
|
|
|
#include <net/route.h>
|
2005-08-10 05:07:13 +02:00
|
|
|
#include <net/sock.h>
|
2005-08-10 05:08:28 +02:00
|
|
|
#include <net/tcp_states.h>
|
2005-08-10 05:07:13 +02:00
|
|
|
|
2005-08-10 05:08:09 +02:00
|
|
|
#include <asm/atomic.h>
|
2005-08-10 05:09:46 +02:00
|
|
|
#include <asm/byteorder.h>
|
2005-08-10 05:08:09 +02:00
|
|
|
|
2005-08-10 05:00:51 +02:00
|
|
|
/* This is for all connections with a full identity, no wildcards.
|
|
|
|
* New scheme, half the table is for TIME_WAIT, the other half is
|
|
|
|
* for the rest. I'll experiment with dynamic table growth later.
|
|
|
|
*/
|
|
|
|
struct inet_ehash_bucket {
|
|
|
|
rwlock_t lock;
|
|
|
|
struct hlist_head chain;
|
2005-10-05 00:55:51 +02:00
|
|
|
};
|
2005-08-10 05:00:51 +02:00
|
|
|
|
|
|
|
/* There are a few simple rules, which allow for local port reuse by
|
|
|
|
* an application. In essence:
|
|
|
|
*
|
|
|
|
* 1) Sockets bound to different interfaces may share a local port.
|
|
|
|
* Failing that, goto test 2.
|
|
|
|
* 2) If all sockets have sk->sk_reuse set, and none of them are in
|
|
|
|
* TCP_LISTEN state, the port may be shared.
|
|
|
|
* Failing that, goto test 3.
|
|
|
|
* 3) If all sockets are bound to a specific inet_sk(sk)->rcv_saddr local
|
|
|
|
* address, and none of them are the same, the port may be
|
|
|
|
* shared.
|
|
|
|
* Failing this, the port cannot be shared.
|
|
|
|
*
|
|
|
|
* The interesting point, is test #2. This is what an FTP server does
|
|
|
|
* all day. To optimize this case we use a specific flag bit defined
|
|
|
|
* below. As we add sockets to a bind bucket list, we perform a
|
|
|
|
* check of: (newsk->sk_reuse && (newsk->sk_state != TCP_LISTEN))
|
|
|
|
* As long as all sockets added to a bind bucket pass this test,
|
|
|
|
* the flag bit will be set.
|
|
|
|
* The resulting situation is that tcp_v[46]_verify_bind() can just check
|
|
|
|
* for this flag bit, if it is set and the socket trying to bind has
|
|
|
|
* sk->sk_reuse set, we don't even have to walk the owners list at all,
|
|
|
|
* we return that it is ok to bind this socket to the requested local port.
|
|
|
|
*
|
|
|
|
* Sounds like a lot of work, but it is worth it. In a more naive
|
|
|
|
* implementation (ie. current FreeBSD etc.) the entire list of ports
|
|
|
|
* must be walked for each data port opened by an ftp server. Needless
|
|
|
|
* to say, this does not scale at all. With a couple thousand FTP
|
|
|
|
* users logged onto your box, isn't it nice to know that new data
|
|
|
|
* ports are created in O(1) time? I thought so. ;-) -DaveM
|
|
|
|
*/
|
|
|
|
struct inet_bind_bucket {
|
|
|
|
unsigned short port;
|
|
|
|
signed short fastreuse;
|
|
|
|
struct hlist_node node;
|
|
|
|
struct hlist_head owners;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define inet_bind_bucket_for_each(tb, node, head) \
|
|
|
|
hlist_for_each_entry(tb, node, head, node)
|
|
|
|
|
|
|
|
struct inet_bind_hashbucket {
|
|
|
|
spinlock_t lock;
|
|
|
|
struct hlist_head chain;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* This is for listening sockets, thus all sockets which possess wildcards. */
|
|
|
|
#define INET_LHTABLE_SIZE 32 /* Yes, really, this is all you need. */
|
|
|
|
|
|
|
|
struct inet_hashinfo {
|
|
|
|
/* This is for sockets with full identity only. Sockets here will
|
|
|
|
* always be without wildcards and will have the following invariant:
|
|
|
|
*
|
|
|
|
* TCP_ESTABLISHED <= sk->sk_state < TCP_CLOSE
|
|
|
|
*
|
|
|
|
* First half of the table is for sockets not in TIME_WAIT, second half
|
|
|
|
* is for TIME_WAIT sockets only.
|
|
|
|
*/
|
|
|
|
struct inet_ehash_bucket *ehash;
|
|
|
|
|
|
|
|
/* Ok, let's try this, I give up, we do need a local binding
|
|
|
|
* TCP hash as well as the others for fast bind/connect.
|
|
|
|
*/
|
|
|
|
struct inet_bind_hashbucket *bhash;
|
|
|
|
|
|
|
|
int bhash_size;
|
[INET]: speedup inet (tcp/dccp) lookups
Arnaldo and I agreed it could be applied now, because I have other
pending patches depending on this one (Thank you Arnaldo)
(The other important patch moves skc_refcnt in a separate cache line,
so that the SMP/NUMA performance doesnt suffer from cache line ping pongs)
1) First some performance data :
--------------------------------
tcp_v4_rcv() wastes a *lot* of time in __inet_lookup_established()
The most time critical code is :
sk_for_each(sk, node, &head->chain) {
if (INET_MATCH(sk, acookie, saddr, daddr, ports, dif))
goto hit; /* You sunk my battleship! */
}
The sk_for_each() does use prefetch() hints but only the begining of
"struct sock" is prefetched.
As INET_MATCH first comparison uses inet_sk(__sk)->daddr, wich is far
away from the begining of "struct sock", it has to bring into CPU
cache cold cache line. Each iteration has to use at least 2 cache
lines.
This can be problematic if some chains are very long.
2) The goal
-----------
The idea I had is to change things so that INET_MATCH() may return
FALSE in 99% of cases only using the data already in the CPU cache,
using one cache line per iteration.
3) Description of the patch
---------------------------
Adds a new 'unsigned int skc_hash' field in 'struct sock_common',
filling a 32 bits hole on 64 bits platform.
struct sock_common {
unsigned short skc_family;
volatile unsigned char skc_state;
unsigned char skc_reuse;
int skc_bound_dev_if;
struct hlist_node skc_node;
struct hlist_node skc_bind_node;
atomic_t skc_refcnt;
+ unsigned int skc_hash;
struct proto *skc_prot;
};
Store in this 32 bits field the full hash, not masked by (ehash_size -
1) Using this full hash as the first comparison done in INET_MATCH
permits us immediatly skip the element without touching a second cache
line in case of a miss.
Suppress the sk_hashent/tw_hashent fields since skc_hash (aliased to
sk_hash and tw_hash) already contains the slot number if we mask with
(ehash_size - 1)
File include/net/inet_hashtables.h
64 bits platforms :
#define INET_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash))
((*((__u64 *)&(inet_sk(__sk)->daddr)))== (__cookie)) && \
((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
32bits platforms:
#define TCP_IPV4_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash)) && \
(inet_sk(__sk)->daddr == (__saddr)) && \
(inet_sk(__sk)->rcv_saddr == (__daddr)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
- Adds a prefetch(head->chain.first) in
__inet_lookup_established()/__tcp_v4_check_established() and
__inet6_lookup_established()/__tcp_v6_check_established() and
__dccp_v4_check_established() to bring into cache the first element of the
list, before the {read|write}_lock(&head->lock);
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Acked-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-10-03 23:13:38 +02:00
|
|
|
unsigned int ehash_size;
|
2005-08-10 05:00:51 +02:00
|
|
|
|
|
|
|
/* All sockets in TCP_LISTEN state will be in here. This is the only
|
|
|
|
* table where wildcard'd TCP sockets can exist. Hash function here
|
|
|
|
* is just local port number.
|
|
|
|
*/
|
|
|
|
struct hlist_head listening_hash[INET_LHTABLE_SIZE];
|
|
|
|
|
|
|
|
/* All the above members are written once at bootup and
|
|
|
|
* never written again _or_ are predominantly read-access.
|
|
|
|
*
|
|
|
|
* Now align to a new cache line as all the following members
|
|
|
|
* are often dirty.
|
|
|
|
*/
|
|
|
|
rwlock_t lhash_lock ____cacheline_aligned;
|
|
|
|
atomic_t lhash_users;
|
|
|
|
wait_queue_head_t lhash_wait;
|
2005-08-10 05:07:13 +02:00
|
|
|
kmem_cache_t *bind_bucket_cachep;
|
2005-08-10 05:00:51 +02:00
|
|
|
};
|
|
|
|
|
[INET]: speedup inet (tcp/dccp) lookups
Arnaldo and I agreed it could be applied now, because I have other
pending patches depending on this one (Thank you Arnaldo)
(The other important patch moves skc_refcnt in a separate cache line,
so that the SMP/NUMA performance doesnt suffer from cache line ping pongs)
1) First some performance data :
--------------------------------
tcp_v4_rcv() wastes a *lot* of time in __inet_lookup_established()
The most time critical code is :
sk_for_each(sk, node, &head->chain) {
if (INET_MATCH(sk, acookie, saddr, daddr, ports, dif))
goto hit; /* You sunk my battleship! */
}
The sk_for_each() does use prefetch() hints but only the begining of
"struct sock" is prefetched.
As INET_MATCH first comparison uses inet_sk(__sk)->daddr, wich is far
away from the begining of "struct sock", it has to bring into CPU
cache cold cache line. Each iteration has to use at least 2 cache
lines.
This can be problematic if some chains are very long.
2) The goal
-----------
The idea I had is to change things so that INET_MATCH() may return
FALSE in 99% of cases only using the data already in the CPU cache,
using one cache line per iteration.
3) Description of the patch
---------------------------
Adds a new 'unsigned int skc_hash' field in 'struct sock_common',
filling a 32 bits hole on 64 bits platform.
struct sock_common {
unsigned short skc_family;
volatile unsigned char skc_state;
unsigned char skc_reuse;
int skc_bound_dev_if;
struct hlist_node skc_node;
struct hlist_node skc_bind_node;
atomic_t skc_refcnt;
+ unsigned int skc_hash;
struct proto *skc_prot;
};
Store in this 32 bits field the full hash, not masked by (ehash_size -
1) Using this full hash as the first comparison done in INET_MATCH
permits us immediatly skip the element without touching a second cache
line in case of a miss.
Suppress the sk_hashent/tw_hashent fields since skc_hash (aliased to
sk_hash and tw_hash) already contains the slot number if we mask with
(ehash_size - 1)
File include/net/inet_hashtables.h
64 bits platforms :
#define INET_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash))
((*((__u64 *)&(inet_sk(__sk)->daddr)))== (__cookie)) && \
((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
32bits platforms:
#define TCP_IPV4_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash)) && \
(inet_sk(__sk)->daddr == (__saddr)) && \
(inet_sk(__sk)->rcv_saddr == (__daddr)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
- Adds a prefetch(head->chain.first) in
__inet_lookup_established()/__tcp_v4_check_established() and
__inet6_lookup_established()/__tcp_v6_check_established() and
__dccp_v4_check_established() to bring into cache the first element of the
list, before the {read|write}_lock(&head->lock);
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Acked-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-10-03 23:13:38 +02:00
|
|
|
static inline struct inet_ehash_bucket *inet_ehash_bucket(
|
|
|
|
struct inet_hashinfo *hashinfo,
|
|
|
|
unsigned int hash)
|
|
|
|
{
|
|
|
|
return &hashinfo->ehash[hash & (hashinfo->ehash_size - 1)];
|
2005-08-10 04:59:20 +02:00
|
|
|
}
|
|
|
|
|
2005-08-10 05:00:51 +02:00
|
|
|
extern struct inet_bind_bucket *
|
|
|
|
inet_bind_bucket_create(kmem_cache_t *cachep,
|
|
|
|
struct inet_bind_hashbucket *head,
|
|
|
|
const unsigned short snum);
|
|
|
|
extern void inet_bind_bucket_destroy(kmem_cache_t *cachep,
|
|
|
|
struct inet_bind_bucket *tb);
|
|
|
|
|
|
|
|
static inline int inet_bhashfn(const __u16 lport, const int bhash_size)
|
|
|
|
{
|
|
|
|
return lport & (bhash_size - 1);
|
|
|
|
}
|
|
|
|
|
2005-08-10 05:07:13 +02:00
|
|
|
extern void inet_bind_hash(struct sock *sk, struct inet_bind_bucket *tb,
|
|
|
|
const unsigned short snum);
|
|
|
|
|
2005-08-10 05:00:51 +02:00
|
|
|
/* These can have wildcards, don't try too hard. */
|
|
|
|
static inline int inet_lhashfn(const unsigned short num)
|
|
|
|
{
|
|
|
|
return num & (INET_LHTABLE_SIZE - 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int inet_sk_listen_hashfn(const struct sock *sk)
|
|
|
|
{
|
|
|
|
return inet_lhashfn(inet_sk(sk)->num);
|
|
|
|
}
|
|
|
|
|
2005-08-10 05:07:13 +02:00
|
|
|
/* Caller must disable local BH processing. */
|
|
|
|
static inline void __inet_inherit_port(struct inet_hashinfo *table,
|
|
|
|
struct sock *sk, struct sock *child)
|
|
|
|
{
|
|
|
|
const int bhash = inet_bhashfn(inet_sk(child)->num, table->bhash_size);
|
|
|
|
struct inet_bind_hashbucket *head = &table->bhash[bhash];
|
|
|
|
struct inet_bind_bucket *tb;
|
|
|
|
|
|
|
|
spin_lock(&head->lock);
|
2005-08-10 05:10:42 +02:00
|
|
|
tb = inet_csk(sk)->icsk_bind_hash;
|
2005-08-10 05:07:13 +02:00
|
|
|
sk_add_bind_node(child, &tb->owners);
|
2005-08-10 05:10:42 +02:00
|
|
|
inet_csk(child)->icsk_bind_hash = tb;
|
2005-08-10 05:07:13 +02:00
|
|
|
spin_unlock(&head->lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void inet_inherit_port(struct inet_hashinfo *table,
|
|
|
|
struct sock *sk, struct sock *child)
|
|
|
|
{
|
|
|
|
local_bh_disable();
|
|
|
|
__inet_inherit_port(table, sk, child);
|
|
|
|
local_bh_enable();
|
|
|
|
}
|
|
|
|
|
|
|
|
extern void inet_put_port(struct inet_hashinfo *table, struct sock *sk);
|
|
|
|
|
2005-08-10 05:08:09 +02:00
|
|
|
extern void inet_listen_wlock(struct inet_hashinfo *hashinfo);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* - We may sleep inside this lock.
|
|
|
|
* - If sleeping is not required (or called from BH),
|
|
|
|
* use plain read_(un)lock(&inet_hashinfo.lhash_lock).
|
|
|
|
*/
|
|
|
|
static inline void inet_listen_lock(struct inet_hashinfo *hashinfo)
|
|
|
|
{
|
|
|
|
/* read_lock synchronizes to candidates to writers */
|
|
|
|
read_lock(&hashinfo->lhash_lock);
|
|
|
|
atomic_inc(&hashinfo->lhash_users);
|
|
|
|
read_unlock(&hashinfo->lhash_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void inet_listen_unlock(struct inet_hashinfo *hashinfo)
|
|
|
|
{
|
|
|
|
if (atomic_dec_and_test(&hashinfo->lhash_users))
|
|
|
|
wake_up(&hashinfo->lhash_wait);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void __inet_hash(struct inet_hashinfo *hashinfo,
|
|
|
|
struct sock *sk, const int listen_possible)
|
|
|
|
{
|
|
|
|
struct hlist_head *list;
|
|
|
|
rwlock_t *lock;
|
|
|
|
|
|
|
|
BUG_TRAP(sk_unhashed(sk));
|
|
|
|
if (listen_possible && sk->sk_state == TCP_LISTEN) {
|
|
|
|
list = &hashinfo->listening_hash[inet_sk_listen_hashfn(sk)];
|
|
|
|
lock = &hashinfo->lhash_lock;
|
|
|
|
inet_listen_wlock(hashinfo);
|
|
|
|
} else {
|
[INET]: speedup inet (tcp/dccp) lookups
Arnaldo and I agreed it could be applied now, because I have other
pending patches depending on this one (Thank you Arnaldo)
(The other important patch moves skc_refcnt in a separate cache line,
so that the SMP/NUMA performance doesnt suffer from cache line ping pongs)
1) First some performance data :
--------------------------------
tcp_v4_rcv() wastes a *lot* of time in __inet_lookup_established()
The most time critical code is :
sk_for_each(sk, node, &head->chain) {
if (INET_MATCH(sk, acookie, saddr, daddr, ports, dif))
goto hit; /* You sunk my battleship! */
}
The sk_for_each() does use prefetch() hints but only the begining of
"struct sock" is prefetched.
As INET_MATCH first comparison uses inet_sk(__sk)->daddr, wich is far
away from the begining of "struct sock", it has to bring into CPU
cache cold cache line. Each iteration has to use at least 2 cache
lines.
This can be problematic if some chains are very long.
2) The goal
-----------
The idea I had is to change things so that INET_MATCH() may return
FALSE in 99% of cases only using the data already in the CPU cache,
using one cache line per iteration.
3) Description of the patch
---------------------------
Adds a new 'unsigned int skc_hash' field in 'struct sock_common',
filling a 32 bits hole on 64 bits platform.
struct sock_common {
unsigned short skc_family;
volatile unsigned char skc_state;
unsigned char skc_reuse;
int skc_bound_dev_if;
struct hlist_node skc_node;
struct hlist_node skc_bind_node;
atomic_t skc_refcnt;
+ unsigned int skc_hash;
struct proto *skc_prot;
};
Store in this 32 bits field the full hash, not masked by (ehash_size -
1) Using this full hash as the first comparison done in INET_MATCH
permits us immediatly skip the element without touching a second cache
line in case of a miss.
Suppress the sk_hashent/tw_hashent fields since skc_hash (aliased to
sk_hash and tw_hash) already contains the slot number if we mask with
(ehash_size - 1)
File include/net/inet_hashtables.h
64 bits platforms :
#define INET_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash))
((*((__u64 *)&(inet_sk(__sk)->daddr)))== (__cookie)) && \
((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
32bits platforms:
#define TCP_IPV4_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash)) && \
(inet_sk(__sk)->daddr == (__saddr)) && \
(inet_sk(__sk)->rcv_saddr == (__daddr)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
- Adds a prefetch(head->chain.first) in
__inet_lookup_established()/__tcp_v4_check_established() and
__inet6_lookup_established()/__tcp_v6_check_established() and
__dccp_v4_check_established() to bring into cache the first element of the
list, before the {read|write}_lock(&head->lock);
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Acked-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-10-03 23:13:38 +02:00
|
|
|
struct inet_ehash_bucket *head;
|
|
|
|
sk->sk_hash = inet_sk_ehashfn(sk);
|
|
|
|
head = inet_ehash_bucket(hashinfo, sk->sk_hash);
|
|
|
|
list = &head->chain;
|
|
|
|
lock = &head->lock;
|
2005-08-10 05:08:09 +02:00
|
|
|
write_lock(lock);
|
|
|
|
}
|
|
|
|
__sk_add_node(sk, list);
|
|
|
|
sock_prot_inc_use(sk->sk_prot);
|
|
|
|
write_unlock(lock);
|
|
|
|
if (listen_possible && sk->sk_state == TCP_LISTEN)
|
|
|
|
wake_up(&hashinfo->lhash_wait);
|
|
|
|
}
|
2005-08-10 05:08:50 +02:00
|
|
|
|
|
|
|
static inline void inet_hash(struct inet_hashinfo *hashinfo, struct sock *sk)
|
|
|
|
{
|
|
|
|
if (sk->sk_state != TCP_CLOSE) {
|
|
|
|
local_bh_disable();
|
|
|
|
__inet_hash(hashinfo, sk, 1);
|
|
|
|
local_bh_enable();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void inet_unhash(struct inet_hashinfo *hashinfo, struct sock *sk)
|
|
|
|
{
|
|
|
|
rwlock_t *lock;
|
|
|
|
|
|
|
|
if (sk_unhashed(sk))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
if (sk->sk_state == TCP_LISTEN) {
|
|
|
|
local_bh_disable();
|
|
|
|
inet_listen_wlock(hashinfo);
|
|
|
|
lock = &hashinfo->lhash_lock;
|
|
|
|
} else {
|
[INET]: speedup inet (tcp/dccp) lookups
Arnaldo and I agreed it could be applied now, because I have other
pending patches depending on this one (Thank you Arnaldo)
(The other important patch moves skc_refcnt in a separate cache line,
so that the SMP/NUMA performance doesnt suffer from cache line ping pongs)
1) First some performance data :
--------------------------------
tcp_v4_rcv() wastes a *lot* of time in __inet_lookup_established()
The most time critical code is :
sk_for_each(sk, node, &head->chain) {
if (INET_MATCH(sk, acookie, saddr, daddr, ports, dif))
goto hit; /* You sunk my battleship! */
}
The sk_for_each() does use prefetch() hints but only the begining of
"struct sock" is prefetched.
As INET_MATCH first comparison uses inet_sk(__sk)->daddr, wich is far
away from the begining of "struct sock", it has to bring into CPU
cache cold cache line. Each iteration has to use at least 2 cache
lines.
This can be problematic if some chains are very long.
2) The goal
-----------
The idea I had is to change things so that INET_MATCH() may return
FALSE in 99% of cases only using the data already in the CPU cache,
using one cache line per iteration.
3) Description of the patch
---------------------------
Adds a new 'unsigned int skc_hash' field in 'struct sock_common',
filling a 32 bits hole on 64 bits platform.
struct sock_common {
unsigned short skc_family;
volatile unsigned char skc_state;
unsigned char skc_reuse;
int skc_bound_dev_if;
struct hlist_node skc_node;
struct hlist_node skc_bind_node;
atomic_t skc_refcnt;
+ unsigned int skc_hash;
struct proto *skc_prot;
};
Store in this 32 bits field the full hash, not masked by (ehash_size -
1) Using this full hash as the first comparison done in INET_MATCH
permits us immediatly skip the element without touching a second cache
line in case of a miss.
Suppress the sk_hashent/tw_hashent fields since skc_hash (aliased to
sk_hash and tw_hash) already contains the slot number if we mask with
(ehash_size - 1)
File include/net/inet_hashtables.h
64 bits platforms :
#define INET_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash))
((*((__u64 *)&(inet_sk(__sk)->daddr)))== (__cookie)) && \
((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
32bits platforms:
#define TCP_IPV4_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash)) && \
(inet_sk(__sk)->daddr == (__saddr)) && \
(inet_sk(__sk)->rcv_saddr == (__daddr)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
- Adds a prefetch(head->chain.first) in
__inet_lookup_established()/__tcp_v4_check_established() and
__inet6_lookup_established()/__tcp_v6_check_established() and
__dccp_v4_check_established() to bring into cache the first element of the
list, before the {read|write}_lock(&head->lock);
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Acked-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-10-03 23:13:38 +02:00
|
|
|
lock = &inet_ehash_bucket(hashinfo, sk->sk_hash)->lock;
|
|
|
|
write_lock_bh(lock);
|
2005-08-10 05:08:50 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (__sk_del_node_init(sk))
|
|
|
|
sock_prot_dec_use(sk->sk_prot);
|
|
|
|
write_unlock_bh(lock);
|
|
|
|
out:
|
|
|
|
if (sk->sk_state == TCP_LISTEN)
|
|
|
|
wake_up(&hashinfo->lhash_wait);
|
|
|
|
}
|
2005-08-10 05:09:06 +02:00
|
|
|
|
2005-08-10 05:11:41 +02:00
|
|
|
static inline int inet_iif(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return ((struct rtable *)skb->dst)->rt_iif;
|
|
|
|
}
|
|
|
|
|
2006-08-10 00:47:12 +02:00
|
|
|
extern struct sock *__inet_lookup_listener(struct inet_hashinfo *hashinfo,
|
2006-09-28 03:43:33 +02:00
|
|
|
const __be32 daddr,
|
2006-08-10 00:47:12 +02:00
|
|
|
const unsigned short hnum,
|
|
|
|
const int dif);
|
|
|
|
|
|
|
|
static inline struct sock *inet_lookup_listener(struct inet_hashinfo *hashinfo,
|
2006-09-28 03:43:33 +02:00
|
|
|
__be32 daddr, __be16 dport, int dif)
|
2006-08-10 00:47:12 +02:00
|
|
|
{
|
|
|
|
return __inet_lookup_listener(hashinfo, daddr, ntohs(dport), dif);
|
|
|
|
}
|
2005-08-10 05:09:30 +02:00
|
|
|
|
|
|
|
/* Socket demux engine toys. */
|
2006-09-28 03:43:07 +02:00
|
|
|
/* What happens here is ugly; there's a pair of adjacent fields in
|
|
|
|
struct inet_sock; __be16 dport followed by __u16 num. We want to
|
|
|
|
search by pair, so we combine the keys into a single 32bit value
|
|
|
|
and compare with 32bit value read from &...->dport. Let's at least
|
|
|
|
make sure that it's not mixed with anything else...
|
|
|
|
On 64bit targets we combine comparisons with pair of adjacent __be32
|
|
|
|
fields in the same way.
|
|
|
|
*/
|
|
|
|
typedef __u32 __bitwise __portpair;
|
2005-08-10 05:09:30 +02:00
|
|
|
#ifdef __BIG_ENDIAN
|
|
|
|
#define INET_COMBINED_PORTS(__sport, __dport) \
|
2006-09-28 03:43:07 +02:00
|
|
|
((__force __portpair)(((__force __u32)(__be16)(__sport) << 16) | (__u32)(__dport)))
|
2005-08-10 05:09:30 +02:00
|
|
|
#else /* __LITTLE_ENDIAN */
|
|
|
|
#define INET_COMBINED_PORTS(__sport, __dport) \
|
2006-09-28 03:43:07 +02:00
|
|
|
((__force __portpair)(((__u32)(__dport) << 16) | (__force __u32)(__be16)(__sport)))
|
2005-08-10 05:09:30 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#if (BITS_PER_LONG == 64)
|
2006-09-28 03:43:07 +02:00
|
|
|
typedef __u64 __bitwise __addrpair;
|
2005-08-10 05:09:30 +02:00
|
|
|
#ifdef __BIG_ENDIAN
|
|
|
|
#define INET_ADDR_COOKIE(__name, __saddr, __daddr) \
|
2006-09-28 03:43:07 +02:00
|
|
|
const __addrpair __name = (__force __addrpair) ( \
|
|
|
|
(((__force __u64)(__be32)(__saddr)) << 32) | \
|
|
|
|
((__force __u64)(__be32)(__daddr)));
|
2005-08-10 05:09:30 +02:00
|
|
|
#else /* __LITTLE_ENDIAN */
|
|
|
|
#define INET_ADDR_COOKIE(__name, __saddr, __daddr) \
|
2006-09-28 03:43:07 +02:00
|
|
|
const __addrpair __name = (__force __addrpair) ( \
|
|
|
|
(((__force __u64)(__be32)(__daddr)) << 32) | \
|
|
|
|
((__force __u64)(__be32)(__saddr)));
|
2005-08-10 05:09:30 +02:00
|
|
|
#endif /* __BIG_ENDIAN */
|
[INET]: speedup inet (tcp/dccp) lookups
Arnaldo and I agreed it could be applied now, because I have other
pending patches depending on this one (Thank you Arnaldo)
(The other important patch moves skc_refcnt in a separate cache line,
so that the SMP/NUMA performance doesnt suffer from cache line ping pongs)
1) First some performance data :
--------------------------------
tcp_v4_rcv() wastes a *lot* of time in __inet_lookup_established()
The most time critical code is :
sk_for_each(sk, node, &head->chain) {
if (INET_MATCH(sk, acookie, saddr, daddr, ports, dif))
goto hit; /* You sunk my battleship! */
}
The sk_for_each() does use prefetch() hints but only the begining of
"struct sock" is prefetched.
As INET_MATCH first comparison uses inet_sk(__sk)->daddr, wich is far
away from the begining of "struct sock", it has to bring into CPU
cache cold cache line. Each iteration has to use at least 2 cache
lines.
This can be problematic if some chains are very long.
2) The goal
-----------
The idea I had is to change things so that INET_MATCH() may return
FALSE in 99% of cases only using the data already in the CPU cache,
using one cache line per iteration.
3) Description of the patch
---------------------------
Adds a new 'unsigned int skc_hash' field in 'struct sock_common',
filling a 32 bits hole on 64 bits platform.
struct sock_common {
unsigned short skc_family;
volatile unsigned char skc_state;
unsigned char skc_reuse;
int skc_bound_dev_if;
struct hlist_node skc_node;
struct hlist_node skc_bind_node;
atomic_t skc_refcnt;
+ unsigned int skc_hash;
struct proto *skc_prot;
};
Store in this 32 bits field the full hash, not masked by (ehash_size -
1) Using this full hash as the first comparison done in INET_MATCH
permits us immediatly skip the element without touching a second cache
line in case of a miss.
Suppress the sk_hashent/tw_hashent fields since skc_hash (aliased to
sk_hash and tw_hash) already contains the slot number if we mask with
(ehash_size - 1)
File include/net/inet_hashtables.h
64 bits platforms :
#define INET_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash))
((*((__u64 *)&(inet_sk(__sk)->daddr)))== (__cookie)) && \
((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
32bits platforms:
#define TCP_IPV4_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash)) && \
(inet_sk(__sk)->daddr == (__saddr)) && \
(inet_sk(__sk)->rcv_saddr == (__daddr)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
- Adds a prefetch(head->chain.first) in
__inet_lookup_established()/__tcp_v4_check_established() and
__inet6_lookup_established()/__tcp_v6_check_established() and
__dccp_v4_check_established() to bring into cache the first element of the
list, before the {read|write}_lock(&head->lock);
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Acked-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-10-03 23:13:38 +02:00
|
|
|
#define INET_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
|
|
|
|
(((__sk)->sk_hash == (__hash)) && \
|
2006-09-28 03:43:07 +02:00
|
|
|
((*((__addrpair *)&(inet_sk(__sk)->daddr))) == (__cookie)) && \
|
|
|
|
((*((__portpair *)&(inet_sk(__sk)->dport))) == (__ports)) && \
|
2005-08-10 05:09:30 +02:00
|
|
|
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
|
[INET]: speedup inet (tcp/dccp) lookups
Arnaldo and I agreed it could be applied now, because I have other
pending patches depending on this one (Thank you Arnaldo)
(The other important patch moves skc_refcnt in a separate cache line,
so that the SMP/NUMA performance doesnt suffer from cache line ping pongs)
1) First some performance data :
--------------------------------
tcp_v4_rcv() wastes a *lot* of time in __inet_lookup_established()
The most time critical code is :
sk_for_each(sk, node, &head->chain) {
if (INET_MATCH(sk, acookie, saddr, daddr, ports, dif))
goto hit; /* You sunk my battleship! */
}
The sk_for_each() does use prefetch() hints but only the begining of
"struct sock" is prefetched.
As INET_MATCH first comparison uses inet_sk(__sk)->daddr, wich is far
away from the begining of "struct sock", it has to bring into CPU
cache cold cache line. Each iteration has to use at least 2 cache
lines.
This can be problematic if some chains are very long.
2) The goal
-----------
The idea I had is to change things so that INET_MATCH() may return
FALSE in 99% of cases only using the data already in the CPU cache,
using one cache line per iteration.
3) Description of the patch
---------------------------
Adds a new 'unsigned int skc_hash' field in 'struct sock_common',
filling a 32 bits hole on 64 bits platform.
struct sock_common {
unsigned short skc_family;
volatile unsigned char skc_state;
unsigned char skc_reuse;
int skc_bound_dev_if;
struct hlist_node skc_node;
struct hlist_node skc_bind_node;
atomic_t skc_refcnt;
+ unsigned int skc_hash;
struct proto *skc_prot;
};
Store in this 32 bits field the full hash, not masked by (ehash_size -
1) Using this full hash as the first comparison done in INET_MATCH
permits us immediatly skip the element without touching a second cache
line in case of a miss.
Suppress the sk_hashent/tw_hashent fields since skc_hash (aliased to
sk_hash and tw_hash) already contains the slot number if we mask with
(ehash_size - 1)
File include/net/inet_hashtables.h
64 bits platforms :
#define INET_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash))
((*((__u64 *)&(inet_sk(__sk)->daddr)))== (__cookie)) && \
((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
32bits platforms:
#define TCP_IPV4_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash)) && \
(inet_sk(__sk)->daddr == (__saddr)) && \
(inet_sk(__sk)->rcv_saddr == (__daddr)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
- Adds a prefetch(head->chain.first) in
__inet_lookup_established()/__tcp_v4_check_established() and
__inet6_lookup_established()/__tcp_v6_check_established() and
__dccp_v4_check_established() to bring into cache the first element of the
list, before the {read|write}_lock(&head->lock);
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Acked-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-10-03 23:13:38 +02:00
|
|
|
#define INET_TW_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
|
|
|
|
(((__sk)->sk_hash == (__hash)) && \
|
2006-09-28 03:43:07 +02:00
|
|
|
((*((__addrpair *)&(inet_twsk(__sk)->tw_daddr))) == (__cookie)) && \
|
|
|
|
((*((__portpair *)&(inet_twsk(__sk)->tw_dport))) == (__ports)) && \
|
2005-08-10 05:09:30 +02:00
|
|
|
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
|
|
|
|
#else /* 32-bit arch */
|
|
|
|
#define INET_ADDR_COOKIE(__name, __saddr, __daddr)
|
[INET]: speedup inet (tcp/dccp) lookups
Arnaldo and I agreed it could be applied now, because I have other
pending patches depending on this one (Thank you Arnaldo)
(The other important patch moves skc_refcnt in a separate cache line,
so that the SMP/NUMA performance doesnt suffer from cache line ping pongs)
1) First some performance data :
--------------------------------
tcp_v4_rcv() wastes a *lot* of time in __inet_lookup_established()
The most time critical code is :
sk_for_each(sk, node, &head->chain) {
if (INET_MATCH(sk, acookie, saddr, daddr, ports, dif))
goto hit; /* You sunk my battleship! */
}
The sk_for_each() does use prefetch() hints but only the begining of
"struct sock" is prefetched.
As INET_MATCH first comparison uses inet_sk(__sk)->daddr, wich is far
away from the begining of "struct sock", it has to bring into CPU
cache cold cache line. Each iteration has to use at least 2 cache
lines.
This can be problematic if some chains are very long.
2) The goal
-----------
The idea I had is to change things so that INET_MATCH() may return
FALSE in 99% of cases only using the data already in the CPU cache,
using one cache line per iteration.
3) Description of the patch
---------------------------
Adds a new 'unsigned int skc_hash' field in 'struct sock_common',
filling a 32 bits hole on 64 bits platform.
struct sock_common {
unsigned short skc_family;
volatile unsigned char skc_state;
unsigned char skc_reuse;
int skc_bound_dev_if;
struct hlist_node skc_node;
struct hlist_node skc_bind_node;
atomic_t skc_refcnt;
+ unsigned int skc_hash;
struct proto *skc_prot;
};
Store in this 32 bits field the full hash, not masked by (ehash_size -
1) Using this full hash as the first comparison done in INET_MATCH
permits us immediatly skip the element without touching a second cache
line in case of a miss.
Suppress the sk_hashent/tw_hashent fields since skc_hash (aliased to
sk_hash and tw_hash) already contains the slot number if we mask with
(ehash_size - 1)
File include/net/inet_hashtables.h
64 bits platforms :
#define INET_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash))
((*((__u64 *)&(inet_sk(__sk)->daddr)))== (__cookie)) && \
((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
32bits platforms:
#define TCP_IPV4_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash)) && \
(inet_sk(__sk)->daddr == (__saddr)) && \
(inet_sk(__sk)->rcv_saddr == (__daddr)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
- Adds a prefetch(head->chain.first) in
__inet_lookup_established()/__tcp_v4_check_established() and
__inet6_lookup_established()/__tcp_v6_check_established() and
__dccp_v4_check_established() to bring into cache the first element of the
list, before the {read|write}_lock(&head->lock);
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Acked-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-10-03 23:13:38 +02:00
|
|
|
#define INET_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif) \
|
|
|
|
(((__sk)->sk_hash == (__hash)) && \
|
|
|
|
(inet_sk(__sk)->daddr == (__saddr)) && \
|
2005-08-10 05:09:30 +02:00
|
|
|
(inet_sk(__sk)->rcv_saddr == (__daddr)) && \
|
2006-09-28 03:43:07 +02:00
|
|
|
((*((__portpair *)&(inet_sk(__sk)->dport))) == (__ports)) && \
|
2005-08-10 05:09:30 +02:00
|
|
|
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
|
[INET]: speedup inet (tcp/dccp) lookups
Arnaldo and I agreed it could be applied now, because I have other
pending patches depending on this one (Thank you Arnaldo)
(The other important patch moves skc_refcnt in a separate cache line,
so that the SMP/NUMA performance doesnt suffer from cache line ping pongs)
1) First some performance data :
--------------------------------
tcp_v4_rcv() wastes a *lot* of time in __inet_lookup_established()
The most time critical code is :
sk_for_each(sk, node, &head->chain) {
if (INET_MATCH(sk, acookie, saddr, daddr, ports, dif))
goto hit; /* You sunk my battleship! */
}
The sk_for_each() does use prefetch() hints but only the begining of
"struct sock" is prefetched.
As INET_MATCH first comparison uses inet_sk(__sk)->daddr, wich is far
away from the begining of "struct sock", it has to bring into CPU
cache cold cache line. Each iteration has to use at least 2 cache
lines.
This can be problematic if some chains are very long.
2) The goal
-----------
The idea I had is to change things so that INET_MATCH() may return
FALSE in 99% of cases only using the data already in the CPU cache,
using one cache line per iteration.
3) Description of the patch
---------------------------
Adds a new 'unsigned int skc_hash' field in 'struct sock_common',
filling a 32 bits hole on 64 bits platform.
struct sock_common {
unsigned short skc_family;
volatile unsigned char skc_state;
unsigned char skc_reuse;
int skc_bound_dev_if;
struct hlist_node skc_node;
struct hlist_node skc_bind_node;
atomic_t skc_refcnt;
+ unsigned int skc_hash;
struct proto *skc_prot;
};
Store in this 32 bits field the full hash, not masked by (ehash_size -
1) Using this full hash as the first comparison done in INET_MATCH
permits us immediatly skip the element without touching a second cache
line in case of a miss.
Suppress the sk_hashent/tw_hashent fields since skc_hash (aliased to
sk_hash and tw_hash) already contains the slot number if we mask with
(ehash_size - 1)
File include/net/inet_hashtables.h
64 bits platforms :
#define INET_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash))
((*((__u64 *)&(inet_sk(__sk)->daddr)))== (__cookie)) && \
((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
32bits platforms:
#define TCP_IPV4_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash)) && \
(inet_sk(__sk)->daddr == (__saddr)) && \
(inet_sk(__sk)->rcv_saddr == (__daddr)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
- Adds a prefetch(head->chain.first) in
__inet_lookup_established()/__tcp_v4_check_established() and
__inet6_lookup_established()/__tcp_v6_check_established() and
__dccp_v4_check_established() to bring into cache the first element of the
list, before the {read|write}_lock(&head->lock);
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Acked-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-10-03 23:13:38 +02:00
|
|
|
#define INET_TW_MATCH(__sk, __hash,__cookie, __saddr, __daddr, __ports, __dif) \
|
|
|
|
(((__sk)->sk_hash == (__hash)) && \
|
|
|
|
(inet_twsk(__sk)->tw_daddr == (__saddr)) && \
|
2005-08-10 05:09:30 +02:00
|
|
|
(inet_twsk(__sk)->tw_rcv_saddr == (__daddr)) && \
|
2006-09-28 03:43:07 +02:00
|
|
|
((*((__portpair *)&(inet_twsk(__sk)->tw_dport))) == (__ports)) && \
|
2005-08-10 05:09:30 +02:00
|
|
|
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
|
|
|
|
#endif /* 64-bit arch */
|
2005-08-10 05:09:46 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Sockets in TCP_CLOSE state are _always_ taken out of the hash, so we need
|
|
|
|
* not check it for lookups anymore, thanks Alexey. -DaveM
|
|
|
|
*
|
|
|
|
* Local BH must be disabled here.
|
|
|
|
*/
|
|
|
|
static inline struct sock *
|
|
|
|
__inet_lookup_established(struct inet_hashinfo *hashinfo,
|
2006-09-28 03:43:33 +02:00
|
|
|
const __be32 saddr, const __be16 sport,
|
|
|
|
const __be32 daddr, const u16 hnum,
|
2005-08-10 05:09:46 +02:00
|
|
|
const int dif)
|
|
|
|
{
|
|
|
|
INET_ADDR_COOKIE(acookie, saddr, daddr)
|
2006-09-28 03:43:07 +02:00
|
|
|
const __portpair ports = INET_COMBINED_PORTS(sport, hnum);
|
2005-08-10 05:09:46 +02:00
|
|
|
struct sock *sk;
|
|
|
|
const struct hlist_node *node;
|
|
|
|
/* Optimize here for direct hit, only listening connections can
|
|
|
|
* have wildcards anyways.
|
|
|
|
*/
|
[INET]: speedup inet (tcp/dccp) lookups
Arnaldo and I agreed it could be applied now, because I have other
pending patches depending on this one (Thank you Arnaldo)
(The other important patch moves skc_refcnt in a separate cache line,
so that the SMP/NUMA performance doesnt suffer from cache line ping pongs)
1) First some performance data :
--------------------------------
tcp_v4_rcv() wastes a *lot* of time in __inet_lookup_established()
The most time critical code is :
sk_for_each(sk, node, &head->chain) {
if (INET_MATCH(sk, acookie, saddr, daddr, ports, dif))
goto hit; /* You sunk my battleship! */
}
The sk_for_each() does use prefetch() hints but only the begining of
"struct sock" is prefetched.
As INET_MATCH first comparison uses inet_sk(__sk)->daddr, wich is far
away from the begining of "struct sock", it has to bring into CPU
cache cold cache line. Each iteration has to use at least 2 cache
lines.
This can be problematic if some chains are very long.
2) The goal
-----------
The idea I had is to change things so that INET_MATCH() may return
FALSE in 99% of cases only using the data already in the CPU cache,
using one cache line per iteration.
3) Description of the patch
---------------------------
Adds a new 'unsigned int skc_hash' field in 'struct sock_common',
filling a 32 bits hole on 64 bits platform.
struct sock_common {
unsigned short skc_family;
volatile unsigned char skc_state;
unsigned char skc_reuse;
int skc_bound_dev_if;
struct hlist_node skc_node;
struct hlist_node skc_bind_node;
atomic_t skc_refcnt;
+ unsigned int skc_hash;
struct proto *skc_prot;
};
Store in this 32 bits field the full hash, not masked by (ehash_size -
1) Using this full hash as the first comparison done in INET_MATCH
permits us immediatly skip the element without touching a second cache
line in case of a miss.
Suppress the sk_hashent/tw_hashent fields since skc_hash (aliased to
sk_hash and tw_hash) already contains the slot number if we mask with
(ehash_size - 1)
File include/net/inet_hashtables.h
64 bits platforms :
#define INET_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash))
((*((__u64 *)&(inet_sk(__sk)->daddr)))== (__cookie)) && \
((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
32bits platforms:
#define TCP_IPV4_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash)) && \
(inet_sk(__sk)->daddr == (__saddr)) && \
(inet_sk(__sk)->rcv_saddr == (__daddr)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
- Adds a prefetch(head->chain.first) in
__inet_lookup_established()/__tcp_v4_check_established() and
__inet6_lookup_established()/__tcp_v6_check_established() and
__dccp_v4_check_established() to bring into cache the first element of the
list, before the {read|write}_lock(&head->lock);
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Acked-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-10-03 23:13:38 +02:00
|
|
|
unsigned int hash = inet_ehashfn(daddr, hnum, saddr, sport);
|
|
|
|
struct inet_ehash_bucket *head = inet_ehash_bucket(hashinfo, hash);
|
2005-08-10 05:09:46 +02:00
|
|
|
|
[INET]: speedup inet (tcp/dccp) lookups
Arnaldo and I agreed it could be applied now, because I have other
pending patches depending on this one (Thank you Arnaldo)
(The other important patch moves skc_refcnt in a separate cache line,
so that the SMP/NUMA performance doesnt suffer from cache line ping pongs)
1) First some performance data :
--------------------------------
tcp_v4_rcv() wastes a *lot* of time in __inet_lookup_established()
The most time critical code is :
sk_for_each(sk, node, &head->chain) {
if (INET_MATCH(sk, acookie, saddr, daddr, ports, dif))
goto hit; /* You sunk my battleship! */
}
The sk_for_each() does use prefetch() hints but only the begining of
"struct sock" is prefetched.
As INET_MATCH first comparison uses inet_sk(__sk)->daddr, wich is far
away from the begining of "struct sock", it has to bring into CPU
cache cold cache line. Each iteration has to use at least 2 cache
lines.
This can be problematic if some chains are very long.
2) The goal
-----------
The idea I had is to change things so that INET_MATCH() may return
FALSE in 99% of cases only using the data already in the CPU cache,
using one cache line per iteration.
3) Description of the patch
---------------------------
Adds a new 'unsigned int skc_hash' field in 'struct sock_common',
filling a 32 bits hole on 64 bits platform.
struct sock_common {
unsigned short skc_family;
volatile unsigned char skc_state;
unsigned char skc_reuse;
int skc_bound_dev_if;
struct hlist_node skc_node;
struct hlist_node skc_bind_node;
atomic_t skc_refcnt;
+ unsigned int skc_hash;
struct proto *skc_prot;
};
Store in this 32 bits field the full hash, not masked by (ehash_size -
1) Using this full hash as the first comparison done in INET_MATCH
permits us immediatly skip the element without touching a second cache
line in case of a miss.
Suppress the sk_hashent/tw_hashent fields since skc_hash (aliased to
sk_hash and tw_hash) already contains the slot number if we mask with
(ehash_size - 1)
File include/net/inet_hashtables.h
64 bits platforms :
#define INET_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash))
((*((__u64 *)&(inet_sk(__sk)->daddr)))== (__cookie)) && \
((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
32bits platforms:
#define TCP_IPV4_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash)) && \
(inet_sk(__sk)->daddr == (__saddr)) && \
(inet_sk(__sk)->rcv_saddr == (__daddr)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
- Adds a prefetch(head->chain.first) in
__inet_lookup_established()/__tcp_v4_check_established() and
__inet6_lookup_established()/__tcp_v6_check_established() and
__dccp_v4_check_established() to bring into cache the first element of the
list, before the {read|write}_lock(&head->lock);
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Acked-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-10-03 23:13:38 +02:00
|
|
|
prefetch(head->chain.first);
|
2005-08-10 05:09:46 +02:00
|
|
|
read_lock(&head->lock);
|
|
|
|
sk_for_each(sk, node, &head->chain) {
|
[INET]: speedup inet (tcp/dccp) lookups
Arnaldo and I agreed it could be applied now, because I have other
pending patches depending on this one (Thank you Arnaldo)
(The other important patch moves skc_refcnt in a separate cache line,
so that the SMP/NUMA performance doesnt suffer from cache line ping pongs)
1) First some performance data :
--------------------------------
tcp_v4_rcv() wastes a *lot* of time in __inet_lookup_established()
The most time critical code is :
sk_for_each(sk, node, &head->chain) {
if (INET_MATCH(sk, acookie, saddr, daddr, ports, dif))
goto hit; /* You sunk my battleship! */
}
The sk_for_each() does use prefetch() hints but only the begining of
"struct sock" is prefetched.
As INET_MATCH first comparison uses inet_sk(__sk)->daddr, wich is far
away from the begining of "struct sock", it has to bring into CPU
cache cold cache line. Each iteration has to use at least 2 cache
lines.
This can be problematic if some chains are very long.
2) The goal
-----------
The idea I had is to change things so that INET_MATCH() may return
FALSE in 99% of cases only using the data already in the CPU cache,
using one cache line per iteration.
3) Description of the patch
---------------------------
Adds a new 'unsigned int skc_hash' field in 'struct sock_common',
filling a 32 bits hole on 64 bits platform.
struct sock_common {
unsigned short skc_family;
volatile unsigned char skc_state;
unsigned char skc_reuse;
int skc_bound_dev_if;
struct hlist_node skc_node;
struct hlist_node skc_bind_node;
atomic_t skc_refcnt;
+ unsigned int skc_hash;
struct proto *skc_prot;
};
Store in this 32 bits field the full hash, not masked by (ehash_size -
1) Using this full hash as the first comparison done in INET_MATCH
permits us immediatly skip the element without touching a second cache
line in case of a miss.
Suppress the sk_hashent/tw_hashent fields since skc_hash (aliased to
sk_hash and tw_hash) already contains the slot number if we mask with
(ehash_size - 1)
File include/net/inet_hashtables.h
64 bits platforms :
#define INET_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash))
((*((__u64 *)&(inet_sk(__sk)->daddr)))== (__cookie)) && \
((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
32bits platforms:
#define TCP_IPV4_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash)) && \
(inet_sk(__sk)->daddr == (__saddr)) && \
(inet_sk(__sk)->rcv_saddr == (__daddr)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
- Adds a prefetch(head->chain.first) in
__inet_lookup_established()/__tcp_v4_check_established() and
__inet6_lookup_established()/__tcp_v6_check_established() and
__dccp_v4_check_established() to bring into cache the first element of the
list, before the {read|write}_lock(&head->lock);
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Acked-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-10-03 23:13:38 +02:00
|
|
|
if (INET_MATCH(sk, hash, acookie, saddr, daddr, ports, dif))
|
2005-08-10 05:09:46 +02:00
|
|
|
goto hit; /* You sunk my battleship! */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Must check for a TIME_WAIT'er before going to listener hash. */
|
|
|
|
sk_for_each(sk, node, &(head + hashinfo->ehash_size)->chain) {
|
[INET]: speedup inet (tcp/dccp) lookups
Arnaldo and I agreed it could be applied now, because I have other
pending patches depending on this one (Thank you Arnaldo)
(The other important patch moves skc_refcnt in a separate cache line,
so that the SMP/NUMA performance doesnt suffer from cache line ping pongs)
1) First some performance data :
--------------------------------
tcp_v4_rcv() wastes a *lot* of time in __inet_lookup_established()
The most time critical code is :
sk_for_each(sk, node, &head->chain) {
if (INET_MATCH(sk, acookie, saddr, daddr, ports, dif))
goto hit; /* You sunk my battleship! */
}
The sk_for_each() does use prefetch() hints but only the begining of
"struct sock" is prefetched.
As INET_MATCH first comparison uses inet_sk(__sk)->daddr, wich is far
away from the begining of "struct sock", it has to bring into CPU
cache cold cache line. Each iteration has to use at least 2 cache
lines.
This can be problematic if some chains are very long.
2) The goal
-----------
The idea I had is to change things so that INET_MATCH() may return
FALSE in 99% of cases only using the data already in the CPU cache,
using one cache line per iteration.
3) Description of the patch
---------------------------
Adds a new 'unsigned int skc_hash' field in 'struct sock_common',
filling a 32 bits hole on 64 bits platform.
struct sock_common {
unsigned short skc_family;
volatile unsigned char skc_state;
unsigned char skc_reuse;
int skc_bound_dev_if;
struct hlist_node skc_node;
struct hlist_node skc_bind_node;
atomic_t skc_refcnt;
+ unsigned int skc_hash;
struct proto *skc_prot;
};
Store in this 32 bits field the full hash, not masked by (ehash_size -
1) Using this full hash as the first comparison done in INET_MATCH
permits us immediatly skip the element without touching a second cache
line in case of a miss.
Suppress the sk_hashent/tw_hashent fields since skc_hash (aliased to
sk_hash and tw_hash) already contains the slot number if we mask with
(ehash_size - 1)
File include/net/inet_hashtables.h
64 bits platforms :
#define INET_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash))
((*((__u64 *)&(inet_sk(__sk)->daddr)))== (__cookie)) && \
((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
32bits platforms:
#define TCP_IPV4_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->sk_hash == (__hash)) && \
(inet_sk(__sk)->daddr == (__saddr)) && \
(inet_sk(__sk)->rcv_saddr == (__daddr)) && \
(!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
- Adds a prefetch(head->chain.first) in
__inet_lookup_established()/__tcp_v4_check_established() and
__inet6_lookup_established()/__tcp_v6_check_established() and
__dccp_v4_check_established() to bring into cache the first element of the
list, before the {read|write}_lock(&head->lock);
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Acked-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-10-03 23:13:38 +02:00
|
|
|
if (INET_TW_MATCH(sk, hash, acookie, saddr, daddr, ports, dif))
|
2005-08-10 05:09:46 +02:00
|
|
|
goto hit;
|
|
|
|
}
|
|
|
|
sk = NULL;
|
|
|
|
out:
|
|
|
|
read_unlock(&head->lock);
|
|
|
|
return sk;
|
|
|
|
hit:
|
|
|
|
sock_hold(sk);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2006-08-10 00:47:12 +02:00
|
|
|
static inline struct sock *
|
|
|
|
inet_lookup_established(struct inet_hashinfo *hashinfo,
|
2006-09-28 03:43:33 +02:00
|
|
|
const __be32 saddr, const __be16 sport,
|
|
|
|
const __be32 daddr, const __be16 dport,
|
2006-08-10 00:47:12 +02:00
|
|
|
const int dif)
|
|
|
|
{
|
|
|
|
return __inet_lookup_established(hashinfo, saddr, sport, daddr,
|
|
|
|
ntohs(dport), dif);
|
|
|
|
}
|
|
|
|
|
2005-08-10 05:09:46 +02:00
|
|
|
static inline struct sock *__inet_lookup(struct inet_hashinfo *hashinfo,
|
2006-09-28 03:43:33 +02:00
|
|
|
const __be32 saddr, const __be16 sport,
|
|
|
|
const __be32 daddr, const __be16 dport,
|
2005-08-10 05:09:46 +02:00
|
|
|
const int dif)
|
|
|
|
{
|
2006-08-10 00:47:12 +02:00
|
|
|
u16 hnum = ntohs(dport);
|
2005-08-10 05:09:46 +02:00
|
|
|
struct sock *sk = __inet_lookup_established(hashinfo, saddr, sport, daddr,
|
|
|
|
hnum, dif);
|
2006-08-10 00:47:12 +02:00
|
|
|
return sk ? : __inet_lookup_listener(hashinfo, daddr, hnum, dif);
|
2005-08-10 05:09:46 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct sock *inet_lookup(struct inet_hashinfo *hashinfo,
|
2006-09-28 03:43:33 +02:00
|
|
|
const __be32 saddr, const __be16 sport,
|
|
|
|
const __be32 daddr, const __be16 dport,
|
2005-08-10 05:09:46 +02:00
|
|
|
const int dif)
|
|
|
|
{
|
|
|
|
struct sock *sk;
|
|
|
|
|
|
|
|
local_bh_disable();
|
2006-08-10 00:47:12 +02:00
|
|
|
sk = __inet_lookup(hashinfo, saddr, sport, daddr, dport, dif);
|
2005-08-10 05:09:46 +02:00
|
|
|
local_bh_enable();
|
|
|
|
|
|
|
|
return sk;
|
|
|
|
}
|
2005-12-14 08:25:31 +01:00
|
|
|
|
|
|
|
extern int inet_hash_connect(struct inet_timewait_death_row *death_row,
|
|
|
|
struct sock *sk);
|
2005-08-10 04:59:20 +02:00
|
|
|
#endif /* _INET_HASHTABLES_H */
|