Commit bd2687f2 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Keith Busch
Browse files

nvme: change __nvme_submit_sync_cmd() calling conventions 



Combine the two arguments 'flags' and 'at_head' from __nvme_submit_sync_cmd()
into a single 'flags' argument and use function-specific values to indicate
what should be set within the function.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent f9ddefb6

drivers/nvme/host/auth.c

+3 −4
Original line number Diff line number Diff line
@@ -58,12 +58,12 @@ static int nvme_auth_submit(struct nvme_ctrl *ctrl, int qid, 
			    void *data, size_t data_len, bool auth_send)

{

	struct nvme_command cmd = {};

	blk_mq_req_flags_t flags = 0;

	nvme_submit_flags_t flags = 0;

	struct request_queue *q = ctrl->fabrics_q;

	int ret;



	if (qid != 0) {

		flags |= BLK_MQ_REQ_NOWAIT | BLK_MQ_REQ_RESERVED;

		flags |= NVME_SUBMIT_NOWAIT | NVME_SUBMIT_RESERVED;

		q = ctrl->connect_q;

	}
@@ -80,8 +80,7 @@ static int nvme_auth_submit(struct nvme_ctrl *ctrl, int qid, 
	}



	ret = __nvme_submit_sync_cmd(q, &cmd, NULL, data, data_len,

				     qid == 0 ? NVME_QID_ANY : qid,

				     0, flags);

				     qid == 0 ? NVME_QID_ANY : qid, flags);

	if (ret > 0)

		dev_warn(ctrl->device,

			"qid %d auth_send failed with status %d\n", qid, ret);

drivers/nvme/host/core.c

+12 −7
Original line number Diff line number Diff line
@@ -1051,15 +1051,20 @@ EXPORT_SYMBOL_NS_GPL(nvme_execute_rq, NVME_TARGET_PASSTHRU); 
 */

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

		union nvme_result *result, void *buffer, unsigned bufflen,

		int qid, int at_head, blk_mq_req_flags_t flags)

		int qid, nvme_submit_flags_t flags)

{

	struct request *req;

	int ret;

	blk_mq_req_flags_t blk_flags = 0;



	if (flags & NVME_SUBMIT_NOWAIT)

		blk_flags |= BLK_MQ_REQ_NOWAIT;

	if (flags & NVME_SUBMIT_RESERVED)

		blk_flags |= BLK_MQ_REQ_RESERVED;

	if (qid == NVME_QID_ANY)

		req = blk_mq_alloc_request(q, nvme_req_op(cmd), flags);

		req = blk_mq_alloc_request(q, nvme_req_op(cmd), blk_flags);

	else

		req = blk_mq_alloc_request_hctx(q, nvme_req_op(cmd), flags,

		req = blk_mq_alloc_request_hctx(q, nvme_req_op(cmd), blk_flags,

						qid - 1);



	if (IS_ERR(req))
@@ -1072,7 +1077,7 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, 
			goto out;

	}



	ret = nvme_execute_rq(req, at_head);

	ret = nvme_execute_rq(req, flags & NVME_SUBMIT_AT_HEAD);

	if (result && ret >= 0)

		*result = nvme_req(req)->result;

 out:
@@ -1085,7 +1090,7 @@ int nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, 
		void *buffer, unsigned bufflen)

{

	return __nvme_submit_sync_cmd(q, cmd, NULL, buffer, bufflen,

			NVME_QID_ANY, 0, 0);

			NVME_QID_ANY, 0);

}

EXPORT_SYMBOL_GPL(nvme_submit_sync_cmd);
@@ -1560,7 +1565,7 @@ static int nvme_features(struct nvme_ctrl *dev, u8 op, unsigned int fid, 
	c.features.dword11 = cpu_to_le32(dword11);



	ret = __nvme_submit_sync_cmd(dev->admin_q, &c, &res,

			buffer, buflen, NVME_QID_ANY, 0, 0);

			buffer, buflen, NVME_QID_ANY, 0);

	if (ret >= 0 && result)

		*result = le32_to_cpu(res.u32);

	return ret;
@@ -2172,7 +2177,7 @@ static int nvme_sec_submit(void *data, u16 spsp, u8 secp, void *buffer, size_t l 
	cmd.common.cdw11 = cpu_to_le32(len);



	return __nvme_submit_sync_cmd(ctrl->admin_q, &cmd, NULL, buffer, len,

			NVME_QID_ANY, 1, 0);

			NVME_QID_ANY, NVME_SUBMIT_AT_HEAD);

}



static void nvme_configure_opal(struct nvme_ctrl *ctrl, bool was_suspended)

drivers/nvme/host/fabrics.c

+11 −7
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ int nvmf_reg_read32(struct nvme_ctrl *ctrl, u32 off, u32 *val) 
	cmd.prop_get.offset = cpu_to_le32(off);



	ret = __nvme_submit_sync_cmd(ctrl->fabrics_q, &cmd, &res, NULL, 0,

			NVME_QID_ANY, 0, 0);

			NVME_QID_ANY, 0);



	if (ret >= 0)

		*val = le64_to_cpu(res.u64);
@@ -226,7 +226,7 @@ int nvmf_reg_read64(struct nvme_ctrl *ctrl, u32 off, u64 *val) 
	cmd.prop_get.offset = cpu_to_le32(off);



	ret = __nvme_submit_sync_cmd(ctrl->fabrics_q, &cmd, &res, NULL, 0,

			NVME_QID_ANY, 0, 0);

			NVME_QID_ANY, 0);



	if (ret >= 0)

		*val = le64_to_cpu(res.u64);
@@ -271,7 +271,7 @@ int nvmf_reg_write32(struct nvme_ctrl *ctrl, u32 off, u32 val) 
	cmd.prop_set.value = cpu_to_le64(val);



	ret = __nvme_submit_sync_cmd(ctrl->fabrics_q, &cmd, NULL, NULL, 0,

			NVME_QID_ANY, 0, 0);

			NVME_QID_ANY, 0);

	if (unlikely(ret))

		dev_err(ctrl->device,

			"Property Set error: %d, offset %#x\n",
@@ -450,8 +450,10 @@ int nvmf_connect_admin_queue(struct nvme_ctrl *ctrl) 
		return -ENOMEM;



	ret = __nvme_submit_sync_cmd(ctrl->fabrics_q, &cmd, &res,

			data, sizeof(*data), NVME_QID_ANY, 1,

			BLK_MQ_REQ_RESERVED | BLK_MQ_REQ_NOWAIT);

			data, sizeof(*data), NVME_QID_ANY,

			NVME_SUBMIT_AT_HEAD |

			NVME_SUBMIT_NOWAIT |

			NVME_SUBMIT_RESERVED);

	if (ret) {

		nvmf_log_connect_error(ctrl, ret, le32_to_cpu(res.u32),

				       &cmd, data);
@@ -525,8 +527,10 @@ int nvmf_connect_io_queue(struct nvme_ctrl *ctrl, u16 qid) 
		return -ENOMEM;



	ret = __nvme_submit_sync_cmd(ctrl->connect_q, &cmd, &res,

			data, sizeof(*data), qid, 1,

			BLK_MQ_REQ_RESERVED | BLK_MQ_REQ_NOWAIT);

			data, sizeof(*data), qid,

			NVME_SUBMIT_AT_HEAD |

			NVME_SUBMIT_RESERVED |

			NVME_SUBMIT_NOWAIT);

	if (ret) {

		nvmf_log_connect_error(ctrl, ret, le32_to_cpu(res.u32),

				       &cmd, data);

drivers/nvme/host/nvme.h

+15 −2
Original line number Diff line number Diff line
@@ -837,12 +837,25 @@ static inline bool nvme_is_unique_nsid(struct nvme_ctrl *ctrl, 
		(ctrl->ctratt & NVME_CTRL_CTRATT_NVM_SETS);

}



/*

 * Flags for __nvme_submit_sync_cmd()

 */

typedef __u32 __bitwise nvme_submit_flags_t;



enum {

	/* Insert request at the head of the queue */

	NVME_SUBMIT_AT_HEAD  = (__force nvme_submit_flags_t)(1 << 0),

	/* Set BLK_MQ_REQ_NOWAIT when allocating request */

	NVME_SUBMIT_NOWAIT = (__force nvme_submit_flags_t)(1 << 1),

	/* Set BLK_MQ_REQ_RESERVED when allocating request */

	NVME_SUBMIT_RESERVED = (__force nvme_submit_flags_t)(1 << 2),

};



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,

		union nvme_result *result, void *buffer, unsigned bufflen,

		int qid, int at_head,

		blk_mq_req_flags_t flags);

		int qid, nvme_submit_flags_t flags);

int nvme_set_features(struct nvme_ctrl *dev, unsigned int fid,

		      unsigned int dword11, void *buffer, size_t buflen,

		      u32 *result);