Commit a9fd7f0b authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdev/nvme: Add nvme_ctrlr's state string to the bdev_nvme_get_controllers RPC 



The state of a nvme_ctrlr can be more fine grained than a boolean
and such state gives more information to end users for debug or
root cause analysis.

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


Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
parent 1b3172f7

module/bdev/nvme/bdev_nvme_rpc.c

+19 −0
Original line number Diff line number Diff line
@@ -515,6 +515,22 @@ SPDK_RPC_REGISTER("bdev_nvme_attach_controller", rpc_bdev_nvme_attach_controller 
		  SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_nvme_attach_controller, construct_nvme_bdev)



static const char *

nvme_ctrlr_get_state_str(struct nvme_ctrlr *nvme_ctrlr)

{

	if (nvme_ctrlr->destruct) {

		return "deleting";

	} else if (spdk_nvme_ctrlr_is_failed(nvme_ctrlr->ctrlr)) {

		return "failed";

	} else if (nvme_ctrlr->resetting) {

		return "resetting";

	} else if (nvme_ctrlr->reconnect_is_delayed > 0) {

		return "reconnect_is_delayed";

	} else {

		return "enabled";

	}

}



static void

rpc_dump_nvme_bdev_controller_info(struct nvme_bdev_ctrlr *nbdev_ctrlr, void *ctx)

{
@@ -529,6 +545,9 @@ rpc_dump_nvme_bdev_controller_info(struct nvme_bdev_ctrlr *nbdev_ctrlr, void *ct 
	spdk_json_write_named_array_begin(w, "ctrlrs");

	TAILQ_FOREACH(nvme_ctrlr, &nbdev_ctrlr->ctrlrs, tailq) {

		spdk_json_write_object_begin(w);



		spdk_json_write_named_string(w, "state", nvme_ctrlr_get_state_str(nvme_ctrlr));



#ifdef SPDK_CONFIG_NVME_CUSE

		size_t cuse_name_size = 128;

		char cuse_name[cuse_name_size];