Commit 499aeb45 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'nvme-4.21' of git://git.infradead.org/nvme into for-4.21/block 

Pull last batch of NVMe updates for 4.21 from Christoph:

"This contains a series from Sagi to restore poll support for nvme-rdma,
 a new tracepoint from yupeng and various fixes."

* 'nvme-4.21' of git://git.infradead.org/nvme:
  nvme-pci: trace SQ status on completions
  nvme-rdma: implement polling queue map
  nvme-fabrics: allow user to pass in nr_poll_queues
  nvme-fabrics: allow nvmf_connect_io_queue to poll
  nvme-core: optionally poll sync commands
  block: make request_to_qc_t public
  nvme-tcp: fix spelling mistake "attepmpt" -> "attempt"
  nvme-tcp: fix endianess annotations
  nvmet-tcp: fix endianess annotations
  nvme-pci: refactor nvme_poll_irqdisable to make sparse happy
  nvme-pci: only set nr_maps to 2 if poll queues are supported
  nvmet: use a macro for default error location
  nvmet: fix comparison of a u16 with -1
parents cd19181b 604c01d5

block/blk-mq.c

+0 −8
Original line number Diff line number Diff line
@@ -1749,14 +1749,6 @@ static void blk_mq_bio_to_request(struct request *rq, struct bio *bio) 
	blk_account_io_start(rq, true);

}



static blk_qc_t request_to_qc_t(struct blk_mq_hw_ctx *hctx, struct request *rq)

{

	if (rq->tag != -1)

		return blk_tag_to_qc_t(rq->tag, hctx->queue_num, false);



	return blk_tag_to_qc_t(rq->internal_tag, hctx->queue_num, true);

}



static blk_status_t __blk_mq_issue_directly(struct blk_mq_hw_ctx *hctx,

					    struct request *rq,

					    blk_qc_t *cookie, bool last)

drivers/nvme/host/core.c

+33 −5
Original line number Diff line number Diff line
@@ -724,6 +724,31 @@ blk_status_t nvme_setup_cmd(struct nvme_ns *ns, struct request *req, 
}

EXPORT_SYMBOL_GPL(nvme_setup_cmd);



static void nvme_end_sync_rq(struct request *rq, blk_status_t error)

{

	struct completion *waiting = rq->end_io_data;



	rq->end_io_data = NULL;

	complete(waiting);

}



static void nvme_execute_rq_polled(struct request_queue *q,

		struct gendisk *bd_disk, struct request *rq, int at_head)

{

	DECLARE_COMPLETION_ONSTACK(wait);



	WARN_ON_ONCE(!test_bit(QUEUE_FLAG_POLL, &q->queue_flags));



	rq->cmd_flags |= REQ_HIPRI;

	rq->end_io_data = &wait;

	blk_execute_rq_nowait(q, bd_disk, rq, at_head, nvme_end_sync_rq);



	while (!completion_done(&wait)) {

		blk_poll(q, request_to_qc_t(rq->mq_hctx, rq), true);

		cond_resched();

	}

}



/*

 * 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
@@ -731,7 +756,7 @@ EXPORT_SYMBOL_GPL(nvme_setup_cmd); 
int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,

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

		unsigned timeout, int qid, int at_head,

		blk_mq_req_flags_t flags)

		blk_mq_req_flags_t flags, bool poll)

{

	struct request *req;

	int ret;
@@ -748,6 +773,9 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, 
			goto out;

	}



	if (poll)

		nvme_execute_rq_polled(req->q, NULL, req, at_head);

	else

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

	if (result)

		*result = nvme_req(req)->result;
@@ -765,7 +793,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, 0,

			NVME_QID_ANY, 0, 0);

			NVME_QID_ANY, 0, 0, false);

}

EXPORT_SYMBOL_GPL(nvme_submit_sync_cmd);
@@ -1084,7 +1112,7 @@ static int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword 
	c.features.dword11 = cpu_to_le32(dword11);



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

			buffer, buflen, 0, NVME_QID_ANY, 0, 0);

			buffer, buflen, 0, NVME_QID_ANY, 0, 0, false);

	if (ret >= 0 && result)

		*result = le32_to_cpu(res.u32);

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



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

				      ADMIN_TIMEOUT, NVME_QID_ANY, 1, 0);

				      ADMIN_TIMEOUT, NVME_QID_ANY, 1, 0, false);

}

EXPORT_SYMBOL_GPL(nvme_sec_submit);

#endif /* CONFIG_BLK_SED_OPAL */

drivers/nvme/host/fabrics.c

+19 −6
Original line number Diff line number Diff line
@@ -159,7 +159,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->admin_q, &cmd, &res, NULL, 0, 0,

			NVME_QID_ANY, 0, 0);

			NVME_QID_ANY, 0, 0, false);



	if (ret >= 0)

		*val = le64_to_cpu(res.u64);
@@ -206,7 +206,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->admin_q, &cmd, &res, NULL, 0, 0,

			NVME_QID_ANY, 0, 0);

			NVME_QID_ANY, 0, 0, false);



	if (ret >= 0)

		*val = le64_to_cpu(res.u64);
@@ -252,7 +252,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->admin_q, &cmd, NULL, NULL, 0, 0,

			NVME_QID_ANY, 0, 0);

			NVME_QID_ANY, 0, 0, false);

	if (unlikely(ret))

		dev_err(ctrl->device,

			"Property Set error: %d, offset %#x\n",
@@ -406,7 +406,7 @@ int nvmf_connect_admin_queue(struct nvme_ctrl *ctrl) 


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

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

			BLK_MQ_REQ_RESERVED | BLK_MQ_REQ_NOWAIT);

			BLK_MQ_REQ_RESERVED | BLK_MQ_REQ_NOWAIT, false);

	if (ret) {

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

				       &cmd, data);
@@ -441,7 +441,7 @@ EXPORT_SYMBOL_GPL(nvmf_connect_admin_queue); 
 *	> 0: NVMe error status code

 *	< 0: Linux errno error code

 */

int nvmf_connect_io_queue(struct nvme_ctrl *ctrl, u16 qid)

int nvmf_connect_io_queue(struct nvme_ctrl *ctrl, u16 qid, bool poll)

{

	struct nvme_command cmd;

	struct nvmf_connect_data *data;
@@ -468,7 +468,7 @@ int nvmf_connect_io_queue(struct nvme_ctrl *ctrl, u16 qid) 


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

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

			BLK_MQ_REQ_RESERVED | BLK_MQ_REQ_NOWAIT);

			BLK_MQ_REQ_RESERVED | BLK_MQ_REQ_NOWAIT, poll);

	if (ret) {

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

				       &cmd, data);
@@ -617,6 +617,7 @@ static const match_table_t opt_tokens = { 
	{ NVMF_OPT_HDR_DIGEST,		"hdr_digest"		},

	{ NVMF_OPT_DATA_DIGEST,		"data_digest"		},

	{ NVMF_OPT_NR_WRITE_QUEUES,	"nr_write_queues=%d"	},

	{ NVMF_OPT_NR_POLL_QUEUES,	"nr_poll_queues=%d"	},

	{ NVMF_OPT_ERR,			NULL			}

};
@@ -850,6 +851,18 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts, 
			}

			opts->nr_write_queues = token;

			break;

		case NVMF_OPT_NR_POLL_QUEUES:

			if (match_int(args, &token)) {

				ret = -EINVAL;

				goto out;

			}

			if (token <= 0) {

				pr_err("Invalid nr_poll_queues %d\n", token);

				ret = -EINVAL;

				goto out;

			}

			opts->nr_poll_queues = token;

			break;

		default:

			pr_warn("unknown parameter or missing value '%s' in ctrl creation request\n",

				p);

drivers/nvme/host/fabrics.h

+4 −1
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ enum { 
	NVMF_OPT_HDR_DIGEST	= 1 << 15,

	NVMF_OPT_DATA_DIGEST	= 1 << 16,

	NVMF_OPT_NR_WRITE_QUEUES = 1 << 17,

	NVMF_OPT_NR_POLL_QUEUES = 1 << 18,

};



/**
@@ -93,6 +94,7 @@ enum { 
 * @hdr_digest: generate/verify header digest (TCP)

 * @data_digest: generate/verify data digest (TCP)

 * @nr_write_queues: number of queues for write I/O

 * @nr_poll_queues: number of queues for polling I/O

 */

struct nvmf_ctrl_options {

	unsigned		mask;
@@ -113,6 +115,7 @@ struct nvmf_ctrl_options { 
	bool			hdr_digest;

	bool			data_digest;

	unsigned int		nr_write_queues;

	unsigned int		nr_poll_queues;

};



/*
@@ -168,7 +171,7 @@ int nvmf_reg_read32(struct nvme_ctrl *ctrl, u32 off, u32 *val); 
int nvmf_reg_read64(struct nvme_ctrl *ctrl, u32 off, u64 *val);

int nvmf_reg_write32(struct nvme_ctrl *ctrl, u32 off, u32 val);

int nvmf_connect_admin_queue(struct nvme_ctrl *ctrl);

int nvmf_connect_io_queue(struct nvme_ctrl *ctrl, u16 qid);

int nvmf_connect_io_queue(struct nvme_ctrl *ctrl, u16 qid, bool poll);

int nvmf_register_transport(struct nvmf_transport_ops *ops);

void nvmf_unregister_transport(struct nvmf_transport_ops *ops);

void nvmf_free_options(struct nvmf_ctrl_options *opts);

drivers/nvme/host/fc.c

+1 −1
Original line number Diff line number Diff line
@@ -1975,7 +1975,7 @@ nvme_fc_connect_io_queues(struct nvme_fc_ctrl *ctrl, u16 qsize) 
					(qsize / 5));

		if (ret)

			break;

		ret = nvmf_connect_io_queue(&ctrl->ctrl, i);

		ret = nvmf_connect_io_queue(&ctrl->ctrl, i, false);

		if (ret)

			break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE