X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Flnet%2Flib-me.c;h=1ec83db2e0a30a0cb45acd982574a1e694a62576;hb=3c580c93b8d3e94fac0ac2cf3cca2ff706c6497a;hp=d798b1944fcca957b71f31053a5f470d6c74ac22;hpb=ed22093b2d569fd0e93f35504580171114bf212d;p=fs%2Flustre-release.git diff --git a/lnet/lnet/lib-me.c b/lnet/lnet/lib-me.c index d798b19..1ec83db 100644 --- a/lnet/lnet/lib-me.c +++ b/lnet/lnet/lib-me.c @@ -15,17 +15,15 @@ * * You should have received a copy of the GNU General Public License * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ /* * 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/ @@ -48,7 +46,7 @@ * \param portal The portal table index where the ME should be attached. * \param match_id Specifies the match criteria for the process ID of * the requester. The constants LNET_PID_ANY and LNET_NID_ANY can be - * used to wildcard either of the identifiers in the lnet_process_id_t + * used to wildcard either of the identifiers in the struct lnet_process_id * structure. * \param match_bits,ignore_bits Specify the match criteria to apply * to the match bits in the incoming request. The ignore bits are used @@ -62,141 +60,61 @@ * \param pos Indicates whether the new ME should be prepended or * appended to the match list. Allowed constants: LNET_INS_BEFORE, * LNET_INS_AFTER. - * \param handle On successful returns, a handle to the newly created ME - * object is saved here. This handle can be used later in LNetMEInsert(), - * LNetMEUnlink(), or LNetMDAttach() functions. * - * \retval 0 On success. - * \retval -EINVAL If \a portal is invalid. - * \retval -ENOMEM If new ME object cannot be allocated. + * \retval A handle to the newly created ME is returned on success + * \retval ERR_PTR(-EINVAL) If \a portal is invalid. + * \retval ERR_PTR(-ENOMEM) If new ME object cannot be allocated. */ -int +struct lnet_me * LNetMEAttach(unsigned int portal, - lnet_process_id_t match_id, - __u64 match_bits, __u64 ignore_bits, - lnet_unlink_t unlink, lnet_ins_pos_t pos, - lnet_handle_me_t *handle) + struct lnet_process_id match_id, + __u64 match_bits, __u64 ignore_bits, + enum lnet_unlink unlink, enum lnet_ins_pos pos) { - 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 ERR_PTR(-EINVAL); - ptl = the_lnet.ln_portals[portal]; - rc = lnet_ptl_type_match(ptl, match_id, match_bits, ignore_bits); - if (!rc) - return -EPERM; + mtable = lnet_mt_of_attach(portal, match_id, + match_bits, ignore_bits, pos); + if (mtable == NULL) /* can't match portal type */ + return ERR_PTR(-EPERM); - me = lnet_me_alloc(); - if (me == NULL) - return -ENOMEM; + me = lnet_me_alloc(); + if (me == NULL) + return ERR_PTR(-ENOMEM); - LNET_LOCK(); + lnet_res_lock(mtable->mt_cpt); - me->me_portal = portal; - me->me_match_id = match_id; - me->me_match_bits = match_bits; - me->me_ignore_bits = ignore_bits; - me->me_unlink = unlink; - me->me_md = NULL; + me->me_portal = portal; + me->me_match_id = match_id; + me->me_match_bits = match_bits; + me->me_ignore_bits = ignore_bits; + 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); + me->me_cpt = mtable->mt_cpt; - if (pos == LNET_INS_AFTER) - cfs_list_add_tail(&me->me_list, head); - else - cfs_list_add(&me->me_list, head); + 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(); - - return 0; -} - -/** - * Create and a match entry and insert it before or after the ME pointed to by - * \a current_meh. The new ME is empty, i.e. not associated with a memory - * descriptor. LNetMDAttach() can be used to attach a MD to an empty ME. - * - * This function is identical to LNetMEAttach() except for the position - * where the new ME is inserted. - * - * \param current_meh A handle for a ME. The new ME will be inserted - * immediately before or immediately after this ME. - * \param match_id,match_bits,ignore_bits,unlink,pos,handle See the discussion - * for LNetMEAttach(). - * - * \retval 0 On success. - * \retval -ENOMEM If new ME object cannot be allocated. - * \retval -ENOENT If \a current_meh does not point to a valid match entry. - */ -int -LNetMEInsert(lnet_handle_me_t current_meh, - lnet_process_id_t match_id, - __u64 match_bits, __u64 ignore_bits, - 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; - - LASSERT (the_lnet.ln_init); - LASSERT (the_lnet.ln_refcount > 0); - - new_me = lnet_me_alloc(); - if (new_me == NULL) - return -ENOMEM; - - LNET_LOCK(); - - current_me = lnet_handle2me(¤t_meh); - if (current_me == NULL) { - lnet_me_free_locked(new_me); - - LNET_UNLOCK(); - 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; - } - - new_me->me_portal = current_me->me_portal; - new_me->me_match_id = match_id; - new_me->me_match_bits = match_bits; - new_me->me_ignore_bits = ignore_bits; - new_me->me_unlink = unlink; - new_me->me_md = NULL; - - lnet_res_lh_initialize(&the_lnet.ln_me_container, &new_me->me_lh); - - if (pos == LNET_INS_AFTER) - cfs_list_add(&new_me->me_list, ¤t_me->me_list); - else - cfs_list_add_tail(&new_me->me_list, ¤t_me->me_list); - - lnet_me2handle(handle, new_me); - - LNET_UNLOCK(); - - return 0; + lnet_res_unlock(mtable->mt_cpt); + return me; } +EXPORT_SYMBOL(LNetMEAttach); /** * Unlink a match entry from its match list. @@ -208,71 +126,68 @@ LNetMEInsert(lnet_handle_me_t current_meh, * * \param meh A handle for the ME to be unlinked. * - * \retval 0 On success. + * \retval 0 On success. * \retval -ENOENT If \a meh does not point to a valid ME. * \see LNetMDUnlink() for the discussion on delivering unlink event. */ -int -LNetMEUnlink(lnet_handle_me_t meh) +void +LNetMEUnlink(struct lnet_me *me) { - lnet_me_t *me; - lnet_libmd_t *md; - lnet_event_t ev; - - LASSERT (the_lnet.ln_init); - LASSERT (the_lnet.ln_refcount > 0); + struct lnet_libmd *md; + struct lnet_event ev; + int cpt; - LNET_LOCK(); + LASSERT(the_lnet.ln_refcount > 0); - me = lnet_handle2me(&meh); - if (me == NULL) { - LNET_UNLOCK(); - return -ENOENT; - } + cpt = me->me_cpt; + lnet_res_lock(cpt); - 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); } +EXPORT_SYMBOL(LNetMEUnlink); -/* call with LNET_LOCK please */ +/* call with lnet_res_lock please */ void -lnet_me_unlink(lnet_me_t *me) +lnet_me_unlink(struct lnet_me *me) { - cfs_list_del (&me->me_list); + list_del(&me->me_list); + + if (me->me_md != NULL) { + struct lnet_libmd *md = me->me_md; - if (me->me_md != NULL) { - me->me_md->md_me = NULL; - lnet_md_unlink(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) +lib_me_dump(struct lnet_me *me) { - CWARN("Match Entry %p ("LPX64")\n", me, - me->me_lh.lh_cookie); + CWARN("Match Entry %p (%#llx)\n", me, + me->me_lh.lh_cookie); - CWARN("\tMatch/Ignore\t= %016lx / %016lx\n", - me->me_match_bits, me->me_ignore_bits); + CWARN("\tMatch/Ignore\t= %016lx / %016lx\n", + me->me_match_bits, me->me_ignore_bits); - CWARN("\tMD\t= %p\n", me->md); - CWARN("\tprev\t= %p\n", - cfs_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)); + CWARN("\tMD\t= %p\n", me->md); + CWARN("\tprev\t= %p\n", + list_entry(me->me_list.prev, struct lnet_me, me_list)); + CWARN("\tnext\t= %p\n", + list_entry(me->me_list.next, struct lnet_me, me_list)); } #endif