X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Flib-me.c;h=fb72c6d7d1d8d8938906cde8b9234b4905d136ed;hp=e3c46ea154b55cf0c075423e28f935867f1989cd;hb=05f5c4ca167911c60e4a72beb411306363df877d;hpb=090c677210ee2946d99c71412e4ff762bb300f4f diff --git a/lnet/lnet/lib-me.c b/lnet/lnet/lib-me.c index e3c46ea..fb72c6d 100644 --- a/lnet/lnet/lib-me.c +++ b/lnet/lnet/lib-me.c @@ -5,9 +5,8 @@ * Match Entry management routines * * Copyright (c) 2001-2003 Cluster File Systems, Inc. - * Copyright (c) 2001-2002 Sandia National Laboratories * - * This file is part of Lustre, http://www.sf.net/projects/lustre/ + * This file is part of Lustre, http://www.lustre.org * * Lustre is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -23,205 +22,152 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef __KERNEL__ -# include -#else -# define DEBUG_SUBSYSTEM S_PORTALS -# include -#endif - -#include -#include +#define DEBUG_SUBSYSTEM S_LNET -static void lib_me_dump(nal_cb_t * nal, lib_me_t * me); +#include -int do_PtlMEAttach(nal_cb_t * nal, void *private, void *v_args, void *v_ret) +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) { - PtlMEAttach_in *args = v_args; - PtlMEAttach_out *ret = v_ret; - lib_ni_t *ni = &nal->ni; - lib_ptl_t *tbl = &ni->tbl; - unsigned long flags; - lib_me_t *me; - - if (args->index_in >= tbl->size) - return ret->rc = PTL_PT_INDEX_INVALID; + lnet_me_t *me; - /* Should check for valid matchid, but not yet */ - if (0) - return ret->rc = PTL_PROCESS_INVALID; + LASSERT (the_lnet.ln_init); + LASSERT (the_lnet.ln_refcount > 0); + + if (portal >= the_lnet.ln_nportals) + return -EINVAL; - me = lib_me_alloc (nal); + me = lnet_me_alloc(); if (me == NULL) - return (ret->rc = PTL_NO_SPACE); + return -ENOMEM; - state_lock(nal, &flags); + LNET_LOCK(); - me->match_id = args->match_id_in; - me->match_bits = args->match_bits_in; - me->ignore_bits = args->ignore_bits_in; - me->unlink = args->unlink_in; - 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; - lib_initialise_handle (nal, &me->me_lh, PTL_COOKIE_TYPE_ME); + lnet_initialise_handle (&me->me_lh, LNET_COOKIE_TYPE_ME); - if (args->position_in == PTL_INS_AFTER) - list_add_tail(&me->me_list, &(tbl->tbl[args->index_in])); + if (pos == LNET_INS_AFTER) + list_add_tail(&me->me_list, &(the_lnet.ln_portals[portal].ptl_ml)); else - list_add(&me->me_list, &(tbl->tbl[args->index_in])); + list_add(&me->me_list, &(the_lnet.ln_portals[portal].ptl_ml)); - ptl_me2handle(&ret->handle_out, me); + lnet_me2handle(handle, me); - state_unlock(nal, &flags); + LNET_UNLOCK(); - return ret->rc = PTL_OK; + return 0; } -int do_PtlMEInsert(nal_cb_t * nal, void *private, void *v_args, void *v_ret) +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) { - PtlMEInsert_in *args = v_args; - PtlMEInsert_out *ret = v_ret; - unsigned long flags; - lib_me_t *me; - lib_me_t *new; + lnet_me_t *current_me; + lnet_me_t *new_me; - new = lib_me_alloc (nal); - if (new == NULL) - return (ret->rc = PTL_NO_SPACE); + LASSERT (the_lnet.ln_init); + LASSERT (the_lnet.ln_refcount > 0); + + new_me = lnet_me_alloc(); + if (new_me == NULL) + return -ENOMEM; - /* Should check for valid matchid, but not yet */ + LNET_LOCK(); - state_lock(nal, &flags); + current_me = lnet_handle2me(¤t_meh); + if (current_me == NULL) { + lnet_me_free (new_me); - me = ptl_handle2me(&args->current_in, nal); - if (me == NULL) { - lib_me_free (nal, new); - - state_unlock (nal, &flags); - return (ret->rc = PTL_ME_INVALID); + LNET_UNLOCK(); + return -ENOENT; } - new->match_id = args->match_id_in; - new->match_bits = args->match_bits_in; - new->ignore_bits = args->ignore_bits_in; - new->unlink = args->unlink_in; - new->md = NULL; + 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; - lib_initialise_handle (nal, &new->me_lh, PTL_COOKIE_TYPE_ME); + lnet_initialise_handle (&new_me->me_lh, LNET_COOKIE_TYPE_ME); - if (args->position_in == PTL_INS_AFTER) - list_add_tail(&new->me_list, &me->me_list); + if (pos == LNET_INS_AFTER) + list_add_tail(&new_me->me_list, ¤t_me->me_list); else - list_add(&new->me_list, &me->me_list); + list_add(&new_me->me_list, ¤t_me->me_list); - ptl_me2handle(&ret->handle_out, new); + lnet_me2handle(handle, new_me); - state_unlock(nal, &flags); + LNET_UNLOCK(); - return ret->rc = PTL_OK; + return 0; } -int do_PtlMEUnlink(nal_cb_t * nal, void *private, void *v_args, void *v_ret) +int +LNetMEUnlink(lnet_handle_me_t meh) { - PtlMEUnlink_in *args = v_args; - PtlMEUnlink_out *ret = v_ret; - unsigned long flags; - lib_me_t *me; + lnet_me_t *me; + int rc; - state_lock(nal, &flags); + LASSERT (the_lnet.ln_init); + LASSERT (the_lnet.ln_refcount > 0); + + LNET_LOCK(); - me = ptl_handle2me(&args->current_in, nal); + me = lnet_handle2me(&meh); if (me == NULL) { - ret->rc = PTL_ME_INVALID; + rc = -ENOENT; } else { - lib_me_unlink(nal, me); - ret->rc = PTL_OK; + lnet_me_unlink(me); + rc = 0; } - state_unlock(nal, &flags); + LNET_UNLOCK(); - return (ret->rc); + return (rc); } -/* call with state_lock please */ -void lib_me_unlink(nal_cb_t *nal, lib_me_t *me) +/* call with LNET_LOCK please */ +void +lnet_me_unlink(lnet_me_t *me) { - lib_ni_t *ni = &nal->ni; - - if (ni->debug & PTL_DEBUG_UNLINK) { - ptl_handle_any_t handle; - ptl_me2handle(&handle, me); - } - list_del (&me->me_list); - if (me->md) { - me->md->me = NULL; - lib_md_unlink(nal, me->md); - } - - lib_invalidate_handle (nal, &me->me_lh); - lib_me_free(nal, me); -} - -int do_PtlTblDump(nal_cb_t * nal, void *private, void *v_args, void *v_ret) -{ - PtlTblDump_in *args = v_args; - PtlTblDump_out *ret = v_ret; - lib_ptl_t *tbl = &nal->ni.tbl; - ptl_handle_any_t handle; - struct list_head *tmp; - unsigned long flags; - - if (args->index_in < 0 || args->index_in >= tbl->size) - return ret->rc = PTL_PT_INDEX_INVALID; - - nal->cb_printf(nal, "Portal table index %d\n", args->index_in); - - state_lock(nal, &flags); - list_for_each(tmp, &(tbl->tbl[args->index_in])) { - lib_me_t *me = list_entry(tmp, lib_me_t, me_list); - ptl_me2handle(&handle, me); - lib_me_dump(nal, me); - } - state_unlock(nal, &flags); - - return ret->rc = PTL_OK; -} - -int do_PtlMEDump(nal_cb_t * nal, void *private, void *v_args, void *v_ret) -{ - PtlMEDump_in *args = v_args; - PtlMEDump_out *ret = v_ret; - lib_me_t *me; - unsigned long flags; - - state_lock(nal, &flags); - - me = ptl_handle2me(&args->current_in, nal); - if (me == NULL) { - ret->rc = PTL_ME_INVALID; - } else { - lib_me_dump(nal, me); - ret->rc = PTL_OK; + if (me->me_md) { + me->me_md->md_me = NULL; + lnet_md_unlink(me->me_md); } - state_unlock(nal, &flags); - - return ret->rc; + lnet_invalidate_handle (&me->me_lh); + lnet_me_free(me); } -static void lib_me_dump(nal_cb_t * nal, lib_me_t * me) +#if 0 +static void +lib_me_dump(lnet_me_t *me) { - nal->cb_printf(nal, "Match Entry %p ("LPX64")\n", me, - me->me_lh.lh_cookie); + CWARN("Match Entry %p ("LPX64")\n", me, + me->me_lh.lh_cookie); - nal->cb_printf(nal, "\tMatch/Ignore\t= %016lx / %016lx\n", - me->match_bits, me->ignore_bits); + CWARN("\tMatch/Ignore\t= %016lx / %016lx\n", + me->me_match_bits, me->me_ignore_bits); - nal->cb_printf(nal, "\tMD\t= %p\n", me->md); - nal->cb_printf(nal, "\tprev\t= %p\n", - list_entry(me->me_list.prev, lib_me_t, me_list)); - nal->cb_printf(nal, "\tnext\t= %p\n", - list_entry(me->me_list.next, lib_me_t, me_list)); + CWARN("\tMD\t= %p\n", me->md); + CWARN("\tprev\t= %p\n", + list_entry(me->me_list.prev, lnet_me_t, me_list)); + CWARN("\tnext\t= %p\n", + list_entry(me->me_list.next, lnet_me_t, me_list)); } +#endif