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

ublk: pass ublk pointer to ublk_ctrl_cmd()

Browse Source 
We will put this pointer into the sqe.  It will
be useful when we start doing async completions
on the ctrl ring.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I3bdb728eb1d3ed66a8ecd05df208e4f36e3fbe0b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16401
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Xiaodong Liu <xiaodong.liu@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Jim Harris 2023-01-20 00:21:30 +00:00 committed by Tomasz Zawadzki
parent c62637c9e7
commit f08743e9eb
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/ublk/ublk.c
View File

@ -186,8 +186,9 @@ spdk_ublk_init(void)
} }
static int static int
ublk_ctrl_cmd(uint32_t dev_id, uint32_t cmd_op, void *args) ublk_ctrl_cmd(struct spdk_ublk_dev *ublk, uint32_t cmd_op, void *args)
{ {
uint32_t dev_id = ublk->ublk_id;
int rc = -EINVAL; int rc = -EINVAL;
struct io_uring_sqe *sqe; struct io_uring_sqe *sqe;
struct io_uring_cqe *cqe; struct io_uring_cqe *cqe;
@ -409,7 +410,7 @@ _ublk_start_kernel(void *arg)
SPDK_DEBUGLOG(ublk, "Enter start pthread for ublk %d\n", ublk->ublk_id); SPDK_DEBUGLOG(ublk, "Enter start pthread for ublk %d\n", ublk->ublk_id);
assert(ublk->dev_info.ublksrv_pid == getpid()); assert(ublk->dev_info.ublksrv_pid == getpid());
rc = ublk_ctrl_cmd(ublk->ublk_id, UBLK_CMD_START_DEV, &ublk->dev_info.ublksrv_pid); rc = ublk_ctrl_cmd(ublk, UBLK_CMD_START_DEV, &ublk->dev_info.ublksrv_pid);
if (rc < 0) { if (rc < 0) {
SPDK_ERRLOG("start dev %d failed, rc %s\n", ublk->ublk_id, SPDK_ERRLOG("start dev %d failed, rc %s\n", ublk->ublk_id,
spdk_strerror(-rc)); spdk_strerror(-rc));
@ -452,7 +453,7 @@ _ublk_stop_kernel(void *arg)
SPDK_DEBUGLOG(ublk, "Enter stop pthread for ublk %d\n", ublk->ublk_id); SPDK_DEBUGLOG(ublk, "Enter stop pthread for ublk %d\n", ublk->ublk_id);
rc = ublk_ctrl_cmd(ublk->ublk_id, UBLK_CMD_STOP_DEV, NULL); rc = ublk_ctrl_cmd(ublk, UBLK_CMD_STOP_DEV, NULL);
if (rc < 0) { if (rc < 0) {
SPDK_ERRLOG("stop dev %d failed\n", ublk->ublk_id); SPDK_ERRLOG("stop dev %d failed\n", ublk->ublk_id);
} }
@ -695,7 +696,7 @@ ublk_close_dev_done(void *arg)
close(ublk->cdev_fd); close(ublk->cdev_fd);
} }
rc = ublk_ctrl_cmd(ublk->ublk_id, UBLK_CMD_DEL_DEV, NULL); rc = ublk_ctrl_cmd(ublk, UBLK_CMD_DEL_DEV, NULL);
if (rc < 0) { if (rc < 0) {
SPDK_ERRLOG("delete dev %d failed\n", ublk->ublk_id); SPDK_ERRLOG("delete dev %d failed\n", ublk->ublk_id);
} }
@ -1180,14 +1181,14 @@ _ublk_start_disk(struct spdk_ublk_dev *ublk)
int rc; int rc;
char buf[64]; char buf[64];
rc = ublk_ctrl_cmd(ublk->ublk_id, UBLK_CMD_ADD_DEV, &ublk->dev_info); rc = ublk_ctrl_cmd(ublk, UBLK_CMD_ADD_DEV, &ublk->dev_info);
if (rc < 0) { if (rc < 0) {
SPDK_ERRLOG("UBLK can't add dev %d, rc %s\n", ublk->ublk_id, spdk_strerror(-rc)); SPDK_ERRLOG("UBLK can't add dev %d, rc %s\n", ublk->ublk_id, spdk_strerror(-rc));
goto err; goto err;
} }
ublk->dev_params.len = sizeof(struct ublk_params); ublk->dev_params.len = sizeof(struct ublk_params);
rc = ublk_ctrl_cmd(ublk->ublk_id, UBLK_CMD_SET_PARAMS, &ublk->dev_params); rc = ublk_ctrl_cmd(ublk, UBLK_CMD_SET_PARAMS, &ublk->dev_params);
if (rc < 0) { if (rc < 0) {
SPDK_ERRLOG("UBLK can't set params for dev %d, rc %s\n", ublk->ublk_id, spdk_strerror(-rc)); SPDK_ERRLOG("UBLK can't set params for dev %d, rc %s\n", ublk->ublk_id, spdk_strerror(-rc));
goto err; goto err;