LU-5568 lnet: fix kernel crash when network failed to start

[fs/lustre-release.git] / lnet / lnet / lib-me.c

diff --git a/lnet/lnet/lib-me.c b/lnet/lnet/lib-me.c
index f203e30..cc36df1 100644 (file)
--- a/lnet/lnet/lib-me.c
+++ b/lnet/lnet/lib-me.c
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -79,7 +81,7 @@ LNetMEAttach(unsigned int portal,
 {
        struct lnet_match_table *mtable;
        struct lnet_me          *me;
-       cfs_list_t              *head;
+       struct list_head        *head;
 
        LASSERT(the_lnet.ln_init);
        LASSERT(the_lnet.ln_refcount > 0);
@@ -107,12 +109,16 @@ LNetMEAttach(unsigned int portal,
 
        lnet_res_lh_initialize(the_lnet.ln_me_containers[mtable->mt_cpt],
                               &me->me_lh);
-       head = lnet_mt_match_head(mtable, match_id, match_bits);
+       if (ignore_bits != 0)
+               head = &mtable->mt_mhash[LNET_MT_HASH_IGNORE];
+       else
+               head = lnet_mt_match_head(mtable, match_id, match_bits);
 
+       me->me_pos = head - &mtable->mt_mhash[0];
        if (pos == LNET_INS_AFTER || pos == LNET_INS_LOCAL)
-               cfs_list_add_tail(&me->me_list, head);
+               list_add_tail(&me->me_list, head);
        else
-               cfs_list_add(&me->me_list, head);
+               list_add(&me->me_list, head);
 
        lnet_me2handle(handle, me);
 
@@ -182,6 +188,7 @@ LNetMEInsert(lnet_handle_me_t current_meh,
                return -EPERM;
         }
 
+       new_me->me_pos = current_me->me_pos;
         new_me->me_portal = current_me->me_portal;
         new_me->me_match_id = match_id;
         new_me->me_match_bits = match_bits;
@@ -191,12 +198,12 @@ LNetMEInsert(lnet_handle_me_t current_meh,
 
        lnet_res_lh_initialize(the_lnet.ln_me_containers[cpt], &new_me->me_lh);
 
-        if (pos == LNET_INS_AFTER)
-                cfs_list_add(&new_me->me_list, &current_me->me_list);
-        else
-                cfs_list_add_tail(&new_me->me_list, &current_me->me_list);
+       if (pos == LNET_INS_AFTER)
+               list_add(&new_me->me_list, &current_me->me_list);
+       else
+               list_add_tail(&new_me->me_list, &current_me->me_list);
 
-        lnet_me2handle(handle, new_me);
+       lnet_me2handle(handle, new_me);
 
        lnet_res_unlock(cpt);
 
@@ -238,12 +245,13 @@ LNetMEUnlink(lnet_handle_me_t meh)
                 return -ENOENT;
         }
 
-        md = me->me_md;
-        if (md != NULL &&
-            md->md_eq != NULL &&
-            md->md_refcount == 0) {
-                lnet_build_unlink_event(md, &ev);
-               lnet_eq_enqueue_event(md->md_eq, &ev);
+       md = me->me_md;
+       if (md != NULL) {
+               md->md_flags |= LNET_MD_FLAG_ABORTED;
+               if (md->md_eq != NULL && md->md_refcount == 0) {
+                       lnet_build_unlink_event(md, &ev);
+                       lnet_eq_enqueue_event(md->md_eq, &ev);
+               }
        }
 
        lnet_me_unlink(me);
@@ -257,7 +265,7 @@ EXPORT_SYMBOL(LNetMEUnlink);
 void
 lnet_me_unlink(lnet_me_t *me)
 {
-       cfs_list_del(&me->me_list);
+       list_del(&me->me_list);
 
        if (me->me_md != NULL) {
                lnet_libmd_t *md = me->me_md;
@@ -283,8 +291,8 @@ lib_me_dump(lnet_me_t *me)
 
         CWARN("\tMD\t= %p\n", me->md);
         CWARN("\tprev\t= %p\n",
-              cfs_list_entry(me->me_list.prev, lnet_me_t, me_list));
+             list_entry(me->me_list.prev, lnet_me_t, me_list));
         CWARN("\tnext\t= %p\n",
-              cfs_list_entry(me->me_list.next, lnet_me_t, me_list));
+             list_entry(me->me_list.next, lnet_me_t, me_list));
 }
 #endif