ublk: introduce UBLK_CMD_TRY_STOP_DEV
Subsystems (2)
v2 cover ublk: introduce UBLK_CMD_TRY_STOP_DEV
Hello,
This patch series introduces a new command for ublk device management.
The first patch changes ublk_ctrl_stop_dev() to return void, since it always returned 0. This simplifies the API.
The second patch introduces UBLK_CMD_TRY_STOP_DEV, which stops the device only if there are no active openers. Unlike the existing stop command (UBLK_CMD_STOP_DEV), this command avoids disrupting active users by returning -EBUSY if the device is busy.
These patches only introduce the new command and API simplification without altering existing behavior for active users.
Yoav Cohen (2):
ublk: make ublk_ctrl_stop_dev return void
ublk: add UBLK_CMD_TRY_STOP_DEV command
drivers/block/ublk_drv.c | 48 ++++++++++++++++++++++++++++++++--- include/uapi/linux/ublk_cmd.h | 3 ++- 2 files changed, 47 insertions(+), 4 deletions(-)
Signature · 1 line
2.39.5 (Apple Git-154)
PATCH v2 1/2 ublk: make ublk_ctrl_stop_dev return void
This function always returns 0, so there is no need to return a value.
--- drivers/block/ublk_drv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/block/ublk_drv.c +3 -3
@@ -3304,10 +3304,9 @@ static inline void ublk_ctrl_cmd_dump(struct io_uring_cmd *cmd) header->data[0], header->addr, header->len); } -static int ublk_ctrl_stop_dev (struct ublk_device *ub) +static void ublk_ctrl_stop_dev (struct ublk_device *ub) {ublk_stop_dev (ub); -return 0 ; } static int ublk_ctrl_get_dev_info(struct ublk_device *ub,
@@ -3780,7 +3779,8 @@ static int ublk_ctrl_uring_cmd(struct io_uring_cmd *cmd, ret =ublk_ctrl_start_dev (ub, header);break ;case UBLK_CMD_STOP_DEV : - ret =ublk_ctrl_stop_dev (ub); +ublk_ctrl_stop_dev (ub); + ret =0 ;break ;case UBLK_CMD_GET_DEV_INFO :case UBLK_CMD_GET_DEV_INFO2 :
Signature · 1 line
2.39.5 (Apple Git-154)
Re: [PATCH v2 1/2] ublk: make ublk_ctrl_stop_dev return void
Quoted 24 lines · Yoav Cohen
This function always returns 0, so there is no need to return a value.
Signed-off-by Yoav Cohen <[email protected]>--- drivers/block/ublk_drv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/block/ublk_drv.c +1
-2@@ -3304,10 +3304,9 @@ static inline void ublk_ctrl_cmd_dump(struct io_uring_cmd *cmd) header->data[0], header->addr, header->len); } -static int ublk_ctrl_stop_dev (struct ublk_device *ub) +static void ublk_ctrl_stop_dev (struct ublk_device *ub) {ublk_stop_dev (ub); -return 0 ; } static int ublk_ctrl_get_dev_info(struct ublk_device *ub,
drivers/block/ublk_drv.c static int ublk_ctrl_uring_cmd(struct io_uring_cmd *cmd, · line 3783
Quoted 6 lines
drivers/block/ublk_drv.c +2
-1@@ -3780,7 +3779,8 @@ static int ublk_ctrl_uring_cmd(struct io_uring_cmd *cmd, ret =ublk_ctrl_start_dev (ub, header);break ;case UBLK_CMD_STOP_DEV : - ret =ublk_ctrl_stop_dev (ub); +ublk_ctrl_stop_dev (ub); + ret =0 ;
Thanks
Ming
PATCH v2 2/2 ublk: add UBLK_CMD_TRY_STOP_DEV command
In reply to Yoav CohenThis command is similar to UBLK_CMD_STOP_DEV, but it only stops the device if there are no active openers for the ublk block device. If the device is busy, the command returns -EBUSY instead of disrupting active clients. This allows safe, non-destructive stopping.
--- drivers/block/ublk_drv.c | 42 +++++++++++++++++++++++++++++++++++ include/uapi/linux/ublk_cmd.h | 3 ++- 2 files changed, 44 insertions(+), 1 deletion(-)
drivers/block/ublk_drv.c +42 -0
@@ -54,6 +54,7 @@#define UBLK_CMD_DEL_DEV_ASYNC _IOC_NR(UBLK_U_CMD_DEL_DEV_ASYNC)#define UBLK_CMD_UPDATE_SIZE _IOC_NR(UBLK_U_CMD_UPDATE_SIZE)#define UBLK_CMD_QUIESCE_DEV _IOC_NR(UBLK_U_CMD_QUIESCE_DEV) +#define UBLK_CMD_TRY_STOP_DEV _IOC_NR(UBLK_U_CMD_TRY_STOP_DEV)#define UBLK_IO_REGISTER_IO_BUF _IOC_NR(UBLK_U_IO_REGISTER_IO_BUF)#define UBLK_IO_UNREGISTER_IO_BUF _IOC_NR(UBLK_U_IO_UNREGISTER_IO_BUF)
@@ -239,6 +240,8 @@ struct ublk_device {struct delayed_work exit_work;struct work_struct partition_scan_work; +bool block_open;/* protected by open_mutex */ +struct ublk_queue *queues[]; };
@@ -919,6 +922,9 @@ static int ublk_open(struct gendisk *disk, blk_mode_t mode)return -EPERM ; } +if (ub->block_open) +return -EBUSY ; +return 0 ; }
@@ -3309,6 +3315,38 @@ static void ublk_ctrl_stop_dev(struct ublk_device *ub)ublk_stop_dev (ub); } +static int ublk_ctrl_try_stop_dev (struct ublk_device *ub) +{ +struct gendisk *disk; +int ret = -EINVAL ; + + disk =ublk_get_disk (ub); +if (!disk) { + ret = -ENODEV ; + goto out; + } + +mutex_lock (&disk->open_mutex); +if (disk_openers (disk) >0 ) { + ret = -EBUSY ; + goto unlock; + } + ub->block_open = true; +/* release open_mutex as del_gendisk() will reacquire it */ +mutex_unlock (&disk->open_mutex); + +ublk_ctrl_stop_dev (ub); + ret =0 ; + goto put_disk; + +unlock: +mutex_unlock (&disk->open_mutex); +put_disk: +ublk_put_disk (disk); +out: +return ret; +} +static int ublk_ctrl_get_dev_info (struct ublk_device *ub,const struct ublksrv_ctrl_cmd *header) {
@@ -3704,6 +3742,7 @@ static int ublk_ctrl_uring_cmd_permission(struct ublk_device *ub,case UBLK_CMD_END_USER_RECOVERY :case UBLK_CMD_UPDATE_SIZE :case UBLK_CMD_QUIESCE_DEV : +case UBLK_CMD_TRY_STOP_DEV : mask =MAY_READ |MAY_WRITE ;break ;default :
@@ -3817,6 +3856,9 @@ static int ublk_ctrl_uring_cmd(struct io_uring_cmd *cmd,case UBLK_CMD_QUIESCE_DEV : ret =ublk_ctrl_quiesce_dev (ub, header);break ; +case UBLK_CMD_TRY_STOP_DEV : + ret =ublk_ctrl_try_stop_dev (ub); +break ;default : ret = -EOPNOTSUPP ;break ;
include/uapi/linux/ublk_cmd.h +2 -1
@@ -55,7 +55,8 @@ _IOWR('u', 0x15, struct ublksrv_ctrl_cmd)#define UBLK_U_CMD_QUIESCE_DEV \ _IOWR('u', 0x16, struct ublksrv_ctrl_cmd) - +#define UBLK_U_CMD_TRY_STOP_DEV \ + _IOWR('u', 0x17, struct ublksrv_ctrl_cmd)/* * 64bits are enough now, and it should be easy to extend in case of * running out of feature flags
Signature · 1 line
2.39.5 (Apple Git-154)
Re: [PATCH v2 2/2] ublk: add UBLK_CMD_TRY_STOP_DEV command
Quoted 16 lines · Yoav Cohen
This command is similar to
UBLK_CMD_STOP_DEV, but it only stops the device if there are no active openers for the ublk block device. If the device is busy, the command returns-EBUSYinstead of disrupting active clients. This allows safe, non-destructive stopping.Signed-off-by Yoav Cohen <[email protected]>--- drivers/block/ublk_drv.c | 42 +++++++++++++++++++++++++++++++++++ include/uapi/linux/ublk_cmd.h | 3 ++- 2 files changed, 44 insertions(+), 1 deletion(-)drivers/block/ublk_drv.c +0
-0
drivers/block/ublk_drv.c line 57
Quoted 4 lines
drivers/block/ublk_drv.c +1
-0@@ -54,6 +54,7 @@#define UBLK_CMD_DEL_DEV_ASYNC _IOC_NR(UBLK_U_CMD_DEL_DEV_ASYNC)#define UBLK_CMD_UPDATE_SIZE _IOC_NR(UBLK_U_CMD_UPDATE_SIZE)#define UBLK_CMD_QUIESCE_DEV _IOC_NR(UBLK_U_CMD_QUIESCE_DEV) +#define UBLK_CMD_TRY_STOP_DEV _IOC_NR(UBLK_U_CMD_TRY_STOP_DEV)
This need a feature flag, such as UBLK_F_SAFE_STOP, which is set in ublk_ctrl_add_dev(), meantime document that UBLK_CMD_TRY_STOP_DEV is supported with this feature.
Quoted 23 lines
drivers/block/ublk_drv.c +5
-0#define UBLK_IO_REGISTER_IO_BUF _IOC_NR(UBLK_U_IO_REGISTER_IO_BUF)#define UBLK_IO_UNREGISTER_IO_BUF _IOC_NR(UBLK_U_IO_UNREGISTER_IO_BUF)@@ -239,6 +240,8 @@ struct ublk_device {struct delayed_work exit_work;struct work_struct partition_scan_work; +bool block_open;/* protected by open_mutex */ +struct ublk_queue *queues[]; };@@ -919,6 +922,9 @@ static int ublk_open(struct gendisk *disk, blk_mode_t mode)return -EPERM ; } +if (ub->block_open) +return -EBUSY ; +return 0 ; }
drivers/block/ublk_drv.c static void ublk_ctrl_stop_dev(struct ublk_device *ub) · line 3321
Quoted 7 lines
drivers/block/ublk_drv.c +4
-0@@ -3309,6 +3315,38 @@ static void ublk_ctrl_stop_dev(struct ublk_device *ub)ublk_stop_dev (ub); } +static int ublk_ctrl_try_stop_dev (struct ublk_device *ub) +{ +struct gendisk *disk; +int ret = -EINVAL ;
-EINVAL is never used, it may save the line of ret = 0 if it is initialized as 0.
drivers/block/ublk_drv.c static void ublk_ctrl_stop_dev(struct ublk_device *ub) · line 3326
Quoted 5 lines
drivers/block/ublk_drv.c +5
-0+ + disk =ublk_get_disk (ub); +if (!disk) { + ret = -ENODEV ; + goto out;
return -ENODEV;
Thanks,
Ming