Commit 17365ae6 authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Christoph Hellwig
Browse files

nvme: introduce nvme_execute_passthru_rq to call nvme_passthru_[start|end]() 



Introduce a new nvme_execute_passthru_rq() helper which calls
nvme_passthru_[start|end]() around blk_execute_rq(). This ensures
all passthru calls (including nvme_submit_io()) will be wrapped
appropriately.

nvme_execute_passthru_rq() will also be useful for the nvmet passthru
code and is exported in the NVME_TARGET_PASSTHRU namespace.

Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent df21b6b1

drivers/nvme/host/core.c

+15 −7
Original line number Diff line number Diff line
@@ -1028,6 +1028,20 @@ static void nvme_passthru_end(struct nvme_ctrl *ctrl, u32 effects) 
	}

}



void nvme_execute_passthru_rq(struct request *rq)

{

	struct nvme_command *cmd = nvme_req(rq)->cmd;

	struct nvme_ctrl *ctrl = nvme_req(rq)->ctrl;

	struct nvme_ns *ns = rq->q->queuedata;

	struct gendisk *disk = ns ? ns->disk : NULL;

	u32 effects;



	effects = nvme_passthru_start(ctrl, ns, cmd->common.opcode);

	blk_execute_rq(rq->q, disk, rq, 0);

	nvme_passthru_end(ctrl, effects);

}

EXPORT_SYMBOL_NS_GPL(nvme_execute_passthru_rq, NVME_TARGET_PASSTHRU);



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,
@@ -1066,7 +1080,7 @@ static int nvme_submit_user_cmd(struct request_queue *q, 
		}

	}



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

	nvme_execute_passthru_rq(req);

	if (nvme_req(req)->flags & NVME_REQ_CANCELLED)

		ret = -EINTR;

	else
@@ -1500,7 +1514,6 @@ static int nvme_user_cmd(struct nvme_ctrl *ctrl, struct nvme_ns *ns, 
	struct nvme_passthru_cmd cmd;

	struct nvme_command c;

	unsigned timeout = 0;

	u32 effects;

	u64 result;

	int status;
@@ -1527,12 +1540,10 @@ static int nvme_user_cmd(struct nvme_ctrl *ctrl, struct nvme_ns *ns, 
	if (cmd.timeout_ms)

		timeout = msecs_to_jiffies(cmd.timeout_ms);



	effects = nvme_passthru_start(ctrl, ns, cmd.opcode);

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

			nvme_to_user_ptr(cmd.addr), cmd.data_len,

			nvme_to_user_ptr(cmd.metadata), cmd.metadata_len,

			0, &result, timeout);

	nvme_passthru_end(ctrl, effects);



	if (status >= 0) {

		if (put_user(result, &ucmd->result))
@@ -1548,7 +1559,6 @@ static int nvme_user_cmd64(struct nvme_ctrl *ctrl, struct nvme_ns *ns, 
	struct nvme_passthru_cmd64 cmd;

	struct nvme_command c;

	unsigned timeout = 0;

	u32 effects;

	int status;



	if (!capable(CAP_SYS_ADMIN))
@@ -1574,12 +1584,10 @@ static int nvme_user_cmd64(struct nvme_ctrl *ctrl, struct nvme_ns *ns, 
	if (cmd.timeout_ms)

		timeout = msecs_to_jiffies(cmd.timeout_ms);



	effects = nvme_passthru_start(ctrl, ns, cmd.opcode);

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

			nvme_to_user_ptr(cmd.addr), cmd.data_len,

			nvme_to_user_ptr(cmd.metadata), cmd.metadata_len,

			0, &cmd.result, timeout);

	nvme_passthru_end(ctrl, effects);



	if (status >= 0) {

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

drivers/nvme/host/nvme.h

+1 −0
Original line number Diff line number Diff line
@@ -792,5 +792,6 @@ static inline void nvme_hwmon_init(struct nvme_ctrl *ctrl) { } 


u32 nvme_command_effects(struct nvme_ctrl *ctrl, struct nvme_ns *ns,

			 u8 opcode);

void nvme_execute_passthru_rq(struct request *rq);



#endif /* _NVME_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE