X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Flib-md.c;h=c13993466e04193110387d1e0e26ee6f7589831f;hp=dbb007e5382551817b60669c40af882f43735b13;hb=3b84a1ee5213563945225854a50e9037bb9646db;hpb=c7bff5640caff778d4cfca229672a2cc67b350d6 diff --git a/lnet/lnet/lib-md.c b/lnet/lnet/lib-md.c index dbb007e..c139934 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/ @@ -71,13 +73,15 @@ 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); - lnet_md_free_locked(md); + LASSERT(!list_empty(&md->md_list)); + list_del_init(&md->md_list); + lnet_md_free(md); } static int @@ -123,9 +127,6 @@ lnet_md_build(lnet_libmd_t *lmd, lnet_md_t *umd, int unlink) return -EINVAL; } else if ((umd->options & LNET_MD_KIOV) != 0) { -#ifndef __KERNEL__ - return -EINVAL; -#else lmd->md_niov = niov = umd->length; memcpy(lmd->md_iov.kiov, umd->start, niov * sizeof (lmd->md_iov.kiov[0])); @@ -133,7 +134,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; @@ -145,7 +146,6 @@ lnet_md_build(lnet_libmd_t *lmd, lnet_md_t *umd, int unlink) (umd->max_size < 0 || umd->max_size > total_length)) // illegal max_size return -EINVAL; -#endif } else { /* contiguous */ lmd->md_length = umd->length; lmd->md_niov = niov = 1; @@ -163,9 +163,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,13 +185,13 @@ 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; } @@ -215,7 +215,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,15 +261,15 @@ 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); if (lnet_md_validate(&umd) != 0) @@ -285,18 +285,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_res_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 +308,7 @@ LNetMDAttach(lnet_handle_me_t meh, lnet_md_t umd, lnet_md2handle(handle, md); - lnet_res_unlock(); + lnet_res_unlock(cpt); lnet_drop_delayed_msg_list(&drops, "Bad match"); lnet_recv_delayed_msg_list(&matches); @@ -315,11 +316,12 @@ LNetMDAttach(lnet_handle_me_t meh, lnet_md_t umd, return 0; failed: - lnet_md_free_locked(md); + lnet_md_free(md); - lnet_res_unlock(); + lnet_res_unlock(cpt); return rc; } +EXPORT_SYMBOL(LNetMDAttach); /** * Create a "free floating" memory descriptor - a MD that is not associated @@ -340,10 +342,10 @@ 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); if (lnet_md_validate(&umd) != 0) @@ -360,29 +362,31 @@ LNetMDBind(lnet_md_t umd, lnet_unlink_t unlink, lnet_handle_md_t *handle) rc = lnet_md_build(md, &umd, unlink); - lnet_res_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_res_unlock(); + lnet_res_unlock(cpt); return 0; failed: - lnet_md_free_locked(md); + lnet_md_free(md); - lnet_res_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 +416,33 @@ 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_refcount > 0); - lnet_res_lock(); + cpt = lnet_cpt_of_cookie(mdh.cookie); + lnet_res_lock(cpt); md = lnet_handle2md(&mdh); if (md == NULL) { - lnet_res_unlock(); + 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_res_unlock(); + lnet_res_unlock(cpt); return 0; } +EXPORT_SYMBOL(LNetMDUnlink);