Commit 34430edd authored by GangCao's avatar GangCao Committed by Tomasz Zawadzki
Browse files

nvme: add the ctrlr traddr in the error message 



In the case, there are several ctrlr used, it's better to
have the traddr to indicate which ctrlr has the issue to
shutdown.

Change-Id: Ie564bb70566ba5822938efc99125d063f7b4ae4a
Signed-off-by: default avatarGangCao <gang.cao@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2588


Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarXiaodong Liu <xiaodong.liu@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 391dd1c2

lib/nvme/nvme_ctrlr.c

+7 −6
Original line number Diff line number Diff line
@@ -794,14 +794,14 @@ nvme_ctrlr_shutdown(struct spdk_nvme_ctrlr *ctrlr) 
	}



	if (nvme_ctrlr_get_cc(ctrlr, &cc)) {

		SPDK_ERRLOG("get_cc() failed\n");

		SPDK_ERRLOG("ctrlr %s get_cc() failed\n", ctrlr->trid.traddr);

		return;

	}



	cc.bits.shn = SPDK_NVME_SHN_NORMAL;



	if (nvme_ctrlr_set_cc(ctrlr, &cc)) {

		SPDK_ERRLOG("set_cc() failed\n");

		SPDK_ERRLOG("ctrlr %s set_cc() failed\n", ctrlr->trid.traddr);

		return;

	}
@@ -820,13 +820,13 @@ nvme_ctrlr_shutdown(struct spdk_nvme_ctrlr *ctrlr) 


	do {

		if (nvme_ctrlr_get_csts(ctrlr, &csts)) {

			SPDK_ERRLOG("get_csts() failed\n");

			SPDK_ERRLOG("ctrlr %s get_csts() failed\n", ctrlr->trid.traddr);

			return;

		}



		if (csts.bits.shst == SPDK_NVME_SHST_COMPLETE) {

			SPDK_DEBUGLOG(SPDK_LOG_NVME, "shutdown complete in %u milliseconds\n",

				      ms_waited);

			SPDK_DEBUGLOG(SPDK_LOG_NVME, "ctrlr %s shutdown complete in %u milliseconds\n",

				      ctrlr->trid.traddr, ms_waited);

			return;

		}
@@ -834,7 +834,8 @@ nvme_ctrlr_shutdown(struct spdk_nvme_ctrlr *ctrlr) 
		ms_waited++;

	} while (ms_waited < shutdown_timeout_ms);



	SPDK_ERRLOG("did not shutdown within %u milliseconds\n", shutdown_timeout_ms);

	SPDK_ERRLOG("ctrlr %s did not shutdown within %u milliseconds\n",

		    ctrlr->trid.traddr, shutdown_timeout_ms);

	if (ctrlr->quirks & NVME_QUIRK_SHST_COMPLETE) {

		SPDK_ERRLOG("likely due to shutdown handling in the VMWare emulated NVMe SSD\n");

	}