X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Flib-me.c;h=9f39a8718c723dc2e3ba98b0d20d1cfa441babba;hp=d798b1944fcca957b71f31053a5f470d6c74ac22;hb=703ebd87c1705810b8f8eb0f8f25ebef11bde8fc;hpb=ed22093b2d569fd0e93f35504580171114bf212d

diff --git a/lnet/lnet/lib-me.c b/lnet/lnet/lib-me.c
index d798b19..9f39a87 100644
--- 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, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -77,27 +79,25 @@ LNetMEAttach(unsigned int portal,
              lnet_unlink_t unlink, lnet_ins_pos_t pos,
              lnet_handle_me_t *handle)
 {
-        lnet_me_t        *me;
-        lnet_portal_t    *ptl;
-        cfs_list_t       *head;
-        int               rc;
+	struct lnet_match_table *mtable;
+	struct lnet_me		*me;
+	struct list_head	*head;
 
-        LASSERT (the_lnet.ln_init);
-        LASSERT (the_lnet.ln_refcount > 0);
+	LASSERT(the_lnet.ln_refcount > 0);
 
-        if ((int)portal >= the_lnet.ln_nportals)
-                return -EINVAL;
+	if ((int)portal >= the_lnet.ln_nportals)
+		return -EINVAL;
 
-	ptl = the_lnet.ln_portals[portal];
-	rc = lnet_ptl_type_match(ptl, match_id, match_bits, ignore_bits);
-	if (!rc)
+	mtable = lnet_mt_of_attach(portal, match_id,
+				   match_bits, ignore_bits, pos);
+	if (mtable == NULL) /* can't match portal type */
 		return -EPERM;
 
-        me = lnet_me_alloc();
-        if (me == NULL)
-                return -ENOMEM;
+	me = lnet_me_alloc();
+	if (me == NULL)
+		return -ENOMEM;
 
-        LNET_LOCK();
+	lnet_res_lock(mtable->mt_cpt);
 
         me->me_portal = portal;
         me->me_match_id = match_id;
@@ -106,21 +106,25 @@ LNetMEAttach(unsigned int portal,
         me->me_unlink = unlink;
         me->me_md = NULL;
 
-	lnet_res_lh_initialize(&the_lnet.ln_me_container, &me->me_lh);
-	head = lnet_ptl_me_head(portal, match_id, match_bits);
-        LASSERT (head != NULL);
-
-        if (pos == LNET_INS_AFTER)
-                cfs_list_add_tail(&me->me_list, head);
-        else
-                cfs_list_add(&me->me_list, head);
+	lnet_res_lh_initialize(the_lnet.ln_me_containers[mtable->mt_cpt],
+			       &me->me_lh);
+	if (ignore_bits != 0)
+		head = &mtable->mt_mhash[LNET_MT_HASH_IGNORE];
+	else
+		head = lnet_mt_match_head(mtable, match_id, match_bits);
 
-        lnet_me2handle(handle, me);
+	me->me_pos = head - &mtable->mt_mhash[0];
+	if (pos == LNET_INS_AFTER || pos == LNET_INS_LOCAL)
+		list_add_tail(&me->me_list, head);
+	else
+		list_add(&me->me_list, head);
 
-        LNET_UNLOCK();
+	lnet_me2handle(handle, me);
 
-        return 0;
+	lnet_res_unlock(mtable->mt_cpt);
+	return 0;
 }
+EXPORT_SYMBOL(LNetMEAttach);
 
 /**
  * Create and a match entry and insert it before or after the ME pointed to by
@@ -146,37 +150,43 @@ LNetMEInsert(lnet_handle_me_t current_meh,
              lnet_unlink_t unlink, lnet_ins_pos_t pos,
              lnet_handle_me_t *handle)
 {
-        lnet_me_t     *current_me;
-        lnet_me_t     *new_me;
-        lnet_portal_t *ptl;
+	struct lnet_me		*current_me;
+	struct lnet_me		*new_me;
+	struct lnet_portal	*ptl;
+	int			cpt;
+
+	LASSERT(the_lnet.ln_refcount > 0);
 
-        LASSERT (the_lnet.ln_init);
-        LASSERT (the_lnet.ln_refcount > 0);
+	if (pos == LNET_INS_LOCAL)
+		return -EPERM;
 
-        new_me = lnet_me_alloc();
-        if (new_me == NULL)
-                return -ENOMEM;
+	new_me = lnet_me_alloc();
+	if (new_me == NULL)
+		return -ENOMEM;
 
-        LNET_LOCK();
+	cpt = lnet_cpt_of_cookie(current_meh.cookie);
 
-        current_me = lnet_handle2me(&current_meh);
-        if (current_me == NULL) {
-		lnet_me_free_locked(new_me);
+	lnet_res_lock(cpt);
 
-                LNET_UNLOCK();
-                return -ENOENT;
-        }
+	current_me = lnet_handle2me(&current_meh);
+	if (current_me == NULL) {
+		lnet_me_free(new_me);
 
-        LASSERT (current_me->me_portal < the_lnet.ln_nportals);
+		lnet_res_unlock(cpt);
+		return -ENOENT;
+	}
+
+	LASSERT(current_me->me_portal < the_lnet.ln_nportals);
 
 	ptl = the_lnet.ln_portals[current_me->me_portal];
 	if (lnet_ptl_is_unique(ptl)) {
-                /* nosense to insertion on unique portal */
-		lnet_me_free_locked(new_me);
-                LNET_UNLOCK();
-                return -EPERM;
+		/* nosense to insertion on unique portal */
+		lnet_me_free(new_me);
+		lnet_res_unlock(cpt);
+		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;
@@ -184,19 +194,20 @@ LNetMEInsert(lnet_handle_me_t current_meh,
         new_me->me_unlink = unlink;
         new_me->me_md = NULL;
 
-	lnet_res_lh_initialize(&the_lnet.ln_me_container, &new_me->me_lh);
+	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_UNLOCK();
+	lnet_res_unlock(cpt);
 
-        return 0;
+	return 0;
 }
+EXPORT_SYMBOL(LNetMEInsert);
 
 /**
  * Unlink a match entry from its match list.
@@ -215,55 +226,61 @@ LNetMEInsert(lnet_handle_me_t current_meh,
 int
 LNetMEUnlink(lnet_handle_me_t meh)
 {
-        lnet_me_t    *me;
-        lnet_libmd_t *md;
-        lnet_event_t  ev;
+	lnet_me_t	*me;
+	lnet_libmd_t	*md;
+	lnet_event_t	ev;
+	int		cpt;
 
-        LASSERT (the_lnet.ln_init);
-        LASSERT (the_lnet.ln_refcount > 0);
+	LASSERT(the_lnet.ln_refcount > 0);
 
-        LNET_LOCK();
+	cpt = lnet_cpt_of_cookie(meh.cookie);
+	lnet_res_lock(cpt);
 
-        me = lnet_handle2me(&meh);
-        if (me == NULL) {
-                LNET_UNLOCK();
+	me = lnet_handle2me(&meh);
+	if (me == NULL) {
+		lnet_res_unlock(cpt);
                 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);
+	lnet_me_unlink(me);
 
-        LNET_UNLOCK();
-        return 0;
+	lnet_res_unlock(cpt);
+	return 0;
 }
+EXPORT_SYMBOL(LNetMEUnlink);
 
-/* call with LNET_LOCK please */
+/* call with lnet_res_lock please */
 void
 lnet_me_unlink(lnet_me_t *me)
 {
-        cfs_list_del (&me->me_list);
+	list_del(&me->me_list);
 
-        if (me->me_md != NULL) {
-                me->me_md->md_me = NULL;
-                lnet_md_unlink(me->me_md);
-        }
+	if (me->me_md != NULL) {
+		lnet_libmd_t *md = me->me_md;
+
+		/* detach MD from portal of this ME */
+		lnet_ptl_detach_md(me, md);
+		lnet_md_unlink(md);
+	}
 
 	lnet_res_lh_invalidate(&me->me_lh);
-	lnet_me_free_locked(me);
+	lnet_me_free(me);
 }
 
 #if 0
 static void
 lib_me_dump(lnet_me_t *me)
 {
-        CWARN("Match Entry %p ("LPX64")\n", me,
+	CWARN("Match Entry %p (%#llx)\n", me,
               me->me_lh.lh_cookie);
 
         CWARN("\tMatch/Ignore\t= %016lx / %016lx\n",
@@ -271,8 +288,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