#include <portals/lib-p30.h>
#include <portals/arg-blocks.h>
-/*
- * must be called with state lock held
- */
+/* must be called with state lock held */
void lib_md_unlink(nal_cb_t * nal, lib_md_t * md)
{
- lib_me_t *me = md->me;
+ if ((md->md_flags & PTL_MD_FLAG_ZOMBIE) == 0) {
+ /* first unlink attempt... */
+ lib_me_t *me = md->me;
+
+ md->md_flags |= PTL_MD_FLAG_ZOMBIE;
+
+ /* Disassociate from ME (if any), and unlink it if it was created
+ * with PTL_UNLINK */
+ if (me != NULL) {
+ me->md = NULL;
+ if (me->unlink == PTL_UNLINK)
+ lib_me_unlink(nal, me);
+ }
+
+ /* emsure all future handle lookups fail */
+ lib_invalidate_handle(nal, &md->md_lh);
+ }
if (md->pending != 0) {
CDEBUG(D_NET, "Queueing unlink of md %p\n", md);
- md->md_flags |= PTL_MD_FLAG_UNLINK;
return;
}
if (nal->cb_unmap_pages != NULL)
nal->cb_unmap_pages (nal, md->md_niov, md->md_iov.kiov,
&md->md_addrkey);
- } else if (nal->cb_unmap != NULL)
+ } else if (nal->cb_unmap != NULL) {
nal->cb_unmap (nal, md->md_niov, md->md_iov.iov,
&md->md_addrkey);
-
- if (me) {
- me->md = NULL;
- if (me->unlink == PTL_UNLINK)
- lib_me_unlink(nal, me);
}
- if (md->eq != NULL)
- {
+ if (md->eq != NULL) {
md->eq->eq_refcount--;
LASSERT (md->eq->eq_refcount >= 0);
}
- lib_invalidate_handle (nal, &md->md_lh);
list_del (&md->md_list);
lib_md_free(nal, md);
}
static int lib_md_build(nal_cb_t *nal, lib_md_t *new, void *private,
ptl_md_t *md, ptl_handle_eq_t *eqh, int unlink)
{
- const int max_size_opts = PTL_MD_AUTO_UNLINK |
- PTL_MD_MAX_SIZE;
lib_eq_t *eq = NULL;
int rc;
int i;
* otherwise caller may only lib_md_free() it.
*/
- if (!PtlHandleEqual (*eqh, PTL_EQ_NONE)) {
+ if (!PtlHandleIsEqual (*eqh, PTL_EQ_NONE)) {
eq = ptl_handle2eq(eqh, nal);
if (eq == NULL)
- return PTL_INV_EQ;
+ return PTL_EQ_INVALID;
}
/* Must check this _before_ allocation. Also, note that non-iov
* MDs must set md_niov to 0. */
- LASSERT((md->options & (PTL_MD_IOV | PTL_MD_KIOV)) == 0 ||
+ LASSERT((md->options & (PTL_MD_IOVEC | PTL_MD_KIOV)) == 0 ||
md->niov <= PTL_MD_MAX_IOV);
- if ((md->options & max_size_opts) != 0 && /* max size used */
+ /* This implementation doesn't know how to create START events or
+ * disable END events. Best to LASSERT our caller is compliant so
+ * we find out quickly... */
+ LASSERT (PtlHandleIsEqual (*eqh, PTL_EQ_NONE) ||
+ ((md->options & PTL_MD_EVENT_START_DISABLE) != 0 &&
+ (md->options & PTL_MD_EVENT_END_DISABLE) == 0));
+
+ if ((md->options & PTL_MD_MAX_SIZE) != 0 && /* max size used */
(md->max_size < 0 || md->max_size > md->length)) // illegal max_size
- return PTL_INV_MD;
+ return PTL_MD_INVALID;
new->me = NULL;
new->start = md->start;
new->length = md->length;
new->offset = 0;
new->max_size = md->max_size;
- new->unlink = unlink;
new->options = md->options;
new->user_ptr = md->user_ptr;
new->eq = eq;
new->threshold = md->threshold;
new->pending = 0;
- new->md_flags = 0;
+ new->md_flags = (unlink == PTL_UNLINK) ? PTL_MD_FLAG_AUTO_UNLINK : 0;
- if ((md->options & PTL_MD_IOV) != 0) {
+ if ((md->options & PTL_MD_IOVEC) != 0) {
int total_length = 0;
if ((md->options & PTL_MD_KIOV) != 0) /* Can't specify both */
- return PTL_INV_MD;
+ return PTL_MD_INVALID;
new->md_niov = md->niov;
}
} else if ((md->options & PTL_MD_KIOV) != 0) {
#ifndef __KERNEL__
- return PTL_INV_MD;
+ return PTL_MD_INVALID;
#else
int total_length = 0;
/* Trap attempt to use paged I/O if unsupported early. */
if (nal->cb_send_pages == NULL ||
nal->cb_recv_pages == NULL)
- return PTL_INV_MD;
+ return PTL_MD_INVALID;
new->md_niov = md->niov;
new->options = md->options;
new->user_ptr = md->user_ptr;
ptl_eq2handle(&new->eventq, md->eq);
- new->niov = ((md->options & (PTL_MD_IOV | PTL_MD_KIOV)) == 0) ? 0 : md->md_niov;
+ new->niov = ((md->options & (PTL_MD_IOVEC | PTL_MD_KIOV)) == 0) ? 0 : md->md_niov;
}
int do_PtlMDAttach(nal_cb_t * nal, void *private, void *v_args, void *v_ret)
lib_md_t *md;
unsigned long flags;
- if ((args->md_in.options & (PTL_MD_KIOV | PTL_MD_IOV)) != 0 &&
+ if ((args->md_in.options & (PTL_MD_KIOV | PTL_MD_IOVEC)) != 0 &&
args->md_in.niov > PTL_MD_MAX_IOV) /* too many fragments */
return (ret->rc = PTL_IOV_TOO_MANY);
md = lib_md_alloc(nal, &args->md_in);
if (md == NULL)
- return (ret->rc = PTL_NOSPACE);
+ return (ret->rc = PTL_NO_SPACE);
state_lock(nal, &flags);
me = ptl_handle2me(&args->me_in, nal);
if (me == NULL) {
- ret->rc = PTL_INV_ME;
+ ret->rc = PTL_ME_INVALID;
} else if (me->md != NULL) {
- ret->rc = PTL_INUSE;
+ ret->rc = PTL_ME_IN_USE;
} else {
ret->rc = lib_md_build(nal, md, private, &args->md_in,
&args->eq_in, args->unlink_in);
lib_md_t *md;
unsigned long flags;
- if ((args->md_in.options & (PTL_MD_KIOV | PTL_MD_IOV)) != 0 &&
+ if ((args->md_in.options & (PTL_MD_KIOV | PTL_MD_IOVEC)) != 0 &&
args->md_in.niov > PTL_MD_MAX_IOV) /* too many fragments */
return (ret->rc = PTL_IOV_TOO_MANY);
md = lib_md_alloc(nal, &args->md_in);
if (md == NULL)
- return (ret->rc = PTL_NOSPACE);
+ return (ret->rc = PTL_NO_SPACE);
state_lock(nal, &flags);
- ret->rc = lib_md_build(nal, md, private,
- &args->md_in, &args->eq_in, PTL_UNLINK);
+ ret->rc = lib_md_build(nal, md, private, &args->md_in,
+ &args->eq_in, args->unlink_in);
if (ret->rc == PTL_OK) {
ptl_md2handle(&ret->handle_out, md);
md = ptl_handle2md(&args->md_in, nal);
if (md == NULL) {
state_unlock(nal, &flags);
- return (ret->rc = PTL_INV_MD);
+ return (ret->rc = PTL_MD_INVALID);
}
/* If the MD is busy, lib_md_unlink just marks it for deletion, and
memset(&ev, 0, sizeof(ev));
ev.type = PTL_EVENT_UNLINK;
- ev.status = PTL_OK;
+ ev.ni_fail_type = PTL_OK;
ev.unlinked = 1;
lib_md_deconstruct(nal, md, &ev.mem_desc);
md = ptl_handle2md(&args->md_in, nal);
if (md == NULL) {
- ret->rc = PTL_INV_MD;
+ ret->rc = PTL_MD_INVALID;
goto out;
}
/* XXX fttb, the new MD must be the same type wrt fragmentation */
if (((new->options ^ md->options) &
- (PTL_MD_IOV | PTL_MD_KIOV)) != 0) {
- ret->rc = PTL_INV_MD;
+ (PTL_MD_IOVEC | PTL_MD_KIOV)) != 0) {
+ ret->rc = PTL_MD_INVALID;
goto out;
}
goto out;
}
- if (!PtlHandleEqual (args->testq_in, PTL_EQ_NONE)) {
+ if (!PtlHandleIsEqual (args->testq_in, PTL_EQ_NONE)) {
test_eq = ptl_handle2eq(&args->testq_in, nal);
if (test_eq == NULL) {
- ret->rc = PTL_INV_EQ;
+ ret->rc = PTL_EQ_INVALID;
goto out;
}
}
if (md->pending != 0) {
- ret->rc = PTL_NOUPDATE;
+ ret->rc = PTL_MD_NO_UPDATE;
goto out;
}
if (test_eq == NULL ||
test_eq->sequence == args->sequence_in) {
lib_me_t *me = md->me;
+ int unlink = (md->md_flags & PTL_MD_FLAG_AUTO_UNLINK) ?
+ PTL_UNLINK : PTL_RETAIN;
// #warning this does not track eq refcounts properly
ret->rc = lib_md_build(nal, md, private,
- new, &new->eventq, md->unlink);
+ new, &new->eventq, unlink);
md->me = me;
} else {
- ret->rc = PTL_NOUPDATE;
+ ret->rc = PTL_MD_NO_UPDATE;
}
out:
git://git.whamcloud.com / fs / lustre-release.git / blobdiff