Commit 69d483d5 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring/nvme: pass issue_flags to io_uring_cmd_import_fixed() 



io_uring_cmd_import_fixed() will need to know the io_uring execution
state in following commits, for now just pass issue_flags into it
without actually using.

Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20250224213116.3509093-5-kbusch@meta.com


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

drivers/nvme/host/ioctl.c

+6 −4
Original line number Diff line number Diff line
@@ -114,7 +114,8 @@ static struct request *nvme_alloc_user_request(struct request_queue *q, 


static int nvme_map_user_request(struct request *req, u64 ubuffer,

		unsigned bufflen, void __user *meta_buffer, unsigned meta_len,

		struct io_uring_cmd *ioucmd, unsigned int flags)

		struct io_uring_cmd *ioucmd, unsigned int flags,

		unsigned int iou_issue_flags)

{

	struct request_queue *q = req->q;

	struct nvme_ns *ns = q->queuedata;
@@ -142,7 +143,8 @@ static int nvme_map_user_request(struct request *req, u64 ubuffer, 
		if (WARN_ON_ONCE(flags & NVME_IOCTL_VEC))

			return -EINVAL;

		ret = io_uring_cmd_import_fixed(ubuffer, bufflen,

				rq_data_dir(req), &iter, ioucmd);

				rq_data_dir(req), &iter, ioucmd,

				iou_issue_flags);

		if (ret < 0)

			goto out;

		ret = blk_rq_map_user_iov(q, req, NULL, &iter, GFP_KERNEL);
@@ -194,7 +196,7 @@ static int nvme_submit_user_cmd(struct request_queue *q, 
	req->timeout = timeout;

	if (ubuffer && bufflen) {

		ret = nvme_map_user_request(req, ubuffer, bufflen, meta_buffer,

				meta_len, NULL, flags);

				meta_len, NULL, flags, 0);

		if (ret)

			return ret;

	}
@@ -514,7 +516,7 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, struct nvme_ns *ns, 
	if (d.addr && d.data_len) {

		ret = nvme_map_user_request(req, d.addr,

			d.data_len, nvme_to_user_ptr(d.metadata),

			d.metadata_len, ioucmd, vec);

			d.metadata_len, ioucmd, vec, issue_flags);

		if (ret)

			return ret;

	}

include/linux/io_uring/cmd.h

+4 −2
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ static inline void io_uring_cmd_private_sz_check(size_t cmd_sz) 


#if defined(CONFIG_IO_URING)

int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,

			      struct iov_iter *iter, void *ioucmd);

			      struct iov_iter *iter, void *ioucmd,

			      unsigned int issue_flags);



/*

 * Completes the request, i.e. posts an io_uring CQE and deallocates @ioucmd
@@ -67,7 +68,8 @@ void io_uring_cmd_issue_blocking(struct io_uring_cmd *ioucmd); 


#else

static inline int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,

			      struct iov_iter *iter, void *ioucmd)

			      struct iov_iter *iter, void *ioucmd,

			      unsigned int issue_flags)

{

	return -EOPNOTSUPP;

}

io_uring/uring_cmd.c

+2 −1
Original line number Diff line number Diff line
@@ -257,7 +257,8 @@ int io_uring_cmd(struct io_kiocb *req, unsigned int issue_flags) 
}



int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,

			      struct iov_iter *iter, void *ioucmd)

			      struct iov_iter *iter, void *ioucmd,

			      unsigned int issue_flags)

{

	struct io_kiocb *req = cmd_to_io_kiocb(ioucmd);

	struct io_rsrc_node *node = req->buf_node;