staging/lustre/lnet: fix deadloop in ksocknal_push

ksocknal_push() should break the loop if it can't find matching peer

Signed-off-by: Liang Zhen <liang.zhen@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4423
Reviewed-on: http://review.whamcloud.com/10128
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Doug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: Isaac Huang <he.huang@intel.com>
Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
index d8bfcadd184a8bb94001b65619e63b6104e71e64..22f4cd0173c1530ee529c6cb9ac2fb6afbe5c9b5 100644 (file)
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
@@ -1874,52 +1874,51 @@ ksocknal_push_peer(ksock_peer_t *peer)
        }
 }
 
-static int
-ksocknal_push(lnet_ni_t *ni, lnet_process_id_t id)
+static int ksocknal_push(lnet_ni_t *ni, lnet_process_id_t id)
 {
-       ksock_peer_t *peer;
+       struct list_head *start;
+       struct list_head *end;
        struct list_head *tmp;
-       int index;
-       int i;
-       int j;
        int rc = -ENOENT;
+       unsigned int hsize = ksocknal_data.ksnd_peer_hash_size;
 
-       for (i = 0; i < ksocknal_data.ksnd_peer_hash_size; i++) {
-               for (j = 0; ; j++) {
-                       read_lock(&ksocknal_data.ksnd_global_lock);
+       if (id.nid == LNET_NID_ANY) {
+               start = &ksocknal_data.ksnd_peers[0];
+               end = &ksocknal_data.ksnd_peers[hsize - 1];
+       } else {
+               start = end = ksocknal_nid2peerlist(id.nid);
+       }
 
-                       index = 0;
-                       peer = NULL;
+       for (tmp = start; tmp <= end; tmp++) {
+               int peer_off; /* searching offset in peer hash table */
 
-                       list_for_each(tmp, &ksocknal_data.ksnd_peers[i]) {
-                               peer = list_entry(tmp, ksock_peer_t,
-                                                     ksnp_list);
+               for (peer_off = 0; ; peer_off++) {
+                       ksock_peer_t *peer;
+                       int i = 0;
 
+                       read_lock(&ksocknal_data.ksnd_global_lock);
+                       list_for_each_entry(peer, tmp, ksnp_list) {
                                if (!((id.nid == LNET_NID_ANY ||
                                       id.nid == peer->ksnp_id.nid) &&
                                      (id.pid == LNET_PID_ANY ||
-                                      id.pid == peer->ksnp_id.pid))) {
-                                       peer = NULL;
+                                      id.pid == peer->ksnp_id.pid)))
                                        continue;
-                               }
 
-                               if (index++ == j) {
+                               if (i++ == peer_off) {
                                        ksocknal_peer_addref(peer);
                                        break;
                                }
                        }
-
                        read_unlock(&ksocknal_data.ksnd_global_lock);
 
-                       if (peer != NULL) {
-                               rc = 0;
-                               ksocknal_push_peer(peer);
-                               ksocknal_peer_decref(peer);
-                       }
-               }
+                       if (i == 0) /* no match */
+                               break;
 
+                       rc = 0;
+                       ksocknal_push_peer(peer);
+                       ksocknal_peer_decref(peer);
+               }
        }
-
        return rc;
 }