X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Flib-md.c;h=a3a72046e1f8b64d3733eebc48b818d947935736;hp=c189fb95928d23638753478f08de7e6720778d8b;hb=33984c012883a7c714429d2c612cf6dcda191974;hpb=38fcdd3966da09517ca176b962230b7dae43514c diff --git a/lnet/lnet/lib-md.c b/lnet/lnet/lib-md.c index c189fb9..a3a7204 100644 --- a/lnet/lnet/lib-md.c +++ b/lnet/lnet/lib-md.c @@ -26,6 +26,8 @@ /* * 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/ @@ -40,7 +42,7 @@ #include -/* must be called with LNET_LOCK held */ +/* must be called with lnet_res_lock held */ void lnet_md_unlink(lnet_libmd_t *md) { @@ -71,12 +73,14 @@ lnet_md_unlink(lnet_libmd_t *md) CDEBUG(D_NET, "Unlinking md %p\n", md); if (md->md_eq != NULL) { - md->md_eq->eq_refcount--; - LASSERT (md->md_eq->eq_refcount >= 0); - } + int cpt = lnet_cpt_of_cookie(md->md_lh.lh_cookie); + + LASSERT(*md->md_eq->eq_refs[cpt] > 0); + (*md->md_eq->eq_refs[cpt])--; + } - LASSERT (!cfs_list_empty(&md->md_list)); - cfs_list_del_init (&md->md_list); + LASSERT(!list_empty(&md->md_list)); + list_del_init(&md->md_list); lnet_md_free_locked(md); } @@ -133,7 +137,7 @@ lnet_md_build(lnet_libmd_t *lmd, lnet_md_t *umd, int unlink) for (i = 0; i < (int)niov; i++) { /* We take the page pointer on trust */ if (lmd->md_iov.kiov[i].kiov_offset + - lmd->md_iov.kiov[i].kiov_len > CFS_PAGE_SIZE ) + lmd->md_iov.kiov[i].kiov_len > PAGE_CACHE_SIZE) return -EINVAL; /* invalid length */ total_length += lmd->md_iov.kiov[i].kiov_len; @@ -163,9 +167,9 @@ lnet_md_build(lnet_libmd_t *lmd, lnet_md_t *umd, int unlink) /* must be called with resource lock held */ static int -lnet_md_link(lnet_libmd_t *md, lnet_handle_eq_t eq_handle) +lnet_md_link(lnet_libmd_t *md, lnet_handle_eq_t eq_handle, int cpt) { - struct lnet_res_container *container = &the_lnet.ln_md_container; + struct lnet_res_container *container = the_lnet.ln_md_containers[cpt]; /* NB we are passed an allocated, but inactive md. * if we return success, caller may lnet_md_unlink() it. @@ -185,18 +189,18 @@ lnet_md_link(lnet_libmd_t *md, lnet_handle_eq_t eq_handle) if (md->md_eq == NULL) return -ENOENT; - md->md_eq->eq_refcount++; + (*md->md_eq->eq_refs[cpt])++; } lnet_res_lh_initialize(container, &md->md_lh); - LASSERT(cfs_list_empty(&md->md_list)); - cfs_list_add(&md->md_list, &container->rec_active); + LASSERT(list_empty(&md->md_list)); + list_add(&md->md_list, &container->rec_active); return 0; } -/* must be called with LNET_LOCK held */ +/* must be called with lnet_res_lock held */ void lnet_md_deconstruct(lnet_libmd_t *lmd, lnet_md_t *umd) { @@ -215,7 +219,7 @@ lnet_md_deconstruct(lnet_libmd_t *lmd, lnet_md_t *umd) lnet_eq2handle(&umd->eq_handle, lmd->md_eq); } -int +static int lnet_md_validate(lnet_md_t *umd) { if (umd->start == NULL && umd->length != 0) { @@ -261,13 +265,14 @@ lnet_md_validate(lnet_md_t *umd) */ int LNetMDAttach(lnet_handle_me_t meh, lnet_md_t umd, - lnet_unlink_t unlink, lnet_handle_md_t *handle) + lnet_unlink_t unlink, lnet_handle_md_t *handle) { - CFS_LIST_HEAD (matches); - CFS_LIST_HEAD (drops); - lnet_me_t *me; - lnet_libmd_t *md; - int rc; + struct list_head matches = LIST_HEAD_INIT(matches); + struct list_head drops = LIST_HEAD_INIT(drops); + struct lnet_me *me; + struct lnet_libmd *md; + int cpt; + int rc; LASSERT (the_lnet.ln_init); LASSERT (the_lnet.ln_refcount > 0); @@ -285,18 +290,19 @@ LNetMDAttach(lnet_handle_me_t meh, lnet_md_t umd, return -ENOMEM; rc = lnet_md_build(md, &umd, unlink); + cpt = lnet_cpt_of_cookie(meh.cookie); - LNET_LOCK(); + lnet_res_lock(cpt); if (rc != 0) goto failed; - me = lnet_handle2me(&meh); + me = lnet_handle2me(&meh); if (me == NULL) rc = -ENOENT; else if (me->me_md != NULL) - rc = -EBUSY; + rc = -EBUSY; else - rc = lnet_md_link(md, umd.eq_handle); + rc = lnet_md_link(md, umd.eq_handle, cpt); if (rc != 0) goto failed; @@ -307,7 +313,7 @@ LNetMDAttach(lnet_handle_me_t meh, lnet_md_t umd, lnet_md2handle(handle, md); - LNET_UNLOCK(); + lnet_res_unlock(cpt); lnet_drop_delayed_msg_list(&drops, "Bad match"); lnet_recv_delayed_msg_list(&matches); @@ -317,9 +323,10 @@ LNetMDAttach(lnet_handle_me_t meh, lnet_md_t umd, failed: lnet_md_free_locked(md); - LNET_UNLOCK(); + lnet_res_unlock(cpt); return rc; } +EXPORT_SYMBOL(LNetMDAttach); /** * Create a "free floating" memory descriptor - a MD that is not associated @@ -340,8 +347,9 @@ LNetMDAttach(lnet_handle_me_t meh, lnet_md_t umd, int LNetMDBind(lnet_md_t umd, lnet_unlink_t unlink, lnet_handle_md_t *handle) { - lnet_libmd_t *md; - int rc; + lnet_libmd_t *md; + int cpt; + int rc; LASSERT (the_lnet.ln_init); LASSERT (the_lnet.ln_refcount > 0); @@ -360,29 +368,31 @@ LNetMDBind(lnet_md_t umd, lnet_unlink_t unlink, lnet_handle_md_t *handle) rc = lnet_md_build(md, &umd, unlink); - LNET_LOCK(); + cpt = lnet_res_lock_current(); if (rc != 0) goto failed; - rc = lnet_md_link(md, umd.eq_handle); + rc = lnet_md_link(md, umd.eq_handle, cpt); if (rc != 0) goto failed; lnet_md2handle(handle, md); - LNET_UNLOCK(); + lnet_res_unlock(cpt); return 0; failed: lnet_md_free_locked(md); - LNET_UNLOCK(); + lnet_res_unlock(cpt); return rc; } +EXPORT_SYMBOL(LNetMDBind); /** * Unlink the memory descriptor from any ME it may be linked to and release - * the internal resources associated with it. + * the internal resources associated with it. As a result, active messages + * associated with the MD may get aborted. * * 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 @@ -412,32 +422,34 @@ LNetMDBind(lnet_md_t umd, lnet_unlink_t unlink, lnet_handle_md_t *handle) int LNetMDUnlink (lnet_handle_md_t mdh) { - lnet_event_t ev; - lnet_libmd_t *md; + lnet_event_t ev; + lnet_libmd_t *md; + int cpt; - LASSERT (the_lnet.ln_init); - LASSERT (the_lnet.ln_refcount > 0); + LASSERT(the_lnet.ln_init); + LASSERT(the_lnet.ln_refcount > 0); - LNET_LOCK(); + cpt = lnet_cpt_of_cookie(mdh.cookie); + lnet_res_lock(cpt); - md = lnet_handle2md(&mdh); - if (md == NULL) { - LNET_UNLOCK(); + md = lnet_handle2md(&mdh); + if (md == NULL) { + lnet_res_unlock(cpt); return -ENOENT; } - /* If the MD is busy, lnet_md_unlink just marks it for deletion, and - * when the NAL is done, the completion event flags that the MD was - * unlinked. Otherwise, we enqueue an event now... */ - - if (md->md_eq != NULL && - md->md_refcount == 0) { - lnet_build_unlink_event(md, &ev); + md->md_flags |= LNET_MD_FLAG_ABORTED; + /* If the MD is busy, lnet_md_unlink just marks it for deletion, and + * when the LND is done, the completion event flags that the MD was + * unlinked. Otherwise, we enqueue an event now... */ + if (md->md_eq != NULL && md->md_refcount == 0) { + lnet_build_unlink_event(md, &ev); lnet_eq_enqueue_event(md->md_eq, &ev); - } + } lnet_md_unlink(md); - LNET_UNLOCK(); - return 0; + lnet_res_unlock(cpt); + return 0; } +EXPORT_SYMBOL(LNetMDUnlink);