2005-08-12 14:26:18 +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 INET6 transport hashtables
|
|
|
|
*
|
2005-12-14 08:25:44 +01:00
|
|
|
* Authors: Lotsa people, from code originally in tcp, generalised here
|
|
|
|
* by Arnaldo Carvalho de Melo <acme@mandriva.com>
|
2005-08-12 14:26:18 +02:00
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
2005-12-14 08:25:44 +01:00
|
|
|
#include <linux/random.h>
|
2005-08-12 14:26:18 +02:00
|
|
|
|
|
|
|
#include <net/inet_connection_sock.h>
|
|
|
|
#include <net/inet_hashtables.h>
|
|
|
|
#include <net/inet6_hashtables.h>
|
2005-12-14 08:25:44 +01:00
|
|
|
#include <net/ip.h>
|
2005-08-12 14:26:18 +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
|
|
|
void __inet6_hash(struct sock *sk)
|
2006-04-10 07:48:59 +02:00
|
|
|
{
|
2008-03-23 00:50:58 +01:00
|
|
|
struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
|
2006-04-10 07:48:59 +02:00
|
|
|
|
2008-07-26 06:43:18 +02:00
|
|
|
WARN_ON(!sk_unhashed(sk));
|
2006-04-10 07:48:59 +02:00
|
|
|
|
|
|
|
if (sk->sk_state == TCP_LISTEN) {
|
2008-11-20 09:40:07 +01:00
|
|
|
struct inet_listen_hashbucket *ilb;
|
2008-11-17 04:40:17 +01:00
|
|
|
|
2008-11-20 09:40:07 +01:00
|
|
|
ilb = &hashinfo->listening_hash[inet_sk_listen_hashfn(sk)];
|
|
|
|
spin_lock(&ilb->lock);
|
2008-11-24 02:22:55 +01:00
|
|
|
__sk_nulls_add_node_rcu(sk, &ilb->head);
|
2008-11-20 09:40:07 +01:00
|
|
|
spin_unlock(&ilb->lock);
|
2006-04-10 07:48:59 +02:00
|
|
|
} else {
|
|
|
|
unsigned int hash;
|
2008-11-17 04:40:17 +01:00
|
|
|
struct hlist_nulls_head *list;
|
2008-11-21 05:39:09 +01:00
|
|
|
spinlock_t *lock;
|
2008-11-17 04:40:17 +01:00
|
|
|
|
2006-04-10 07:48:59 +02:00
|
|
|
sk->sk_hash = hash = inet6_sk_ehashfn(sk);
|
2007-11-07 11:40:20 +01:00
|
|
|
list = &inet_ehash_bucket(hashinfo, hash)->chain;
|
|
|
|
lock = inet_ehash_lockp(hashinfo, hash);
|
2008-11-21 05:39:09 +01:00
|
|
|
spin_lock(lock);
|
2008-11-17 04:40:17 +01:00
|
|
|
__sk_nulls_add_node_rcu(sk, list);
|
2008-11-21 05:39:09 +01:00
|
|
|
spin_unlock(lock);
|
2006-04-10 07:48:59 +02:00
|
|
|
}
|
|
|
|
|
2008-04-01 04:41:46 +02:00
|
|
|
sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
|
2006-04-10 07:48:59 +02:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(__inet6_hash);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Sockets in TCP_CLOSE state are _always_ taken out of the hash, so
|
|
|
|
* we need not check it for TCP lookups anymore, thanks Alexey. -DaveM
|
|
|
|
*
|
|
|
|
* The sockhash lock must be held as a reader here.
|
|
|
|
*/
|
2008-01-31 14:07:21 +01:00
|
|
|
struct sock *__inet6_lookup_established(struct net *net,
|
|
|
|
struct inet_hashinfo *hashinfo,
|
2006-04-10 07:48:59 +02:00
|
|
|
const struct in6_addr *saddr,
|
2006-11-08 09:20:00 +01:00
|
|
|
const __be16 sport,
|
2006-04-10 07:48:59 +02:00
|
|
|
const struct in6_addr *daddr,
|
|
|
|
const u16 hnum,
|
|
|
|
const int dif)
|
|
|
|
{
|
|
|
|
struct sock *sk;
|
2008-11-17 04:40:17 +01:00
|
|
|
const struct hlist_nulls_node *node;
|
2006-09-28 03:43:07 +02:00
|
|
|
const __portpair ports = INET_COMBINED_PORTS(sport, hnum);
|
2006-04-10 07:48:59 +02:00
|
|
|
/* Optimize here for direct hit, only listening connections can
|
|
|
|
* have wildcards anyways.
|
|
|
|
*/
|
2008-06-17 02:13:48 +02:00
|
|
|
unsigned int hash = inet6_ehashfn(net, daddr, hnum, saddr, sport);
|
2008-11-17 04:40:17 +01:00
|
|
|
unsigned int slot = hash & (hashinfo->ehash_size - 1);
|
|
|
|
struct inet_ehash_bucket *head = &hashinfo->ehash[slot];
|
2006-04-10 07:48:59 +02:00
|
|
|
|
2008-11-17 04:40:17 +01:00
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
begin:
|
|
|
|
sk_nulls_for_each_rcu(sk, node, &head->chain) {
|
2006-04-10 07:48:59 +02:00
|
|
|
/* For IPV6 do the cheaper port and family tests first. */
|
2008-11-17 04:40:17 +01:00
|
|
|
if (INET6_MATCH(sk, net, hash, saddr, daddr, ports, dif)) {
|
|
|
|
if (unlikely(!atomic_inc_not_zero(&sk->sk_refcnt)))
|
|
|
|
goto begintw;
|
|
|
|
if (!INET6_MATCH(sk, net, hash, saddr, daddr, ports, dif)) {
|
|
|
|
sock_put(sk);
|
|
|
|
goto begin;
|
|
|
|
}
|
|
|
|
goto out;
|
|
|
|
}
|
2006-04-10 07:48:59 +02:00
|
|
|
}
|
2008-11-17 04:40:17 +01:00
|
|
|
if (get_nulls_value(node) != slot)
|
|
|
|
goto begin;
|
|
|
|
|
|
|
|
begintw:
|
2006-04-10 07:48:59 +02:00
|
|
|
/* Must check for a TIME_WAIT'er before going to listener hash. */
|
2008-11-17 04:40:17 +01:00
|
|
|
sk_nulls_for_each_rcu(sk, node, &head->twchain) {
|
|
|
|
if (INET6_TW_MATCH(sk, net, hash, saddr, daddr, ports, dif)) {
|
|
|
|
if (unlikely(!atomic_inc_not_zero(&sk->sk_refcnt))) {
|
|
|
|
sk = NULL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (!INET6_TW_MATCH(sk, net, hash, saddr, daddr, ports, dif)) {
|
|
|
|
sock_put(sk);
|
|
|
|
goto begintw;
|
|
|
|
}
|
|
|
|
goto out;
|
|
|
|
}
|
2006-04-10 07:48:59 +02:00
|
|
|
}
|
2008-11-17 04:40:17 +01:00
|
|
|
if (get_nulls_value(node) != slot)
|
|
|
|
goto begintw;
|
|
|
|
sk = NULL;
|
|
|
|
out:
|
|
|
|
rcu_read_unlock();
|
2006-04-10 07:48:59 +02:00
|
|
|
return sk;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(__inet6_lookup_established);
|
|
|
|
|
2008-11-24 02:22:55 +01:00
|
|
|
static int inline compute_score(struct sock *sk, struct net *net,
|
|
|
|
const unsigned short hnum,
|
|
|
|
const struct in6_addr *daddr,
|
|
|
|
const int dif)
|
|
|
|
{
|
|
|
|
int score = -1;
|
|
|
|
|
|
|
|
if (net_eq(sock_net(sk), net) && inet_sk(sk)->num == hnum &&
|
|
|
|
sk->sk_family == PF_INET6) {
|
|
|
|
const struct ipv6_pinfo *np = inet6_sk(sk);
|
|
|
|
|
|
|
|
score = 1;
|
|
|
|
if (!ipv6_addr_any(&np->rcv_saddr)) {
|
|
|
|
if (!ipv6_addr_equal(&np->rcv_saddr, daddr))
|
|
|
|
return -1;
|
|
|
|
score++;
|
|
|
|
}
|
|
|
|
if (sk->sk_bound_dev_if) {
|
|
|
|
if (sk->sk_bound_dev_if != dif)
|
|
|
|
return -1;
|
|
|
|
score++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return score;
|
|
|
|
}
|
|
|
|
|
2008-01-31 14:07:21 +01:00
|
|
|
struct sock *inet6_lookup_listener(struct net *net,
|
|
|
|
struct inet_hashinfo *hashinfo, const struct in6_addr *daddr,
|
|
|
|
const unsigned short hnum, const int dif)
|
2005-08-12 14:26:18 +02:00
|
|
|
{
|
|
|
|
struct sock *sk;
|
2008-11-24 02:22:55 +01:00
|
|
|
const struct hlist_nulls_node *node;
|
|
|
|
struct sock *result;
|
|
|
|
int score, hiscore;
|
|
|
|
unsigned int hash = inet_lhashfn(net, hnum);
|
|
|
|
struct inet_listen_hashbucket *ilb = &hashinfo->listening_hash[hash];
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
begin:
|
|
|
|
result = NULL;
|
|
|
|
hiscore = -1;
|
|
|
|
sk_nulls_for_each(sk, node, &ilb->head) {
|
|
|
|
score = compute_score(sk, net, hnum, daddr, dif);
|
|
|
|
if (score > hiscore) {
|
|
|
|
hiscore = score;
|
|
|
|
result = sk;
|
2005-08-12 14:26:18 +02:00
|
|
|
}
|
|
|
|
}
|
2008-11-24 02:22:55 +01: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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
2005-08-12 14:26:18 +02:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL_GPL(inet6_lookup_listener);
|
|
|
|
|
2008-01-31 14:07:21 +01:00
|
|
|
struct sock *inet6_lookup(struct net *net, struct inet_hashinfo *hashinfo,
|
2006-11-08 09:20:00 +01:00
|
|
|
const struct in6_addr *saddr, const __be16 sport,
|
|
|
|
const struct in6_addr *daddr, const __be16 dport,
|
2005-08-12 14:26:18 +02:00
|
|
|
const int dif)
|
|
|
|
{
|
|
|
|
struct sock *sk;
|
|
|
|
|
|
|
|
local_bh_disable();
|
2008-01-31 14:07:21 +01:00
|
|
|
sk = __inet6_lookup(net, hashinfo, saddr, sport, daddr, ntohs(dport), dif);
|
2005-08-12 14:26:18 +02:00
|
|
|
local_bh_enable();
|
|
|
|
|
|
|
|
return sk;
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL_GPL(inet6_lookup);
|
2005-12-14 08:25:44 +01:00
|
|
|
|
|
|
|
static int __inet6_check_established(struct inet_timewait_death_row *death_row,
|
|
|
|
struct sock *sk, const __u16 lport,
|
|
|
|
struct inet_timewait_sock **twp)
|
|
|
|
{
|
|
|
|
struct inet_hashinfo *hinfo = death_row->hashinfo;
|
2006-03-13 23:26:12 +01:00
|
|
|
struct inet_sock *inet = inet_sk(sk);
|
2005-12-14 08:25:44 +01:00
|
|
|
const struct ipv6_pinfo *np = inet6_sk(sk);
|
|
|
|
const struct in6_addr *daddr = &np->rcv_saddr;
|
|
|
|
const struct in6_addr *saddr = &np->daddr;
|
|
|
|
const int dif = sk->sk_bound_dev_if;
|
2006-09-28 03:43:07 +02:00
|
|
|
const __portpair ports = INET_COMBINED_PORTS(inet->dport, lport);
|
2008-06-17 02:13:48 +02:00
|
|
|
struct net *net = sock_net(sk);
|
|
|
|
const unsigned int hash = inet6_ehashfn(net, daddr, lport, saddr,
|
2005-12-14 08:25:44 +01:00
|
|
|
inet->dport);
|
|
|
|
struct inet_ehash_bucket *head = inet_ehash_bucket(hinfo, hash);
|
2008-11-21 05:39:09 +01:00
|
|
|
spinlock_t *lock = inet_ehash_lockp(hinfo, hash);
|
2005-12-14 08:25:44 +01:00
|
|
|
struct sock *sk2;
|
2008-11-17 04:40:17 +01:00
|
|
|
const struct hlist_nulls_node *node;
|
2005-12-14 08:25:44 +01:00
|
|
|
struct inet_timewait_sock *tw;
|
|
|
|
|
2008-11-21 05:39:09 +01:00
|
|
|
spin_lock(lock);
|
2005-12-14 08:25:44 +01:00
|
|
|
|
|
|
|
/* Check TIME-WAIT sockets first. */
|
2008-11-17 04:40:17 +01:00
|
|
|
sk_nulls_for_each(sk2, node, &head->twchain) {
|
2005-12-14 08:25:44 +01:00
|
|
|
tw = inet_twsk(sk2);
|
|
|
|
|
2008-01-31 14:07:21 +01:00
|
|
|
if (INET6_TW_MATCH(sk2, net, hash, saddr, daddr, ports, dif)) {
|
2005-12-14 08:25:44 +01:00
|
|
|
if (twsk_unique(sk, sk2, twp))
|
|
|
|
goto unique;
|
|
|
|
else
|
|
|
|
goto not_unique;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
tw = NULL;
|
|
|
|
|
|
|
|
/* And established part... */
|
2008-11-17 04:40:17 +01:00
|
|
|
sk_nulls_for_each(sk2, node, &head->chain) {
|
2008-01-31 14:07:21 +01:00
|
|
|
if (INET6_MATCH(sk2, net, hash, saddr, daddr, ports, dif))
|
2005-12-14 08:25:44 +01:00
|
|
|
goto not_unique;
|
|
|
|
}
|
|
|
|
|
|
|
|
unique:
|
2006-03-13 23:26:12 +01:00
|
|
|
/* 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);
|
2008-07-26 06:43:18 +02:00
|
|
|
WARN_ON(!sk_unhashed(sk));
|
2008-11-17 04:40:17 +01:00
|
|
|
__sk_nulls_add_node_rcu(sk, &head->chain);
|
2005-12-14 08:25:44 +01:00
|
|
|
sk->sk_hash = hash;
|
2008-11-21 05:39:09 +01:00
|
|
|
spin_unlock(lock);
|
2008-04-01 04:41:46 +02:00
|
|
|
sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
|
2005-12-14 08:25:44 +01:00
|
|
|
|
|
|
|
if (twp != NULL) {
|
|
|
|
*twp = tw;
|
2008-07-17 05:31:16 +02:00
|
|
|
NET_INC_STATS_BH(twsk_net(tw), LINUX_MIB_TIMEWAITRECYCLED);
|
2005-12-14 08:25:44 +01:00
|
|
|
} else if (tw != NULL) {
|
|
|
|
/* Silly. Should hash-dance instead... */
|
|
|
|
inet_twsk_deschedule(tw, death_row);
|
2008-07-17 05:31:16 +02:00
|
|
|
NET_INC_STATS_BH(twsk_net(tw), LINUX_MIB_TIMEWAITRECYCLED);
|
2005-12-14 08:25:44 +01:00
|
|
|
|
|
|
|
inet_twsk_put(tw);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
not_unique:
|
2008-11-21 05:39:09 +01:00
|
|
|
spin_unlock(lock);
|
2005-12-14 08:25:44 +01:00
|
|
|
return -EADDRNOTAVAIL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline u32 inet6_sk_port_offset(const struct sock *sk)
|
|
|
|
{
|
|
|
|
const struct inet_sock *inet = inet_sk(sk);
|
|
|
|
const struct ipv6_pinfo *np = inet6_sk(sk);
|
|
|
|
return secure_ipv6_port_ephemeral(np->rcv_saddr.s6_addr32,
|
|
|
|
np->daddr.s6_addr32,
|
|
|
|
inet->dport);
|
|
|
|
}
|
|
|
|
|
|
|
|
int inet6_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, inet6_sk_port_offset(sk),
|
2008-01-31 14:04:45 +01:00
|
|
|
__inet6_check_established, __inet6_hash);
|
2005-12-14 08:25:44 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL_GPL(inet6_hash_connect);
|