Commit d6aa0c17 authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

ublk: call ublk_dispatch_req() for handling UBLK_U_IO_NEED_GET_DATA 



We call io_uring_cmd_complete_in_task() to schedule task_work for handling
UBLK_U_IO_NEED_GET_DATA.

This way is really not necessary because the current context is exactly
the ublk queue context, so call ublk_dispatch_req() directly for handling
UBLK_U_IO_NEED_GET_DATA.

Fixes: 216c8f5e ("ublk: replace monitor with cancelable uring_cmd")
Tested-by: default avatarJared Holzman <jholzman@nvidia.com>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20250425013742.1079549-2-ming.lei@redhat.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c4d2519c

drivers/block/ublk_drv.c

+3 −11
Original line number Diff line number Diff line
@@ -1886,15 +1886,6 @@ static void ublk_mark_io_ready(struct ublk_device *ub, struct ublk_queue *ubq) 
	}

}



static void ublk_handle_need_get_data(struct ublk_device *ub, int q_id,

		int tag)

{

	struct ublk_queue *ubq = ublk_get_queue(ub, q_id);

	struct request *req = blk_mq_tag_to_rq(ub->tag_set.tags[q_id], tag);



	ublk_queue_cmd(ubq, req);

}



static inline int ublk_check_cmd_op(u32 cmd_op)

{

	u32 ioc_type = _IOC_TYPE(cmd_op);
@@ -2103,8 +2094,9 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, 
		if (!(io->flags & UBLK_IO_FLAG_OWNED_BY_SRV))

			goto out;

		ublk_fill_io_cmd(io, cmd, ub_cmd->addr);

		ublk_handle_need_get_data(ub, ub_cmd->q_id, ub_cmd->tag);

		break;

		req = blk_mq_tag_to_rq(ub->tag_set.tags[ub_cmd->q_id], tag);

		ublk_dispatch_req(ubq, req, issue_flags);

		return -EIOCBQUEUED;

	default:

		goto out;

	}