ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/idxd: refactor batch prep command function

Browse Source 
To match regular sumission prep function and allow caller to
modify both descriptor and completion structures.  Also allows
for more accurate error reporting.  Needed for upcoming patch to
fix batch CRC submissions.

Signed-off-by: paul luse <paul.e.luse@intel.com>
Change-Id: I4b7b5b24e2f54149b513d4b23ba32f3802aff3e5
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8144
Community-CI: Mellanox Build Bot
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Ziye Yang <ziye.yang@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
paul luse 2021-06-01 18:04:20 -04:00 committed by Tomasz Zawadzki
parent f6ad617077
commit fa99984283
1 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
lib/idxd/idxd.c
View File

@ -805,25 +805,27 @@ spdk_idxd_batch_submit(struct spdk_idxd_io_channel *chan, struct idxd_batch *bat
return 0; return 0;
} }
static struct idxd_hw_desc * static int
_idxd_prep_batch_cmd(struct spdk_idxd_io_channel *chan, spdk_idxd_req_cb cb_fn, _idxd_prep_batch_cmd(struct spdk_idxd_io_channel *chan, spdk_idxd_req_cb cb_fn,
void *cb_arg, struct idxd_batch *batch) void *cb_arg, struct idxd_batch *batch,
struct idxd_hw_desc **_desc, struct idxd_comp **_comp)
{ {
struct idxd_hw_desc *desc; struct idxd_hw_desc *desc;
struct idxd_comp *comp; struct idxd_comp *comp;
if (_is_batch_valid(batch, chan) == false) { if (_is_batch_valid(batch, chan) == false) {
SPDK_ERRLOG("Attempt to add to an invalid batch.\n"); SPDK_ERRLOG("Attempt to add to an invalid batch.\n");
return NULL; return -EINVAL;
} }
assert(batch != NULL); /* suppress scan-build warning. */
if (batch->index == DESC_PER_BATCH) { if (batch->index == DESC_PER_BATCH) {
SPDK_ERRLOG("Attempt to add to a batch that is already full.\n"); SPDK_ERRLOG("Attempt to add to a batch that is already full.\n");
return NULL; return -EINVAL;
} }
desc = &batch->user_desc[batch->index]; desc = *_desc = &batch->user_desc[batch->index];
comp = &batch->user_completions[batch->index]; comp = *_comp = &batch->user_completions[batch->index];
_track_comp(chan, true, batch->index, comp, desc, batch); _track_comp(chan, true, batch->index, comp, desc, batch);
SPDK_DEBUGLOG(idxd, "Prep batch %p index %u\n", batch, batch->index); SPDK_DEBUGLOG(idxd, "Prep batch %p index %u\n", batch, batch->index);
@ -835,18 +837,20 @@ _idxd_prep_batch_cmd(struct spdk_idxd_io_channel *chan, spdk_idxd_req_cb cb_fn,
comp->cb_fn = cb_fn; comp->cb_fn = cb_fn;
comp->batch = batch; comp->batch = batch;
return desc; return 0;
} }
static int static int
_idxd_batch_prep_nop(struct spdk_idxd_io_channel *chan, struct idxd_batch *batch) _idxd_batch_prep_nop(struct spdk_idxd_io_channel *chan, struct idxd_batch *batch)
{ {
struct idxd_hw_desc *desc; struct idxd_hw_desc *desc;
struct idxd_comp *comp;
int rc;
/* Common prep. */ /* Common prep. */
desc = _idxd_prep_batch_cmd(chan, NULL, NULL, batch); rc = _idxd_prep_batch_cmd(chan, NULL, NULL, batch, &desc, &comp);
if (desc == NULL) { if (rc) {
return -EINVAL; return rc;
} }
/* Command specific. */ /* Command specific. */
@ -863,13 +867,14 @@ spdk_idxd_batch_prep_copy(struct spdk_idxd_io_channel *chan, struct idxd_batch *
void *dst, const void *src, uint64_t nbytes, spdk_idxd_req_cb cb_fn, void *cb_arg) void *dst, const void *src, uint64_t nbytes, spdk_idxd_req_cb cb_fn, void *cb_arg)
{ {
struct idxd_hw_desc *desc; struct idxd_hw_desc *desc;
struct idxd_comp *comp;
uint64_t src_addr, dst_addr; uint64_t src_addr, dst_addr;
int rc; int rc;
/* Common prep. */ /* Common prep. */
desc = _idxd_prep_batch_cmd(chan, cb_fn, cb_arg, batch); rc = _idxd_prep_batch_cmd(chan, cb_fn, cb_arg, batch, &desc, &comp);
if (desc == NULL) { if (rc) {
return -EINVAL; return rc;
} }
rc = _vtophys(src, &src_addr, nbytes); rc = _vtophys(src, &src_addr, nbytes);
@ -897,13 +902,14 @@ spdk_idxd_batch_prep_fill(struct spdk_idxd_io_channel *chan, struct idxd_batch *
spdk_idxd_req_cb cb_fn, void *cb_arg) spdk_idxd_req_cb cb_fn, void *cb_arg)
{ {
struct idxd_hw_desc *desc; struct idxd_hw_desc *desc;
struct idxd_comp *comp;
uint64_t dst_addr; uint64_t dst_addr;
int rc; int rc;
/* Common prep. */ /* Common prep. */
desc = _idxd_prep_batch_cmd(chan, cb_fn, cb_arg, batch); rc = _idxd_prep_batch_cmd(chan, cb_fn, cb_arg, batch, &desc, &comp);
if (desc == NULL) { if (rc) {
return -EINVAL; return rc;
} }
rc = _vtophys(dst, &dst_addr, nbytes); rc = _vtophys(dst, &dst_addr, nbytes);
@ -925,6 +931,7 @@ spdk_idxd_batch_prep_dualcast(struct spdk_idxd_io_channel *chan, struct idxd_bat
void *dst1, void *dst2, const void *src, uint64_t nbytes, spdk_idxd_req_cb cb_fn, void *cb_arg) void *dst1, void *dst2, const void *src, uint64_t nbytes, spdk_idxd_req_cb cb_fn, void *cb_arg)
{ {
struct idxd_hw_desc *desc; struct idxd_hw_desc *desc;
struct idxd_comp *comp;
uint64_t src_addr, dst1_addr, dst2_addr; uint64_t src_addr, dst1_addr, dst2_addr;
int rc; int rc;
@ -934,9 +941,9 @@ spdk_idxd_batch_prep_dualcast(struct spdk_idxd_io_channel *chan, struct idxd_bat
} }
/* Common prep. */ /* Common prep. */
desc = _idxd_prep_batch_cmd(chan, cb_fn, cb_arg, batch); rc = _idxd_prep_batch_cmd(chan, cb_fn, cb_arg, batch, &desc, &comp);
if (desc == NULL) { if (rc) {
return -EINVAL; return rc;
} }
rc = _vtophys(src, &src_addr, nbytes); rc = _vtophys(src, &src_addr, nbytes);
@ -969,13 +976,14 @@ spdk_idxd_batch_prep_crc32c(struct spdk_idxd_io_channel *chan, struct idxd_batch
spdk_idxd_req_cb cb_fn, void *cb_arg) spdk_idxd_req_cb cb_fn, void *cb_arg)
{ {
struct idxd_hw_desc *desc; struct idxd_hw_desc *desc;
struct idxd_comp *comp;
uint64_t src_addr, dst_addr; uint64_t src_addr, dst_addr;
int rc; int rc;
/* Common prep. */ /* Common prep. */
desc = _idxd_prep_batch_cmd(chan, cb_fn, cb_arg, batch); rc = _idxd_prep_batch_cmd(chan, cb_fn, cb_arg, batch, &desc, &comp);
if (desc == NULL) { if (rc) {
return -EINVAL; return rc;
} }
rc = _vtophys(src, &src_addr, nbytes); rc = _vtophys(src, &src_addr, nbytes);
@ -1005,13 +1013,14 @@ spdk_idxd_batch_prep_compare(struct spdk_idxd_io_channel *chan, struct idxd_batc
void *cb_arg) void *cb_arg)
{ {
struct idxd_hw_desc *desc; struct idxd_hw_desc *desc;
struct idxd_comp *comp;
uint64_t src1_addr, src2_addr; uint64_t src1_addr, src2_addr;
int rc; int rc;
/* Common prep. */ /* Common prep. */
desc = _idxd_prep_batch_cmd(chan, cb_fn, cb_arg, batch); rc = _idxd_prep_batch_cmd(chan, cb_fn, cb_arg, batch, &desc, &comp);
if (desc == NULL) { if (rc) {
return -EINVAL; return rc;
} }
rc = _vtophys(src1, &src1_addr, nbytes); rc = _vtophys(src1, &src1_addr, nbytes);