2005-08-10 05:00:51 +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.
|
|
|
|
*
|
|
|
|
* 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 05:07:13 +02:00
|
|
|
#include <linux/module.h>
|
2005-12-14 08:25:31 +01:00
|
|
|
#include <linux/random.h>
|
2005-08-10 05:08:09 +02:00
|
|
|
#include <linux/sched.h>
|
2005-08-10 05:00:51 +02:00
|
|
|
#include <linux/slab.h>
|
2005-08-10 05:08:09 +02:00
|
|
|
#include <linux/wait.h>
|
2005-08-10 05:00:51 +02:00
|
|
|
|
2005-08-10 05:10:42 +02:00
|
|
|
#include <net/inet_connection_sock.h>
|
2005-08-10 05:00:51 +02:00
|
|
|
#include <net/inet_hashtables.h>
|
2005-12-14 08:25:31 +01:00
|
|
|
#include <net/ip.h>
|
2005-08-10 05:00:51 +02: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 05:33:20 +01:00
|
|
|
struct inet_bind_bucket *inet_bind_bucket_create(struct kmem_cache *cachep,
|
2008-01-31 14:05:50 +01:00
|
|
|
struct net *net,
|
2005-08-10 05:00:51 +02:00
|
|
|
struct inet_bind_hashbucket *head,
|
|
|
|
const unsigned short snum)
|
|
|
|
{
|
2006-12-07 05:33:16 +01:00
|
|
|
struct inet_bind_bucket *tb = kmem_cache_alloc(cachep, GFP_ATOMIC);
|
2005-08-10 05:00:51 +02:00
|
|
|
|
|
|
|
if (tb != NULL) {
|
2008-01-31 14:05:50 +01:00
|
|
|
tb->ib_net = net;
|
2005-08-10 05:00:51 +02:00
|
|
|
tb->port = snum;
|
|
|
|
tb->fastreuse = 0;
|
|
|
|
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 05:33:20 +01:00
|
|
|
void inet_bind_bucket_destroy(struct kmem_cache *cachep, struct inet_bind_bucket *tb)
|
2005-08-10 05:00:51 +02:00
|
|
|
{
|
|
|
|
if (hlist_empty(&tb->owners)) {
|
|
|
|
__hlist_del(&tb->node);
|
|
|
|
kmem_cache_free(cachep, tb);
|
|
|
|
}
|
|
|
|
}
|
2005-08-10 05:07:13 +02:00
|
|
|
|
|
|
|
void inet_bind_hash(struct sock *sk, struct inet_bind_bucket *tb,
|
|
|
|
const unsigned short snum)
|
|
|
|
{
|
2005-08-10 05:10:42 +02:00
|
|
|
inet_sk(sk)->num = snum;
|
2005-08-10 05:07:13 +02:00
|
|
|
sk_add_bind_node(sk, &tb->owners);
|
2005-08-10 05:10:42 +02:00
|
|
|
inet_csk(sk)->icsk_bind_hash = tb;
|
2005-08-10 05:07:13 +02: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 13:06:04 +01:00
|
|
|
static void __inet_put_port(struct sock *sk)
|
2005-08-10 05:07:13 +02: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 13:06:04 +01:00
|
|
|
struct inet_hashinfo *hashinfo = sk->sk_prot->hashinfo;
|
2005-08-10 05:10:42 +02:00
|
|
|
const int bhash = inet_bhashfn(inet_sk(sk)->num, hashinfo->bhash_size);
|
2005-08-10 05:07:13 +02:00
|
|
|
struct inet_bind_hashbucket *head = &hashinfo->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_del_bind_node(sk);
|
2005-08-10 05:10:42 +02:00
|
|
|
inet_csk(sk)->icsk_bind_hash = NULL;
|
|
|
|
inet_sk(sk)->num = 0;
|
2005-08-10 05:07:13 +02: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 13:06:04 +01:00
|
|
|
void inet_put_port(struct sock *sk)
|
2005-08-10 05:07:13 +02: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 13:06:04 +01:00
|
|
|
__inet_put_port(sk);
|
2005-08-10 05:07:13 +02:00
|
|
|
local_bh_enable();
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(inet_put_port);
|
2005-08-10 05:08:09 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This lock without WQ_FLAG_EXCLUSIVE is good on UP and it can be very bad on SMP.
|
|
|
|
* Look, when several writers sleep and reader wakes them up, all but one
|
|
|
|
* immediately hit write lock and grab all the cpus. Exclusive sleep solves
|
|
|
|
* this, _but_ remember, it adds useless work on UP machines (wake up each
|
|
|
|
* exclusive lock release). It should be ifdefed really.
|
|
|
|
*/
|
|
|
|
void inet_listen_wlock(struct inet_hashinfo *hashinfo)
|
2008-01-02 06:58:02 +01:00
|
|
|
__acquires(hashinfo->lhash_lock)
|
2005-08-10 05:08:09 +02:00
|
|
|
{
|
|
|
|
write_lock(&hashinfo->lhash_lock);
|
|
|
|
|
|
|
|
if (atomic_read(&hashinfo->lhash_users)) {
|
|
|
|
DEFINE_WAIT(wait);
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
prepare_to_wait_exclusive(&hashinfo->lhash_wait,
|
|
|
|
&wait, TASK_UNINTERRUPTIBLE);
|
|
|
|
if (!atomic_read(&hashinfo->lhash_users))
|
|
|
|
break;
|
|
|
|
write_unlock_bh(&hashinfo->lhash_lock);
|
|
|
|
schedule();
|
|
|
|
write_lock_bh(&hashinfo->lhash_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
finish_wait(&hashinfo->lhash_wait, &wait);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(inet_listen_wlock);
|
2005-08-10 05:09:06 +02: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.
|
|
|
|
*/
|
2008-01-31 14:06:40 +01:00
|
|
|
static struct sock *inet_lookup_listener_slow(struct net *net,
|
|
|
|
const struct hlist_head *head,
|
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)
|
2005-08-10 05:09:06 +02:00
|
|
|
{
|
|
|
|
struct sock *result = NULL, *sk;
|
|
|
|
const struct hlist_node *node;
|
|
|
|
int hiscore = -1;
|
|
|
|
|
|
|
|
sk_for_each(sk, node, head) {
|
|
|
|
const struct inet_sock *inet = inet_sk(sk);
|
|
|
|
|
2008-01-31 14:06:40 +01:00
|
|
|
if (sk->sk_net == net && inet->num == hnum &&
|
|
|
|
!ipv6_only_sock(sk)) {
|
2006-09-28 03:43:33 +02:00
|
|
|
const __be32 rcv_saddr = inet->rcv_saddr;
|
2005-08-10 05:09:06 +02:00
|
|
|
int score = sk->sk_family == PF_INET ? 1 : 0;
|
|
|
|
|
|
|
|
if (rcv_saddr) {
|
|
|
|
if (rcv_saddr != daddr)
|
|
|
|
continue;
|
|
|
|
score += 2;
|
|
|
|
}
|
|
|
|
if (sk->sk_bound_dev_if) {
|
|
|
|
if (sk->sk_bound_dev_if != dif)
|
|
|
|
continue;
|
|
|
|
score += 2;
|
|
|
|
}
|
|
|
|
if (score == 5)
|
|
|
|
return sk;
|
|
|
|
if (score > hiscore) {
|
|
|
|
hiscore = score;
|
|
|
|
result = sk;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
2005-08-10 05:09:46 +02:00
|
|
|
|
2006-08-08 11:18:10 +02:00
|
|
|
/* Optimize the common listener case. */
|
2008-01-31 14:06:40 +01:00
|
|
|
struct sock *__inet_lookup_listener(struct net *net,
|
|
|
|
struct inet_hashinfo *hashinfo,
|
2006-09-28 03:43:33 +02:00
|
|
|
const __be32 daddr, const unsigned short hnum,
|
2006-08-10 00:47:12 +02:00
|
|
|
const int dif)
|
2006-08-08 11:18:10 +02:00
|
|
|
{
|
|
|
|
struct sock *sk = NULL;
|
|
|
|
const struct hlist_head *head;
|
|
|
|
|
|
|
|
read_lock(&hashinfo->lhash_lock);
|
|
|
|
head = &hashinfo->listening_hash[inet_lhashfn(hnum)];
|
|
|
|
if (!hlist_empty(head)) {
|
|
|
|
const struct inet_sock *inet = inet_sk((sk = __sk_head(head)));
|
|
|
|
|
|
|
|
if (inet->num == hnum && !sk->sk_node.next &&
|
|
|
|
(!inet->rcv_saddr || inet->rcv_saddr == daddr) &&
|
|
|
|
(sk->sk_family == PF_INET || !ipv6_only_sock(sk)) &&
|
2008-01-31 14:06:40 +01:00
|
|
|
!sk->sk_bound_dev_if && sk->sk_net == net)
|
2006-08-08 11:18:10 +02:00
|
|
|
goto sherry_cache;
|
2008-01-31 14:06:40 +01:00
|
|
|
sk = inet_lookup_listener_slow(net, head, daddr, hnum, dif);
|
2006-08-08 11:18:10 +02:00
|
|
|
}
|
|
|
|
if (sk) {
|
|
|
|
sherry_cache:
|
|
|
|
sock_hold(sk);
|
|
|
|
}
|
|
|
|
read_unlock(&hashinfo->lhash_lock);
|
|
|
|
return sk;
|
|
|
|
}
|
2006-08-10 00:47:12 +02:00
|
|
|
EXPORT_SYMBOL_GPL(__inet_lookup_listener);
|
2005-12-14 08:25:31 +01:00
|
|
|
|
2008-01-31 14:06:40 +01:00
|
|
|
struct sock * __inet_lookup_established(struct net *net,
|
|
|
|
struct inet_hashinfo *hashinfo,
|
2007-12-21 00:32:17 +01: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;
|
|
|
|
const struct hlist_node *node;
|
|
|
|
/* Optimize here for direct hit, only listening connections can
|
|
|
|
* have wildcards anyways.
|
|
|
|
*/
|
|
|
|
unsigned int hash = inet_ehashfn(daddr, hnum, saddr, sport);
|
|
|
|
struct inet_ehash_bucket *head = inet_ehash_bucket(hashinfo, hash);
|
|
|
|
rwlock_t *lock = inet_ehash_lockp(hashinfo, hash);
|
|
|
|
|
|
|
|
prefetch(head->chain.first);
|
|
|
|
read_lock(lock);
|
|
|
|
sk_for_each(sk, node, &head->chain) {
|
2008-01-31 14:06:40 +01:00
|
|
|
if (INET_MATCH(sk, net, hash, acookie,
|
|
|
|
saddr, daddr, ports, dif))
|
2007-12-21 00:32:17 +01: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->twchain) {
|
2008-01-31 14:06:40 +01:00
|
|
|
if (INET_TW_MATCH(sk, net, hash, acookie,
|
|
|
|
saddr, daddr, ports, dif))
|
2007-12-21 00:32:17 +01:00
|
|
|
goto hit;
|
|
|
|
}
|
|
|
|
sk = NULL;
|
|
|
|
out:
|
|
|
|
read_unlock(lock);
|
|
|
|
return sk;
|
|
|
|
hit:
|
|
|
|
sock_hold(sk);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(__inet_lookup_established);
|
|
|
|
|
2005-12-14 08:25:31 +01: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 03:43:33 +02:00
|
|
|
__be32 daddr = inet->rcv_saddr;
|
|
|
|
__be32 saddr = inet->daddr;
|
2005-12-14 08:25:31 +01:00
|
|
|
int dif = sk->sk_bound_dev_if;
|
|
|
|
INET_ADDR_COOKIE(acookie, saddr, daddr)
|
2006-09-28 03:43:07 +02:00
|
|
|
const __portpair ports = INET_COMBINED_PORTS(inet->dport, lport);
|
2005-12-14 08:25:31 +01:00
|
|
|
unsigned int hash = inet_ehashfn(daddr, lport, saddr, inet->dport);
|
|
|
|
struct inet_ehash_bucket *head = inet_ehash_bucket(hinfo, hash);
|
2007-11-07 11:40:20 +01:00
|
|
|
rwlock_t *lock = inet_ehash_lockp(hinfo, hash);
|
2005-12-14 08:25:31 +01:00
|
|
|
struct sock *sk2;
|
|
|
|
const struct hlist_node *node;
|
|
|
|
struct inet_timewait_sock *tw;
|
2008-01-31 14:06:40 +01:00
|
|
|
struct net *net = sk->sk_net;
|
2005-12-14 08:25:31 +01:00
|
|
|
|
|
|
|
prefetch(head->chain.first);
|
2007-11-07 11:40:20 +01:00
|
|
|
write_lock(lock);
|
2005-12-14 08:25:31 +01:00
|
|
|
|
|
|
|
/* Check TIME-WAIT sockets first. */
|
[NET]: change layout of ehash table
ehash table layout is currently this one :
First half of this table is used by sockets not in TIME_WAIT state
Second half of it is used by sockets in TIME_WAIT state.
This is non optimal because of for a given hash or socket, the two chain heads
are located in separate cache lines.
Moreover the locks of the second half are never used.
If instead of this halving, we use two list heads in inet_ehash_bucket instead
of only one, we probably can avoid one cache miss, and reduce ram usage,
particularly if sizeof(rwlock_t) is big (various CONFIG_DEBUG_SPINLOCK,
CONFIG_DEBUG_LOCK_ALLOC settings). So we still halves the table but we keep
together related chains to speedup lookups and socket state change.
In this patch I did not try to align struct inet_ehash_bucket, but a future
patch could try to make this structure have a convenient size (a power of two
or a multiple of L1_CACHE_SIZE).
I guess rwlock will just vanish as soon as RCU is plugged into ehash :) , so
maybe we dont need to scratch our heads to align the bucket...
Note : In case struct inet_ehash_bucket is not a power of two, we could
probably change alloc_large_system_hash() (in case it use __get_free_pages())
to free the unused space. It currently allocates a big zone, but the last
quarter of it could be freed. Again, this should be a temporary 'problem'.
Patch tested on ipv4 tcp only, but should be OK for IPV6 and DCCP.
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-02-08 23:16:46 +01:00
|
|
|
sk_for_each(sk2, node, &head->twchain) {
|
2005-12-14 08:25:31 +01:00
|
|
|
tw = inet_twsk(sk2);
|
|
|
|
|
2008-01-31 14:06:40 +01:00
|
|
|
if (INET_TW_MATCH(sk2, net, hash, acookie,
|
|
|
|
saddr, daddr, ports, dif)) {
|
2005-12-14 08:25:31 +01:00
|
|
|
if (twsk_unique(sk, sk2, twp))
|
|
|
|
goto unique;
|
|
|
|
else
|
|
|
|
goto not_unique;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
tw = NULL;
|
|
|
|
|
|
|
|
/* And established part... */
|
|
|
|
sk_for_each(sk2, node, &head->chain) {
|
2008-01-31 14:06:40 +01:00
|
|
|
if (INET_MATCH(sk2, net, hash, acookie,
|
|
|
|
saddr, daddr, ports, dif))
|
2005-12-14 08:25:31 +01: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;
|
|
|
|
BUG_TRAP(sk_unhashed(sk));
|
|
|
|
__sk_add_node(sk, &head->chain);
|
2008-01-04 05:46:48 +01:00
|
|
|
sock_prot_inuse_add(sk->sk_prot, 1);
|
2007-11-07 11:40:20 +01:00
|
|
|
write_unlock(lock);
|
2005-12-14 08:25:31 +01:00
|
|
|
|
|
|
|
if (twp) {
|
|
|
|
*twp = tw;
|
|
|
|
NET_INC_STATS_BH(LINUX_MIB_TIMEWAITRECYCLED);
|
|
|
|
} else if (tw) {
|
|
|
|
/* Silly. Should hash-dance instead... */
|
|
|
|
inet_twsk_deschedule(tw, death_row);
|
|
|
|
NET_INC_STATS_BH(LINUX_MIB_TIMEWAITRECYCLED);
|
|
|
|
|
|
|
|
inet_twsk_put(tw);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
not_unique:
|
2007-11-07 11:40:20 +01:00
|
|
|
write_unlock(lock);
|
2005-12-14 08:25:31 +01: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 15:24:47 +01:00
|
|
|
return secure_ipv4_port_ephemeral(inet->rcv_saddr, inet->daddr,
|
2005-12-14 08:25:31 +01: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 13:06:04 +01:00
|
|
|
void __inet_hash_nolisten(struct sock *sk)
|
2007-12-21 00:31:33 +01: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 13:06:04 +01:00
|
|
|
struct inet_hashinfo *hashinfo = sk->sk_prot->hashinfo;
|
2007-12-21 00:31:33 +01:00
|
|
|
struct hlist_head *list;
|
|
|
|
rwlock_t *lock;
|
|
|
|
struct inet_ehash_bucket *head;
|
|
|
|
|
|
|
|
BUG_TRAP(sk_unhashed(sk));
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
|
|
|
write_lock(lock);
|
|
|
|
__sk_add_node(sk, list);
|
2008-01-04 05:46:48 +01:00
|
|
|
sock_prot_inuse_add(sk->sk_prot, 1);
|
2007-12-21 00:31:33 +01:00
|
|
|
write_unlock(lock);
|
|
|
|
}
|
|
|
|
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 13:06:04 +01:00
|
|
|
static void __inet_hash(struct sock *sk)
|
2007-12-21 00:31:33 +01: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 13:06:04 +01:00
|
|
|
struct inet_hashinfo *hashinfo = sk->sk_prot->hashinfo;
|
2007-12-21 00:31:33 +01:00
|
|
|
struct hlist_head *list;
|
|
|
|
rwlock_t *lock;
|
|
|
|
|
|
|
|
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 13:06:04 +01:00
|
|
|
__inet_hash_nolisten(sk);
|
2007-12-21 00:31:33 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
BUG_TRAP(sk_unhashed(sk));
|
|
|
|
list = &hashinfo->listening_hash[inet_sk_listen_hashfn(sk)];
|
|
|
|
lock = &hashinfo->lhash_lock;
|
|
|
|
|
|
|
|
inet_listen_wlock(hashinfo);
|
|
|
|
__sk_add_node(sk, list);
|
2008-01-04 05:46:48 +01:00
|
|
|
sock_prot_inuse_add(sk->sk_prot, 1);
|
2007-12-21 00:31:33 +01:00
|
|
|
write_unlock(lock);
|
|
|
|
wake_up(&hashinfo->lhash_wait);
|
|
|
|
}
|
[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 13:06:04 +01: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)
|
|
|
|
{
|
|
|
|
rwlock_t *lock;
|
|
|
|
struct inet_hashinfo *hashinfo = sk->sk_prot->hashinfo;
|
|
|
|
|
|
|
|
if (sk_unhashed(sk))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
if (sk->sk_state == TCP_LISTEN) {
|
|
|
|
local_bh_disable();
|
|
|
|
inet_listen_wlock(hashinfo);
|
|
|
|
lock = &hashinfo->lhash_lock;
|
|
|
|
} else {
|
|
|
|
lock = inet_ehash_lockp(hashinfo, sk->sk_hash);
|
|
|
|
write_lock_bh(lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (__sk_del_node_init(sk))
|
|
|
|
sock_prot_inuse_add(sk->sk_prot, -1);
|
|
|
|
write_unlock_bh(lock);
|
|
|
|
out:
|
|
|
|
if (sk->sk_state == TCP_LISTEN)
|
|
|
|
wake_up(&hashinfo->lhash_wait);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(inet_unhash);
|
2007-12-21 00:31:33 +01:00
|
|
|
|
2008-01-31 14:04:45 +01:00
|
|
|
int __inet_hash_connect(struct inet_timewait_death_row *death_row,
|
2008-02-05 12:14:44 +01:00
|
|
|
struct sock *sk, u32 port_offset,
|
2008-01-31 14:04:45 +01: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 13:06:04 +01:00
|
|
|
void (*hash)(struct sock *sk))
|
2005-12-14 08:25:31 +01:00
|
|
|
{
|
|
|
|
struct inet_hashinfo *hinfo = death_row->hashinfo;
|
|
|
|
const unsigned short snum = inet_sk(sk)->num;
|
2007-02-09 15:24:47 +01:00
|
|
|
struct inet_bind_hashbucket *head;
|
|
|
|
struct inet_bind_bucket *tb;
|
2005-12-14 08:25:31 +01:00
|
|
|
int ret;
|
2008-01-31 14:05:50 +01:00
|
|
|
struct net *net = sk->sk_net;
|
2005-12-14 08:25:31 +01:00
|
|
|
|
2007-02-09 15:24:47 +01:00
|
|
|
if (!snum) {
|
2007-10-11 02:30:46 +02:00
|
|
|
int i, remaining, low, high, port;
|
2005-12-14 08:25:31 +01:00
|
|
|
static u32 hint;
|
2008-02-05 12:14:44 +01:00
|
|
|
u32 offset = hint + port_offset;
|
2005-12-14 08:25:31 +01:00
|
|
|
struct hlist_node *node;
|
2007-02-09 15:24:47 +01:00
|
|
|
struct inet_timewait_sock *tw = NULL;
|
2005-12-14 08:25:31 +01:00
|
|
|
|
2007-10-11 02:30:46 +02:00
|
|
|
inet_get_local_port_range(&low, &high);
|
2007-10-19 07:00:17 +02:00
|
|
|
remaining = (high - low) + 1;
|
2007-10-11 02:30:46 +02:00
|
|
|
|
2007-02-09 15:24:47 +01:00
|
|
|
local_bh_disable();
|
2007-10-11 02:30:46 +02:00
|
|
|
for (i = 1; i <= remaining; i++) {
|
|
|
|
port = low + (i + offset) % remaining;
|
2007-02-09 15:24:47 +01:00
|
|
|
head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];
|
|
|
|
spin_lock(&head->lock);
|
2005-12-14 08:25:31 +01:00
|
|
|
|
2007-02-09 15:24:47 +01:00
|
|
|
/* Does not bother with rcv_saddr checks,
|
|
|
|
* because the established check is already
|
|
|
|
* unique enough.
|
|
|
|
*/
|
2005-12-14 08:25:31 +01:00
|
|
|
inet_bind_bucket_for_each(tb, node, &head->chain) {
|
2008-01-31 14:05:50 +01:00
|
|
|
if (tb->ib_net == net && tb->port == port) {
|
2007-02-09 15:24:47 +01:00
|
|
|
BUG_TRAP(!hlist_empty(&tb->owners));
|
|
|
|
if (tb->fastreuse >= 0)
|
|
|
|
goto next_port;
|
2008-01-31 14:04:45 +01:00
|
|
|
if (!check_established(death_row, sk,
|
|
|
|
port, &tw))
|
2007-02-09 15:24:47 +01:00
|
|
|
goto ok;
|
|
|
|
goto next_port;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-01-31 14:05:50 +01:00
|
|
|
tb = inet_bind_bucket_create(hinfo->bind_bucket_cachep,
|
|
|
|
net, head, port);
|
2007-02-09 15:24:47 +01: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 08:25:31 +01:00
|
|
|
|
|
|
|
ok:
|
|
|
|
hint += i;
|
|
|
|
|
2007-02-09 15:24:47 +01:00
|
|
|
/* Head lock still held and bh's disabled */
|
|
|
|
inet_bind_hash(sk, tb, port);
|
2005-12-14 08:25:31 +01:00
|
|
|
if (sk_unhashed(sk)) {
|
2007-02-09 15:24:47 +01: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 13:06:04 +01:00
|
|
|
hash(sk);
|
2007-02-09 15:24:47 +01:00
|
|
|
}
|
|
|
|
spin_unlock(&head->lock);
|
2005-12-14 08:25:31 +01:00
|
|
|
|
2007-02-09 15:24:47 +01:00
|
|
|
if (tw) {
|
|
|
|
inet_twsk_deschedule(tw, death_row);
|
|
|
|
inet_twsk_put(tw);
|
|
|
|
}
|
2005-12-14 08:25:31 +01:00
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
goto out;
|
2007-02-09 15:24:47 +01:00
|
|
|
}
|
2005-12-14 08:25:31 +01:00
|
|
|
|
2007-02-09 15:24:47 +01:00
|
|
|
head = &hinfo->bhash[inet_bhashfn(snum, hinfo->bhash_size)];
|
|
|
|
tb = inet_csk(sk)->icsk_bind_hash;
|
2005-12-14 08:25:31 +01: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 13:06:04 +01:00
|
|
|
hash(sk);
|
2005-12-14 08:25:31 +01:00
|
|
|
spin_unlock_bh(&head->lock);
|
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
spin_unlock(&head->lock);
|
|
|
|
/* No definite answer... Walk to established hash table */
|
2008-01-31 14:04:45 +01:00
|
|
|
ret = check_established(death_row, sk, snum, NULL);
|
2005-12-14 08:25:31 +01:00
|
|
|
out:
|
|
|
|
local_bh_enable();
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
2008-01-31 14:04:45 +01:00
|
|
|
EXPORT_SYMBOL_GPL(__inet_hash_connect);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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 12:14:44 +01:00
|
|
|
return __inet_hash_connect(death_row, sk, inet_sk_port_offset(sk),
|
2008-01-31 14:04:45 +01:00
|
|
|
__inet_check_established, __inet_hash_nolisten);
|
|
|
|
}
|
2005-12-14 08:25:31 +01:00
|
|
|
|
|
|
|
EXPORT_SYMBOL_GPL(inet_hash_connect);
|