diff mbox series

ublk: honor IO_URING_F_NONBLOCK for handling control command

Message ID 20230104133235.836536-1-ming.lei@redhat.com (mailing list archive)
State New, archived
Headers show
Series ublk: honor IO_URING_F_NONBLOCK for handling control command | expand

Commit Message

Ming Lei Jan. 4, 2023, 1:32 p.m. UTC
Most of control command handlers may sleep, so return -EAGAIN in case
of IO_URING_F_NONBLOCK to defer the handling into io wq context.

Fixes: 71f28f3136af ("ublk_drv: add io_uring based userspace block driver")
Reported-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
 drivers/block/ublk_drv.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Jens Axboe Jan. 4, 2023, 4:13 p.m. UTC | #1
On Wed, 04 Jan 2023 21:32:35 +0800, Ming Lei wrote:
> Most of control command handlers may sleep, so return -EAGAIN in case
> of IO_URING_F_NONBLOCK to defer the handling into io wq context.
> 
> 

Applied, thanks!

[1/1] ublk: honor IO_URING_F_NONBLOCK for handling control command
      commit: 6a894753cef6494feb7e5332a95477f31212ebe9

Best regards,
diff mbox series

Patch

diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index e9de9d846b73..17b677b5d3b2 100644
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -1992,6 +1992,9 @@  static int ublk_ctrl_uring_cmd(struct io_uring_cmd *cmd,
 	struct ublksrv_ctrl_cmd *header = (struct ublksrv_ctrl_cmd *)cmd->cmd;
 	int ret = -EINVAL;
 
+	if (issue_flags & IO_URING_F_NONBLOCK)
+		return -EAGAIN;
+
 	ublk_ctrl_cmd_dump(cmd);
 
 	if (!(issue_flags & IO_URING_F_SQE128))