ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I357f4a83736977d319175445b4d65443f57b2c6f
Signed-off-by: Ziye Yang <ziye.yang@intel.com>
This commit is contained in:
Ziye Yang 2016-11-29 13:18:30 +08:00 committed by Daniel Verkamp
parent bdbea32857
commit 2e6ec373bf
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/spdk/nvme.h
View File

@ -99,7 +99,7 @@ struct spdk_nvme_ctrlr_opts {
/** /**
* The queue depth of each NVMe I/O queue. * The queue depth of each NVMe I/O queue.
*/ */
int queue_size; uint32_t queue_size;
}; };
/** /**

3
lib/nvme/nvme_pcie.c
View File

@ -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); 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); rc = nvme_qpair_construct(qpair, qid, num_entries, ctrlr, qprio);
if (rc != 0) { if (rc != 0) {
spdk_free(pqpair); spdk_free(pqpair);

21
lib/nvme/nvme_rdma.c
View File

@ -63,6 +63,8 @@
#define NVME_HOST_ID_DEFAULT "12345679890" #define NVME_HOST_ID_DEFAULT "12345679890"
#define NVME_HOST_NQN "nqn.2016-06.io.spdk:host" #define NVME_HOST_NQN "nqn.2016-06.io.spdk:host"
#define NVME_HOST_MAX_ENTRIES_PER_QUEUE (127)
/* /*
NVME RDMA qpair Resouce Defaults 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->hostnqn, NVME_HOST_NQN, sizeof(nvmf_data->hostnqn));
strncpy((char *)nvmf_data->subnqn, ctrlr->probe_info.nqn, sizeof(nvmf_data->subnqn)); strncpy((char *)nvmf_data->subnqn, ctrlr->probe_info.nqn, sizeof(nvmf_data->subnqn));
rc = spdk_nvme_ctrlr_cmd_admin_raw(ctrlr, if (nvme_qpair_is_admin_queue(&rqpair->qpair)) {
(struct spdk_nvme_cmd *)&cmd, rc = spdk_nvme_ctrlr_cmd_admin_raw(ctrlr,
nvmf_data, sizeof(*nvmf_data), (struct spdk_nvme_cmd *)&cmd,
nvme_completion_poll_cb, &status); 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) { if (rc < 0) {
SPDK_ERRLOG("spdk_nvme_rdma_req_fabric_connect failed\n"); 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; num_entries = SPDK_NVMF_MIN_ADMIN_QUEUE_ENTRIES;
ctrlr->adminq = qpair; ctrlr->adminq = qpair;
} else { } 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); rc = nvme_qpair_construct(qpair, qid, num_entries, ctrlr, qprio);