Commit c9ef7642 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

nvme: make set_num_qpairs failure non-fatal 



A controller that fails the Set Features/Get Features - Number of Queues
won't be able to create I/O queues, but it may still accept admin
commands.

Change-Id: Iec79d641f7d460448a8d8e1295764f1f03f98594
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/407378


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent c43dc1f1

lib/nvme/nvme_ctrlr.c

+17 −18
Original line number Diff line number Diff line
@@ -902,7 +902,6 @@ nvme_ctrlr_set_num_qpairs(struct spdk_nvme_ctrlr *ctrlr) 
	}

	if (spdk_nvme_cpl_is_error(&status.cpl)) {

		SPDK_ERRLOG("nvme_set_num_queues failed!\n");

		return -ENXIO;

	}



	/* Obtain the number of queues allocated using Get Features. */
@@ -917,9 +916,8 @@ nvme_ctrlr_set_num_qpairs(struct spdk_nvme_ctrlr *ctrlr) 
	}

	if (spdk_nvme_cpl_is_error(&status.cpl)) {

		SPDK_ERRLOG("nvme_set_num_queues failed!\n");

		return -ENXIO;

	}



		ctrlr->opts.num_io_queues = 0;

	} else {

		/*

		 * Data in cdw0 is 0-based.

		 * Lower 16-bits indicate number of submission queues allocated.
@@ -936,6 +934,7 @@ nvme_ctrlr_set_num_qpairs(struct spdk_nvme_ctrlr *ctrlr) 


		/* Set number of queues to be minimum of requested and actually allocated. */

		ctrlr->opts.num_io_queues = spdk_min(min_allocated, ctrlr->opts.num_io_queues);

	}



	ctrlr->free_io_qids = spdk_bit_array_create(ctrlr->opts.num_io_queues + 1);

	if (ctrlr->free_io_qids == NULL) {