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

Commit 4160982e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

nvme: split __nvme_submit_sync_cmd 



Add a separate nvme_submit_user_cmd for commands that directly DMA
to or from userspace.  We'll add metadata support to that soon and
the common version would become too messy.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 22944e99

drivers/nvme/host/core.c

+57 −24
Original line number Diff line number Diff line
@@ -21,22 +21,15 @@ 


#include "nvme.h"



/*

 * Returns 0 on success.  If the result is negative, it's a Linux error code;

 * if the result is positive, it's an NVM Express status code

 */

int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,

		void *buffer, void __user *ubuffer, unsigned bufflen,

		u32 *result, unsigned timeout)

struct request *nvme_alloc_request(struct request_queue *q,

		struct nvme_command *cmd, unsigned int flags)

{

	bool write = cmd->common.opcode & 1;

	struct bio *bio = NULL;

	struct request *req;

	int ret;



	req = blk_mq_alloc_request(q, write, 0);

	req = blk_mq_alloc_request(q, write, flags);

	if (IS_ERR(req))

		return PTR_ERR(req);

		return req;



	req->cmd_type = REQ_TYPE_DRV_PRIV;

	req->cmd_flags |= REQ_FAILFAST_DRIVER;
@@ -44,17 +37,65 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, 
	req->__sector = (sector_t) -1;

	req->bio = req->biotail = NULL;



	req->timeout = timeout ? timeout : ADMIN_TIMEOUT;



	req->cmd = (unsigned char *)cmd;

	req->cmd_len = sizeof(struct nvme_command);

	req->special = (void *)0;



	return req;

}



/*

 * Returns 0 on success.  If the result is negative, it's a Linux error code;

 * if the result is positive, it's an NVM Express status code

 */

int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,

		void *buffer, unsigned bufflen, u32 *result, unsigned timeout)

{

	struct request *req;

	int ret;



	req = nvme_alloc_request(q, cmd, 0);

	if (IS_ERR(req))

		return PTR_ERR(req);



	req->timeout = timeout ? timeout : ADMIN_TIMEOUT;



	if (buffer && bufflen) {

		ret = blk_rq_map_kern(q, req, buffer, bufflen, GFP_KERNEL);

		if (ret)

			goto out;

	} else if (ubuffer && bufflen) {

	}



	blk_execute_rq(req->q, NULL, req, 0);

	if (result)

		*result = (u32)(uintptr_t)req->special;

	ret = req->errors;

 out:

	blk_mq_free_request(req);

	return ret;

}



int nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,

		void *buffer, unsigned bufflen)

{

	return __nvme_submit_sync_cmd(q, cmd, buffer, bufflen, NULL, 0);

}



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

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

		unsigned timeout)

{

	struct bio *bio = NULL;

	struct request *req;

	int ret;



	req = nvme_alloc_request(q, cmd, 0);

	if (IS_ERR(req))

		return PTR_ERR(req);



	req->timeout = timeout ? timeout : ADMIN_TIMEOUT;



	if (ubuffer && bufflen) {

		ret = blk_rq_map_user(q, req, NULL, ubuffer, bufflen,

				GFP_KERNEL);

		if (ret)
@@ -73,12 +114,6 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, 
	return ret;

}



int nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,

		void *buffer, unsigned bufflen)

{

	return __nvme_submit_sync_cmd(q, cmd, buffer, NULL, bufflen, NULL, 0);

}



int nvme_identify_ctrl(struct nvme_ctrl *dev, struct nvme_id_ctrl **id)

{

	struct nvme_command c = { };
@@ -131,8 +166,7 @@ int nvme_get_features(struct nvme_ctrl *dev, unsigned fid, unsigned nsid, 
	c.features.prp1 = cpu_to_le64(dma_addr);

	c.features.fid = cpu_to_le32(fid);



	return __nvme_submit_sync_cmd(dev->admin_q, &c, NULL, NULL, 0,

			result, 0);

	return __nvme_submit_sync_cmd(dev->admin_q, &c, NULL, 0, result, 0);

}



int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword11,
@@ -146,8 +180,7 @@ int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword11, 
	c.features.fid = cpu_to_le32(fid);

	c.features.dword11 = cpu_to_le32(dword11);



	return __nvme_submit_sync_cmd(dev->admin_q, &c, NULL, NULL, 0,

			result, 0);

	return __nvme_submit_sync_cmd(dev->admin_q, &c, NULL, 0, result, 0);

}



int nvme_get_log_page(struct nvme_ctrl *dev, struct nvme_smart_log **log)

drivers/nvme/host/nvme.h

+6 −2
Original line number Diff line number Diff line
@@ -148,11 +148,15 @@ static inline int nvme_error_status(u16 status) 
	}

}



struct request *nvme_alloc_request(struct request_queue *q,

		struct nvme_command *cmd, unsigned int flags);

int nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,

		void *buf, unsigned bufflen);

int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,

		void *buffer, void __user *ubuffer, unsigned bufflen,

		u32 *result, unsigned timeout);

		void *buffer, unsigned bufflen,  u32 *result, unsigned timeout);

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

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

		unsigned timeout);

int nvme_identify_ctrl(struct nvme_ctrl *dev, struct nvme_id_ctrl **id);

int nvme_identify_ns(struct nvme_ctrl *dev, unsigned nsid,

		struct nvme_id_ns **id);

drivers/nvme/host/pci.c

+3 −3
Original line number Diff line number Diff line
@@ -1697,7 +1697,7 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio) 
	c.rw.appmask = cpu_to_le16(io.appmask);

	c.rw.metadata = cpu_to_le64(meta_dma);



	status = __nvme_submit_sync_cmd(ns->queue, &c, NULL,

	status = nvme_submit_user_cmd(ns->queue, &c,

			(void __user *)(uintptr_t)io.addr, length, NULL, 0);

 unmap:

	if (meta) {
@@ -1739,8 +1739,8 @@ static int nvme_user_cmd(struct nvme_ctrl *ctrl, struct nvme_ns *ns, 
	if (cmd.timeout_ms)

		timeout = msecs_to_jiffies(cmd.timeout_ms);



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

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

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

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

			&cmd.result, timeout);

	if (status >= 0) {

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

drivers/nvme/host/scsi.c

+2 −2
Original line number Diff line number Diff line
@@ -1327,7 +1327,7 @@ static int nvme_trans_send_download_fw_cmd(struct nvme_ns *ns, struct sg_io_hdr 
	c.dlfw.numd = cpu_to_le32((tot_len/BYTES_TO_DWORDS) - 1);

	c.dlfw.offset = cpu_to_le32(offset/BYTES_TO_DWORDS);



	nvme_sc = __nvme_submit_sync_cmd(ns->ctrl->admin_q, &c, NULL,

	nvme_sc = nvme_submit_user_cmd(ns->ctrl->admin_q, &c,

			hdr->dxferp, tot_len, NULL, 0);

	return nvme_trans_status_code(hdr, nvme_sc);

}
@@ -1731,7 +1731,7 @@ static int nvme_trans_do_nvme_io(struct nvme_ns *ns, struct sg_io_hdr *hdr, 
			nvme_sc = NVME_SC_LBA_RANGE;

			break;

		}

		nvme_sc = __nvme_submit_sync_cmd(ns->queue, &c, NULL,

		nvme_sc = nvme_submit_user_cmd(ns->queue, &c,

				next_mapping_addr, unit_len, NULL, 0);

		if (nvme_sc)

			break;