ublk: pass ublksrv_ctrl_cmd * instead of io_uring_cmd *
Subsystems (2)
PATCH 1/1 ublk: pass ublksrv_ctrl_cmd * instead of io_uring_cmd *
The ublk_ctrl_*() handlers all take struct io_uring_cmd *cmd but only use it to get struct ublksrv_ctrl_cmd *header from the io_uring SQE. Since the caller ublk_ctrl_uring_cmd() has already computed header, pass it instead of cmd.
--- drivers/block/ublk_drv.c | 46 +++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 27 deletions(-)
drivers/block/ublk_drv.c +19 -27
@@ -2411,13 +2411,13 @@ static struct ublk_device *ublk_get_device_from_id(int idx)spin_unlock (&ublk_idr_lock);return ub; } -static int ublk_ctrl_start_dev (struct ublk_device *ub,struct io_uring_cmd *cmd) +static int ublk_ctrl_start_dev (struct ublk_device *ub, +const struct ublksrv_ctrl_cmd *header) { -const struct ublksrv_ctrl_cmd *header =io_uring_sqe_cmd (cmd->sqe);const struct ublk_param_basic *p = &ub->params.basic;int ublksrv_pid = (int )header->data[0 ];struct queue_limits lim = { .logical_block_size =1 << p->logical_bs_shift, .physical_block_size =1 << p->physical_bs_shift,
@@ -2532,13 +2532,12 @@ static int ublk_ctrl_start_dev(struct ublk_device *ub, struct io_uring_cmd *cmd)mutex_unlock (&ub->mutex);return ret; }static int ublk_ctrl_get_queue_affinity (struct ublk_device *ub, -struct io_uring_cmd *cmd) +const struct ublksrv_ctrl_cmd *header) { -const struct ublksrv_ctrl_cmd *header =io_uring_sqe_cmd (cmd->sqe);void __user *argp = (void __user *)(unsigned long )header->addr;cpumask_var_t cpumask;unsigned long queue;unsigned int retlen;unsigned int i;
@@ -2583,13 +2582,12 @@ static inline void ublk_dump_dev_info(struct ublksrv_ctrl_dev_info *info) info->dev_id, info->flags);pr_devel ("\t nr_hw_queues %d queue_depth %d\n" , info->nr_hw_queues, info->queue_depth); } -static int ublk_ctrl_add_dev (struct io_uring_cmd *cmd) +static int ublk_ctrl_add_dev (const struct ublksrv_ctrl_cmd *header) { -const struct ublksrv_ctrl_cmd *header =io_uring_sqe_cmd (cmd->sqe);void __user *argp = (void __user *)(unsigned long )header->addr;struct ublksrv_ctrl_dev_info info;struct ublk_device *ub;int ret = -EINVAL ;
@@ -2810,13 +2808,12 @@ static int ublk_ctrl_stop_dev(struct ublk_device *ub)cancel_work_sync (&ub->nosrv_work);return 0 ; }static int ublk_ctrl_get_dev_info (struct ublk_device *ub, -struct io_uring_cmd *cmd) +const struct ublksrv_ctrl_cmd *header) { -const struct ublksrv_ctrl_cmd *header =io_uring_sqe_cmd (cmd->sqe);void __user *argp = (void __user *)(unsigned long )header->addr;if (header->len <sizeof (struct ublksrv_ctrl_dev_info ) || !header->addr)return -EINVAL ;
@@ -2841,13 +2838,12 @@ static void ublk_ctrl_fill_params_devt(struct ublk_device *ub) } ub->params.types |=UBLK_PARAM_TYPE_DEVT ; }static int ublk_ctrl_get_params (struct ublk_device *ub, -struct io_uring_cmd *cmd) +const struct ublksrv_ctrl_cmd *header) { -const struct ublksrv_ctrl_cmd *header =io_uring_sqe_cmd (cmd->sqe);void __user *argp = (void __user *)(unsigned long )header->addr;struct ublk_params_header ph;int ret;if (header->len <=sizeof (ph) || !header->addr)
@@ -2872,13 +2868,12 @@ static int ublk_ctrl_get_params(struct ublk_device *ub,return ret; }static int ublk_ctrl_set_params (struct ublk_device *ub, -struct io_uring_cmd *cmd) +const struct ublksrv_ctrl_cmd *header) { -const struct ublksrv_ctrl_cmd *header =io_uring_sqe_cmd (cmd->sqe);void __user *argp = (void __user *)(unsigned long )header->addr;struct ublk_params_header ph;int ret = -EFAULT ;if (header->len <=sizeof (ph) || !header->addr)
@@ -2938,13 +2933,12 @@ static void ublk_queue_reinit(struct ublk_device *ub, struct ublk_queue *ubq) io->addr =0 ; } }static int ublk_ctrl_start_recovery (struct ublk_device *ub, -struct io_uring_cmd *cmd) +const struct ublksrv_ctrl_cmd *header) { -const struct ublksrv_ctrl_cmd *header =io_uring_sqe_cmd (cmd->sqe);int ret = -EINVAL ;int i;mutex_lock (&ub->mutex);if (ublk_nosrv_should_stop_dev (ub))
@@ -2986,13 +2980,12 @@ static int ublk_ctrl_start_recovery(struct ublk_device *ub,mutex_unlock (&ub->mutex);return ret; }static int ublk_ctrl_end_recovery (struct ublk_device *ub, -struct io_uring_cmd *cmd) +const struct ublksrv_ctrl_cmd *header) { -const struct ublksrv_ctrl_cmd *header =io_uring_sqe_cmd (cmd->sqe);int ublksrv_pid = (int )header->data[0 ];int ret = -EINVAL ;int i; pr_devel("%s: Waiting for new ubq_daemons(nr: %d) are ready, dev id %d...\n",
@@ -3035,13 +3028,12 @@ static int ublk_ctrl_end_recovery(struct ublk_device *ub, out_unlock:mutex_unlock (&ub->mutex);return ret; } -static int ublk_ctrl_get_features (struct io_uring_cmd *cmd) +static int ublk_ctrl_get_features (const struct ublksrv_ctrl_cmd *header) { -const struct ublksrv_ctrl_cmd *header =io_uring_sqe_cmd (cmd->sqe);void __user *argp = (void __user *)(unsigned long )header->addr;u64 features =UBLK_F_ALL ;if (header->len !=UBLK_FEATURES_LEN || !header->addr)return -EINVAL ;
@@ -3176,11 +3168,11 @@ static int ublk_ctrl_uring_cmd(struct io_uring_cmd *cmd, ret =ublk_check_cmd_op (cmd_op);if (ret) goto out;if (cmd_op ==UBLK_U_CMD_GET_FEATURES ) { - ret =ublk_ctrl_get_features (cmd); + ret =ublk_ctrl_get_features (header); goto out; }if (_IOC_NR (cmd_op) !=UBLK_CMD_ADD_DEV ) { ret = -ENODEV ;
@@ -3193,42 +3185,42 @@ static int ublk_ctrl_uring_cmd(struct io_uring_cmd *cmd, goto put_dev; }switch (_IOC_NR (cmd_op)) {case UBLK_CMD_START_DEV : - ret =ublk_ctrl_start_dev (ub, cmd); + ret =ublk_ctrl_start_dev (ub, header);break ;case UBLK_CMD_STOP_DEV : ret =ublk_ctrl_stop_dev (ub);break ;case UBLK_CMD_GET_DEV_INFO :case UBLK_CMD_GET_DEV_INFO2 : - ret =ublk_ctrl_get_dev_info (ub, cmd); + ret =ublk_ctrl_get_dev_info (ub, header);break ;case UBLK_CMD_ADD_DEV : - ret =ublk_ctrl_add_dev (cmd); + ret =ublk_ctrl_add_dev (header);break ;case UBLK_CMD_DEL_DEV : ret =ublk_ctrl_del_dev (&ub, true);break ;case UBLK_CMD_DEL_DEV_ASYNC : ret =ublk_ctrl_del_dev (&ub, false);break ;case UBLK_CMD_GET_QUEUE_AFFINITY : - ret =ublk_ctrl_get_queue_affinity (ub, cmd); + ret =ublk_ctrl_get_queue_affinity (ub, header);break ;case UBLK_CMD_GET_PARAMS : - ret =ublk_ctrl_get_params (ub, cmd); + ret =ublk_ctrl_get_params (ub, header);break ;case UBLK_CMD_SET_PARAMS : - ret =ublk_ctrl_set_params (ub, cmd); + ret =ublk_ctrl_set_params (ub, header);break ;case UBLK_CMD_START_USER_RECOVERY : - ret =ublk_ctrl_start_recovery (ub, cmd); + ret =ublk_ctrl_start_recovery (ub, header);break ;case UBLK_CMD_END_USER_RECOVERY : - ret =ublk_ctrl_end_recovery (ub, cmd); + ret =ublk_ctrl_end_recovery (ub, header);break ;default : ret = -EOPNOTSUPP ;break ; }
Signature · 1 line
2.45.2
Quoted 6 lines · Caleb Sander Mateos
The ublk_ctrl_*() handlers all take struct
io_uring_cmd*cmd but only use it to get structublksrv_ctrl_cmd*header from theio_uringSQE. Since the callerublk_ctrl_uring_cmd()has already computed header, pass it instead of cmd.Signed-off-by Caleb Sander Mateos <[email protected]>
Thanks,
Ming
Quoted 6 lines · Caleb Sander Mateos
The ublk_ctrl_*() handlers all take struct
io_uring_cmd*cmd but only use it to get structublksrv_ctrl_cmd*header from theio_uringSQE. Since the callerublk_ctrl_uring_cmd()has already computed header, pass it instead of cmd.
Applied, thanks!
[1/1] ublk: pass ublksrv_ctrl_cmd * instead of io_uring_cmd *
commit: 843c6cec1af85f05971b7baf3704801895e77d76
Best regards,
Signature · 1 line
Jens Axboe