Commit d7120a3e authored by Changpeng Liu's avatar Changpeng Liu Committed by Ben Walker
Browse files

nvme: Fix max I/O size enforcement when no stripe size is specified 



Intel DC P3*** NVMe devices specify a desired stripe size, which was
used for splitting I/O. Not all devices, however, specify a desired
stripe size (such as the Intel DC D3*** line), and for only these
devices there was a logic mistake that overwrote the maximum I/O
size with a 2MB default. This patch corrects that error.

Change-Id: I94b72a3a3dd1dfa18bd638daf7e01a592eb6ed17
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
parent c4afe280

lib/nvme/nvme_ctrlr.c

+1 −2
Original line number Diff line number Diff line
@@ -375,8 +375,6 @@ nvme_ctrlr_construct_io_qpairs(struct spdk_nvme_ctrlr *ctrlr) 
	 */

	num_trackers = nvme_min(NVME_IO_TRACKERS, (num_entries - 1));



	ctrlr->max_xfer_size = NVME_MAX_XFER_SIZE;



	ctrlr->ioq = calloc(ctrlr->opts.num_io_queues, sizeof(struct spdk_nvme_qpair));



	if (ctrlr->ioq == NULL)
@@ -598,6 +596,7 @@ nvme_ctrlr_identify(struct spdk_nvme_ctrlr *ctrlr) 
	 * Use MDTS to ensure our default max_xfer_size doesn't exceed what the

	 *  controller supports.

	 */

	ctrlr->max_xfer_size = NVME_MAX_XFER_SIZE;

	if (ctrlr->cdata.mdts > 0) {

		ctrlr->max_xfer_size = nvme_min(ctrlr->max_xfer_size,

						ctrlr->min_page_size * (1 << (ctrlr->cdata.mdts)));