From cb0538aefb7cb6f059a5f853ec252f22c5138254 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Fri, 3 Mar 2017 12:04:03 -0700 Subject: [PATCH] nvme: clamp io_queue_size to valid range I/O queues must have at least 2 entries. Change-Id: Ib11b08fab4b518501f8ce80d6b73d9e33c9777a6 Signed-off-by: Daniel Verkamp --- lib/nvme/nvme_ctrlr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c index cdecf3eea..3cbca3162 100644 --- a/lib/nvme/nvme_ctrlr.c +++ b/lib/nvme/nvme_ctrlr.c @@ -1337,6 +1337,7 @@ nvme_ctrlr_init_cap(struct spdk_nvme_ctrlr *ctrlr, const union spdk_nvme_cap_reg ctrlr->min_page_size = 1u << (12 + ctrlr->cap.bits.mpsmin); + ctrlr->opts.io_queue_size = spdk_max(ctrlr->opts.io_queue_size, SPDK_NVME_IO_QUEUE_MIN_ENTRIES); ctrlr->opts.io_queue_size = spdk_min(ctrlr->opts.io_queue_size, ctrlr->cap.bits.mqes + 1u); ctrlr->opts.io_queue_size = spdk_min(ctrlr->opts.io_queue_size, max_io_queue_size); }