Commit 76062d47 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Konrad Sztyber
Browse files

nvme: Add multipath info (controller ID) to NVME_CTRLR_*LOG() 



NVME_CTRLR_*LOG() is helpful but all controllers have the same SUBNQN
for fabric transports. We cannot distinguish which path caused an error.

IP address and port are nice identification information but too long.

For multipath, each controller should have unique ID. Hence, controller
ID is good practical information to add.

Signed-off-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: Id0739a4caccff93aba5fbdfa3b611c4bf7da3045
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/25296


Community-CI: Community CI Samsung <spdk.community.ci.samsung@gmail.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent df311f49

lib/nvme/nvme_internal.h

+5 −5
Original line number Diff line number Diff line
@@ -592,20 +592,20 @@ struct spdk_nvme_ns { 
	ctrlr->trid.subnqn : ctrlr->trid.traddr)



#define NVME_CTRLR_ERRLOG(ctrlr, format, ...) \

	SPDK_ERRLOG("[%s] " format, CTRLR_STRING(ctrlr), ##__VA_ARGS__);

	SPDK_ERRLOG("[%s, %u] " format, CTRLR_STRING(ctrlr), ctrlr->cntlid, ##__VA_ARGS__);



#define NVME_CTRLR_WARNLOG(ctrlr, format, ...) \

	SPDK_WARNLOG("[%s] " format, CTRLR_STRING(ctrlr), ##__VA_ARGS__);

	SPDK_WARNLOG("[%s, %u] " format, CTRLR_STRING(ctrlr), ctrlr->cntlid, ##__VA_ARGS__);



#define NVME_CTRLR_NOTICELOG(ctrlr, format, ...) \

	SPDK_NOTICELOG("[%s] " format, CTRLR_STRING(ctrlr), ##__VA_ARGS__);

	SPDK_NOTICELOG("[%s, %u] " format, CTRLR_STRING(ctrlr), ctrlr->cntlid, ##__VA_ARGS__);



#define NVME_CTRLR_INFOLOG(ctrlr, format, ...) \

	SPDK_INFOLOG(nvme, "[%s] " format, CTRLR_STRING(ctrlr), ##__VA_ARGS__);

	SPDK_INFOLOG(nvme, "[%s, %u] " format, CTRLR_STRING(ctrlr), ctrlr->cntlid, ##__VA_ARGS__);



#ifdef DEBUG

#define NVME_CTRLR_DEBUGLOG(ctrlr, format, ...) \

	SPDK_DEBUGLOG(nvme, "[%s] " format, CTRLR_STRING(ctrlr), ##__VA_ARGS__);

	SPDK_DEBUGLOG(nvme, "[%s, %u] " format, CTRLR_STRING(ctrlr), ctrlr->cntlid, ##__VA_ARGS__);

#else

#define NVME_CTRLR_DEBUGLOG(ctrlr, ...) do { } while (0)

#endif