X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Flib-md.c;h=137299cce8561b8a0101289c13acc0ff06f048b0;hp=1d5eb7a846643ea5c13bd6b1fba36d127af4612a;hb=b9bad9bd7d1c3271df916ee62091106e3f3c98b7;hpb=9e78291e0f1f0b12472d6a0b15eaf1aec8076ca1 diff --git a/lnet/lnet/lib-md.c b/lnet/lnet/lib-md.c index 1d5eb7a..137299c 100644 --- a/lnet/lnet/lib-md.c +++ b/lnet/lnet/lib-md.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,7 +24,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -62,7 +60,7 @@ lnet_md_unlink(lnet_libmd_t *md) } /* ensure all future handle lookups fail */ - lnet_invalidate_handle(&md->md_lh); + lnet_res_lh_invalidate(&md->md_lh); } if (md->md_refcount != 0) { @@ -77,9 +75,9 @@ lnet_md_unlink(lnet_libmd_t *md) LASSERT (md->md_eq->eq_refcount >= 0); } - LASSERT (!list_empty(&md->md_list)); - list_del_init (&md->md_list); - lnet_md_free(md); + LASSERT (!cfs_list_empty(&md->md_list)); + cfs_list_del_init (&md->md_list); + lnet_md_free_locked(md); } /* must be called with LNET_LOCK held */ @@ -186,11 +184,11 @@ lib_md_build(lnet_libmd_t *lmd, lnet_md_t *umd, int unlink) eq->eq_refcount++; /* It's good; let handle2md succeed and add to active mds */ - lnet_initialise_handle (&lmd->md_lh, LNET_COOKIE_TYPE_MD); - LASSERT (list_empty(&lmd->md_list)); - list_add (&lmd->md_list, &the_lnet.ln_active_mds); + lnet_res_lh_initialize(&the_lnet.ln_md_container, &lmd->md_lh); + LASSERT(cfs_list_empty(&lmd->md_list)); + cfs_list_add(&lmd->md_list, &the_lnet.ln_md_container.rec_active); - return 0; + return 0; } /* must be called with LNET_LOCK held */ @@ -215,8 +213,9 @@ lnet_md_deconstruct(lnet_libmd_t *lmd, lnet_md_t *umd) int lnet_md_validate(lnet_md_t *umd) { - if (umd->start == NULL) { - CERROR("MD start pointer can not be NULL\n"); + if (umd->start == NULL && umd->length != 0) { + CERROR("MD start pointer can not be NULL with length %u\n", + umd->length); return -EINVAL; } @@ -230,6 +229,31 @@ lnet_md_validate(lnet_md_t *umd) return 0; } +/** + * Create a memory descriptor and attach it to a ME + * + * \param meh A handle for a ME to associate the new MD with. + * \param umd Provides initial values for the user-visible parts of a MD. + * Other than its use for initialization, there is no linkage between this + * structure and the MD maintained by the LNet. + * \param unlink A flag to indicate whether the MD is automatically unlinked + * when it becomes inactive, either because the operation threshold drops to + * zero or because the available memory becomes less than \a umd.max_size. + * (Note that the check for unlinking a MD only occurs after the completion + * of a successful operation on the MD.) The value LNET_UNLINK enables auto + * unlinking; the value LNET_RETAIN disables it. + * \param handle On successful returns, a handle to the newly created MD is + * saved here. This handle can be used later in LNetMDUnlink(). + * + * \retval 0 On success. + * \retval -EINVAL If \a umd is not valid. + * \retval -ENOMEM If new MD cannot be allocated. + * \retval -ENOENT Either \a meh or \a umd.eq_handle does not point to a + * valid object. Note that it's OK to supply a NULL \a umd.eq_handle by + * calling LNetInvalidateHandle() on it. + * \retval -EBUSY If the ME pointed to by \a meh is already associated with + * a MD. + */ int LNetMDAttach(lnet_handle_me_t meh, lnet_md_t umd, lnet_unlink_t unlink, lnet_handle_md_t *handle) @@ -263,7 +287,7 @@ LNetMDAttach(lnet_handle_me_t meh, lnet_md_t umd, } else { rc = lib_md_build(md, &umd, unlink); if (rc == 0) { - the_lnet.ln_portals[me->me_portal].ptl_ml_version++; + the_lnet.ln_portals[me->me_portal]->ptl_ml_version++; me->me_md = md; md->md_me = me; @@ -278,12 +302,28 @@ LNetMDAttach(lnet_handle_me_t meh, lnet_md_t umd, } } - lnet_md_free (md); + lnet_md_free_locked(md); LNET_UNLOCK(); return (rc); } +/** + * Create a "free floating" memory descriptor - a MD that is not associated + * with a ME. Such MDs are usually used in LNetPut() and LNetGet() operations. + * + * \param umd,unlink See the discussion for LNetMDAttach(). + * \param handle On successful returns, a handle to the newly created MD is + * saved here. This handle can be used later in LNetMDUnlink(), LNetPut(), + * and LNetGet() operations. + * + * \retval 0 On success. + * \retval -EINVAL If \a umd is not valid. + * \retval -ENOMEM If new MD cannot be allocated. + * \retval -ENOENT \a umd.eq_handle does not point to a valid EQ. Note that + * it's OK to supply a NULL \a umd.eq_handle by calling + * LNetInvalidateHandle() on it. + */ int LNetMDBind(lnet_md_t umd, lnet_unlink_t unlink, lnet_handle_md_t *handle) { @@ -316,12 +356,41 @@ LNetMDBind(lnet_md_t umd, lnet_unlink_t unlink, lnet_handle_md_t *handle) return (0); } - lnet_md_free (md); + lnet_md_free_locked(md); LNET_UNLOCK(); return (rc); } +/** + * Unlink the memory descriptor from any ME it may be linked to and release + * the internal resources associated with it. + * + * This function does not free the memory region associated with the MD; + * i.e., the memory the user allocated for this MD. If the ME associated with + * this MD is not NULL and was created with auto unlink enabled, the ME is + * unlinked as well (see LNetMEAttach()). + * + * Explicitly unlinking a MD via this function call has the same behavior as + * a MD that has been automatically unlinked, except that no LNET_EVENT_UNLINK + * is generated in the latter case. + * + * An unlinked event can be reported in two ways: + * - If there's no pending operations on the MD, it's unlinked immediately + * and an LNET_EVENT_UNLINK event is logged before this function returns. + * - Otherwise, the MD is only marked for deletion when this function + * returns, and the unlinked event will be piggybacked on the event of + * the completion of the last operation by setting the unlinked field of + * the event. No dedicated LNET_EVENT_UNLINK event is generated. + * + * Note that in both cases the unlinked field of the event is always set; no + * more event will happen on the MD after such an event is logged. + * + * \param mdh A handle for the MD to be unlinked. + * + * \retval 0 On success. + * \retval -ENOENT If \a mdh does not point to a valid MD object. + */ int LNetMDUnlink (lnet_handle_md_t mdh) { @@ -346,7 +415,7 @@ LNetMDUnlink (lnet_handle_md_t mdh) if (md->md_eq != NULL && md->md_refcount == 0) { lnet_build_unlink_event(md, &ev); - lnet_enq_event_locked(md->md_eq, &ev); + lnet_eq_enqueue_event(md->md_eq, &ev); } lnet_md_unlink(md);