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

idxd: Release batches based on refcnt

Browse Source 
Instead of releasing the batch memory when the batch generates a
completion, instead do it via refcnt. This will allow us to later hold
onto batch memory longer if vectored transactions end up spanning a
batch.

Change-Id: I942d6aa5052029eb0951e51a046dd98943108b94
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12259
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Ben Walker 2022-04-13 09:24:12 -07:00 committed by Tomasz Zawadzki
parent 14757fe8fb
commit 855390a585
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/idxd/idxd.c
View File

@ -413,6 +413,7 @@ static void
_free_batch(struct idxd_batch *batch, struct spdk_idxd_io_channel *chan) _free_batch(struct idxd_batch *batch, struct spdk_idxd_io_channel *chan)
{ {
SPDK_DEBUGLOG(idxd, "Free batch %p\n", batch); SPDK_DEBUGLOG(idxd, "Free batch %p\n", batch);
assert(batch->refcnt == 0);
batch->index = 0; batch->index = 0;
batch->chan = NULL; batch->chan = NULL;
TAILQ_INSERT_TAIL(&chan->batch_pool, batch, link); TAILQ_INSERT_TAIL(&chan->batch_pool, batch, link);
@ -489,11 +490,11 @@ idxd_batch_submit(struct spdk_idxd_io_channel *chan,
desc->opcode = IDXD_OPCODE_BATCH; desc->opcode = IDXD_OPCODE_BATCH;
desc->desc_list_addr = batch->user_desc_addr; desc->desc_list_addr = batch->user_desc_addr;
desc->desc_count = batch->index; desc->desc_count = batch->index;
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. */ /* Add the batch elements completion contexts to the outstanding list to be polled. */
for (i = 0 ; i < batch->index; i++) { for (i = 0 ; i < batch->index; i++) {
batch->refcnt++;
STAILQ_INSERT_TAIL(&chan->ops_outstanding, (struct idxd_ops *)&batch->user_ops[i], STAILQ_INSERT_TAIL(&chan->ops_outstanding, (struct idxd_ops *)&batch->user_ops[i],
link); link);
} }
@ -1302,13 +1303,19 @@ spdk_idxd_process_events(struct spdk_idxd_io_channel *chan)
break; break;
} }
op->hw.status = 0;
cb_fn = op->cb_fn; cb_fn = op->cb_fn;
cb_arg = op->cb_arg; cb_arg = op->cb_arg;
op->hw.status = 0;
if (op->desc->opcode == IDXD_OPCODE_BATCH) { if (op->batch != NULL) {
assert(op->batch->refcnt > 0);
op->batch->refcnt--;
if (op->batch->refcnt == 0) {
_free_batch(op->batch, chan); _free_batch(op->batch, chan);
STAILQ_INSERT_HEAD(&chan->ops_pool, op, link); }
} else if (!op->batch) { } else {
STAILQ_INSERT_HEAD(&chan->ops_pool, op, link); STAILQ_INSERT_HEAD(&chan->ops_pool, op, link);
} }

1
lib/idxd/idxd.h
View File

@ -77,6 +77,7 @@ struct idxd_batch {
struct idxd_ops *user_ops; struct idxd_ops *user_ops;
uint64_t user_desc_addr; uint64_t user_desc_addr;
uint8_t index; uint8_t index;
uint8_t refcnt;
struct spdk_idxd_io_channel *chan; struct spdk_idxd_io_channel *chan;
TAILQ_ENTRY(idxd_batch) link; TAILQ_ENTRY(idxd_batch) link;
}; };