X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Flnet%2Flib-me.c;h=1a1d9b1bdb671ce8f5842f46ea29a5da2bc63cbd;hb=f6d63067e1ec00009b9da5cdb263fe14e7e503e1;hp=df33c83d0ba352bda161a3627bf3449c4ebf80e3;hpb=e531dc437c56a08a65de9074a511faa55184712b;p=fs%2Flustre-release.git diff --git a/lnet/lnet/lib-me.c b/lnet/lnet/lib-me.c index df33c83..1a1d9b1 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 @@ -66,22 +64,21 @@ * object is saved here. This handle can be used later in LNetMEInsert(), * LNetMEUnlink(), or LNetMDAttach() functions. * - * \retval 0 On success. + * \retval 0 On success. * \retval -EINVAL If \a portal is invalid. * \retval -ENOMEM If new ME object cannot be allocated. */ int 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, + struct lnet_handle_me *handle) { 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); if ((int)portal >= the_lnet.ln_nportals) @@ -98,27 +95,32 @@ LNetMEAttach(unsigned int portal, 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_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); 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 @@ -133,23 +135,22 @@ LNetMEAttach(unsigned int portal, * \param match_id,match_bits,ignore_bits,unlink,pos,handle See the discussion * for LNetMEAttach(). * - * \retval 0 On success. + * \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) +LNetMEInsert(struct lnet_handle_me current_meh, + struct lnet_process_id match_id, + __u64 match_bits, __u64 ignore_bits, + enum lnet_unlink unlink, enum lnet_ins_pos pos, + struct lnet_handle_me *handle) { struct lnet_me *current_me; struct lnet_me *new_me; struct lnet_portal *ptl; int cpt; - LASSERT(the_lnet.ln_init); LASSERT(the_lnet.ln_refcount > 0); if (pos == LNET_INS_LOCAL) @@ -165,7 +166,7 @@ LNetMEInsert(lnet_handle_me_t current_meh, current_me = lnet_handle2me(¤t_meh); if (current_me == NULL) { - lnet_me_free_locked(new_me); + lnet_me_free(new_me); lnet_res_unlock(cpt); return -ENOENT; @@ -176,31 +177,33 @@ LNetMEInsert(lnet_handle_me_t current_meh, 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_me_free(new_me); lnet_res_unlock(cpt); 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; + 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) - cfs_list_add(&new_me->me_list, ¤t_me->me_list); - else - cfs_list_add_tail(&new_me->me_list, ¤t_me->me_list); + 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_me2handle(handle, new_me); lnet_res_unlock(cpt); return 0; } +EXPORT_SYMBOL(LNetMEInsert); /** * Unlink a match entry from its match list. @@ -212,19 +215,18 @@ 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) +LNetMEUnlink(struct lnet_handle_me meh) { - lnet_me_t *me; - lnet_libmd_t *md; - lnet_event_t ev; - int cpt; + struct lnet_me *me; + struct lnet_libmd *md; + struct lnet_event ev; + int cpt; - LASSERT(the_lnet.ln_init); LASSERT(the_lnet.ln_refcount > 0); cpt = lnet_cpt_of_cookie(meh.cookie); @@ -233,15 +235,16 @@ LNetMEUnlink(lnet_handle_me_t meh) 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); + 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) { + lnet_build_unlink_event(md, &ev); + lnet_eq_enqueue_event(md->md_eq, &ev); + } } lnet_me_unlink(me); @@ -249,15 +252,16 @@ LNetMEUnlink(lnet_handle_me_t meh) 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) { - cfs_list_del(&me->me_list); + 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); @@ -265,23 +269,23 @@ lnet_me_unlink(lnet_me_t *me) } 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