X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Flnet%2Flib-me.c;h=a87cf74e0abefd03e39b65d92051f21825bb5461;hb=e35b7751f49fb7044955e3fa65de5e1a6d638ca0;hp=8c9faabf6ff3e016854aa59fb3cbbebc5cd820d8;hpb=72057a3af19ee02d9a686bd7e7d074917e381310;p=fs%2Flustre-release.git diff --git a/lnet/lnet/lib-me.c b/lnet/lnet/lib-me.c index 8c9faab..a87cf74 100644 --- a/lnet/lnet/lib-me.c +++ b/lnet/lnet/lib-me.c @@ -46,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 @@ -60,20 +60,16 @@ * \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, + struct lnet_process_id match_id, __u64 match_bits, __u64 ignore_bits, - lnet_unlink_t unlink, lnet_ins_pos_t pos, - lnet_handle_me_t *handle) + enum lnet_unlink unlink, enum lnet_ins_pos pos) { struct lnet_match_table *mtable; struct lnet_me *me; @@ -82,16 +78,19 @@ LNetMEAttach(unsigned int portal, LASSERT(the_lnet.ln_refcount > 0); if ((int)portal >= the_lnet.ln_nportals) - return -EINVAL; + return ERR_PTR(-EINVAL); mtable = lnet_mt_of_attach(portal, match_id, match_bits, ignore_bits, pos); if (mtable == NULL) /* can't match portal type */ - return -EPERM; + return ERR_PTR(-EPERM); - me = lnet_me_alloc(); - if (me == NULL) - return -ENOMEM; + me = kmem_cache_alloc(lnet_mes_cachep, GFP_NOFS | __GFP_ZERO); + if (me == NULL) { + CDEBUG(D_MALLOC, "failed to allocate 'me'\n"); + return ERR_PTR(-ENOMEM); + } + CDEBUG(D_MALLOC, "slab-alloced 'me' at %p.\n", me); lnet_res_lock(mtable->mt_cpt); @@ -102,8 +101,8 @@ LNetMEAttach(unsigned int portal, me->me_unlink = unlink; me->me_md = NULL; - lnet_res_lh_initialize(the_lnet.ln_me_containers[mtable->mt_cpt], - &me->me_lh); + me->me_cpt = mtable->mt_cpt; + if (ignore_bits != 0) head = &mtable->mt_mhash[LNET_MT_HASH_IGNORE]; else @@ -115,97 +114,12 @@ LNetMEAttach(unsigned int portal, else list_add(&me->me_list, head); - lnet_me2handle(handle, me); - lnet_res_unlock(mtable->mt_cpt); - return 0; + return me; } EXPORT_SYMBOL(LNetMEAttach); /** - * 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) -{ - struct lnet_me *current_me; - struct lnet_me *new_me; - struct lnet_portal *ptl; - int cpt; - - LASSERT(the_lnet.ln_refcount > 0); - - if (pos == LNET_INS_LOCAL) - return -EPERM; - - new_me = lnet_me_alloc(); - if (new_me == NULL) - return -ENOMEM; - - cpt = lnet_cpt_of_cookie(current_meh.cookie); - - lnet_res_lock(cpt); - - current_me = lnet_handle2me(¤t_meh); - if (current_me == NULL) { - lnet_me_free(new_me); - - 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(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; - 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_containers[cpt], &new_me->me_lh); - - if (pos == LNET_INS_AFTER) - list_add(&new_me->me_list, ¤t_me->me_list); - else - list_add_tail(&new_me->me_list, ¤t_me->me_list); - - lnet_me2handle(handle, new_me); - - lnet_res_unlock(cpt); - - return 0; -} -EXPORT_SYMBOL(LNetMEInsert); - -/** * Unlink a match entry from its match list. * * This operation also releases any resources associated with the ME. If a @@ -219,62 +133,54 @@ EXPORT_SYMBOL(LNetMEInsert); * \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; - int cpt; + struct lnet_libmd *md; + struct lnet_event ev; + int cpt; LASSERT(the_lnet.ln_refcount > 0); - cpt = lnet_cpt_of_cookie(meh.cookie); + cpt = me->me_cpt; lnet_res_lock(cpt); - me = lnet_handle2me(&meh); - if (me == NULL) { - lnet_res_unlock(cpt); - return -ENOENT; - } - md = me->me_md; if (md != NULL) { md->md_flags |= LNET_MD_FLAG_ABORTED; - if (md->md_eq != NULL && md->md_refcount == 0) { + if (md->md_handler && md->md_refcount == 0) { lnet_build_unlink_event(md, &ev); - lnet_eq_enqueue_event(md->md_eq, &ev); + md->md_handler(&ev); } } lnet_me_unlink(me); lnet_res_unlock(cpt); - return 0; } EXPORT_SYMBOL(LNetMEUnlink); /* call with lnet_res_lock please */ void -lnet_me_unlink(lnet_me_t *me) +lnet_me_unlink(struct lnet_me *me) { list_del(&me->me_list); if (me->me_md != NULL) { - lnet_libmd_t *md = me->me_md; + struct lnet_libmd *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(me); + CDEBUG(D_MALLOC, "slab-freed 'me' at %p.\n", me); + kmem_cache_free(lnet_mes_cachep, me); } #if 0 static void -lib_me_dump(lnet_me_t *me) +lib_me_dump(struct lnet_me *me) { CWARN("Match Entry %p (%#llx)\n", me, me->me_lh.lh_cookie); @@ -284,8 +190,8 @@ lib_me_dump(lnet_me_t *me) CWARN("\tMD\t= %p\n", me->md); CWARN("\tprev\t= %p\n", - list_entry(me->me_list.prev, lnet_me_t, me_list)); + list_entry(me->me_list.prev, struct lnet_me, me_list)); CWARN("\tnext\t= %p\n", - list_entry(me->me_list.next, lnet_me_t, me_list)); + list_entry(me->me_list.next, struct lnet_me, me_list)); } #endif