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

lib/nvme: implement SPDK_NVME_DATA_HOST_TO_CONTROLLER in cuse

Browse Source 
Change-Id: I07bc1771eec284f90d887a0a806d315fbc989428
Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1218
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Tomasz Kulasek 2020-03-10 20:19:22 +01:00 committed by Tomasz Zawadzki
parent 8da21f69d3
commit a7567709a6
1 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/nvme/nvme_cuse.c
View File

@ -66,6 +66,7 @@ static struct spdk_bit_array *g_ctrlr_started;
struct cuse_io_ctx { struct cuse_io_ctx {
struct spdk_nvme_cmd nvme_cmd; struct spdk_nvme_cmd nvme_cmd;
enum spdk_nvme_data_transfer data_transfer;
uint64_t lba; uint64_t lba;
uint32_t lba_count; uint32_t lba_count;
@ -99,10 +100,14 @@ cuse_nvme_admin_cmd_cb(void *arg, const struct spdk_nvme_cpl *cpl)
struct iovec out_iov[2]; struct iovec out_iov[2];
struct spdk_nvme_cpl _cpl; struct spdk_nvme_cpl _cpl;
if (ctx->data_transfer == SPDK_NVME_DATA_HOST_TO_CONTROLLER) {
fuse_reply_ioctl_iov(ctx->req, cpl->status.sc, NULL, 0);
} else {
memcpy(&_cpl, cpl, sizeof(struct spdk_nvme_cpl)); memcpy(&_cpl, cpl, sizeof(struct spdk_nvme_cpl));
out_iov[0].iov_base = &_cpl.cdw0; out_iov[0].iov_base = &_cpl.cdw0;
out_iov[0].iov_len = sizeof(_cpl.cdw0); out_iov[0].iov_len = sizeof(_cpl.cdw0);
if (ctx->data_len > 0) { if (ctx->data_len > 0) {
out_iov[1].iov_base = ctx->data; out_iov[1].iov_base = ctx->data;
out_iov[1].iov_len = ctx->data_len; out_iov[1].iov_len = ctx->data_len;
@ -110,6 +115,7 @@ cuse_nvme_admin_cmd_cb(void *arg, const struct spdk_nvme_cpl *cpl)
} else { } else {
fuse_reply_ioctl_iov(ctx->req, cpl->status.sc, out_iov, 1); fuse_reply_ioctl_iov(ctx->req, cpl->status.sc, out_iov, 1);
} }
}
cuse_io_ctx_free(ctx); cuse_io_ctx_free(ctx);
} }
@ -129,7 +135,8 @@ cuse_nvme_admin_cmd_execute(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid, void *
} }
static void static void
cuse_nvme_admin_cmd_send(fuse_req_t req, struct nvme_admin_cmd *admin_cmd) cuse_nvme_admin_cmd_send(fuse_req_t req, struct nvme_admin_cmd *admin_cmd,
const void *data)
{ {
struct cuse_io_ctx *ctx; struct cuse_io_ctx *ctx;
struct cuse_device *cuse_device = fuse_req_userdata(req); struct cuse_device *cuse_device = fuse_req_userdata(req);
@ -143,6 +150,7 @@ cuse_nvme_admin_cmd_send(fuse_req_t req, struct nvme_admin_cmd *admin_cmd)
} }
ctx->req = req; ctx->req = req;
ctx->data_transfer = spdk_nvme_opc_get_data_transfer(admin_cmd->opcode);
memset(&ctx->nvme_cmd, 0, sizeof(ctx->nvme_cmd)); memset(&ctx->nvme_cmd, 0, sizeof(ctx->nvme_cmd));
ctx->nvme_cmd.opc = admin_cmd->opcode; ctx->nvme_cmd.opc = admin_cmd->opcode;
@ -164,6 +172,9 @@ cuse_nvme_admin_cmd_send(fuse_req_t req, struct nvme_admin_cmd *admin_cmd)
free(ctx); free(ctx);
return; return;
} }
if (data != NULL) {
memcpy(ctx->data, data, ctx->data_len);
}
} }
rv = nvme_io_msg_send(cuse_device->ctrlr, 0, cuse_nvme_admin_cmd_execute, ctx); rv = nvme_io_msg_send(cuse_device->ctrlr, 0, cuse_nvme_admin_cmd_execute, ctx);
@ -181,12 +192,12 @@ cuse_nvme_admin_cmd(fuse_req_t req, int cmd, void *arg,
const void *in_buf, size_t in_bufsz, size_t out_bufsz) const void *in_buf, size_t in_bufsz, size_t out_bufsz)
{ {
struct nvme_admin_cmd *admin_cmd; struct nvme_admin_cmd *admin_cmd;
struct iovec in_iov, out_iov[2]; struct iovec in_iov[2], out_iov[2];
in_iov.iov_base = (void *)arg; in_iov[0].iov_base = (void *)arg;
in_iov.iov_len = sizeof(*admin_cmd); in_iov[0].iov_len = sizeof(*admin_cmd);
if (in_bufsz == 0) { if (in_bufsz == 0) {
fuse_reply_ioctl_retry(req, &in_iov, 1, NULL, 0); fuse_reply_ioctl_retry(req, in_iov, 1, NULL, 0);
return; return;
} }
@ -198,8 +209,17 @@ cuse_nvme_admin_cmd(fuse_req_t req, int cmd, void *arg,
fuse_reply_err(req, EINVAL); fuse_reply_err(req, EINVAL);
return; return;
case SPDK_NVME_DATA_HOST_TO_CONTROLLER: case SPDK_NVME_DATA_HOST_TO_CONTROLLER:
SPDK_ERRLOG("SPDK_NVME_DATA_HOST_TO_CONTROLLER not implemented\n"); if (admin_cmd->addr != 0) {
fuse_reply_err(req, EINVAL); in_iov[1].iov_base = (void *)admin_cmd->addr;
in_iov[1].iov_len = admin_cmd->data_len;
if (in_bufsz == sizeof(*admin_cmd)) {
fuse_reply_ioctl_retry(req, in_iov, 2, NULL, 0);
return;
}
cuse_nvme_admin_cmd_send(req, admin_cmd, in_buf + sizeof(*admin_cmd));
} else {
cuse_nvme_admin_cmd_send(req, admin_cmd, NULL);
}
return; return;
case SPDK_NVME_DATA_CONTROLLER_TO_HOST: case SPDK_NVME_DATA_CONTROLLER_TO_HOST:
if (out_bufsz == 0) { if (out_bufsz == 0) {
@ -208,14 +228,14 @@ cuse_nvme_admin_cmd(fuse_req_t req, int cmd, void *arg,
if (admin_cmd->data_len > 0) { if (admin_cmd->data_len > 0) {
out_iov[1].iov_base = (void *)admin_cmd->addr; out_iov[1].iov_base = (void *)admin_cmd->addr;
out_iov[1].iov_len = admin_cmd->data_len; out_iov[1].iov_len = admin_cmd->data_len;
fuse_reply_ioctl_retry(req, &in_iov, 1, out_iov, 2); fuse_reply_ioctl_retry(req, in_iov, 1, out_iov, 2);
} else { } else {
fuse_reply_ioctl_retry(req, &in_iov, 1, out_iov, 1); fuse_reply_ioctl_retry(req, in_iov, 1, out_iov, 1);
} }
return; return;
} }
cuse_nvme_admin_cmd_send(req, admin_cmd); cuse_nvme_admin_cmd_send(req, admin_cmd, NULL);
return; return;
case SPDK_NVME_DATA_BIDIRECTIONAL: case SPDK_NVME_DATA_BIDIRECTIONAL: