2005-08-10 03:00:51 +00: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.
|
|
|
|
|
*
|
|
|
|
|
* Generic INET transport hashtables
|
|
|
|
|
*
|
|
|
|
|
* 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.
|
|
|
|
|
*/
|
|
|
|
|
|
2005-08-10 03:07:13 +00:00
|
|
|
#include <linux/module.h>
|
2005-12-14 07:25:31 +00:00
|
|
|
#include <linux/random.h>
|
2005-08-10 03:08:09 +00:00
|
|
|
#include <linux/sched.h>
|
2005-08-10 03:00:51 +00:00
|
|
|
#include <linux/slab.h>
|
2005-08-10 03:08:09 +00:00
|
|
|
#include <linux/wait.h>
|
2005-08-10 03:00:51 +00:00
|
|
|
|
2005-08-10 03:10:42 +00:00
|
|
|
#include <net/inet_connection_sock.h>
|
2005-08-10 03:00:51 +00:00
|
|
|
#include <net/inet_hashtables.h>
|
2005-12-14 07:25:31 +00:00
|
|
|
#include <net/ip.h>
|
2005-08-10 03:00:51 +00:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Allocate and initialize a new local port bind bucket.
|
|
|
|
|
* The bindhash mutex for snum's hash chain must be held here.
|
|
|
|
|
*/
|
2006-12-07 04:33:20 +00:00
|
|
|
struct inet_bind_bucket *inet_bind_bucket_create(struct kmem_cache *cachep,
|
2008-01-31 13:05:50 +00:00
|
|
|
struct net *net,
|
2005-08-10 03:00:51 +00:00
|
|
|
struct inet_bind_hashbucket *head,
|
|
|
|
|
const unsigned short snum)
|
|
|
|
|
{
|
2006-12-07 04:33:16 +00:00
|
|
|
struct inet_bind_bucket *tb = kmem_cache_alloc(cachep, GFP_ATOMIC);
|
2005-08-10 03:00:51 +00:00
|
|
|
|
|
|
|
|
if (tb != NULL) {
|
2008-11-12 08:54:20 +00:00
|
|
|
write_pnet(&tb->ib_net, hold_net(net));
|
2005-08-10 03:00:51 +00:00
|
|
|
tb->port = snum;
|
|
|
|
|
tb->fastreuse = 0;
|
inet: Allowing more than 64k connections and heavily optimize bind(0) time.
With simple extension to the binding mechanism, which allows to bind more
than 64k sockets (or smaller amount, depending on sysctl parameters),
we have to traverse the whole bind hash table to find out empty bucket.
And while it is not a problem for example for 32k connections, bind()
completion time grows exponentially (since after each successful binding
we have to traverse one bucket more to find empty one) even if we start
each time from random offset inside the hash table.
So, when hash table is full, and we want to add another socket, we have
to traverse the whole table no matter what, so effectivelly this will be
the worst case performance and it will be constant.
Attached picture shows bind() time depending on number of already bound
sockets.
Green area corresponds to the usual binding to zero port process, which
turns on kernel port selection as described above. Red area is the bind
process, when number of reuse-bound sockets is not limited by 64k (or
sysctl parameters). The same exponential growth (hidden by the green
area) before number of ports reaches sysctl limit.
At this time bind hash table has exactly one reuse-enbaled socket in a
bucket, but it is possible that they have different addresses. Actually
kernel selects the first port to try randomly, so at the beginning bind
will take roughly constant time, but with time number of port to check
after random start will increase. And that will have exponential growth,
but because of above random selection, not every next port selection
will necessary take longer time than previous. So we have to consider
the area below in the graph (if you could zoom it, you could find, that
there are many different times placed there), so area can hide another.
Blue area corresponds to the port selection optimization.
This is rather simple design approach: hashtable now maintains (unprecise
and racely updated) number of currently bound sockets, and when number
of such sockets becomes greater than predefined value (I use maximum
port range defined by sysctls), we stop traversing the whole bind hash
table and just stop at first matching bucket after random start. Above
limit roughly corresponds to the case, when bind hash table is full and
we turned on mechanism of allowing to bind more reuse-enabled sockets,
so it does not change behaviour of other sockets.
Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net>
Tested-by: Denys Fedoryschenko <denys@visp.net.lb>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-01-20 00:46:02 +00:00
|
|
|
tb->num_owners = 0;
|
2005-08-10 03:00:51 +00:00
|
|
|
INIT_HLIST_HEAD(&tb->owners);
|
|
|
|
|
hlist_add_head(&tb->node, &head->chain);
|
|
|
|
|
}
|
|
|
|
|
return tb;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Caller must hold hashbucket lock for this tb with local BH disabled
|
|
|
|
|
*/
|
2006-12-07 04:33:20 +00:00
|
|
|
void inet_bind_bucket_destroy(struct kmem_cache *cachep, struct inet_bind_bucket *tb)
|
2005-08-10 03:00:51 +00:00
|
|
|
{
|
|
|
|
|
if (hlist_empty(&tb->owners)) {
|
|
|
|
|
__hlist_del(&tb->node);
|
2008-11-12 08:54:20 +00:00
|
|
|
release_net(ib_net(tb));
|
2005-08-10 03:00:51 +00:00
|
|
|
kmem_cache_free(cachep, tb);
|
|
|
|
|
}
|
|
|
|
|
}
|
2005-08-10 03:07:13 +00:00
|
|
|
|
|
|
|
|
void inet_bind_hash(struct sock *sk, struct inet_bind_bucket *tb,
|
|
|
|
|
const unsigned short snum)
|
|
|
|
|
{
|
inet: Allowing more than 64k connections and heavily optimize bind(0) time.
With simple extension to the binding mechanism, which allows to bind more
than 64k sockets (or smaller amount, depending on sysctl parameters),
we have to traverse the whole bind hash table to find out empty bucket.
And while it is not a problem for example for 32k connections, bind()
completion time grows exponentially (since after each successful binding
we have to traverse one bucket more to find empty one) even if we start
each time from random offset inside the hash table.
So, when hash table is full, and we want to add another socket, we have
to traverse the whole table no matter what, so effectivelly this will be
the worst case performance and it will be constant.
Attached picture shows bind() time depending on number of already bound
sockets.
Green area corresponds to the usual binding to zero port process, which
turns on kernel port selection as described above. Red area is the bind
process, when number of reuse-bound sockets is not limited by 64k (or
sysctl parameters). The same exponential growth (hidden by the green
area) before number of ports reaches sysctl limit.
At this time bind hash table has exactly one reuse-enbaled socket in a
bucket, but it is possible that they have different addresses. Actually
kernel selects the first port to try randomly, so at the beginning bind
will take roughly constant time, but with time number of port to check
after random start will increase. And that will have exponential growth,
but because of above random selection, not every next port selection
will necessary take longer time than previous. So we have to consider
the area below in the graph (if you could zoom it, you could find, that
there are many different times placed there), so area can hide another.
Blue area corresponds to the port selection optimization.
This is rather simple design approach: hashtable now maintains (unprecise
and racely updated) number of currently bound sockets, and when number
of such sockets becomes greater than predefined value (I use maximum
port range defined by sysctls), we stop traversing the whole bind hash
table and just stop at first matching bucket after random start. Above
limit roughly corresponds to the case, when bind hash table is full and
we turned on mechanism of allowing to bind more reuse-enabled sockets,
so it does not change behaviour of other sockets.
Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net>
Tested-by: Denys Fedoryschenko <denys@visp.net.lb>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-01-20 00:46:02 +00:00
|
|
|
struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
|
|
|
|
|
|
2009-02-01 20:31:33 +00:00
|
|
|
atomic_inc(&hashinfo->bsockets);
|
inet: Allowing more than 64k connections and heavily optimize bind(0) time.
With simple extension to the binding mechanism, which allows to bind more
than 64k sockets (or smaller amount, depending on sysctl parameters),
we have to traverse the whole bind hash table to find out empty bucket.
And while it is not a problem for example for 32k connections, bind()
completion time grows exponentially (since after each successful binding
we have to traverse one bucket more to find empty one) even if we start
each time from random offset inside the hash table.
So, when hash table is full, and we want to add another socket, we have
to traverse the whole table no matter what, so effectivelly this will be
the worst case performance and it will be constant.
Attached picture shows bind() time depending on number of already bound
sockets.
Green area corresponds to the usual binding to zero port process, which
turns on kernel port selection as described above. Red area is the bind
process, when number of reuse-bound sockets is not limited by 64k (or
sysctl parameters). The same exponential growth (hidden by the green
area) before number of ports reaches sysctl limit.
At this time bind hash table has exactly one reuse-enbaled socket in a
bucket, but it is possible that they have different addresses. Actually
kernel selects the first port to try randomly, so at the beginning bind
will take roughly constant time, but with time number of port to check
after random start will increase. And that will have exponential growth,
but because of above random selection, not every next port selection
will necessary take longer time than previous. So we have to consider
the area below in the graph (if you could zoom it, you could find, that
there are many different times placed there), so area can hide another.
Blue area corresponds to the port selection optimization.
This is rather simple design approach: hashtable now maintains (unprecise
and racely updated) number of currently bound sockets, and when number
of such sockets becomes greater than predefined value (I use maximum
port range defined by sysctls), we stop traversing the whole bind hash
table and just stop at first matching bucket after random start. Above
limit roughly corresponds to the case, when bind hash table is full and
we turned on mechanism of allowing to bind more reuse-enabled sockets,
so it does not change behaviour of other sockets.
Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net>
Tested-by: Denys Fedoryschenko <denys@visp.net.lb>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-01-20 00:46:02 +00:00
|
|
|
|
2005-08-10 03:10:42 +00:00
|
|
|
inet_sk(sk)->num = snum;
|
2005-08-10 03:07:13 +00:00
|
|
|
sk_add_bind_node(sk, &tb->owners);
|
inet: Allowing more than 64k connections and heavily optimize bind(0) time.
With simple extension to the binding mechanism, which allows to bind more
than 64k sockets (or smaller amount, depending on sysctl parameters),
we have to traverse the whole bind hash table to find out empty bucket.
And while it is not a problem for example for 32k connections, bind()
completion time grows exponentially (since after each successful binding
we have to traverse one bucket more to find empty one) even if we start
each time from random offset inside the hash table.
So, when hash table is full, and we want to add another socket, we have
to traverse the whole table no matter what, so effectivelly this will be
the worst case performance and it will be constant.
Attached picture shows bind() time depending on number of already bound
sockets.
Green area corresponds to the usual binding to zero port process, which
turns on kernel port selection as described above. Red area is the bind
process, when number of reuse-bound sockets is not limited by 64k (or
sysctl parameters). The same exponential growth (hidden by the green
area) before number of ports reaches sysctl limit.
At this time bind hash table has exactly one reuse-enbaled socket in a
bucket, but it is possible that they have different addresses. Actually
kernel selects the first port to try randomly, so at the beginning bind
will take roughly constant time, but with time number of port to check
after random start will increase. And that will have exponential growth,
but because of above random selection, not every next port selection
will necessary take longer time than previous. So we have to consider
the area below in the graph (if you could zoom it, you could find, that
there are many different times placed there), so area can hide another.
Blue area corresponds to the port selection optimization.
This is rather simple design approach: hashtable now maintains (unprecise
and racely updated) number of currently bound sockets, and when number
of such sockets becomes greater than predefined value (I use maximum
port range defined by sysctls), we stop traversing the whole bind hash
table and just stop at first matching bucket after random start. Above
limit roughly corresponds to the case, when bind hash table is full and
we turned on mechanism of allowing to bind more reuse-enabled sockets,
so it does not change behaviour of other sockets.
Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net>
Tested-by: Denys Fedoryschenko <denys@visp.net.lb>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-01-20 00:46:02 +00:00
|
|
|
tb->num_owners++;
|
2005-08-10 03:10:42 +00:00
|
|
|
inet_csk(sk)->icsk_bind_hash = tb;
|
2005-08-10 03:07:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Get rid of any references to a local port held by the given sock.
|
|
|
|
|
*/
|
[SOCK] proto: Add hashinfo member to struct proto
This way we can remove TCP and DCCP specific versions of
sk->sk_prot->get_port: both v4 and v6 use inet_csk_get_port
sk->sk_prot->hash: inet_hash is directly used, only v6 need
a specific version to deal with mapped sockets
sk->sk_prot->unhash: both v4 and v6 use inet_hash directly
struct inet_connection_sock_af_ops also gets a new member, bind_conflict, so
that inet_csk_get_port can find the per family routine.
Now only the lookup routines receive as a parameter a struct inet_hashtable.
With this we further reuse code, reducing the difference among INET transport
protocols.
Eventually work has to be done on UDP and SCTP to make them share this
infrastructure and get as a bonus inet_diag interfaces so that iproute can be
used with these protocols.
net-2.6/net/ipv4/inet_hashtables.c:
struct proto | +8
struct inet_connection_sock_af_ops | +8
2 structs changed
__inet_hash_nolisten | +18
__inet_hash | -210
inet_put_port | +8
inet_bind_bucket_create | +1
__inet_hash_connect | -8
5 functions changed, 27 bytes added, 218 bytes removed, diff: -191
net-2.6/net/core/sock.c:
proto_seq_show | +3
1 function changed, 3 bytes added, diff: +3
net-2.6/net/ipv4/inet_connection_sock.c:
inet_csk_get_port | +15
1 function changed, 15 bytes added, diff: +15
net-2.6/net/ipv4/tcp.c:
tcp_set_state | -7
1 function changed, 7 bytes removed, diff: -7
net-2.6/net/ipv4/tcp_ipv4.c:
tcp_v4_get_port | -31
tcp_v4_hash | -48
tcp_v4_destroy_sock | -7
tcp_v4_syn_recv_sock | -2
tcp_unhash | -179
5 functions changed, 267 bytes removed, diff: -267
net-2.6/net/ipv6/inet6_hashtables.c:
__inet6_hash | +8
1 function changed, 8 bytes added, diff: +8
net-2.6/net/ipv4/inet_hashtables.c:
inet_unhash | +190
inet_hash | +242
2 functions changed, 432 bytes added, diff: +432
vmlinux:
16 functions changed, 485 bytes added, 492 bytes removed, diff: -7
/home/acme/git/net-2.6/net/ipv6/tcp_ipv6.c:
tcp_v6_get_port | -31
tcp_v6_hash | -7
tcp_v6_syn_recv_sock | -9
3 functions changed, 47 bytes removed, diff: -47
/home/acme/git/net-2.6/net/dccp/proto.c:
dccp_destroy_sock | -7
dccp_unhash | -179
dccp_hash | -49
dccp_set_state | -7
dccp_done | +1
5 functions changed, 1 bytes added, 242 bytes removed, diff: -241
/home/acme/git/net-2.6/net/dccp/ipv4.c:
dccp_v4_get_port | -31
dccp_v4_request_recv_sock | -2
2 functions changed, 33 bytes removed, diff: -33
/home/acme/git/net-2.6/net/dccp/ipv6.c:
dccp_v6_get_port | -31
dccp_v6_hash | -7
dccp_v6_request_recv_sock | +5
3 functions changed, 5 bytes added, 38 bytes removed, diff: -33
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-02-03 12:06:04 +00:00
|
|
|
static void __inet_put_port(struct sock *sk)
|
2005-08-10 03:07:13 +00:00
|
|
|
{
|
2008-03-22 23:50:58 +00:00
|
|
|
struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
|
2008-06-17 00:12:49 +00:00
|
|
|
const int bhash = inet_bhashfn(sock_net(sk), inet_sk(sk)->num,
|
|
|
|
|
hashinfo->bhash_size);
|
2005-08-10 03:07:13 +00:00
|
|
|
struct inet_bind_hashbucket *head = &hashinfo->bhash[bhash];
|
|
|
|
|
struct inet_bind_bucket *tb;
|
|
|
|
|
|
2009-02-01 20:31:33 +00:00
|
|
|
atomic_dec(&hashinfo->bsockets);
|
inet: Allowing more than 64k connections and heavily optimize bind(0) time.
With simple extension to the binding mechanism, which allows to bind more
than 64k sockets (or smaller amount, depending on sysctl parameters),
we have to traverse the whole bind hash table to find out empty bucket.
And while it is not a problem for example for 32k connections, bind()
completion time grows exponentially (since after each successful binding
we have to traverse one bucket more to find empty one) even if we start
each time from random offset inside the hash table.
So, when hash table is full, and we want to add another socket, we have
to traverse the whole table no matter what, so effectivelly this will be
the worst case performance and it will be constant.
Attached picture shows bind() time depending on number of already bound
sockets.
Green area corresponds to the usual binding to zero port process, which
turns on kernel port selection as described above. Red area is the bind
process, when number of reuse-bound sockets is not limited by 64k (or
sysctl parameters). The same exponential growth (hidden by the green
area) before number of ports reaches sysctl limit.
At this time bind hash table has exactly one reuse-enbaled socket in a
bucket, but it is possible that they have different addresses. Actually
kernel selects the first port to try randomly, so at the beginning bind
will take roughly constant time, but with time number of port to check
after random start will increase. And that will have exponential growth,
but because of above random selection, not every next port selection
will necessary take longer time than previous. So we have to consider
the area below in the graph (if you could zoom it, you could find, that
there are many different times placed there), so area can hide another.
Blue area corresponds to the port selection optimization.
This is rather simple design approach: hashtable now maintains (unprecise
and racely updated) number of currently bound sockets, and when number
of such sockets becomes greater than predefined value (I use maximum
port range defined by sysctls), we stop traversing the whole bind hash
table and just stop at first matching bucket after random start. Above
limit roughly corresponds to the case, when bind hash table is full and
we turned on mechanism of allowing to bind more reuse-enabled sockets,
so it does not change behaviour of other sockets.
Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net>
Tested-by: Denys Fedoryschenko <denys@visp.net.lb>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-01-20 00:46:02 +00:00
|
|
|
|
2005-08-10 03:07:13 +00:00
|
|
|
spin_lock(&head->lock);
|
2005-08-10 03:10:42 +00:00
|
|
|
tb = inet_csk(sk)->icsk_bind_hash;
|
2005-08-10 03:07:13 +00:00
|
|
|
__sk_del_bind_node(sk);
|
inet: Allowing more than 64k connections and heavily optimize bind(0) time.
With simple extension to the binding mechanism, which allows to bind more
than 64k sockets (or smaller amount, depending on sysctl parameters),
we have to traverse the whole bind hash table to find out empty bucket.
And while it is not a problem for example for 32k connections, bind()
completion time grows exponentially (since after each successful binding
we have to traverse one bucket more to find empty one) even if we start
each time from random offset inside the hash table.
So, when hash table is full, and we want to add another socket, we have
to traverse the whole table no matter what, so effectivelly this will be
the worst case performance and it will be constant.
Attached picture shows bind() time depending on number of already bound
sockets.
Green area corresponds to the usual binding to zero port process, which
turns on kernel port selection as described above. Red area is the bind
process, when number of reuse-bound sockets is not limited by 64k (or
sysctl parameters). The same exponential growth (hidden by the green
area) before number of ports reaches sysctl limit.
At this time bind hash table has exactly one reuse-enbaled socket in a
bucket, but it is possible that they have different addresses. Actually
kernel selects the first port to try randomly, so at the beginning bind
will take roughly constant time, but with time number of port to check
after random start will increase. And that will have exponential growth,
but because of above random selection, not every next port selection
will necessary take longer time than previous. So we have to consider
the area below in the graph (if you could zoom it, you could find, that
there are many different times placed there), so area can hide another.
Blue area corresponds to the port selection optimization.
This is rather simple design approach: hashtable now maintains (unprecise
and racely updated) number of currently bound sockets, and when number
of such sockets becomes greater than predefined value (I use maximum
port range defined by sysctls), we stop traversing the whole bind hash
table and just stop at first matching bucket after random start. Above
limit roughly corresponds to the case, when bind hash table is full and
we turned on mechanism of allowing to bind more reuse-enabled sockets,
so it does not change behaviour of other sockets.
Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net>
Tested-by: Denys Fedoryschenko <denys@visp.net.lb>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-01-20 00:46:02 +00:00
|
|
|
tb->num_owners--;
|
2005-08-10 03:10:42 +00:00
|
|
|
inet_csk(sk)->icsk_bind_hash = NULL;
|
|
|
|
|
inet_sk(sk)->num = 0;
|
2005-08-10 03:07:13 +00:00
|
|
|
inet_bind_bucket_destroy(hashinfo->bind_bucket_cachep, tb);
|
|
|
|
|
spin_unlock(&head->lock);
|
|
|
|
|
}
|
|
|
|
|
|
[SOCK] proto: Add hashinfo member to struct proto
This way we can remove TCP and DCCP specific versions of
sk->sk_prot->get_port: both v4 and v6 use inet_csk_get_port
sk->sk_prot->hash: inet_hash is directly used, only v6 need
a specific version to deal with mapped sockets
sk->sk_prot->unhash: both v4 and v6 use inet_hash directly
struct inet_connection_sock_af_ops also gets a new member, bind_conflict, so
that inet_csk_get_port can find the per family routine.
Now only the lookup routines receive as a parameter a struct inet_hashtable.
With this we further reuse code, reducing the difference among INET transport
protocols.
Eventually work has to be done on UDP and SCTP to make them share this
infrastructure and get as a bonus inet_diag interfaces so that iproute can be
used with these protocols.
net-2.6/net/ipv4/inet_hashtables.c:
struct proto | +8
struct inet_connection_sock_af_ops | +8
2 structs changed
__inet_hash_nolisten | +18
__inet_hash | -210
inet_put_port | +8
inet_bind_bucket_create | +1
__inet_hash_connect | -8
5 functions changed, 27 bytes added, 218 bytes removed, diff: -191
net-2.6/net/core/sock.c:
proto_seq_show | +3
1 function changed, 3 bytes added, diff: +3
net-2.6/net/ipv4/inet_connection_sock.c:
inet_csk_get_port | +15
1 function changed, 15 bytes added, diff: +15
net-2.6/net/ipv4/tcp.c:
tcp_set_state | -7
1 function changed, 7 bytes removed, diff: -7
net-2.6/net/ipv4/tcp_ipv4.c:
tcp_v4_get_port | -31
tcp_v4_hash | -48
tcp_v4_destroy_sock | -7
tcp_v4_syn_recv_sock | -2
tcp_unhash | -179
5 functions changed, 267 bytes removed, diff: -267
net-2.6/net/ipv6/inet6_hashtables.c:
__inet6_hash | +8
1 function changed, 8 bytes added, diff: +8
net-2.6/net/ipv4/inet_hashtables.c:
inet_unhash | +190
inet_hash | +242
2 functions changed, 432 bytes added, diff: +432
vmlinux:
16 functions changed, 485 bytes added, 492 bytes removed, diff: -7
/home/acme/git/net-2.6/net/ipv6/tcp_ipv6.c:
tcp_v6_get_port | -31
tcp_v6_hash | -7
tcp_v6_syn_recv_sock | -9
3 functions changed, 47 bytes removed, diff: -47
/home/acme/git/net-2.6/net/dccp/proto.c:
dccp_destroy_sock | -7
dccp_unhash | -179
dccp_hash | -49
dccp_set_state | -7
dccp_done | +1
5 functions changed, 1 bytes added, 242 bytes removed, diff: -241
/home/acme/git/net-2.6/net/dccp/ipv4.c:
dccp_v4_get_port | -31
dccp_v4_request_recv_sock | -2
2 functions changed, 33 bytes removed, diff: -33
/home/acme/git/net-2.6/net/dccp/ipv6.c:
dccp_v6_get_port | -31
dccp_v6_hash | -7
dccp_v6_request_recv_sock | +5
3 functions changed, 5 bytes added, 38 bytes removed, diff: -33
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-02-03 12:06:04 +00:00
|
|
|
void inet_put_port(struct sock *sk)
|
2005-08-10 03:07:13 +00:00
|
|
|
{
|
|
|
|
|
local_bh_disable();
|
[SOCK] proto: Add hashinfo member to struct proto
This way we can remove TCP and DCCP specific versions of
sk->sk_prot->get_port: both v4 and v6 use inet_csk_get_port
sk->sk_prot->hash: inet_hash is directly used, only v6 need
a specific version to deal with mapped sockets
sk->sk_prot->unhash: both v4 and v6 use inet_hash directly
struct inet_connection_sock_af_ops also gets a new member, bind_conflict, so
that inet_csk_get_port can find the per family routine.
Now only the lookup routines receive as a parameter a struct inet_hashtable.
With this we further reuse code, reducing the difference among INET transport
protocols.
Eventually work has to be done on UDP and SCTP to make them share this
infrastructure and get as a bonus inet_diag interfaces so that iproute can be
used with these protocols.
net-2.6/net/ipv4/inet_hashtables.c:
struct proto | +8
struct inet_connection_sock_af_ops | +8
2 structs changed
__inet_hash_nolisten | +18
__inet_hash | -210
inet_put_port | +8
inet_bind_bucket_create | +1
__inet_hash_connect | -8
5 functions changed, 27 bytes added, 218 bytes removed, diff: -191
net-2.6/net/core/sock.c:
proto_seq_show | +3
1 function changed, 3 bytes added, diff: +3
net-2.6/net/ipv4/inet_connection_sock.c:
inet_csk_get_port | +15
1 function changed, 15 bytes added, diff: +15
net-2.6/net/ipv4/tcp.c:
tcp_set_state | -7
1 function changed, 7 bytes removed, diff: -7
net-2.6/net/ipv4/tcp_ipv4.c:
tcp_v4_get_port | -31
tcp_v4_hash | -48
tcp_v4_destroy_sock | -7
tcp_v4_syn_recv_sock | -2
tcp_unhash | -179
5 functions changed, 267 bytes removed, diff: -267
net-2.6/net/ipv6/inet6_hashtables.c:
__inet6_hash | +8
1 function changed, 8 bytes added, diff: +8
net-2.6/net/ipv4/inet_hashtables.c:
inet_unhash | +190
inet_hash | +242
2 functions changed, 432 bytes added, diff: +432
vmlinux:
16 functions changed, 485 bytes added, 492 bytes removed, diff: -7
/home/acme/git/net-2.6/net/ipv6/tcp_ipv6.c:
tcp_v6_get_port | -31
tcp_v6_hash | -7
tcp_v6_syn_recv_sock | -9
3 functions changed, 47 bytes removed, diff: -47
/home/acme/git/net-2.6/net/dccp/proto.c:
dccp_destroy_sock | -7
dccp_unhash | -179
dccp_hash | -49
dccp_set_state | -7
dccp_done | +1
5 functions changed, 1 bytes added, 242 bytes removed, diff: -241
/home/acme/git/net-2.6/net/dccp/ipv4.c:
dccp_v4_get_port | -31
dccp_v4_request_recv_sock | -2
2 functions changed, 33 bytes removed, diff: -33
/home/acme/git/net-2.6/net/dccp/ipv6.c:
dccp_v6_get_port | -31
dccp_v6_hash | -7
dccp_v6_request_recv_sock | +5
3 functions changed, 5 bytes added, 38 bytes removed, diff: -33
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-02-03 12:06:04 +00:00
|
|
|
__inet_put_port(sk);
|
2005-08-10 03:07:13 +00:00
|
|
|
local_bh_enable();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(inet_put_port);
|
2005-08-10 03:08:09 +00:00
|
|
|
|
2008-04-18 06:18:15 +00:00
|
|
|
void __inet_inherit_port(struct sock *sk, struct sock *child)
|
|
|
|
|
{
|
|
|
|
|
struct inet_hashinfo *table = sk->sk_prot->h.hashinfo;
|
2008-06-17 00:12:49 +00:00
|
|
|
const int bhash = inet_bhashfn(sock_net(sk), inet_sk(child)->num,
|
|
|
|
|
table->bhash_size);
|
2008-04-18 06:18:15 +00:00
|
|
|
struct inet_bind_hashbucket *head = &table->bhash[bhash];
|
|
|
|
|
struct inet_bind_bucket *tb;
|
|
|
|
|
|
|
|
|
|
spin_lock(&head->lock);
|
|
|
|
|
tb = inet_csk(sk)->icsk_bind_hash;
|
|
|
|
|
sk_add_bind_node(child, &tb->owners);
|
|
|
|
|
inet_csk(child)->icsk_bind_hash = tb;
|
|
|
|
|
spin_unlock(&head->lock);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
EXPORT_SYMBOL_GPL(__inet_inherit_port);
|
|
|
|
|
|
2008-11-24 01:22:55 +00:00
|
|
|
static inline int compute_score(struct sock *sk, struct net *net,
|
|
|
|
|
const unsigned short hnum, const __be32 daddr,
|
|
|
|
|
const int dif)
|
|
|
|
|
{
|
|
|
|
|
int score = -1;
|
|
|
|
|
struct inet_sock *inet = inet_sk(sk);
|
|
|
|
|
|
|
|
|
|
if (net_eq(sock_net(sk), net) && inet->num == hnum &&
|
|
|
|
|
!ipv6_only_sock(sk)) {
|
|
|
|
|
__be32 rcv_saddr = inet->rcv_saddr;
|
|
|
|
|
score = sk->sk_family == PF_INET ? 1 : 0;
|
|
|
|
|
if (rcv_saddr) {
|
|
|
|
|
if (rcv_saddr != daddr)
|
|
|
|
|
return -1;
|
|
|
|
|
score += 2;
|
|
|
|
|
}
|
|
|
|
|
if (sk->sk_bound_dev_if) {
|
|
|
|
|
if (sk->sk_bound_dev_if != dif)
|
|
|
|
|
return -1;
|
|
|
|
|
score += 2;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return score;
|
|
|
|
|
}
|
|
|
|
|
|
2005-08-10 03:09:06 +00:00
|
|
|
/*
|
|
|
|
|
* Don't inline this cruft. Here are some nice properties to exploit here. The
|
|
|
|
|
* BSD API does not allow a listening sock to specify the remote port nor the
|
|
|
|
|
* remote address for the connection. So always assume those are both
|
|
|
|
|
* wildcarded during the search since they can never be otherwise.
|
|
|
|
|
*/
|
2005-08-10 03:09:46 +00:00
|
|
|
|
2008-11-24 01:22:55 +00:00
|
|
|
|
2008-01-31 13:06:40 +00:00
|
|
|
struct sock *__inet_lookup_listener(struct net *net,
|
|
|
|
|
struct inet_hashinfo *hashinfo,
|
2006-09-28 01:43:33 +00:00
|
|
|
const __be32 daddr, const unsigned short hnum,
|
2006-08-09 22:47:12 +00:00
|
|
|
const int dif)
|
2006-08-08 09:18:10 +00:00
|
|
|
{
|
2008-11-24 01:22:55 +00:00
|
|
|
struct sock *sk, *result;
|
|
|
|
|
struct hlist_nulls_node *node;
|
|
|
|
|
unsigned int hash = inet_lhashfn(net, hnum);
|
|
|
|
|
struct inet_listen_hashbucket *ilb = &hashinfo->listening_hash[hash];
|
|
|
|
|
int score, hiscore;
|
2006-08-08 09:18:10 +00:00
|
|
|
|
2008-11-24 01:22:55 +00:00
|
|
|
rcu_read_lock();
|
|
|
|
|
begin:
|
|
|
|
|
result = NULL;
|
|
|
|
|
hiscore = -1;
|
|
|
|
|
sk_nulls_for_each_rcu(sk, node, &ilb->head) {
|
|
|
|
|
score = compute_score(sk, net, hnum, daddr, dif);
|
|
|
|
|
if (score > hiscore) {
|
|
|
|
|
result = sk;
|
|
|
|
|
hiscore = score;
|
|
|
|
|
}
|
2006-08-08 09:18:10 +00:00
|
|
|
}
|
2008-11-24 01:22:55 +00:00
|
|
|
/*
|
|
|
|
|
* if the nulls value we got at the end of this lookup is
|
|
|
|
|
* not the expected one, we must restart lookup.
|
|
|
|
|
* We probably met an item that was moved to another chain.
|
|
|
|
|
*/
|
|
|
|
|
if (get_nulls_value(node) != hash + LISTENING_NULLS_BASE)
|
|
|
|
|
goto begin;
|
|
|
|
|
if (result) {
|
|
|
|
|
if (unlikely(!atomic_inc_not_zero(&result->sk_refcnt)))
|
|
|
|
|
result = NULL;
|
|
|
|
|
else if (unlikely(compute_score(result, net, hnum, daddr,
|
|
|
|
|
dif) < hiscore)) {
|
|
|
|
|
sock_put(result);
|
|
|
|
|
goto begin;
|
|
|
|
|
}
|
2006-08-08 09:18:10 +00:00
|
|
|
}
|
2008-11-24 01:22:55 +00:00
|
|
|
rcu_read_unlock();
|
|
|
|
|
return result;
|
2006-08-08 09:18:10 +00:00
|
|
|
}
|
2006-08-09 22:47:12 +00:00
|
|
|
EXPORT_SYMBOL_GPL(__inet_lookup_listener);
|
2005-12-14 07:25:31 +00:00
|
|
|
|
2008-01-31 13:06:40 +00:00
|
|
|
struct sock * __inet_lookup_established(struct net *net,
|
|
|
|
|
struct inet_hashinfo *hashinfo,
|
2007-12-20 23:32:17 +00:00
|
|
|
const __be32 saddr, const __be16 sport,
|
|
|
|
|
const __be32 daddr, const u16 hnum,
|
|
|
|
|
const int dif)
|
|
|
|
|
{
|
|
|
|
|
INET_ADDR_COOKIE(acookie, saddr, daddr)
|
|
|
|
|
const __portpair ports = INET_COMBINED_PORTS(sport, hnum);
|
|
|
|
|
struct sock *sk;
|
2008-11-17 03:40:17 +00:00
|
|
|
const struct hlist_nulls_node *node;
|
2007-12-20 23:32:17 +00:00
|
|
|
/* Optimize here for direct hit, only listening connections can
|
|
|
|
|
* have wildcards anyways.
|
|
|
|
|
*/
|
2008-06-17 00:13:27 +00:00
|
|
|
unsigned int hash = inet_ehashfn(net, daddr, hnum, saddr, sport);
|
2009-10-09 00:16:19 +00:00
|
|
|
unsigned int slot = hash & hashinfo->ehash_mask;
|
2008-11-17 03:40:17 +00:00
|
|
|
struct inet_ehash_bucket *head = &hashinfo->ehash[slot];
|
2007-12-20 23:32:17 +00:00
|
|
|
|
2008-11-17 03:40:17 +00:00
|
|
|
rcu_read_lock();
|
|
|
|
|
begin:
|
|
|
|
|
sk_nulls_for_each_rcu(sk, node, &head->chain) {
|
2008-01-31 13:06:40 +00:00
|
|
|
if (INET_MATCH(sk, net, hash, acookie,
|
2008-11-17 03:40:17 +00:00
|
|
|
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))) {
|
|
|
|
|
sock_put(sk);
|
|
|
|
|
goto begin;
|
|
|
|
|
}
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
2007-12-20 23:32:17 +00:00
|
|
|
}
|
2008-11-17 03:40:17 +00:00
|
|
|
/*
|
|
|
|
|
* if the nulls value we got at the end of this lookup is
|
|
|
|
|
* not the expected one, we must restart lookup.
|
|
|
|
|
* We probably met an item that was moved to another chain.
|
|
|
|
|
*/
|
|
|
|
|
if (get_nulls_value(node) != slot)
|
|
|
|
|
goto begin;
|
2007-12-20 23:32:17 +00:00
|
|
|
|
2008-11-17 03:40:17 +00:00
|
|
|
begintw:
|
2007-12-20 23:32:17 +00:00
|
|
|
/* Must check for a TIME_WAIT'er before going to listener hash. */
|
2008-11-17 03:40:17 +00:00
|
|
|
sk_nulls_for_each_rcu(sk, node, &head->twchain) {
|
2008-01-31 13:06:40 +00:00
|
|
|
if (INET_TW_MATCH(sk, net, hash, acookie,
|
2008-11-17 03:40:17 +00:00
|
|
|
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))) {
|
|
|
|
|
sock_put(sk);
|
|
|
|
|
goto begintw;
|
|
|
|
|
}
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
2007-12-20 23:32:17 +00:00
|
|
|
}
|
2008-11-17 03:40:17 +00:00
|
|
|
/*
|
|
|
|
|
* if the nulls value we got at the end of this lookup is
|
|
|
|
|
* not the expected one, we must restart lookup.
|
|
|
|
|
* We probably met an item that was moved to another chain.
|
|
|
|
|
*/
|
|
|
|
|
if (get_nulls_value(node) != slot)
|
|
|
|
|
goto begintw;
|
2007-12-20 23:32:17 +00:00
|
|
|
sk = NULL;
|
|
|
|
|
out:
|
2008-11-17 03:40:17 +00:00
|
|
|
rcu_read_unlock();
|
2007-12-20 23:32:17 +00:00
|
|
|
return sk;
|
|
|
|
|
}
|
|
|
|
|
EXPORT_SYMBOL_GPL(__inet_lookup_established);
|
|
|
|
|
|
2005-12-14 07:25:31 +00:00
|
|
|
/* called with local bh disabled */
|
|
|
|
|
static int __inet_check_established(struct inet_timewait_death_row *death_row,
|
|
|
|
|
struct sock *sk, __u16 lport,
|
|
|
|
|
struct inet_timewait_sock **twp)
|
|
|
|
|
{
|
|
|
|
|
struct inet_hashinfo *hinfo = death_row->hashinfo;
|
|
|
|
|
struct inet_sock *inet = inet_sk(sk);
|
2006-09-28 01:43:33 +00:00
|
|
|
__be32 daddr = inet->rcv_saddr;
|
|
|
|
|
__be32 saddr = inet->daddr;
|
2005-12-14 07:25:31 +00:00
|
|
|
int dif = sk->sk_bound_dev_if;
|
|
|
|
|
INET_ADDR_COOKIE(acookie, saddr, daddr)
|
2006-09-28 01:43:07 +00:00
|
|
|
const __portpair ports = INET_COMBINED_PORTS(inet->dport, lport);
|
2008-06-17 00:13:27 +00:00
|
|
|
struct net *net = sock_net(sk);
|
|
|
|
|
unsigned int hash = inet_ehashfn(net, daddr, lport, saddr, inet->dport);
|
2005-12-14 07:25:31 +00:00
|
|
|
struct inet_ehash_bucket *head = inet_ehash_bucket(hinfo, hash);
|
2008-11-21 04:39:09 +00:00
|
|
|
spinlock_t *lock = inet_ehash_lockp(hinfo, hash);
|
2005-12-14 07:25:31 +00:00
|
|
|
struct sock *sk2;
|
2008-11-17 03:40:17 +00:00
|
|
|
const struct hlist_nulls_node *node;
|
2005-12-14 07:25:31 +00:00
|
|
|
struct inet_timewait_sock *tw;
|
|
|
|
|
|
2008-11-21 04:39:09 +00:00
|
|
|
spin_lock(lock);
|
2005-12-14 07:25:31 +00:00
|
|
|
|
|
|
|
|
/* Check TIME-WAIT sockets first. */
|
2008-11-17 03:40:17 +00:00
|
|
|
sk_nulls_for_each(sk2, node, &head->twchain) {
|
2005-12-14 07:25:31 +00:00
|
|
|
tw = inet_twsk(sk2);
|
|
|
|
|
|
2008-01-31 13:06:40 +00:00
|
|
|
if (INET_TW_MATCH(sk2, net, hash, acookie,
|
|
|
|
|
saddr, daddr, ports, dif)) {
|
2005-12-14 07:25:31 +00:00
|
|
|
if (twsk_unique(sk, sk2, twp))
|
|
|
|
|
goto unique;
|
|
|
|
|
else
|
|
|
|
|
goto not_unique;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
tw = NULL;
|
|
|
|
|
|
|
|
|
|
/* And established part... */
|
2008-11-17 03:40:17 +00:00
|
|
|
sk_nulls_for_each(sk2, node, &head->chain) {
|
2008-01-31 13:06:40 +00:00
|
|
|
if (INET_MATCH(sk2, net, hash, acookie,
|
|
|
|
|
saddr, daddr, ports, dif))
|
2005-12-14 07:25:31 +00:00
|
|
|
goto not_unique;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
unique:
|
|
|
|
|
/* Must record num and sport now. Otherwise we will see
|
|
|
|
|
* in hash table socket with a funny identity. */
|
|
|
|
|
inet->num = lport;
|
|
|
|
|
inet->sport = htons(lport);
|
|
|
|
|
sk->sk_hash = hash;
|
2008-07-26 04:43:18 +00:00
|
|
|
WARN_ON(!sk_unhashed(sk));
|
2008-11-17 03:40:17 +00:00
|
|
|
__sk_nulls_add_node_rcu(sk, &head->chain);
|
2008-11-21 04:39:09 +00:00
|
|
|
spin_unlock(lock);
|
2008-04-01 02:41:46 +00:00
|
|
|
sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
|
2005-12-14 07:25:31 +00:00
|
|
|
|
|
|
|
|
if (twp) {
|
|
|
|
|
*twp = tw;
|
2008-07-17 03:31:16 +00:00
|
|
|
NET_INC_STATS_BH(net, LINUX_MIB_TIMEWAITRECYCLED);
|
2005-12-14 07:25:31 +00:00
|
|
|
} else if (tw) {
|
|
|
|
|
/* Silly. Should hash-dance instead... */
|
|
|
|
|
inet_twsk_deschedule(tw, death_row);
|
2008-07-17 03:31:16 +00:00
|
|
|
NET_INC_STATS_BH(net, LINUX_MIB_TIMEWAITRECYCLED);
|
2005-12-14 07:25:31 +00:00
|
|
|
|
|
|
|
|
inet_twsk_put(tw);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
not_unique:
|
2008-11-21 04:39:09 +00:00
|
|
|
spin_unlock(lock);
|
2005-12-14 07:25:31 +00:00
|
|
|
return -EADDRNOTAVAIL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline u32 inet_sk_port_offset(const struct sock *sk)
|
|
|
|
|
{
|
|
|
|
|
const struct inet_sock *inet = inet_sk(sk);
|
2007-02-09 14:24:47 +00:00
|
|
|
return secure_ipv4_port_ephemeral(inet->rcv_saddr, inet->daddr,
|
2005-12-14 07:25:31 +00:00
|
|
|
inet->dport);
|
|
|
|
|
}
|
|
|
|
|
|
[SOCK] proto: Add hashinfo member to struct proto
This way we can remove TCP and DCCP specific versions of
sk->sk_prot->get_port: both v4 and v6 use inet_csk_get_port
sk->sk_prot->hash: inet_hash is directly used, only v6 need
a specific version to deal with mapped sockets
sk->sk_prot->unhash: both v4 and v6 use inet_hash directly
struct inet_connection_sock_af_ops also gets a new member, bind_conflict, so
that inet_csk_get_port can find the per family routine.
Now only the lookup routines receive as a parameter a struct inet_hashtable.
With this we further reuse code, reducing the difference among INET transport
protocols.
Eventually work has to be done on UDP and SCTP to make them share this
infrastructure and get as a bonus inet_diag interfaces so that iproute can be
used with these protocols.
net-2.6/net/ipv4/inet_hashtables.c:
struct proto | +8
struct inet_connection_sock_af_ops | +8
2 structs changed
__inet_hash_nolisten | +18
__inet_hash | -210
inet_put_port | +8
inet_bind_bucket_create | +1
__inet_hash_connect | -8
5 functions changed, 27 bytes added, 218 bytes removed, diff: -191
net-2.6/net/core/sock.c:
proto_seq_show | +3
1 function changed, 3 bytes added, diff: +3
net-2.6/net/ipv4/inet_connection_sock.c:
inet_csk_get_port | +15
1 function changed, 15 bytes added, diff: +15
net-2.6/net/ipv4/tcp.c:
tcp_set_state | -7
1 function changed, 7 bytes removed, diff: -7
net-2.6/net/ipv4/tcp_ipv4.c:
tcp_v4_get_port | -31
tcp_v4_hash | -48
tcp_v4_destroy_sock | -7
tcp_v4_syn_recv_sock | -2
tcp_unhash | -179
5 functions changed, 267 bytes removed, diff: -267
net-2.6/net/ipv6/inet6_hashtables.c:
__inet6_hash | +8
1 function changed, 8 bytes added, diff: +8
net-2.6/net/ipv4/inet_hashtables.c:
inet_unhash | +190
inet_hash | +242
2 functions changed, 432 bytes added, diff: +432
vmlinux:
16 functions changed, 485 bytes added, 492 bytes removed, diff: -7
/home/acme/git/net-2.6/net/ipv6/tcp_ipv6.c:
tcp_v6_get_port | -31
tcp_v6_hash | -7
tcp_v6_syn_recv_sock | -9
3 functions changed, 47 bytes removed, diff: -47
/home/acme/git/net-2.6/net/dccp/proto.c:
dccp_destroy_sock | -7
dccp_unhash | -179
dccp_hash | -49
dccp_set_state | -7
dccp_done | +1
5 functions changed, 1 bytes added, 242 bytes removed, diff: -241
/home/acme/git/net-2.6/net/dccp/ipv4.c:
dccp_v4_get_port | -31
dccp_v4_request_recv_sock | -2
2 functions changed, 33 bytes removed, diff: -33
/home/acme/git/net-2.6/net/dccp/ipv6.c:
dccp_v6_get_port | -31
dccp_v6_hash | -7
dccp_v6_request_recv_sock | +5
3 functions changed, 5 bytes added, 38 bytes removed, diff: -33
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-02-03 12:06:04 +00:00
|
|
|
void __inet_hash_nolisten(struct sock *sk)
|
2007-12-20 23:31:33 +00:00
|
|
|
{
|
2008-03-22 23:50:58 +00:00
|
|
|
struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
|
2008-11-17 03:40:17 +00:00
|
|
|
struct hlist_nulls_head *list;
|
2008-11-21 04:39:09 +00:00
|
|
|
spinlock_t *lock;
|
2007-12-20 23:31:33 +00:00
|
|
|
struct inet_ehash_bucket *head;
|
|
|
|
|
|
2008-07-26 04:43:18 +00:00
|
|
|
WARN_ON(!sk_unhashed(sk));
|
2007-12-20 23:31:33 +00:00
|
|
|
|
|
|
|
|
sk->sk_hash = inet_sk_ehashfn(sk);
|
|
|
|
|
head = inet_ehash_bucket(hashinfo, sk->sk_hash);
|
|
|
|
|
list = &head->chain;
|
|
|
|
|
lock = inet_ehash_lockp(hashinfo, sk->sk_hash);
|
|
|
|
|
|
2008-11-21 04:39:09 +00:00
|
|
|
spin_lock(lock);
|
2008-11-17 03:40:17 +00:00
|
|
|
__sk_nulls_add_node_rcu(sk, list);
|
2008-11-21 04:39:09 +00:00
|
|
|
spin_unlock(lock);
|
2008-04-01 02:41:46 +00:00
|
|
|
sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
|
2007-12-20 23:31:33 +00:00
|
|
|
}
|
|
|
|
|
EXPORT_SYMBOL_GPL(__inet_hash_nolisten);
|
|
|
|
|
|
[SOCK] proto: Add hashinfo member to struct proto
This way we can remove TCP and DCCP specific versions of
sk->sk_prot->get_port: both v4 and v6 use inet_csk_get_port
sk->sk_prot->hash: inet_hash is directly used, only v6 need
a specific version to deal with mapped sockets
sk->sk_prot->unhash: both v4 and v6 use inet_hash directly
struct inet_connection_sock_af_ops also gets a new member, bind_conflict, so
that inet_csk_get_port can find the per family routine.
Now only the lookup routines receive as a parameter a struct inet_hashtable.
With this we further reuse code, reducing the difference among INET transport
protocols.
Eventually work has to be done on UDP and SCTP to make them share this
infrastructure and get as a bonus inet_diag interfaces so that iproute can be
used with these protocols.
net-2.6/net/ipv4/inet_hashtables.c:
struct proto | +8
struct inet_connection_sock_af_ops | +8
2 structs changed
__inet_hash_nolisten | +18
__inet_hash | -210
inet_put_port | +8
inet_bind_bucket_create | +1
__inet_hash_connect | -8
5 functions changed, 27 bytes added, 218 bytes removed, diff: -191
net-2.6/net/core/sock.c:
proto_seq_show | +3
1 function changed, 3 bytes added, diff: +3
net-2.6/net/ipv4/inet_connection_sock.c:
inet_csk_get_port | +15
1 function changed, 15 bytes added, diff: +15
net-2.6/net/ipv4/tcp.c:
tcp_set_state | -7
1 function changed, 7 bytes removed, diff: -7
net-2.6/net/ipv4/tcp_ipv4.c:
tcp_v4_get_port | -31
tcp_v4_hash | -48
tcp_v4_destroy_sock | -7
tcp_v4_syn_recv_sock | -2
tcp_unhash | -179
5 functions changed, 267 bytes removed, diff: -267
net-2.6/net/ipv6/inet6_hashtables.c:
__inet6_hash | +8
1 function changed, 8 bytes added, diff: +8
net-2.6/net/ipv4/inet_hashtables.c:
inet_unhash | +190
inet_hash | +242
2 functions changed, 432 bytes added, diff: +432
vmlinux:
16 functions changed, 485 bytes added, 492 bytes removed, diff: -7
/home/acme/git/net-2.6/net/ipv6/tcp_ipv6.c:
tcp_v6_get_port | -31
tcp_v6_hash | -7
tcp_v6_syn_recv_sock | -9
3 functions changed, 47 bytes removed, diff: -47
/home/acme/git/net-2.6/net/dccp/proto.c:
dccp_destroy_sock | -7
dccp_unhash | -179
dccp_hash | -49
dccp_set_state | -7
dccp_done | +1
5 functions changed, 1 bytes added, 242 bytes removed, diff: -241
/home/acme/git/net-2.6/net/dccp/ipv4.c:
dccp_v4_get_port | -31
dccp_v4_request_recv_sock | -2
2 functions changed, 33 bytes removed, diff: -33
/home/acme/git/net-2.6/net/dccp/ipv6.c:
dccp_v6_get_port | -31
dccp_v6_hash | -7
dccp_v6_request_recv_sock | +5
3 functions changed, 5 bytes added, 38 bytes removed, diff: -33
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-02-03 12:06:04 +00:00
|
|
|
static void __inet_hash(struct sock *sk)
|
2007-12-20 23:31:33 +00:00
|
|
|
{
|
2008-03-22 23:50:58 +00:00
|
|
|
struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
|
2008-11-20 08:40:07 +00:00
|
|
|
struct inet_listen_hashbucket *ilb;
|
2007-12-20 23:31:33 +00:00
|
|
|
|
|
|
|
|
if (sk->sk_state != TCP_LISTEN) {
|
[SOCK] proto: Add hashinfo member to struct proto
This way we can remove TCP and DCCP specific versions of
sk->sk_prot->get_port: both v4 and v6 use inet_csk_get_port
sk->sk_prot->hash: inet_hash is directly used, only v6 need
a specific version to deal with mapped sockets
sk->sk_prot->unhash: both v4 and v6 use inet_hash directly
struct inet_connection_sock_af_ops also gets a new member, bind_conflict, so
that inet_csk_get_port can find the per family routine.
Now only the lookup routines receive as a parameter a struct inet_hashtable.
With this we further reuse code, reducing the difference among INET transport
protocols.
Eventually work has to be done on UDP and SCTP to make them share this
infrastructure and get as a bonus inet_diag interfaces so that iproute can be
used with these protocols.
net-2.6/net/ipv4/inet_hashtables.c:
struct proto | +8
struct inet_connection_sock_af_ops | +8
2 structs changed
__inet_hash_nolisten | +18
__inet_hash | -210
inet_put_port | +8
inet_bind_bucket_create | +1
__inet_hash_connect | -8
5 functions changed, 27 bytes added, 218 bytes removed, diff: -191
net-2.6/net/core/sock.c:
proto_seq_show | +3
1 function changed, 3 bytes added, diff: +3
net-2.6/net/ipv4/inet_connection_sock.c:
inet_csk_get_port | +15
1 function changed, 15 bytes added, diff: +15
net-2.6/net/ipv4/tcp.c:
tcp_set_state | -7
1 function changed, 7 bytes removed, diff: -7
net-2.6/net/ipv4/tcp_ipv4.c:
tcp_v4_get_port | -31
tcp_v4_hash | -48
tcp_v4_destroy_sock | -7
tcp_v4_syn_recv_sock | -2
tcp_unhash | -179
5 functions changed, 267 bytes removed, diff: -267
net-2.6/net/ipv6/inet6_hashtables.c:
__inet6_hash | +8
1 function changed, 8 bytes added, diff: +8
net-2.6/net/ipv4/inet_hashtables.c:
inet_unhash | +190
inet_hash | +242
2 functions changed, 432 bytes added, diff: +432
vmlinux:
16 functions changed, 485 bytes added, 492 bytes removed, diff: -7
/home/acme/git/net-2.6/net/ipv6/tcp_ipv6.c:
tcp_v6_get_port | -31
tcp_v6_hash | -7
tcp_v6_syn_recv_sock | -9
3 functions changed, 47 bytes removed, diff: -47
/home/acme/git/net-2.6/net/dccp/proto.c:
dccp_destroy_sock | -7
dccp_unhash | -179
dccp_hash | -49
dccp_set_state | -7
dccp_done | +1
5 functions changed, 1 bytes added, 242 bytes removed, diff: -241
/home/acme/git/net-2.6/net/dccp/ipv4.c:
dccp_v4_get_port | -31
dccp_v4_request_recv_sock | -2
2 functions changed, 33 bytes removed, diff: -33
/home/acme/git/net-2.6/net/dccp/ipv6.c:
dccp_v6_get_port | -31
dccp_v6_hash | -7
dccp_v6_request_recv_sock | +5
3 functions changed, 5 bytes added, 38 bytes removed, diff: -33
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-02-03 12:06:04 +00:00
|
|
|
__inet_hash_nolisten(sk);
|
2007-12-20 23:31:33 +00:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-26 04:43:18 +00:00
|
|
|
WARN_ON(!sk_unhashed(sk));
|
2008-11-20 08:40:07 +00:00
|
|
|
ilb = &hashinfo->listening_hash[inet_sk_listen_hashfn(sk)];
|
2007-12-20 23:31:33 +00:00
|
|
|
|
2008-11-20 08:40:07 +00:00
|
|
|
spin_lock(&ilb->lock);
|
2008-11-24 01:22:55 +00:00
|
|
|
__sk_nulls_add_node_rcu(sk, &ilb->head);
|
2008-04-01 02:41:46 +00:00
|
|
|
sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
|
2008-11-20 08:40:07 +00:00
|
|
|
spin_unlock(&ilb->lock);
|
2007-12-20 23:31:33 +00:00
|
|
|
}
|
[SOCK] proto: Add hashinfo member to struct proto
This way we can remove TCP and DCCP specific versions of
sk->sk_prot->get_port: both v4 and v6 use inet_csk_get_port
sk->sk_prot->hash: inet_hash is directly used, only v6 need
a specific version to deal with mapped sockets
sk->sk_prot->unhash: both v4 and v6 use inet_hash directly
struct inet_connection_sock_af_ops also gets a new member, bind_conflict, so
that inet_csk_get_port can find the per family routine.
Now only the lookup routines receive as a parameter a struct inet_hashtable.
With this we further reuse code, reducing the difference among INET transport
protocols.
Eventually work has to be done on UDP and SCTP to make them share this
infrastructure and get as a bonus inet_diag interfaces so that iproute can be
used with these protocols.
net-2.6/net/ipv4/inet_hashtables.c:
struct proto | +8
struct inet_connection_sock_af_ops | +8
2 structs changed
__inet_hash_nolisten | +18
__inet_hash | -210
inet_put_port | +8
inet_bind_bucket_create | +1
__inet_hash_connect | -8
5 functions changed, 27 bytes added, 218 bytes removed, diff: -191
net-2.6/net/core/sock.c:
proto_seq_show | +3
1 function changed, 3 bytes added, diff: +3
net-2.6/net/ipv4/inet_connection_sock.c:
inet_csk_get_port | +15
1 function changed, 15 bytes added, diff: +15
net-2.6/net/ipv4/tcp.c:
tcp_set_state | -7
1 function changed, 7 bytes removed, diff: -7
net-2.6/net/ipv4/tcp_ipv4.c:
tcp_v4_get_port | -31
tcp_v4_hash | -48
tcp_v4_destroy_sock | -7
tcp_v4_syn_recv_sock | -2
tcp_unhash | -179
5 functions changed, 267 bytes removed, diff: -267
net-2.6/net/ipv6/inet6_hashtables.c:
__inet6_hash | +8
1 function changed, 8 bytes added, diff: +8
net-2.6/net/ipv4/inet_hashtables.c:
inet_unhash | +190
inet_hash | +242
2 functions changed, 432 bytes added, diff: +432
vmlinux:
16 functions changed, 485 bytes added, 492 bytes removed, diff: -7
/home/acme/git/net-2.6/net/ipv6/tcp_ipv6.c:
tcp_v6_get_port | -31
tcp_v6_hash | -7
tcp_v6_syn_recv_sock | -9
3 functions changed, 47 bytes removed, diff: -47
/home/acme/git/net-2.6/net/dccp/proto.c:
dccp_destroy_sock | -7
dccp_unhash | -179
dccp_hash | -49
dccp_set_state | -7
dccp_done | +1
5 functions changed, 1 bytes added, 242 bytes removed, diff: -241
/home/acme/git/net-2.6/net/dccp/ipv4.c:
dccp_v4_get_port | -31
dccp_v4_request_recv_sock | -2
2 functions changed, 33 bytes removed, diff: -33
/home/acme/git/net-2.6/net/dccp/ipv6.c:
dccp_v6_get_port | -31
dccp_v6_hash | -7
dccp_v6_request_recv_sock | +5
3 functions changed, 5 bytes added, 38 bytes removed, diff: -33
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-02-03 12:06:04 +00:00
|
|
|
|
|
|
|
|
void inet_hash(struct sock *sk)
|
|
|
|
|
{
|
|
|
|
|
if (sk->sk_state != TCP_CLOSE) {
|
|
|
|
|
local_bh_disable();
|
|
|
|
|
__inet_hash(sk);
|
|
|
|
|
local_bh_enable();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
EXPORT_SYMBOL_GPL(inet_hash);
|
|
|
|
|
|
|
|
|
|
void inet_unhash(struct sock *sk)
|
|
|
|
|
{
|
2008-03-22 23:50:58 +00:00
|
|
|
struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
|
2008-11-24 01:22:55 +00:00
|
|
|
spinlock_t *lock;
|
|
|
|
|
int done;
|
[SOCK] proto: Add hashinfo member to struct proto
This way we can remove TCP and DCCP specific versions of
sk->sk_prot->get_port: both v4 and v6 use inet_csk_get_port
sk->sk_prot->hash: inet_hash is directly used, only v6 need
a specific version to deal with mapped sockets
sk->sk_prot->unhash: both v4 and v6 use inet_hash directly
struct inet_connection_sock_af_ops also gets a new member, bind_conflict, so
that inet_csk_get_port can find the per family routine.
Now only the lookup routines receive as a parameter a struct inet_hashtable.
With this we further reuse code, reducing the difference among INET transport
protocols.
Eventually work has to be done on UDP and SCTP to make them share this
infrastructure and get as a bonus inet_diag interfaces so that iproute can be
used with these protocols.
net-2.6/net/ipv4/inet_hashtables.c:
struct proto | +8
struct inet_connection_sock_af_ops | +8
2 structs changed
__inet_hash_nolisten | +18
__inet_hash | -210
inet_put_port | +8
inet_bind_bucket_create | +1
__inet_hash_connect | -8
5 functions changed, 27 bytes added, 218 bytes removed, diff: -191
net-2.6/net/core/sock.c:
proto_seq_show | +3
1 function changed, 3 bytes added, diff: +3
net-2.6/net/ipv4/inet_connection_sock.c:
inet_csk_get_port | +15
1 function changed, 15 bytes added, diff: +15
net-2.6/net/ipv4/tcp.c:
tcp_set_state | -7
1 function changed, 7 bytes removed, diff: -7
net-2.6/net/ipv4/tcp_ipv4.c:
tcp_v4_get_port | -31
tcp_v4_hash | -48
tcp_v4_destroy_sock | -7
tcp_v4_syn_recv_sock | -2
tcp_unhash | -179
5 functions changed, 267 bytes removed, diff: -267
net-2.6/net/ipv6/inet6_hashtables.c:
__inet6_hash | +8
1 function changed, 8 bytes added, diff: +8
net-2.6/net/ipv4/inet_hashtables.c:
inet_unhash | +190
inet_hash | +242
2 functions changed, 432 bytes added, diff: +432
vmlinux:
16 functions changed, 485 bytes added, 492 bytes removed, diff: -7
/home/acme/git/net-2.6/net/ipv6/tcp_ipv6.c:
tcp_v6_get_port | -31
tcp_v6_hash | -7
tcp_v6_syn_recv_sock | -9
3 functions changed, 47 bytes removed, diff: -47
/home/acme/git/net-2.6/net/dccp/proto.c:
dccp_destroy_sock | -7
dccp_unhash | -179
dccp_hash | -49
dccp_set_state | -7
dccp_done | +1
5 functions changed, 1 bytes added, 242 bytes removed, diff: -241
/home/acme/git/net-2.6/net/dccp/ipv4.c:
dccp_v4_get_port | -31
dccp_v4_request_recv_sock | -2
2 functions changed, 33 bytes removed, diff: -33
/home/acme/git/net-2.6/net/dccp/ipv6.c:
dccp_v6_get_port | -31
dccp_v6_hash | -7
dccp_v6_request_recv_sock | +5
3 functions changed, 5 bytes added, 38 bytes removed, diff: -33
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-02-03 12:06:04 +00:00
|
|
|
|
|
|
|
|
if (sk_unhashed(sk))
|
2008-11-20 08:40:07 +00:00
|
|
|
return;
|
[SOCK] proto: Add hashinfo member to struct proto
This way we can remove TCP and DCCP specific versions of
sk->sk_prot->get_port: both v4 and v6 use inet_csk_get_port
sk->sk_prot->hash: inet_hash is directly used, only v6 need
a specific version to deal with mapped sockets
sk->sk_prot->unhash: both v4 and v6 use inet_hash directly
struct inet_connection_sock_af_ops also gets a new member, bind_conflict, so
that inet_csk_get_port can find the per family routine.
Now only the lookup routines receive as a parameter a struct inet_hashtable.
With this we further reuse code, reducing the difference among INET transport
protocols.
Eventually work has to be done on UDP and SCTP to make them share this
infrastructure and get as a bonus inet_diag interfaces so that iproute can be
used with these protocols.
net-2.6/net/ipv4/inet_hashtables.c:
struct proto | +8
struct inet_connection_sock_af_ops | +8
2 structs changed
__inet_hash_nolisten | +18
__inet_hash | -210
inet_put_port | +8
inet_bind_bucket_create | +1
__inet_hash_connect | -8
5 functions changed, 27 bytes added, 218 bytes removed, diff: -191
net-2.6/net/core/sock.c:
proto_seq_show | +3
1 function changed, 3 bytes added, diff: +3
net-2.6/net/ipv4/inet_connection_sock.c:
inet_csk_get_port | +15
1 function changed, 15 bytes added, diff: +15
net-2.6/net/ipv4/tcp.c:
tcp_set_state | -7
1 function changed, 7 bytes removed, diff: -7
net-2.6/net/ipv4/tcp_ipv4.c:
tcp_v4_get_port | -31
tcp_v4_hash | -48
tcp_v4_destroy_sock | -7
tcp_v4_syn_recv_sock | -2
tcp_unhash | -179
5 functions changed, 267 bytes removed, diff: -267
net-2.6/net/ipv6/inet6_hashtables.c:
__inet6_hash | +8
1 function changed, 8 bytes added, diff: +8
net-2.6/net/ipv4/inet_hashtables.c:
inet_unhash | +190
inet_hash | +242
2 functions changed, 432 bytes added, diff: +432
vmlinux:
16 functions changed, 485 bytes added, 492 bytes removed, diff: -7
/home/acme/git/net-2.6/net/ipv6/tcp_ipv6.c:
tcp_v6_get_port | -31
tcp_v6_hash | -7
tcp_v6_syn_recv_sock | -9
3 functions changed, 47 bytes removed, diff: -47
/home/acme/git/net-2.6/net/dccp/proto.c:
dccp_destroy_sock | -7
dccp_unhash | -179
dccp_hash | -49
dccp_set_state | -7
dccp_done | +1
5 functions changed, 1 bytes added, 242 bytes removed, diff: -241
/home/acme/git/net-2.6/net/dccp/ipv4.c:
dccp_v4_get_port | -31
dccp_v4_request_recv_sock | -2
2 functions changed, 33 bytes removed, diff: -33
/home/acme/git/net-2.6/net/dccp/ipv6.c:
dccp_v6_get_port | -31
dccp_v6_hash | -7
dccp_v6_request_recv_sock | +5
3 functions changed, 5 bytes added, 38 bytes removed, diff: -33
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-02-03 12:06:04 +00:00
|
|
|
|
2008-11-24 01:22:55 +00:00
|
|
|
if (sk->sk_state == TCP_LISTEN)
|
|
|
|
|
lock = &hashinfo->listening_hash[inet_sk_listen_hashfn(sk)].lock;
|
|
|
|
|
else
|
|
|
|
|
lock = inet_ehash_lockp(hashinfo, sk->sk_hash);
|
2008-11-20 08:40:07 +00:00
|
|
|
|
2008-11-24 01:22:55 +00:00
|
|
|
spin_lock_bh(lock);
|
|
|
|
|
done =__sk_nulls_del_node_init_rcu(sk);
|
|
|
|
|
if (done)
|
|
|
|
|
sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
|
2008-11-24 08:09:29 +00:00
|
|
|
spin_unlock_bh(lock);
|
[SOCK] proto: Add hashinfo member to struct proto
This way we can remove TCP and DCCP specific versions of
sk->sk_prot->get_port: both v4 and v6 use inet_csk_get_port
sk->sk_prot->hash: inet_hash is directly used, only v6 need
a specific version to deal with mapped sockets
sk->sk_prot->unhash: both v4 and v6 use inet_hash directly
struct inet_connection_sock_af_ops also gets a new member, bind_conflict, so
that inet_csk_get_port can find the per family routine.
Now only the lookup routines receive as a parameter a struct inet_hashtable.
With this we further reuse code, reducing the difference among INET transport
protocols.
Eventually work has to be done on UDP and SCTP to make them share this
infrastructure and get as a bonus inet_diag interfaces so that iproute can be
used with these protocols.
net-2.6/net/ipv4/inet_hashtables.c:
struct proto | +8
struct inet_connection_sock_af_ops | +8
2 structs changed
__inet_hash_nolisten | +18
__inet_hash | -210
inet_put_port | +8
inet_bind_bucket_create | +1
__inet_hash_connect | -8
5 functions changed, 27 bytes added, 218 bytes removed, diff: -191
net-2.6/net/core/sock.c:
proto_seq_show | +3
1 function changed, 3 bytes added, diff: +3
net-2.6/net/ipv4/inet_connection_sock.c:
inet_csk_get_port | +15
1 function changed, 15 bytes added, diff: +15
net-2.6/net/ipv4/tcp.c:
tcp_set_state | -7
1 function changed, 7 bytes removed, diff: -7
net-2.6/net/ipv4/tcp_ipv4.c:
tcp_v4_get_port | -31
tcp_v4_hash | -48
tcp_v4_destroy_sock | -7
tcp_v4_syn_recv_sock | -2
tcp_unhash | -179
5 functions changed, 267 bytes removed, diff: -267
net-2.6/net/ipv6/inet6_hashtables.c:
__inet6_hash | +8
1 function changed, 8 bytes added, diff: +8
net-2.6/net/ipv4/inet_hashtables.c:
inet_unhash | +190
inet_hash | +242
2 functions changed, 432 bytes added, diff: +432
vmlinux:
16 functions changed, 485 bytes added, 492 bytes removed, diff: -7
/home/acme/git/net-2.6/net/ipv6/tcp_ipv6.c:
tcp_v6_get_port | -31
tcp_v6_hash | -7
tcp_v6_syn_recv_sock | -9
3 functions changed, 47 bytes removed, diff: -47
/home/acme/git/net-2.6/net/dccp/proto.c:
dccp_destroy_sock | -7
dccp_unhash | -179
dccp_hash | -49
dccp_set_state | -7
dccp_done | +1
5 functions changed, 1 bytes added, 242 bytes removed, diff: -241
/home/acme/git/net-2.6/net/dccp/ipv4.c:
dccp_v4_get_port | -31
dccp_v4_request_recv_sock | -2
2 functions changed, 33 bytes removed, diff: -33
/home/acme/git/net-2.6/net/dccp/ipv6.c:
dccp_v6_get_port | -31
dccp_v6_hash | -7
dccp_v6_request_recv_sock | +5
3 functions changed, 5 bytes added, 38 bytes removed, diff: -33
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-02-03 12:06:04 +00:00
|
|
|
}
|
|
|
|
|
EXPORT_SYMBOL_GPL(inet_unhash);
|
2007-12-20 23:31:33 +00:00
|
|
|
|
2008-01-31 13:04:45 +00:00
|
|
|
int __inet_hash_connect(struct inet_timewait_death_row *death_row,
|
2008-02-05 11:14:44 +00:00
|
|
|
struct sock *sk, u32 port_offset,
|
2008-01-31 13:04:45 +00:00
|
|
|
int (*check_established)(struct inet_timewait_death_row *,
|
|
|
|
|
struct sock *, __u16, struct inet_timewait_sock **),
|
[SOCK] proto: Add hashinfo member to struct proto
This way we can remove TCP and DCCP specific versions of
sk->sk_prot->get_port: both v4 and v6 use inet_csk_get_port
sk->sk_prot->hash: inet_hash is directly used, only v6 need
a specific version to deal with mapped sockets
sk->sk_prot->unhash: both v4 and v6 use inet_hash directly
struct inet_connection_sock_af_ops also gets a new member, bind_conflict, so
that inet_csk_get_port can find the per family routine.
Now only the lookup routines receive as a parameter a struct inet_hashtable.
With this we further reuse code, reducing the difference among INET transport
protocols.
Eventually work has to be done on UDP and SCTP to make them share this
infrastructure and get as a bonus inet_diag interfaces so that iproute can be
used with these protocols.
net-2.6/net/ipv4/inet_hashtables.c:
struct proto | +8
struct inet_connection_sock_af_ops | +8
2 structs changed
__inet_hash_nolisten | +18
__inet_hash | -210
inet_put_port | +8
inet_bind_bucket_create | +1
__inet_hash_connect | -8
5 functions changed, 27 bytes added, 218 bytes removed, diff: -191
net-2.6/net/core/sock.c:
proto_seq_show | +3
1 function changed, 3 bytes added, diff: +3
net-2.6/net/ipv4/inet_connection_sock.c:
inet_csk_get_port | +15
1 function changed, 15 bytes added, diff: +15
net-2.6/net/ipv4/tcp.c:
tcp_set_state | -7
1 function changed, 7 bytes removed, diff: -7
net-2.6/net/ipv4/tcp_ipv4.c:
tcp_v4_get_port | -31
tcp_v4_hash | -48
tcp_v4_destroy_sock | -7
tcp_v4_syn_recv_sock | -2
tcp_unhash | -179
5 functions changed, 267 bytes removed, diff: -267
net-2.6/net/ipv6/inet6_hashtables.c:
__inet6_hash | +8
1 function changed, 8 bytes added, diff: +8
net-2.6/net/ipv4/inet_hashtables.c:
inet_unhash | +190
inet_hash | +242
2 functions changed, 432 bytes added, diff: +432
vmlinux:
16 functions changed, 485 bytes added, 492 bytes removed, diff: -7
/home/acme/git/net-2.6/net/ipv6/tcp_ipv6.c:
tcp_v6_get_port | -31
tcp_v6_hash | -7
tcp_v6_syn_recv_sock | -9
3 functions changed, 47 bytes removed, diff: -47
/home/acme/git/net-2.6/net/dccp/proto.c:
dccp_destroy_sock | -7
dccp_unhash | -179
dccp_hash | -49
dccp_set_state | -7
dccp_done | +1
5 functions changed, 1 bytes added, 242 bytes removed, diff: -241
/home/acme/git/net-2.6/net/dccp/ipv4.c:
dccp_v4_get_port | -31
dccp_v4_request_recv_sock | -2
2 functions changed, 33 bytes removed, diff: -33
/home/acme/git/net-2.6/net/dccp/ipv6.c:
dccp_v6_get_port | -31
dccp_v6_hash | -7
dccp_v6_request_recv_sock | +5
3 functions changed, 5 bytes added, 38 bytes removed, diff: -33
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-02-03 12:06:04 +00:00
|
|
|
void (*hash)(struct sock *sk))
|
2005-12-14 07:25:31 +00:00
|
|
|
{
|
|
|
|
|
struct inet_hashinfo *hinfo = death_row->hashinfo;
|
|
|
|
|
const unsigned short snum = inet_sk(sk)->num;
|
2007-02-09 14:24:47 +00:00
|
|
|
struct inet_bind_hashbucket *head;
|
|
|
|
|
struct inet_bind_bucket *tb;
|
2005-12-14 07:25:31 +00:00
|
|
|
int ret;
|
2008-03-25 17:26:21 +00:00
|
|
|
struct net *net = sock_net(sk);
|
2005-12-14 07:25:31 +00:00
|
|
|
|
2007-02-09 14:24:47 +00:00
|
|
|
if (!snum) {
|
2007-10-11 00:30:46 +00:00
|
|
|
int i, remaining, low, high, port;
|
2005-12-14 07:25:31 +00:00
|
|
|
static u32 hint;
|
2008-02-05 11:14:44 +00:00
|
|
|
u32 offset = hint + port_offset;
|
2005-12-14 07:25:31 +00:00
|
|
|
struct hlist_node *node;
|
2007-02-09 14:24:47 +00:00
|
|
|
struct inet_timewait_sock *tw = NULL;
|
2005-12-14 07:25:31 +00:00
|
|
|
|
2007-10-11 00:30:46 +00:00
|
|
|
inet_get_local_port_range(&low, &high);
|
2007-10-19 05:00:17 +00:00
|
|
|
remaining = (high - low) + 1;
|
2007-10-11 00:30:46 +00:00
|
|
|
|
2007-02-09 14:24:47 +00:00
|
|
|
local_bh_disable();
|
2007-10-11 00:30:46 +00:00
|
|
|
for (i = 1; i <= remaining; i++) {
|
|
|
|
|
port = low + (i + offset) % remaining;
|
2008-06-17 00:12:49 +00:00
|
|
|
head = &hinfo->bhash[inet_bhashfn(net, port,
|
|
|
|
|
hinfo->bhash_size)];
|
2007-02-09 14:24:47 +00:00
|
|
|
spin_lock(&head->lock);
|
2005-12-14 07:25:31 +00:00
|
|
|
|
2007-02-09 14:24:47 +00:00
|
|
|
/* Does not bother with rcv_saddr checks,
|
|
|
|
|
* because the established check is already
|
|
|
|
|
* unique enough.
|
|
|
|
|
*/
|
2005-12-14 07:25:31 +00:00
|
|
|
inet_bind_bucket_for_each(tb, node, &head->chain) {
|
2008-11-12 08:54:20 +00:00
|
|
|
if (ib_net(tb) == net && tb->port == port) {
|
2007-02-09 14:24:47 +00:00
|
|
|
if (tb->fastreuse >= 0)
|
|
|
|
|
goto next_port;
|
inet: Allowing more than 64k connections and heavily optimize bind(0) time.
With simple extension to the binding mechanism, which allows to bind more
than 64k sockets (or smaller amount, depending on sysctl parameters),
we have to traverse the whole bind hash table to find out empty bucket.
And while it is not a problem for example for 32k connections, bind()
completion time grows exponentially (since after each successful binding
we have to traverse one bucket more to find empty one) even if we start
each time from random offset inside the hash table.
So, when hash table is full, and we want to add another socket, we have
to traverse the whole table no matter what, so effectivelly this will be
the worst case performance and it will be constant.
Attached picture shows bind() time depending on number of already bound
sockets.
Green area corresponds to the usual binding to zero port process, which
turns on kernel port selection as described above. Red area is the bind
process, when number of reuse-bound sockets is not limited by 64k (or
sysctl parameters). The same exponential growth (hidden by the green
area) before number of ports reaches sysctl limit.
At this time bind hash table has exactly one reuse-enbaled socket in a
bucket, but it is possible that they have different addresses. Actually
kernel selects the first port to try randomly, so at the beginning bind
will take roughly constant time, but with time number of port to check
after random start will increase. And that will have exponential growth,
but because of above random selection, not every next port selection
will necessary take longer time than previous. So we have to consider
the area below in the graph (if you could zoom it, you could find, that
there are many different times placed there), so area can hide another.
Blue area corresponds to the port selection optimization.
This is rather simple design approach: hashtable now maintains (unprecise
and racely updated) number of currently bound sockets, and when number
of such sockets becomes greater than predefined value (I use maximum
port range defined by sysctls), we stop traversing the whole bind hash
table and just stop at first matching bucket after random start. Above
limit roughly corresponds to the case, when bind hash table is full and
we turned on mechanism of allowing to bind more reuse-enabled sockets,
so it does not change behaviour of other sockets.
Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net>
Tested-by: Denys Fedoryschenko <denys@visp.net.lb>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-01-20 00:46:02 +00:00
|
|
|
WARN_ON(hlist_empty(&tb->owners));
|
2008-01-31 13:04:45 +00:00
|
|
|
if (!check_established(death_row, sk,
|
|
|
|
|
port, &tw))
|
2007-02-09 14:24:47 +00:00
|
|
|
goto ok;
|
|
|
|
|
goto next_port;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2008-01-31 13:05:50 +00:00
|
|
|
tb = inet_bind_bucket_create(hinfo->bind_bucket_cachep,
|
|
|
|
|
net, head, port);
|
2007-02-09 14:24:47 +00:00
|
|
|
if (!tb) {
|
|
|
|
|
spin_unlock(&head->lock);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
tb->fastreuse = -1;
|
|
|
|
|
goto ok;
|
|
|
|
|
|
|
|
|
|
next_port:
|
|
|
|
|
spin_unlock(&head->lock);
|
|
|
|
|
}
|
|
|
|
|
local_bh_enable();
|
|
|
|
|
|
|
|
|
|
return -EADDRNOTAVAIL;
|
2005-12-14 07:25:31 +00:00
|
|
|
|
|
|
|
|
ok:
|
|
|
|
|
hint += i;
|
|
|
|
|
|
2007-02-09 14:24:47 +00:00
|
|
|
/* Head lock still held and bh's disabled */
|
|
|
|
|
inet_bind_hash(sk, tb, port);
|
2005-12-14 07:25:31 +00:00
|
|
|
if (sk_unhashed(sk)) {
|
2007-02-09 14:24:47 +00:00
|
|
|
inet_sk(sk)->sport = htons(port);
|
[SOCK] proto: Add hashinfo member to struct proto
This way we can remove TCP and DCCP specific versions of
sk->sk_prot->get_port: both v4 and v6 use inet_csk_get_port
sk->sk_prot->hash: inet_hash is directly used, only v6 need
a specific version to deal with mapped sockets
sk->sk_prot->unhash: both v4 and v6 use inet_hash directly
struct inet_connection_sock_af_ops also gets a new member, bind_conflict, so
that inet_csk_get_port can find the per family routine.
Now only the lookup routines receive as a parameter a struct inet_hashtable.
With this we further reuse code, reducing the difference among INET transport
protocols.
Eventually work has to be done on UDP and SCTP to make them share this
infrastructure and get as a bonus inet_diag interfaces so that iproute can be
used with these protocols.
net-2.6/net/ipv4/inet_hashtables.c:
struct proto | +8
struct inet_connection_sock_af_ops | +8
2 structs changed
__inet_hash_nolisten | +18
__inet_hash | -210
inet_put_port | +8
inet_bind_bucket_create | +1
__inet_hash_connect | -8
5 functions changed, 27 bytes added, 218 bytes removed, diff: -191
net-2.6/net/core/sock.c:
proto_seq_show | +3
1 function changed, 3 bytes added, diff: +3
net-2.6/net/ipv4/inet_connection_sock.c:
inet_csk_get_port | +15
1 function changed, 15 bytes added, diff: +15
net-2.6/net/ipv4/tcp.c:
tcp_set_state | -7
1 function changed, 7 bytes removed, diff: -7
net-2.6/net/ipv4/tcp_ipv4.c:
tcp_v4_get_port | -31
tcp_v4_hash | -48
tcp_v4_destroy_sock | -7
tcp_v4_syn_recv_sock | -2
tcp_unhash | -179
5 functions changed, 267 bytes removed, diff: -267
net-2.6/net/ipv6/inet6_hashtables.c:
__inet6_hash | +8
1 function changed, 8 bytes added, diff: +8
net-2.6/net/ipv4/inet_hashtables.c:
inet_unhash | +190
inet_hash | +242
2 functions changed, 432 bytes added, diff: +432
vmlinux:
16 functions changed, 485 bytes added, 492 bytes removed, diff: -7
/home/acme/git/net-2.6/net/ipv6/tcp_ipv6.c:
tcp_v6_get_port | -31
tcp_v6_hash | -7
tcp_v6_syn_recv_sock | -9
3 functions changed, 47 bytes removed, diff: -47
/home/acme/git/net-2.6/net/dccp/proto.c:
dccp_destroy_sock | -7
dccp_unhash | -179
dccp_hash | -49
dccp_set_state | -7
dccp_done | +1
5 functions changed, 1 bytes added, 242 bytes removed, diff: -241
/home/acme/git/net-2.6/net/dccp/ipv4.c:
dccp_v4_get_port | -31
dccp_v4_request_recv_sock | -2
2 functions changed, 33 bytes removed, diff: -33
/home/acme/git/net-2.6/net/dccp/ipv6.c:
dccp_v6_get_port | -31
dccp_v6_hash | -7
dccp_v6_request_recv_sock | +5
3 functions changed, 5 bytes added, 38 bytes removed, diff: -33
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-02-03 12:06:04 +00:00
|
|
|
hash(sk);
|
2007-02-09 14:24:47 +00:00
|
|
|
}
|
|
|
|
|
spin_unlock(&head->lock);
|
2005-12-14 07:25:31 +00:00
|
|
|
|
2007-02-09 14:24:47 +00:00
|
|
|
if (tw) {
|
|
|
|
|
inet_twsk_deschedule(tw, death_row);
|
|
|
|
|
inet_twsk_put(tw);
|
|
|
|
|
}
|
2005-12-14 07:25:31 +00:00
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
goto out;
|
2007-02-09 14:24:47 +00:00
|
|
|
}
|
2005-12-14 07:25:31 +00:00
|
|
|
|
2008-06-17 00:12:49 +00:00
|
|
|
head = &hinfo->bhash[inet_bhashfn(net, snum, hinfo->bhash_size)];
|
2007-02-09 14:24:47 +00:00
|
|
|
tb = inet_csk(sk)->icsk_bind_hash;
|
2005-12-14 07:25:31 +00:00
|
|
|
spin_lock_bh(&head->lock);
|
|
|
|
|
if (sk_head(&tb->owners) == sk && !sk->sk_bind_node.next) {
|
[SOCK] proto: Add hashinfo member to struct proto
This way we can remove TCP and DCCP specific versions of
sk->sk_prot->get_port: both v4 and v6 use inet_csk_get_port
sk->sk_prot->hash: inet_hash is directly used, only v6 need
a specific version to deal with mapped sockets
sk->sk_prot->unhash: both v4 and v6 use inet_hash directly
struct inet_connection_sock_af_ops also gets a new member, bind_conflict, so
that inet_csk_get_port can find the per family routine.
Now only the lookup routines receive as a parameter a struct inet_hashtable.
With this we further reuse code, reducing the difference among INET transport
protocols.
Eventually work has to be done on UDP and SCTP to make them share this
infrastructure and get as a bonus inet_diag interfaces so that iproute can be
used with these protocols.
net-2.6/net/ipv4/inet_hashtables.c:
struct proto | +8
struct inet_connection_sock_af_ops | +8
2 structs changed
__inet_hash_nolisten | +18
__inet_hash | -210
inet_put_port | +8
inet_bind_bucket_create | +1
__inet_hash_connect | -8
5 functions changed, 27 bytes added, 218 bytes removed, diff: -191
net-2.6/net/core/sock.c:
proto_seq_show | +3
1 function changed, 3 bytes added, diff: +3
net-2.6/net/ipv4/inet_connection_sock.c:
inet_csk_get_port | +15
1 function changed, 15 bytes added, diff: +15
net-2.6/net/ipv4/tcp.c:
tcp_set_state | -7
1 function changed, 7 bytes removed, diff: -7
net-2.6/net/ipv4/tcp_ipv4.c:
tcp_v4_get_port | -31
tcp_v4_hash | -48
tcp_v4_destroy_sock | -7
tcp_v4_syn_recv_sock | -2
tcp_unhash | -179
5 functions changed, 267 bytes removed, diff: -267
net-2.6/net/ipv6/inet6_hashtables.c:
__inet6_hash | +8
1 function changed, 8 bytes added, diff: +8
net-2.6/net/ipv4/inet_hashtables.c:
inet_unhash | +190
inet_hash | +242
2 functions changed, 432 bytes added, diff: +432
vmlinux:
16 functions changed, 485 bytes added, 492 bytes removed, diff: -7
/home/acme/git/net-2.6/net/ipv6/tcp_ipv6.c:
tcp_v6_get_port | -31
tcp_v6_hash | -7
tcp_v6_syn_recv_sock | -9
3 functions changed, 47 bytes removed, diff: -47
/home/acme/git/net-2.6/net/dccp/proto.c:
dccp_destroy_sock | -7
dccp_unhash | -179
dccp_hash | -49
dccp_set_state | -7
dccp_done | +1
5 functions changed, 1 bytes added, 242 bytes removed, diff: -241
/home/acme/git/net-2.6/net/dccp/ipv4.c:
dccp_v4_get_port | -31
dccp_v4_request_recv_sock | -2
2 functions changed, 33 bytes removed, diff: -33
/home/acme/git/net-2.6/net/dccp/ipv6.c:
dccp_v6_get_port | -31
dccp_v6_hash | -7
dccp_v6_request_recv_sock | +5
3 functions changed, 5 bytes added, 38 bytes removed, diff: -33
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-02-03 12:06:04 +00:00
|
|
|
hash(sk);
|
2005-12-14 07:25:31 +00:00
|
|
|
spin_unlock_bh(&head->lock);
|
|
|
|
|
return 0;
|
|
|
|
|
} else {
|
|
|
|
|
spin_unlock(&head->lock);
|
|
|
|
|
/* No definite answer... Walk to established hash table */
|
2008-01-31 13:04:45 +00:00
|
|
|
ret = check_established(death_row, sk, snum, NULL);
|
2005-12-14 07:25:31 +00:00
|
|
|
out:
|
|
|
|
|
local_bh_enable();
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
}
|
2008-01-31 13:04:45 +00:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Bind a port for a connect operation and hash it.
|
|
|
|
|
*/
|
|
|
|
|
int inet_hash_connect(struct inet_timewait_death_row *death_row,
|
|
|
|
|
struct sock *sk)
|
|
|
|
|
{
|
2008-02-05 11:14:44 +00:00
|
|
|
return __inet_hash_connect(death_row, sk, inet_sk_port_offset(sk),
|
2008-01-31 13:04:45 +00:00
|
|
|
__inet_check_established, __inet_hash_nolisten);
|
|
|
|
|
}
|
2005-12-14 07:25:31 +00:00
|
|
|
|
|
|
|
|
EXPORT_SYMBOL_GPL(inet_hash_connect);
|
2008-11-20 08:40:07 +00:00
|
|
|
|
|
|
|
|
void inet_hashinfo_init(struct inet_hashinfo *h)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
2009-02-01 20:31:33 +00:00
|
|
|
atomic_set(&h->bsockets, 0);
|
2008-11-24 01:22:55 +00:00
|
|
|
for (i = 0; i < INET_LHTABLE_SIZE; i++) {
|
2008-11-20 08:40:07 +00:00
|
|
|
spin_lock_init(&h->listening_hash[i].lock);
|
2008-11-24 01:22:55 +00:00
|
|
|
INIT_HLIST_NULLS_HEAD(&h->listening_hash[i].head,
|
|
|
|
|
i + LISTENING_NULLS_BASE);
|
|
|
|
|
}
|
2008-11-20 08:40:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
EXPORT_SYMBOL_GPL(inet_hashinfo_init);
|
