d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lib/idxd: wait to add operation to outstanding list until hw submit

Browse Source 
No real material impact but easier to read and cleans up error
handling when submitting a batch. Before we put the operation on
the list of operations to poll when it was prepared, a few LOC
before it was submitted to HW.  Now we do it in the hw submission
function. For batch elements, they are added just before the
batch operation itself (as was before).

Signed-off-by: paul luse <paul.e.luse@intel.com>
Change-Id: Icfeaeeb650d5b63f81e13a8ffd27e349c7118089
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9069
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
paul luse 2021-08-04 10:33:00 -04:00 committed by Tomasz Zawadzki
parent e5a19b3ea2
commit 5bfcd5b329
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/idxd/idxd.c
View File

@ -82,10 +82,10 @@ struct device_config g_dev_cfg1 = {
}; };
static inline void static inline void
_submit_to_hw(struct spdk_idxd_io_channel *chan, struct idxd_hw_desc *desc) _submit_to_hw(struct spdk_idxd_io_channel *chan, struct idxd_ops *op)
{ {
/* TODO: move the addition of the op to the outstanding list to here. */ TAILQ_INSERT_TAIL(&chan->ops_outstanding, op, link);
movdir64b(chan->portal + chan->portal_offset, desc); movdir64b(chan->portal + chan->portal_offset, op->desc);
chan->portal_offset = (chan->portal_offset + chan->idxd->chan_per_device * PORTAL_STRIDE) & chan->portal_offset = (chan->portal_offset + chan->idxd->chan_per_device * PORTAL_STRIDE) &
PORTAL_MASK; PORTAL_MASK;
} }
@ -381,7 +381,6 @@ _idxd_prep_command(struct spdk_idxd_io_channel *chan, spdk_idxd_req_cb cb_fn,
op->cb_fn = cb_fn; op->cb_fn = cb_fn;
op->batch = NULL; op->batch = NULL;
op->batch_op = false; op->batch_op = false;
TAILQ_INSERT_TAIL(&chan->ops_outstanding, op, link);
return 0; return 0;
} }
@ -423,7 +422,7 @@ spdk_idxd_submit_copy(struct spdk_idxd_io_channel *chan, void *dst, const void *
desc->flags |= IDXD_FLAG_CACHE_CONTROL; /* direct IO to CPU cache instead of mem */ desc->flags |= IDXD_FLAG_CACHE_CONTROL; /* direct IO to CPU cache instead of mem */
/* Submit operation. */ /* Submit operation. */
_submit_to_hw(chan, desc); _submit_to_hw(chan, op);
return 0; return 0;
} }
@ -478,7 +477,7 @@ spdk_idxd_submit_dualcast(struct spdk_idxd_io_channel *chan, void *dst1, void *d
desc->flags |= IDXD_FLAG_CACHE_CONTROL; /* direct IO to CPU cache instead of mem */ desc->flags |= IDXD_FLAG_CACHE_CONTROL; /* direct IO to CPU cache instead of mem */
/* Submit operation. */ /* Submit operation. */
_submit_to_hw(chan, desc); _submit_to_hw(chan, op);
return 0; return 0;
} }
@ -519,7 +518,7 @@ spdk_idxd_submit_compare(struct spdk_idxd_io_channel *chan, void *src1, const vo
desc->xfer_size = nbytes; desc->xfer_size = nbytes;
/* Submit operation. */ /* Submit operation. */
_submit_to_hw(chan, desc); _submit_to_hw(chan, op);
return 0; return 0;
} }
@ -555,7 +554,7 @@ spdk_idxd_submit_fill(struct spdk_idxd_io_channel *chan, void *dst, uint64_t fil
desc->flags |= IDXD_FLAG_CACHE_CONTROL; /* direct IO to CPU cache instead of mem */ desc->flags |= IDXD_FLAG_CACHE_CONTROL; /* direct IO to CPU cache instead of mem */
/* Submit operation. */ /* Submit operation. */
_submit_to_hw(chan, desc); _submit_to_hw(chan, op);
return 0; return 0;
} }
@ -595,7 +594,7 @@ spdk_idxd_submit_crc32c(struct spdk_idxd_io_channel *chan, uint32_t *crc_dst, vo
op->crc_dst = crc_dst; op->crc_dst = crc_dst;
/* Submit operation. */ /* Submit operation. */
_submit_to_hw(chan, desc); _submit_to_hw(chan, op);
return 0; return 0;
} }
@ -641,7 +640,7 @@ spdk_idxd_submit_copy_crc32c(struct spdk_idxd_io_channel *chan, void *dst, void
op->crc_dst = crc_dst; op->crc_dst = crc_dst;
/* Submit operation. */ /* Submit operation. */
_submit_to_hw(chan, desc); _submit_to_hw(chan, op);
return 0; return 0;
} }
@ -744,23 +743,16 @@ spdk_idxd_batch_submit(struct spdk_idxd_io_channel *chan, struct idxd_batch *bat
} }
} }
/* Add the batch elements completion contexts to the outstanding list to be polled. */
for (i = 0 ; i < batch->index; i++) {
TAILQ_INSERT_TAIL(&chan->ops_outstanding, (struct idxd_ops *)&batch->user_ops[i],
link);
}
/* Common prep. */ /* Common prep. */
rc = _idxd_prep_command(chan, cb_fn, cb_arg, &desc, &op); rc = _idxd_prep_command(chan, cb_fn, cb_arg, &desc, &op);
if (rc) { if (rc) {
goto error; return rc;
} }
/* TODO: pre-tranlate these when allocated for max batch size. */ /* TODO: pre-tranlate these when allocated for max batch size. */
rc = _vtophys(batch->user_desc, &desc_addr, batch->index * sizeof(struct idxd_hw_desc)); rc = _vtophys(batch->user_desc, &desc_addr, batch->index * sizeof(struct idxd_hw_desc));
if (rc) { if (rc) {
rc = -EINVAL; return -EINVAL;
goto error;
} }
/* Command specific. */ /* Command specific. */
@ -770,17 +762,17 @@ spdk_idxd_batch_submit(struct spdk_idxd_io_channel *chan, struct idxd_batch *bat
op->batch = batch; op->batch = batch;
assert(batch->index <= DESC_PER_BATCH); assert(batch->index <= DESC_PER_BATCH);
/* Add the batch elements completion contexts to the outstanding list to be polled. */
for (i = 0 ; i < batch->index; i++) {
TAILQ_INSERT_TAIL(&chan->ops_outstanding, (struct idxd_ops *)&batch->user_ops[i],
link);
}
/* Submit operation. */ /* Submit operation. */
_submit_to_hw(chan, desc); _submit_to_hw(chan, op);
SPDK_DEBUGLOG(idxd, "Submitted batch %p\n", batch); SPDK_DEBUGLOG(idxd, "Submitted batch %p\n", batch);
return 0; return 0;
error:
for (i = 0 ; i < batch->index; i++) {
op = TAILQ_LAST(&chan->ops_outstanding, op_head);
TAILQ_REMOVE(&chan->ops_outstanding, op, link);
}
return rc;
} }
static int static int