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

lib/idxd: factor out common submission code into a prep routine

Browse Source 
Prior to adding more operations, make this a bit more efficient.

Signed-off-by: paul luse <paul.e.luse@intel.com>
Change-Id: I02b864f998800c25076233183840bba8bff92196
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2069
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>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
paul luse 2020-04-28 11:59:09 -04:00 committed by Tomasz Zawadzki
parent fad052b0cb
commit d7d9dc126b
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/idxd/idxd.c
View File

@ -636,10 +636,9 @@ spdk_idxd_detach(struct spdk_idxd_device *idxd)
idxd_device_destruct(idxd); idxd_device_destruct(idxd);
} }
int static struct idxd_hw_desc *
spdk_idxd_submit_copy(struct spdk_idxd_io_channel *chan, void *dst, const void *src, _idxd_prep_command(struct spdk_idxd_io_channel *chan,
uint64_t nbytes, spdk_idxd_req_cb cb_fn, void *cb_arg)
spdk_idxd_req_cb cb_fn, void *cb_arg)
{ {
uint32_t index; uint32_t index;
struct idxd_hw_desc *desc; struct idxd_hw_desc *desc;
@ -648,7 +647,7 @@ spdk_idxd_submit_copy(struct spdk_idxd_io_channel *chan, void *dst, const void *
index = spdk_bit_array_find_first_clear(chan->ring_ctrl.ring_slots, 0); index = spdk_bit_array_find_first_clear(chan->ring_ctrl.ring_slots, 0);
if (index == UINT32_MAX) { if (index == UINT32_MAX) {
/* ran out of ring slots */ /* ran out of ring slots */
return -EBUSY; return NULL;
} }
spdk_bit_array_set(chan->ring_ctrl.ring_slots, index); spdk_bit_array_set(chan->ring_ctrl.ring_slots, index);
@ -656,15 +655,34 @@ spdk_idxd_submit_copy(struct spdk_idxd_io_channel *chan, void *dst, const void *
desc = &chan->ring_ctrl.data_desc[index]; desc = &chan->ring_ctrl.data_desc[index];
comp = &chan->ring_ctrl.completions[index]; comp = &chan->ring_ctrl.completions[index];
desc->opcode = IDXD_OPCODE_MEMMOVE;
desc->flags = IDXD_FLAG_COMPLETION_ADDR_VALID | IDXD_FLAG_REQUEST_COMPLETION; desc->flags = IDXD_FLAG_COMPLETION_ADDR_VALID | IDXD_FLAG_REQUEST_COMPLETION;
desc->completion_addr = (uintptr_t)&comp->hw; desc->completion_addr = (uintptr_t)&comp->hw;
desc->src_addr = (uintptr_t)src;
desc->dst_addr = (uintptr_t)dst;
desc->xfer_size = nbytes;
comp->cb_arg = (uint64_t)cb_arg; comp->cb_arg = (uint64_t)cb_arg;
comp->cb_fn = cb_fn; comp->cb_fn = cb_fn;
return desc;
}
int
spdk_idxd_submit_copy(struct spdk_idxd_io_channel *chan, void *dst, const void *src,
uint64_t nbytes,
spdk_idxd_req_cb cb_fn, void *cb_arg)
{
struct idxd_hw_desc *desc;
/* Common prep. */
desc = _idxd_prep_command(chan, cb_fn, cb_arg);
if (desc == NULL) {
return -EBUSY;
}
/* Command specific. */
desc->opcode = IDXD_OPCODE_MEMMOVE;
desc->src_addr = (uintptr_t)src;
desc->dst_addr = (uintptr_t)dst;
desc->xfer_size = nbytes;
/* Submit operation. */
movdir64b((uint64_t *)chan->ring_ctrl.portal, desc); movdir64b((uint64_t *)chan->ring_ctrl.portal, desc);
return 0; return 0;
@ -675,30 +693,21 @@ spdk_idxd_submit_fill(struct spdk_idxd_io_channel *chan, void *dst, uint64_t fil
uint64_t nbytes, uint64_t nbytes,
spdk_idxd_req_cb cb_fn, void *cb_arg) spdk_idxd_req_cb cb_fn, void *cb_arg)
{ {
uint32_t index;
struct idxd_hw_desc *desc; struct idxd_hw_desc *desc;
struct idxd_comp *comp;
index = spdk_bit_array_find_first_clear(chan->ring_ctrl.ring_slots, 0); /* Common prep. */
if (index == UINT32_MAX) { desc = _idxd_prep_command(chan, cb_fn, cb_arg);
/* ran out of ring slots */ if (desc == NULL) {
return -EBUSY; return -EBUSY;
} }
spdk_bit_array_set(chan->ring_ctrl.ring_slots, index); /* Command specific. */
desc = &chan->ring_ctrl.data_desc[index];
comp = &chan->ring_ctrl.completions[index];
desc->opcode = IDXD_OPCODE_MEMFILL; desc->opcode = IDXD_OPCODE_MEMFILL;
desc->flags = IDXD_FLAG_COMPLETION_ADDR_VALID | IDXD_FLAG_REQUEST_COMPLETION;
desc->completion_addr = (uintptr_t)&comp->hw;
desc->pattern = fill_pattern; desc->pattern = fill_pattern;
desc->dst_addr = (uintptr_t)dst; desc->dst_addr = (uintptr_t)dst;
desc->xfer_size = nbytes; desc->xfer_size = nbytes;
comp->cb_arg = (uint64_t)cb_arg;
comp->cb_fn = cb_fn;
/* Submit operation. */
movdir64b((uint64_t *)chan->ring_ctrl.portal, desc); movdir64b((uint64_t *)chan->ring_ctrl.portal, desc);
return 0; return 0;