net: Generalize socket rx gap / receive queue overflow cmsg

[safe/jmp/linux-2.6] / include / net / inet_hashtables.h

diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index ec7ee2e..d522dcf 100644 (file)
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -82,6 +82,7 @@ struct inet_bind_bucket {
 #endif
        unsigned short          port;
        signed short            fastreuse;
+       int                     num_owners;
        struct hlist_node       node;
        struct hlist_head       owners;
 };
@@ -99,9 +100,16 @@ struct inet_bind_hashbucket {
        struct hlist_head       chain;
 };
 
+/*
+ * Sockets can be hashed in established or listening table
+ * We must use different 'nulls' end-of-chain value for listening
+ * hash table, or we might find a socket that was closed and
+ * reallocated/inserted into established hash table
+ */
+#define LISTENING_NULLS_BASE (1U << 29)
 struct inet_listen_hashbucket {
        spinlock_t              lock;
-       struct hlist_head       head;
+       struct hlist_nulls_head head;
 };
 
 /* This is for listening sockets, thus all sockets which possess wildcards. */
@@ -126,7 +134,7 @@ struct inet_hashinfo {
        struct inet_bind_hashbucket     *bhash;
 
        unsigned int                    bhash_size;
-       /* Note : 4 bytes padding on 64 bit arches */
+       /* 4 bytes hole on 64 bit */
 
        struct kmem_cache               *bind_bucket_cachep;
 
@@ -143,6 +151,7 @@ struct inet_hashinfo {
        struct inet_listen_hashbucket   listening_hash[INET_LHTABLE_SIZE]
                                        ____cacheline_aligned_in_smp;
 
+       atomic_t                        bsockets;
 };
 
 static inline struct inet_ehash_bucket *inet_ehash_bucket(
@@ -175,7 +184,7 @@ static inline int inet_ehash_locks_alloc(struct inet_hashinfo *hashinfo)
                size = 2048;
        if (nr_pcpus >= 32)
                size = 4096;
-       if (sizeof(rwlock_t) != 0) {
+       if (sizeof(spinlock_t) != 0) {
 #ifdef CONFIG_NUMA
                if (size * sizeof(spinlock_t) > PAGE_SIZE)
                        hashinfo->ehash_locks = vmalloc(size * sizeof(spinlock_t));
@@ -376,7 +385,7 @@ static inline struct sock *__inet_lookup_skb(struct inet_hashinfo *hashinfo,
        if (unlikely(sk = skb_steal_sock(skb)))
                return sk;
        else
-               return __inet_lookup(dev_net(skb->dst->dev), hashinfo,
+               return __inet_lookup(dev_net(skb_dst(skb)->dev), hashinfo,
                                     iph->saddr, sport,
                                     iph->daddr, dport, inet_iif(skb));
 }