Commit 121aca0b authored by Changpeng Liu's avatar Changpeng Liu Committed by Tomasz Zawadzki
Browse files

nvme: add SGL dword alignment requirement flag when SGL is supported 



Dword alignment and granularity are required for the data blocks when
the controller reports this capability.

Change-Id: I6b6300515a528acb34a032050ceedf673a4b326c
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1315


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 3de6a9c5

include/spdk/nvme.h

+2 −1
Original line number Diff line number Diff line
@@ -397,10 +397,11 @@ struct spdk_nvme_host_id { 
 * Used for identifying if the controller supports these flags.

 */

enum spdk_nvme_ctrlr_flags {

	SPDK_NVME_CTRLR_SGL_SUPPORTED			= 0x1, /**< The SGL is supported */

	SPDK_NVME_CTRLR_SGL_SUPPORTED			= 0x1, /**< SGL is supported */

	SPDK_NVME_CTRLR_SECURITY_SEND_RECV_SUPPORTED	= 0x2, /**< security send/receive is supported */

	SPDK_NVME_CTRLR_WRR_SUPPORTED			= 0x4, /**< Weighted Round Robin is supported */

	SPDK_NVME_CTRLR_COMPARE_AND_WRITE_SUPPORTED	= 0x8, /**< Compare and write fused operations supported */

	SPDK_NVME_CTRLR_SGL_REQUIRES_DWORD_ALIGNMENT	= 0x10, /**< Dword alignment is required for SGL */

};



/**

lib/nvme/nvme_ctrlr.c

+4 −0
Original line number Diff line number Diff line
@@ -1236,7 +1236,11 @@ nvme_ctrlr_identify_done(void *arg, const struct spdk_nvme_cpl *cpl) 
	}



	if (ctrlr->cdata.sgls.supported) {

		assert(ctrlr->cdata.sgls.supported != 0x3);

		ctrlr->flags |= SPDK_NVME_CTRLR_SGL_SUPPORTED;

		if (ctrlr->cdata.sgls.supported == 0x2) {

			ctrlr->flags |= SPDK_NVME_CTRLR_SGL_REQUIRES_DWORD_ALIGNMENT;

		}

		/*

		 * Use MSDBD to ensure our max_sges doesn't exceed what the

		 *  controller supports.