[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected. No action required from the submitter.
The upstream commit SHA1 provided is correct: 728cbac5fe219d3b8a21a0688a08f2b7f8aeda2b
WARNING: Author mismatch between patch and upstream commit: Backport author: Jared Holzmanjholzman@nvidia.com Commit author: Ming Leiming.lei@redhat.com
Note: The patch differs from the upstream commit: --- 1: 728cbac5fe219 ! 1: 24577a96fbb85 ublk: move device reset into ublk_ch_release() @@ Metadata ## Commit message ## ublk: move device reset into ublk_ch_release()
+ [ Upstream commit 728cbac5fe219d3b8a21a0688a08f2b7f8aeda2b ] + ublk_ch_release() is called after ublk char device is closed, when all uring_cmd are done, so it is perfect fine to move ublk device reset to ublk_ch_release() from ublk_ctrl_start_recovery(). @@ drivers/block/ublk_drv.c: static void ublk_mark_io_ready(struct ublk_device *ub, + } }
- static void ublk_handle_need_get_data(struct ublk_device *ub, int q_id, + static inline int ublk_check_cmd_op(u32 cmd_op) @@ drivers/block/ublk_drv.c: static int ublk_ctrl_set_params(struct ublk_device *ub, return ret; } @@ drivers/block/ublk_drv.c: static int ublk_ctrl_set_params(struct ublk_device *ub -} - static int ublk_ctrl_start_recovery(struct ublk_device *ub, - const struct ublksrv_ctrl_cmd *header) + struct io_uring_cmd *cmd) { + const struct ublksrv_ctrl_cmd *header = io_uring_sqe_cmd(cmd->sqe); int ret = -EINVAL; - int i;
@@ drivers/block/ublk_drv.c: static int ublk_ctrl_start_recovery(struct ublk_device ret = 0; out_unlock: @@ drivers/block/ublk_drv.c: static int ublk_ctrl_end_recovery(struct ublk_device *ub, - { + const struct ublksrv_ctrl_cmd *header = io_uring_sqe_cmd(cmd->sqe); int ublksrv_pid = (int)header->data[0]; int ret = -EINVAL; - int i; ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-5.4.y | Success | Success |