Commit 4d174486 authored by Kanchan Joshi's avatar Kanchan Joshi Committed by Jens Axboe
Browse files

nvme: pass ubuffer as an integer 



This is a prep patch. Modify nvme_submit_user_cmd and
nvme_map_user_request to take ubuffer as plain integer
argument, and do away with nvme_to_user_ptr conversion in callers.

Signed-off-by: default avatarAnuj Gupta <anuj20.g@samsung.com>
Signed-off-by: default avatarKanchan Joshi <joshi.k@samsung.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220930062749.152261-12-anuj20.g@samsung.com


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

drivers/nvme/host/ioctl.c

+12 −11
Original line number Diff line number Diff line
@@ -83,9 +83,10 @@ static struct request *nvme_alloc_user_request(struct request_queue *q, 
	return req;

}



static int nvme_map_user_request(struct request *req, void __user *ubuffer,

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

		unsigned bufflen, void __user *meta_buffer, unsigned meta_len,

		u32 meta_seed, void **metap, bool vec)

		u32 meta_seed, void **metap, struct io_uring_cmd *ioucmd,

		bool vec)

{

	struct request_queue *q = req->q;

	struct nvme_ns *ns = q->queuedata;
@@ -94,8 +95,8 @@ static int nvme_map_user_request(struct request *req, void __user *ubuffer, 
	void *meta = NULL;

	int ret;



	ret = blk_rq_map_user_io(req, NULL, ubuffer, bufflen, GFP_KERNEL, vec,

			0, 0, rq_data_dir(req));

	ret = blk_rq_map_user_io(req, NULL, nvme_to_user_ptr(ubuffer), bufflen,

			GFP_KERNEL, vec, 0, 0, rq_data_dir(req));



	if (ret)

		goto out;
@@ -124,7 +125,7 @@ static int nvme_map_user_request(struct request *req, void __user *ubuffer, 
}



static int nvme_submit_user_cmd(struct request_queue *q,

		struct nvme_command *cmd, void __user *ubuffer,

		struct nvme_command *cmd, u64 ubuffer,

		unsigned bufflen, void __user *meta_buffer, unsigned meta_len,

		u32 meta_seed, u64 *result, unsigned timeout, bool vec)

{
@@ -142,7 +143,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, meta_seed, &meta, vec);

				meta_len, meta_seed, &meta, NULL, vec);

		if (ret)

			return ret;

	}
@@ -226,7 +227,7 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio) 
	c.rw.appmask = cpu_to_le16(io.appmask);



	return nvme_submit_user_cmd(ns->queue, &c,

			nvme_to_user_ptr(io.addr), length,

			io.addr, length,

			metadata, meta_len, lower_32_bits(io.slba), NULL, 0,

			false);

}
@@ -280,7 +281,7 @@ static int nvme_user_cmd(struct nvme_ctrl *ctrl, struct nvme_ns *ns, 
		timeout = msecs_to_jiffies(cmd.timeout_ms);



	status = nvme_submit_user_cmd(ns ? ns->queue : ctrl->admin_q, &c,

			nvme_to_user_ptr(cmd.addr), cmd.data_len,

			cmd.addr, cmd.data_len,

			nvme_to_user_ptr(cmd.metadata), cmd.metadata_len,

			0, &result, timeout, false);
@@ -326,7 +327,7 @@ static int nvme_user_cmd64(struct nvme_ctrl *ctrl, struct nvme_ns *ns, 
		timeout = msecs_to_jiffies(cmd.timeout_ms);



	status = nvme_submit_user_cmd(ns ? ns->queue : ctrl->admin_q, &c,

			nvme_to_user_ptr(cmd.addr), cmd.data_len,

			cmd.addr, cmd.data_len,

			nvme_to_user_ptr(cmd.metadata), cmd.metadata_len,

			0, &cmd.result, timeout, vec);
@@ -512,9 +513,9 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, struct nvme_ns *ns, 
	req->timeout = d.timeout_ms ? msecs_to_jiffies(d.timeout_ms) : 0;



	if (d.addr && d.data_len) {

		ret = nvme_map_user_request(req, nvme_to_user_ptr(d.addr),

		ret = nvme_map_user_request(req, d.addr,

			d.data_len, nvme_to_user_ptr(d.metadata),

			d.metadata_len, 0, &meta, vec);

			d.metadata_len, 0, &meta, ioucmd, vec);

		if (ret)

			return ret;

	}