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

ublk: cleanup io cmd code path by adding ublk_fill_io_cmd() 



Add one small helper to cleanup io command hanlding code path.

Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20230519065030.351216-3-ming.lei@redhat.com


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

drivers/block/ublk_drv.c

+11 −9
Original line number Diff line number Diff line
@@ -1256,6 +1256,14 @@ static inline int ublk_check_cmd_op(u32 cmd_op) 
	return 0;

}



static inline void ublk_fill_io_cmd(struct ublk_io *io,

		struct io_uring_cmd *cmd, unsigned long buf_addr)

{

	io->cmd = cmd;

	io->flags |= UBLK_IO_FLAG_ACTIVE;

	io->addr = buf_addr;

}



static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd,

			       unsigned int issue_flags,

			       const struct ublksrv_io_cmd *ub_cmd)
@@ -1322,10 +1330,8 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, 
		/* FETCH_RQ has to provide IO buffer if NEED GET DATA is not enabled */

		if (!ub_cmd->addr && !ublk_need_get_data(ubq))

			goto out;

		io->cmd = cmd;

		io->flags |= UBLK_IO_FLAG_ACTIVE;

		io->addr = ub_cmd->addr;



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

		ublk_mark_io_ready(ub, ubq);

		break;

	case UBLK_IO_COMMIT_AND_FETCH_REQ:
@@ -1338,17 +1344,13 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, 
			goto out;

		if (!(io->flags & UBLK_IO_FLAG_OWNED_BY_SRV))

			goto out;

		io->addr = ub_cmd->addr;

		io->flags |= UBLK_IO_FLAG_ACTIVE;

		io->cmd = cmd;

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

		ublk_commit_completion(ub, ub_cmd);

		break;

	case UBLK_IO_NEED_GET_DATA:

		if (!(io->flags & UBLK_IO_FLAG_OWNED_BY_SRV))

			goto out;

		io->addr = ub_cmd->addr;

		io->cmd = cmd;

		io->flags |= UBLK_IO_FLAG_ACTIVE;

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

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

		break;

	default: