[ATM]: Convert VCC list to hash.

diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
index f673b7705171406ad76815dd91fe9f57f46ea0a3..9f93e1dd7644912b8b798e8fff852cd231cd4c94 100644 (file)
--- a/drivers/atm/atmtcp.c
+++ b/drivers/atm/atmtcp.c
@@ -158,6 +158,7 @@ static int atmtcp_v_ioctl(struct atm_dev *dev,unsigned int cmd,void *arg)
        struct atm_vcc *vcc;
        struct hlist_node *node;
        struct sock *s;
+       int i;
 
        if (cmd != ATM_SETCIRANGE) return -ENOIOCTLCMD;
        if (copy_from_user(&ci,(void *) arg,sizeof(ci))) return -EFAULT;
@@ -166,14 +167,18 @@ static int atmtcp_v_ioctl(struct atm_dev *dev,unsigned int cmd,void *arg)
        if (ci.vpi_bits > MAX_VPI_BITS || ci.vpi_bits < 0 ||
            ci.vci_bits > MAX_VCI_BITS || ci.vci_bits < 0) return -EINVAL;
        read_lock(&vcc_sklist_lock);
-       sk_for_each(s, node, &vcc_sklist) {
-               vcc = atm_sk(s);
-               if (vcc->dev != dev)
-                       continue;
-               if ((vcc->vpi >> ci.vpi_bits) ||
-                   (vcc->vci >> ci.vci_bits)) {
-                       read_unlock(&vcc_sklist_lock);
-                       return -EBUSY;
+       for(i = 0; i < VCC_HTABLE_SIZE; ++i) {
+               struct hlist_head *head = &vcc_hash[i];
+
+               sk_for_each(s, node, head) {
+                       vcc = atm_sk(s);
+                       if (vcc->dev != dev)
+                               continue;
+                       if ((vcc->vpi >> ci.vpi_bits) ||
+                           (vcc->vci >> ci.vci_bits)) {
+                               read_unlock(&vcc_sklist_lock);
+                               return -EBUSY;
+                       }
                }
        }
        read_unlock(&vcc_sklist_lock);
@@ -244,6 +249,7 @@ static void atmtcp_c_close(struct atm_vcc *vcc)
        struct sock *s;
        struct hlist_node *node;
        struct atm_vcc *walk;
+       int i;
 
        atmtcp_dev = (struct atm_dev *) vcc->dev_data;
        dev_data = PRIV(atmtcp_dev);
@@ -254,11 +260,15 @@ static void atmtcp_c_close(struct atm_vcc *vcc)
        shutdown_atm_dev(atmtcp_dev);
        vcc->dev_data = NULL;
        read_lock(&vcc_sklist_lock);
-       sk_for_each(s, node, &vcc_sklist) {
-               walk = atm_sk(s);
-               if (walk->dev != atmtcp_dev)
-                       continue;
-               wake_up(walk->sk->sk_sleep);
+       for(i = 0; i < VCC_HTABLE_SIZE; ++i) {
+               struct hlist_head *head = &vcc_hash[i];
+
+               sk_for_each(s, node, head) {
+                       walk = atm_sk(s);
+                       if (walk->dev != atmtcp_dev)
+                               continue;
+                       wake_up(walk->sk->sk_sleep);
+               }
        }
        read_unlock(&vcc_sklist_lock);
 }
@@ -272,7 +282,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
        struct hlist_node *node;
        struct atm_vcc *out_vcc = NULL;
        struct sk_buff *new_skb;
-       int result = 0;
+       int i, result = 0;
 
        if (!skb->len) return 0;
        dev = vcc->dev_data;
@@ -283,14 +293,18 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
                goto done;
        }
        read_lock(&vcc_sklist_lock);
-       sk_for_each(s, node, &vcc_sklist) {
-               out_vcc = atm_sk(s);
-               if (out_vcc->dev != dev)
-                       continue;
-               if (out_vcc->vpi == ntohs(hdr->vpi) &&
-                   out_vcc->vci == ntohs(hdr->vci) &&
-                   out_vcc->qos.rxtp.traffic_class != ATM_NONE)
-                       break;
+       for(i = 0; i < VCC_HTABLE_SIZE; ++i) {
+               struct hlist_head *head = &vcc_hash[i];
+
+               sk_for_each(s, node, head) {
+                       out_vcc = atm_sk(s);
+                       if (out_vcc->dev != dev)
+                               continue;
+                       if (out_vcc->vpi == ntohs(hdr->vpi) &&
+                           out_vcc->vci == ntohs(hdr->vci) &&
+                           out_vcc->qos.rxtp.traffic_class != ATM_NONE)
+                               break;
+               }
        }
        read_unlock(&vcc_sklist_lock);
        if (!out_vcc) {

diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index 27f3b486edd4bbe72ff8e5e66b3c2629e431d173..c28b967932df580ab4efa90f28df0eae13e25bea 100644 (file)
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -2147,30 +2147,34 @@ static int eni_proc_read(struct atm_dev *dev,loff_t *pos,char *page)
                    skb_queue_len(&tx->backlog));
        }
        read_lock(&vcc_sklist_lock);
-       sk_for_each(s, node, &vcc_sklist) {
-               struct eni_vcc *eni_vcc;
-               int length;
-
-               vcc = atm_sk(s);
-               if (vcc->dev != dev)
-                       continue;
-               eni_vcc = ENI_VCC(vcc);
-               if (--left) continue;
-               length = sprintf(page,"vcc %4d: ",vcc->vci);
-               if (eni_vcc->rx) {
-                       length += sprintf(page+length,"0x%06lx-0x%06lx "
-                           "(%6ld bytes)",
-                           eni_vcc->recv-eni_dev->ram,
-                           eni_vcc->recv-eni_dev->ram+eni_vcc->words*4-1,
-                           eni_vcc->words*4);
-                       if (eni_vcc->tx) length += sprintf(page+length,", ");
+       for(i = 0; i < VCC_HTABLE_SIZE; ++i) {
+               struct hlist_head *head = &vcc_hash[i];
+
+               sk_for_each(s, node, head) {
+                       struct eni_vcc *eni_vcc;
+                       int length;
+
+                       vcc = atm_sk(s);
+                       if (vcc->dev != dev)
+                               continue;
+                       eni_vcc = ENI_VCC(vcc);
+                       if (--left) continue;
+                       length = sprintf(page,"vcc %4d: ",vcc->vci);
+                       if (eni_vcc->rx) {
+                               length += sprintf(page+length,"0x%06lx-0x%06lx "
+                                   "(%6ld bytes)",
+                                   eni_vcc->recv-eni_dev->ram,
+                                   eni_vcc->recv-eni_dev->ram+eni_vcc->words*4-1,
+                                   eni_vcc->words*4);
+                               if (eni_vcc->tx) length += sprintf(page+length,", ");
+                       }
+                       if (eni_vcc->tx)
+                               length += sprintf(page+length,"tx[%d], txing %d bytes",
+                                   eni_vcc->tx->index,eni_vcc->txing);
+                       page[length] = '\n';
+                       read_unlock(&vcc_sklist_lock);
+                       return length+1;
                }
-               if (eni_vcc->tx)
-                       length += sprintf(page+length,"tx[%d], txing %d bytes",
-                           eni_vcc->tx->index,eni_vcc->txing);
-               page[length] = '\n';
-               read_unlock(&vcc_sklist_lock);
-               return length+1;
        }
        read_unlock(&vcc_sklist_lock);
        for (i = 0; i < eni_dev->free_len; i++) {

diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index 53f4955746573d644c3cfbd481d95cc5e9ed8a57..2193396a1a204b99d91d6cfc819e815670249232 100644 (file)
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -1071,14 +1071,16 @@ fore200e_find_vcc(struct fore200e* fore200e, struct rpd* rpd)
     struct sock *s;
     struct atm_vcc* vcc;
     struct hlist_node *node;
+    int i;
 
     read_lock(&vcc_sklist_lock);
-    sk_for_each(s, node, &vcc_sklist) {
+
+    sk_for_each(s, node, &vcc_hash[rpd->atm_header.vci & (VCC_HTABLE_SIZE-1)]) {
        vcc = atm_sk(s);
        if (vcc->dev != fore200e->atm_dev)
-               continue;
+           continue;
        if (vcc->vpi == rpd->atm_header.vpi && vcc->vci == rpd->atm_header.vci) {
-            read_unlock(&vcc_sklist_lock);
+           read_unlock(&vcc_sklist_lock);
            return vcc;
        }
     }
@@ -2606,7 +2608,7 @@ fore200e_proc_read(struct atm_dev *dev,loff_t* pos,char* page)
     struct sock *s;
     struct hlist_node *node;
     struct fore200e* fore200e  = FORE200E_DEV(dev);
-    int              len, left = *pos;
+    int              i, len, left = *pos;
 
     if (!left--) {
 
@@ -2852,15 +2854,18 @@ fore200e_proc_read(struct atm_dev *dev,loff_t* pos,char* page)
                      " VCCs:\n  address\tVPI.VCI:AAL\t(min/max tx PDU size) (min/max rx PDU size)\n");
        
        read_lock(&vcc_sklist_lock);
-       sk_for_each(s, node, &vcc_sklist) {
-           vcc = atm_sk(s);
+       for(i = 0; i < VCC_HTABLE_SIZE; ++i) {
+           struct hlist_head *head = &vcc_hash[i];
 
-           if (vcc->dev != fore200e->atm_dev)
+           sk_for_each(s, node, head) {
+               vcc = atm_sk(s);
+
+               if (vcc->dev != fore200e->atm_dev)
                    continue;
 
-           fore200e_vcc = FORE200E_VCC(vcc);
+               fore200e_vcc = FORE200E_VCC(vcc);
            
-           len += sprintf(page + len,
+               len += sprintf(page + len,
                           "  %x\t%d.%d:%d\t\t(%d/%d)\t(%d/%d)\n",
                           (u32)(unsigned long)vcc,
                           vcc->vpi, vcc->vci, fore200e_atm2fore_aal(vcc->qos.aal),
@@ -2869,6 +2874,7 @@ fore200e_proc_read(struct atm_dev *dev,loff_t* pos,char* page)
                           fore200e_vcc->rx_min_pdu > 0xFFFF ? 0 : fore200e_vcc->rx_min_pdu,
                           fore200e_vcc->rx_max_pdu
                );
+           }
        }
        read_unlock(&vcc_sklist_lock);
 

diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index ec33717c28fa464efe65755065ac86a84bdf52e2..253775c1019fe6b6f55e77c6514f2eefb5c5877b 100644 (file)
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -327,6 +327,7 @@ he_readl_internal(struct he_dev *he_dev, unsigned addr, unsigned flags)
 static __inline__ struct atm_vcc*
 __find_vcc(struct he_dev *he_dev, unsigned cid)
 {
+       struct hlist_head *head;
        struct atm_vcc *vcc;
        struct hlist_node *node;
        struct sock *s;
@@ -335,8 +336,9 @@ __find_vcc(struct he_dev *he_dev, unsigned cid)
 
        vpi = cid >> he_dev->vcibits;
        vci = cid & ((1 << he_dev->vcibits) - 1);
+       head = &vcc_hash[vci & (VCC_HTABLE_SIZE -1)];
 
-       sk_for_each(s, node, &vcc_sklist) {
+       sk_for_each(s, node, head) {
                vcc = atm_sk(s);
                if (vcc->dev == he_dev->atm_dev &&
                    vcc->vci == vci && vcc->vpi == vpi &&

diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
index 7a190d47b60ebd34a0e8e2a2e6c4cb3f27744e93..0b371eb0e69d1dad50c74e56de4e0b5e21440aa5 100644 (file)
--- a/include/linux/atmdev.h
+++ b/include/linux/atmdev.h
@@ -380,7 +380,9 @@ struct atm_skb_data {
        unsigned long   atm_options;    /* ATM layer options */
 };
 
-extern struct hlist_head vcc_sklist;
+#define VCC_HTABLE_SIZE 32
+
+extern struct hlist_head vcc_hash[VCC_HTABLE_SIZE];
 extern rwlock_t vcc_sklist_lock;
 
 #define ATM_SKB(skb) (((struct atm_skb_data *) (skb)->cb))

diff --git a/net/atm/common.c b/net/atm/common.c
index 13e1a844c9d7a8ea9fe41d4a1b7fa7a570348411..63aea35d0c1cb059564580e70acf591cfaafb823 100644 (file)
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -38,13 +38,16 @@
 #define DPRINTK(format,args...)
 #endif
 
-
-HLIST_HEAD(vcc_sklist);
+struct hlist_head vcc_hash[VCC_HTABLE_SIZE];
 rwlock_t vcc_sklist_lock = RW_LOCK_UNLOCKED;
 
 void __vcc_insert_socket(struct sock *sk)
 {
-       sk_add_node(sk, &vcc_sklist);
+       struct atm_vcc *vcc = atm_sk(sk);
+       struct hlist_head *head = &vcc_hash[vcc->vci &
+                                       (VCC_HTABLE_SIZE - 1)];
+       sk->sk_hashent = vcc->vci & (VCC_HTABLE_SIZE - 1);
+       sk_add_node(sk, head);
 }
 
 void vcc_insert_socket(struct sock *sk)
@@ -80,7 +83,7 @@ static struct sk_buff *alloc_tx(struct atm_vcc *vcc,unsigned int size)
 }
 
 
-EXPORT_SYMBOL(vcc_sklist);
+EXPORT_SYMBOL(vcc_hash);
 EXPORT_SYMBOL(vcc_sklist_lock);
 EXPORT_SYMBOL(vcc_insert_socket);
 EXPORT_SYMBOL(vcc_remove_socket);
@@ -250,11 +253,13 @@ static int adjust_tp(struct atm_trafprm *tp,unsigned char aal)
 
 static int check_ci(struct atm_vcc *vcc, short vpi, int vci)
 {
+       struct hlist_head *head = &vcc_hash[vci &
+                                       (VCC_HTABLE_SIZE - 1)];
        struct hlist_node *node;
        struct sock *s;
        struct atm_vcc *walk;
 
-       sk_for_each(s, node, &vcc_sklist) {
+       sk_for_each(s, node, head) {
                walk = atm_sk(s);
                if (walk->dev != vcc->dev)
                        continue;

diff --git a/net/atm/proc.c b/net/atm/proc.c
index b9978ca95d9666f482e7f740a030815606e8003e..dbfa6c1ee10739eab4ad6398faeeb249aaac4543 100644 (file)
--- a/net/atm/proc.c
+++ b/net/atm/proc.c
@@ -64,6 +64,7 @@ static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
 }
 
 struct vcc_state {
+       int bucket;
        struct sock *sk;
        int family;
 };
@@ -75,19 +76,30 @@ static inline int compare_family(struct sock *sk, int family)
        return !family || (vcc->sk->sk_family == family);
 }
 
-static int __vcc_walk(struct sock **sock, int family, loff_t l)
+static int __vcc_walk(struct sock **sock, int family, int *bucket, loff_t l)
 {
        struct sock *sk = *sock;
 
        if (sk == (void *)1) {
-               sk = hlist_empty(&vcc_sklist) ? NULL : __sk_head(&vcc_sklist);
+               for (*bucket = 0; *bucket < VCC_HTABLE_SIZE; ++*bucket) {
+                       struct hlist_head *head = &vcc_hash[*bucket];
+
+                       sk = hlist_empty(head) ? NULL : __sk_head(head);
+                       if (sk)
+                               break;
+               }
                l--;
        } 
+try_again:
        for (; sk; sk = sk_next(sk)) {
                l -= compare_family(sk, family);
                if (l < 0)
                        goto out;
        }
+       if (!sk && ++*bucket < VCC_HTABLE_SIZE) {
+               sk = sk_head(&vcc_hash[*bucket]);
+               goto try_again;
+       }
        sk = (void *)1;
 out:
        *sock = sk;
@@ -96,7 +108,7 @@ out:
 
 static inline void *vcc_walk(struct vcc_state *state, loff_t l)
 {
-       return __vcc_walk(&state->sk, state->family, l) ?
+       return __vcc_walk(&state->sk, state->family, &state->bucket, l) ?
               state : NULL;
 }
 
@@ -207,9 +219,10 @@ static void vcc_info(struct seq_file *seq, struct atm_vcc *vcc)
                default:
                        seq_printf(seq, "%3d", vcc->sk->sk_family);
        }
-       seq_printf(seq, " %04lx  %5d %7d/%7d %7d/%7d\n", vcc->flags, vcc->sk->sk_err,
+       seq_printf(seq, " %04lx  %5d %7d/%7d %7d/%7d [%d] 0x%x\n", vcc->flags, vcc->sk->sk_err,
                atomic_read(&vcc->sk->sk_wmem_alloc),vcc->sk->sk_sndbuf,
-               atomic_read(&vcc->sk->sk_rmem_alloc),vcc->sk->sk_rcvbuf);
+               atomic_read(&vcc->sk->sk_rmem_alloc),vcc->sk->sk_rcvbuf,
+               atomic_read(&vcc->sk->sk_refcnt), vcc->sk->sk_hashent);
 }
 
 static void svc_info(struct seq_file *seq, struct atm_vcc *vcc)

diff --git a/net/atm/signaling.c b/net/atm/signaling.c
index fc92ff9ce7f1895b2d7847941bbec4765903327c..074fe5c7f86947dfecac807c04137fb4dd330684 100644 (file)
--- a/net/atm/signaling.c
+++ b/net/atm/signaling.c
@@ -216,6 +216,7 @@ static void sigd_close(struct atm_vcc *vcc)
 {
        struct hlist_node *node;
        struct sock *s;
+       int i;
 
        DPRINTK("sigd_close\n");
        sigd = NULL;
@@ -224,11 +225,15 @@ static void sigd_close(struct atm_vcc *vcc)
        skb_queue_purge(&vcc->sk->sk_receive_queue);
 
        read_lock(&vcc_sklist_lock);
-       sk_for_each(s, node, &vcc_sklist) {
-               struct atm_vcc *vcc = atm_sk(s);
+       for(i = 0; i < VCC_HTABLE_SIZE; ++i) {
+               struct hlist_head *head = &vcc_hash[i];
 
-               if (vcc->dev)
-                       purge_vcc(vcc);
+               sk_for_each(s, node, head) {
+                       struct atm_vcc *vcc = atm_sk(s);
+
+                       if (vcc->dev)
+                               purge_vcc(vcc);
+               }
        }
        read_unlock(&vcc_sklist_lock);
 }