Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63263d60 authored by Keith Busch's avatar Keith Busch Committed by Christoph Hellwig
Browse files

nvme: Use metadata for passthrough commands 



The ioctls' struct allows the user to provide a metadata address and
length for a passthrough command. This patch uses these values that were
previously ignored and deletes the now unused wrapper function.

Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 485783ca

drivers/nvme/host/core.c

+4 −11
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ static void *nvme_add_user_metadata(struct bio *bio, void __user *ubuf, 
	return ERR_PTR(ret);

}



static int __nvme_submit_user_cmd(struct request_queue *q,

static int nvme_submit_user_cmd(struct request_queue *q,

		struct nvme_command *cmd, void __user *ubuffer,

		unsigned bufflen, void __user *meta_buffer, unsigned meta_len,

		u32 meta_seed, u32 *result, unsigned timeout)
@@ -690,14 +690,6 @@ static int __nvme_submit_user_cmd(struct request_queue *q, 
	return ret;

}



static int nvme_submit_user_cmd(struct request_queue *q, struct nvme_command *cmd,

		void __user *ubuffer, unsigned bufflen, u32 *result,

		unsigned timeout)

{

	return __nvme_submit_user_cmd(q, cmd, ubuffer, bufflen, NULL, 0, 0,

			result, timeout);

}



static void nvme_keep_alive_end_io(struct request *rq, blk_status_t status)

{

	struct nvme_ctrl *ctrl = rq->end_io_data;
@@ -987,7 +979,7 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio) 
	c.rw.apptag = cpu_to_le16(io.apptag);

	c.rw.appmask = cpu_to_le16(io.appmask);



	return __nvme_submit_user_cmd(ns->queue, &c,

	return nvme_submit_user_cmd(ns->queue, &c,

			(void __user *)(uintptr_t)io.addr, length,

			metadata, meta_len, io.slba, NULL, 0);

}
@@ -1025,7 +1017,8 @@ static int nvme_user_cmd(struct nvme_ctrl *ctrl, struct nvme_ns *ns, 


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

			(void __user *)(uintptr_t)cmd.addr, cmd.data_len,

			&cmd.result, timeout);

			(void __user *)(uintptr_t)cmd.metadata, cmd.metadata,

			0, &cmd.result, timeout);

	if (status >= 0) {

		if (put_user(cmd.result, &ucmd->result))

			return -EFAULT;