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

nvme: rename queue_size option to io_queue_size

Browse Source 
This better describes what the field controls (it does not affect the
admin queue size).

Change-Id: I851ae46fb4ed0fce819af07ae235824e0fc817e6
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-12-12 16:27:23 -07:00
parent 8a62ba51f2
commit 92ee5fc4be
5 changed files with 5 additions and 7 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.
*/ */
uint32_t queue_size; uint32_t io_queue_size;
/** /**
* The host NQN to use when connecting to NVMe over Fabrics controllers. * The host NQN to use when connecting to NVMe over Fabrics controllers.

2
lib/nvme/nvme_ctrlr.c
View File

@ -80,7 +80,7 @@ spdk_nvme_ctrlr_opts_set_defaults(struct spdk_nvme_ctrlr_opts *opts)
opts->use_cmb_sqs = false; opts->use_cmb_sqs = false;
opts->arb_mechanism = SPDK_NVME_CC_AMS_RR; opts->arb_mechanism = SPDK_NVME_CC_AMS_RR;
opts->keep_alive_timeout_ms = 10 * 1000; opts->keep_alive_timeout_ms = 10 * 1000;
opts->queue_size = DEFAULT_MAX_QUEUE_SIZE; opts->io_queue_size = DEFAULT_IO_QUEUE_SIZE;
strncpy(opts->hostnqn, DEFAULT_HOSTNQN, sizeof(opts->hostnqn)); strncpy(opts->hostnqn, DEFAULT_HOSTNQN, sizeof(opts->hostnqn));
} }

2
lib/nvme/nvme_internal.h
View File

@ -98,7 +98,7 @@
* try to configure, if available. * try to configure, if available.
*/ */
#define DEFAULT_MAX_IO_QUEUES (1024) #define DEFAULT_MAX_IO_QUEUES (1024)
#define DEFAULT_MAX_QUEUE_SIZE (256) #define DEFAULT_IO_QUEUE_SIZE (256)
#define DEFAULT_HOSTNQN "nqn.2016-06.io.spdk:host" #define DEFAULT_HOSTNQN "nqn.2016-06.io.spdk:host"

4
lib/nvme/nvme_pcie.c
View File

@ -1339,9 +1339,7 @@ nvme_pcie_ctrlr_create_io_qpair(struct spdk_nvme_ctrlr *ctrlr, uint16_t qid,
* the MQES field in the capabilities register. * the MQES field in the capabilities register.
*/ */
num_entries = nvme_min(NVME_IO_ENTRIES, ctrlr->cap.bits.mqes + 1); num_entries = nvme_min(NVME_IO_ENTRIES, ctrlr->cap.bits.mqes + 1);
num_entries = nvme_min(num_entries, ctrlr->opts.io_queue_size);
/* 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) {

2
lib/nvme/nvme_rdma.c
View File

@ -957,7 +957,7 @@ nvme_rdma_ctrlr_create_qpair(struct spdk_nvme_ctrlr *ctrlr, uint16_t qid,
} else { } else {
num_entries = nvme_min(NVME_HOST_MAX_ENTRIES_PER_QUEUE, num_entries = nvme_min(NVME_HOST_MAX_ENTRIES_PER_QUEUE,
ctrlr->cap.bits.mqes + 1); ctrlr->cap.bits.mqes + 1);
num_entries = nvme_min(num_entries, rctrlr->ctrlr.opts.queue_size); num_entries = nvme_min(num_entries, rctrlr->ctrlr.opts.io_queue_size);
} }
rc = nvme_qpair_construct(qpair, qid, num_entries, ctrlr, qprio); rc = nvme_qpair_construct(qpair, qid, num_entries, ctrlr, qprio);