Commit 2e6ec373 authored by Ziye Yang's avatar Ziye Yang Committed by Daniel Verkamp
Browse files

nvme/rdma: fix the I/O qpair creation issue 



Change-Id: I357f4a83736977d319175445b4d65443f57b2c6f
Signed-off-by: default avatarZiye Yang <ziye.yang@intel.com>
parent bdbea328

include/spdk/nvme.h

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ struct spdk_nvme_ctrlr_opts { 
	/**

	 * The queue depth of each NVMe I/O queue.

	 */

	int queue_size;

	uint32_t queue_size;

};



/**

lib/nvme/nvme_pcie.c

+3 −0
Original line number Diff line number Diff line
@@ -1302,6 +1302,9 @@ nvme_pcie_ctrlr_create_io_qpair(struct spdk_nvme_ctrlr *ctrlr, uint16_t qid, 
	 */

	num_entries = nvme_min(NVME_IO_ENTRIES, ctrlr->cap.bits.mqes + 1);



	/* Also should choose minmal between original and the value passed by users */

	num_entries = nvme_min(num_entries, ctrlr->opts.queue_size);



	rc = nvme_qpair_construct(qpair, qid, num_entries, ctrlr, qprio);

	if (rc != 0) {

		spdk_free(pqpair);

lib/nvme/nvme_rdma.c

+16 −5
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ 
#define NVME_HOST_ID_DEFAULT "12345679890"

#define NVME_HOST_NQN  "nqn.2016-06.io.spdk:host"



#define NVME_HOST_MAX_ENTRIES_PER_QUEUE (127)



/*

NVME RDMA qpair Resouce Defaults

 */
@@ -788,10 +790,17 @@ nvme_rdma_qpair_fabric_connect(struct nvme_rdma_qpair *rqpair) 
	strncpy((char *)nvmf_data->hostnqn, NVME_HOST_NQN, sizeof(nvmf_data->hostnqn));

	strncpy((char *)nvmf_data->subnqn, ctrlr->probe_info.nqn, sizeof(nvmf_data->subnqn));



	if (nvme_qpair_is_admin_queue(&rqpair->qpair)) {

		rc = spdk_nvme_ctrlr_cmd_admin_raw(ctrlr,

						   (struct spdk_nvme_cmd *)&cmd,

						   nvmf_data, sizeof(*nvmf_data),

						   nvme_completion_poll_cb, &status);

	} else {

		rc = spdk_nvme_ctrlr_cmd_io_raw(ctrlr, &rqpair->qpair,

						(struct spdk_nvme_cmd *)&cmd,

						nvmf_data, sizeof(*nvmf_data),

						nvme_completion_poll_cb, &status);

	}



	if (rc < 0) {

		SPDK_ERRLOG("spdk_nvme_rdma_req_fabric_connect failed\n");
@@ -948,7 +957,9 @@ nvme_rdma_ctrlr_create_qpair(struct spdk_nvme_ctrlr *ctrlr, uint16_t qid, 
		num_entries = SPDK_NVMF_MIN_ADMIN_QUEUE_ENTRIES;

		ctrlr->adminq = qpair;

	} else {

		num_entries = rctrlr->ctrlr.opts.queue_size;

		num_entries = nvme_min(NVME_HOST_MAX_ENTRIES_PER_QUEUE,

				       ctrlr->cap.bits.mqes + 1);

		num_entries = nvme_min(num_entries, rctrlr->ctrlr.opts.queue_size);

	}



	rc = nvme_qpair_construct(qpair, qid, num_entries, ctrlr, qprio);