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

vfio-user: correct poller return value

Browse Source 
The transport poller is supposed to return the number of events handled to the
generic nvmf code; correct the vfio-user implementation so it does that.

Signed-off-by: John Levon <john.levon@nutanix.com>
Change-Id: I804e1e8c75701c0b22ea6afd350b455c39908511
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8562
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: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
John Levon 2021-06-28 22:42:11 +00:00 committed by Tomasz Zawadzki
parent 6ec5e75ae4
commit f1c8170632
1 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lib/nvmf/vfio_user.c
View File

@ -1296,11 +1296,13 @@ consume_cmd(struct nvmf_vfio_user_ctrlr *ctrlr, struct nvmf_vfio_user_qpair *qpa
return handle_cmd_req(ctrlr, cmd, get_nvmf_req(qpair)); return handle_cmd_req(ctrlr, cmd, get_nvmf_req(qpair));
} }
static ssize_t /* Returns the number of commands processed, or a negative value on error. */
static int
handle_sq_tdbl_write(struct nvmf_vfio_user_ctrlr *ctrlr, const uint32_t new_tail, handle_sq_tdbl_write(struct nvmf_vfio_user_ctrlr *ctrlr, const uint32_t new_tail,
struct nvmf_vfio_user_qpair *qpair) struct nvmf_vfio_user_qpair *qpair)
{ {
struct spdk_nvme_cmd *queue; struct spdk_nvme_cmd *queue;
int count = 0;
assert(ctrlr != NULL); assert(ctrlr != NULL);
assert(qpair != NULL); assert(qpair != NULL);
@ -1310,6 +1312,8 @@ handle_sq_tdbl_write(struct nvmf_vfio_user_ctrlr *ctrlr, const uint32_t new_tail
int err; int err;
struct spdk_nvme_cmd *cmd = &queue[sq_head(qpair)]; struct spdk_nvme_cmd *cmd = &queue[sq_head(qpair)];
count++;
/* /*
* SQHD must contain the new head pointer, so we must increase * SQHD must contain the new head pointer, so we must increase
* it before we generate a completion. * it before we generate a completion.
@ -1322,7 +1326,7 @@ handle_sq_tdbl_write(struct nvmf_vfio_user_ctrlr *ctrlr, const uint32_t new_tail
} }
} }
return 0; return count;
} }
static int static int
@ -2636,31 +2640,44 @@ handle_cmd_req(struct nvmf_vfio_user_ctrlr *ctrlr, struct spdk_nvme_cmd *cmd,
return 0; return 0;
} }
static void /* Returns the number of commands processed, or a negative value on error. */
static int
nvmf_vfio_user_qpair_poll(struct nvmf_vfio_user_qpair *qpair) nvmf_vfio_user_qpair_poll(struct nvmf_vfio_user_qpair *qpair)
{ {
struct nvmf_vfio_user_ctrlr *ctrlr; struct nvmf_vfio_user_ctrlr *ctrlr;
uint32_t new_tail; uint32_t new_tail;
int count = 0;
assert(qpair != NULL); assert(qpair != NULL);
ctrlr = qpair->ctrlr; ctrlr = qpair->ctrlr;
new_tail = *tdbl(ctrlr, &qpair->sq); new_tail = *tdbl(ctrlr, &qpair->sq);
if (sq_head(qpair) != new_tail) { if (sq_head(qpair) == new_tail) {
int err = handle_sq_tdbl_write(ctrlr, new_tail, qpair); return 0;
if (err != 0) {
fail_ctrlr(ctrlr);
return;
}
} }
count = handle_sq_tdbl_write(ctrlr, new_tail, qpair);
if (count < 0) {
fail_ctrlr(ctrlr);
}
return count;
} }
/*
* vfio-user transport poll handler. Note that the library context is polled in
* a separate poller (->vfu_ctx_poller), so this poller only needs to poll the
* active qpairs.
*
* Returns the number of commands processed, or a negative value on error.
*/
static int static int
nvmf_vfio_user_poll_group_poll(struct spdk_nvmf_transport_poll_group *group) nvmf_vfio_user_poll_group_poll(struct spdk_nvmf_transport_poll_group *group)
{ {
struct nvmf_vfio_user_poll_group *vu_group; struct nvmf_vfio_user_poll_group *vu_group;
struct nvmf_vfio_user_qpair *vu_qpair, *tmp; struct nvmf_vfio_user_qpair *vu_qpair, *tmp;
int count = 0;
assert(group != NULL); assert(group != NULL);
@ -2669,13 +2686,22 @@ nvmf_vfio_user_poll_group_poll(struct spdk_nvmf_transport_poll_group *group)
vu_group = SPDK_CONTAINEROF(group, struct nvmf_vfio_user_poll_group, group); vu_group = SPDK_CONTAINEROF(group, struct nvmf_vfio_user_poll_group, group);
TAILQ_FOREACH_SAFE(vu_qpair, &vu_group->qps, link, tmp) { TAILQ_FOREACH_SAFE(vu_qpair, &vu_group->qps, link, tmp) {
int ret;
if (spdk_unlikely(vu_qpair->state != VFIO_USER_QPAIR_ACTIVE || !vu_qpair->sq.size)) { if (spdk_unlikely(vu_qpair->state != VFIO_USER_QPAIR_ACTIVE || !vu_qpair->sq.size)) {
continue; continue;
} }
nvmf_vfio_user_qpair_poll(vu_qpair);
ret = nvmf_vfio_user_qpair_poll(vu_qpair);
if (ret < 0) {
return ret;
}
count += ret;
} }
return 0; return count;
} }
static int static int