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

nvmf/vfio-user: refactor map_admin_cmd_req()

Browse Source 
PRP1 value 0 is a valid Guest physical address and it may use two vectors
for one page, so we need to set `iovcnt` as the IO commands.  Also
fix the calculation for Get Log Page command.

Change-Id: Ib036bcf1ca9f6644dfd8a7406fea37269cea5c73
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9122
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Changpeng Liu 2021-08-09 18:23:46 +08:00
parent 0ac315f047
commit 1afe4de585
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/nvmf/vfio_user.c
View File

@ -2579,22 +2579,30 @@ map_admin_cmd_req(struct nvmf_vfio_user_ctrlr *ctrlr, struct spdk_nvmf_request *
uint32_t len = 0; uint32_t len = 0;
int iovcnt; int iovcnt;
req->xfer = cmd->opc & 0x3; req->xfer = spdk_nvme_opc_get_data_transfer(cmd->opc);
req->length = 0; req->length = 0;
req->data = NULL; req->data = NULL;
switch (cmd->opc) { if (req->xfer == SPDK_NVME_DATA_NONE) {
case SPDK_NVME_OPC_IDENTIFY:
len = 4096; /* TODO: there should be a define somewhere for this */
break;
case SPDK_NVME_OPC_GET_LOG_PAGE:
len = (cmd->cdw10_bits.get_log_page.numdl + 1) * 4;
break;
}
if (!cmd->dptr.prp.prp1 || !len) {
return 0; return 0;
} }
switch (cmd->opc) {
case SPDK_NVME_OPC_IDENTIFY:
len = 4096;
break;
case SPDK_NVME_OPC_GET_LOG_PAGE:
len = (((cmd->cdw11_bits.get_log_page.numdu << 16) | cmd->cdw10_bits.get_log_page.numdl) + 1) * 4;
break;
default:
/*
* CREATE IO SQ/CQ are processed separately in handle_create_io_q().
* GET/SET FEATURES: no need to support Host Identifier for vfio-user transport.
* Let the NVMf library to decide other commands.
*/
return 0;
}
/* ADMIN command will not use SGL */ /* ADMIN command will not use SGL */
assert(req->cmd->nvme_cmd.psdt == 0); assert(req->cmd->nvme_cmd.psdt == 0);
iovcnt = vfio_user_map_cmd(ctrlr, req, req->iov, len); iovcnt = vfio_user_map_cmd(ctrlr, req, req->iov, len);
@ -2603,9 +2611,9 @@ map_admin_cmd_req(struct nvmf_vfio_user_ctrlr *ctrlr, struct spdk_nvmf_request *
ctrlr_id(ctrlr), cmd->opc); ctrlr_id(ctrlr), cmd->opc);
return -1; return -1;
} }
req->length = len; req->length = len;
req->data = req->iov[0].iov_base; req->data = req->iov[0].iov_base;
req->iovcnt = iovcnt;
return 0; return 0;
} }