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

nvme/cuse: refactor read/write to pass cuse_device and block_size

Browse Source 
This patch does not alter functionality, just moves
around where cuse_device and block_size is determined.

Next patch will fix both paths.

Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I5a827b5b4ab080b2aa0f76f5cdcbcb177b38b474
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4036
Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI
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>
This commit is contained in:
Tomasz Zawadzki 2020-09-02 12:24:45 -04:00
parent 3a8c976aef
commit ef3f0d97ab
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/nvme/nvme_cuse.c
View File

@ -315,16 +315,13 @@ cuse_nvme_submit_io_write_cb(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid, void
} }
static void static void
cuse_nvme_submit_io_write(fuse_req_t req, int cmd, void *arg, cuse_nvme_submit_io_write(struct cuse_device *cuse_device, fuse_req_t req, int cmd, void *arg,
struct fuse_file_info *fi, unsigned flags, struct fuse_file_info *fi, unsigned flags, uint32_t block_size,
const void *in_buf, size_t in_bufsz, size_t out_bufsz) const void *in_buf, size_t in_bufsz, size_t out_bufsz)
{ {
const struct nvme_user_io *user_io = in_buf; const struct nvme_user_io *user_io = in_buf;
struct cuse_io_ctx *ctx; struct cuse_io_ctx *ctx;
struct spdk_nvme_ns *ns;
uint32_t block_size;
int rc; int rc;
struct cuse_device *cuse_device = fuse_req_userdata(req);
ctx = (struct cuse_io_ctx *)calloc(1, sizeof(struct cuse_io_ctx)); ctx = (struct cuse_io_ctx *)calloc(1, sizeof(struct cuse_io_ctx));
if (!ctx) { if (!ctx) {
@ -334,10 +331,6 @@ cuse_nvme_submit_io_write(fuse_req_t req, int cmd, void *arg,
} }
ctx->req = req; ctx->req = req;
ns = spdk_nvme_ctrlr_get_ns(cuse_device->ctrlr, cuse_device->nsid);
block_size = spdk_nvme_ns_get_sector_size(ns);
ctx->lba = user_io->slba; ctx->lba = user_io->slba;
ctx->lba_count = user_io->nblocks + 1; ctx->lba_count = user_io->nblocks + 1;
ctx->data_len = ctx->lba_count * block_size; ctx->data_len = ctx->lba_count * block_size;
@ -397,16 +390,13 @@ cuse_nvme_submit_io_read_cb(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid, void *
} }
static void static void
cuse_nvme_submit_io_read(fuse_req_t req, int cmd, void *arg, cuse_nvme_submit_io_read(struct cuse_device *cuse_device, fuse_req_t req, int cmd, void *arg,
struct fuse_file_info *fi, unsigned flags, struct fuse_file_info *fi, unsigned flags, uint32_t block_size,
const void *in_buf, size_t in_bufsz, size_t out_bufsz) const void *in_buf, size_t in_bufsz, size_t out_bufsz)
{ {
int rc; int rc;
struct cuse_io_ctx *ctx; struct cuse_io_ctx *ctx;
const struct nvme_user_io *user_io = in_buf; const struct nvme_user_io *user_io = in_buf;
struct cuse_device *cuse_device = fuse_req_userdata(req);
struct spdk_nvme_ns *ns;
uint32_t block_size;
ctx = (struct cuse_io_ctx *)calloc(1, sizeof(struct cuse_io_ctx)); ctx = (struct cuse_io_ctx *)calloc(1, sizeof(struct cuse_io_ctx));
if (!ctx) { if (!ctx) {
@ -419,9 +409,6 @@ cuse_nvme_submit_io_read(fuse_req_t req, int cmd, void *arg,
ctx->lba = user_io->slba; ctx->lba = user_io->slba;
ctx->lba_count = user_io->nblocks; ctx->lba_count = user_io->nblocks;
ns = spdk_nvme_ctrlr_get_ns(cuse_device->ctrlr, cuse_device->nsid);
block_size = spdk_nvme_ns_get_sector_size(ns);
ctx->data_len = ctx->lba_count * block_size; ctx->data_len = ctx->lba_count * block_size;
ctx->data = spdk_zmalloc(ctx->data_len, 0x1000, NULL, SPDK_ENV_SOCKET_ID_ANY, ctx->data = spdk_zmalloc(ctx->data_len, 0x1000, NULL, SPDK_ENV_SOCKET_ID_ANY,
SPDK_MALLOC_DMA); SPDK_MALLOC_DMA);
@ -448,6 +435,9 @@ cuse_nvme_submit_io(fuse_req_t req, int cmd, void *arg,
{ {
const struct nvme_user_io *user_io; const struct nvme_user_io *user_io;
struct iovec in_iov[2], out_iov; struct iovec in_iov[2], out_iov;
struct cuse_device *cuse_device = fuse_req_userdata(req);
struct spdk_nvme_ns *ns;
uint32_t block_size;
in_iov[0].iov_base = (void *)arg; in_iov[0].iov_base = (void *)arg;
in_iov[0].iov_len = sizeof(*user_io); in_iov[0].iov_len = sizeof(*user_io);
@ -458,6 +448,9 @@ cuse_nvme_submit_io(fuse_req_t req, int cmd, void *arg,
user_io = in_buf; user_io = in_buf;
ns = spdk_nvme_ctrlr_get_ns(cuse_device->ctrlr, cuse_device->nsid);
block_size = spdk_nvme_ns_get_sector_size(ns);
switch (user_io->opcode) { switch (user_io->opcode) {
case SPDK_NVME_OPC_READ: case SPDK_NVME_OPC_READ:
out_iov.iov_base = (void *)user_io->addr; out_iov.iov_base = (void *)user_io->addr;
@ -467,8 +460,8 @@ cuse_nvme_submit_io(fuse_req_t req, int cmd, void *arg,
return; return;
} }
cuse_nvme_submit_io_read(req, cmd, arg, fi, flags, in_buf, cuse_nvme_submit_io_read(cuse_device, req, cmd, arg, fi, flags,
in_bufsz, out_bufsz); block_size, in_buf, in_bufsz, out_bufsz);
break; break;
case SPDK_NVME_OPC_WRITE: case SPDK_NVME_OPC_WRITE:
in_iov[1].iov_base = (void *)user_io->addr; in_iov[1].iov_base = (void *)user_io->addr;
@ -478,9 +471,8 @@ cuse_nvme_submit_io(fuse_req_t req, int cmd, void *arg,
return; return;
} }
cuse_nvme_submit_io_write(req, cmd, arg, fi, flags, in_buf, cuse_nvme_submit_io_write(cuse_device, req, cmd, arg, fi, flags,
in_bufsz, out_bufsz); block_size, in_buf, in_bufsz, out_bufsz);
break; break;
default: default:
SPDK_ERRLOG("SUBMIT_IO: opc:%d not valid\n", user_io->opcode); SPDK_ERRLOG("SUBMIT_IO: opc:%d not valid\n", user_io->opcode);