Commit 00d58714 authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

bdev/nvme: remove CSTS from driver-specific JSON info 



It's not providing a lot of value, while being pretty problematic, as
the read is blocking and cannot be easily changed to be non-blocking, as
dump_info_json is a synchronous interface.

Now that dump_info_json isn't using any synchronous interfaces from the
NVMe driver, we can send a bdev_get_bdevs call in the async_init.sh
test to verify that.

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: Ida31c8d1000a52b0782f698afe46b071ed4e41df
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9488


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent c5ebb7ff

module/bdev/nvme/bdev_nvme.c

+0 −9
Original line number Diff line number Diff line
@@ -1571,7 +1571,6 @@ bdev_nvme_dump_info_json(void *ctx, struct spdk_json_write_ctx *w) 
	const struct spdk_nvme_ctrlr_data *cdata;

	const struct spdk_nvme_transport_id *trid;

	union spdk_nvme_vs_register vs;

	union spdk_nvme_csts_register csts;

	char buf[128];



	nvme_ns = nvme_bdev->nvme_ns;
@@ -1582,7 +1581,6 @@ bdev_nvme_dump_info_json(void *ctx, struct spdk_json_write_ctx *w) 
	cdata = spdk_nvme_ctrlr_get_data(ctrlr);

	trid = spdk_nvme_ctrlr_get_transport_id(ctrlr);

	vs = spdk_nvme_ctrlr_get_regs_vs(ctrlr);

	csts = spdk_nvme_ctrlr_get_regs_csts(ctrlr);



	spdk_json_write_named_object_begin(w, "nvme");
@@ -1649,13 +1647,6 @@ bdev_nvme_dump_info_json(void *ctx, struct spdk_json_write_ctx *w) 


	spdk_json_write_object_end(w);



	spdk_json_write_named_object_begin(w, "csts");



	spdk_json_write_named_uint32(w, "rdy", csts.bits.rdy);

	spdk_json_write_named_uint32(w, "cfs", csts.bits.cfs);



	spdk_json_write_object_end(w);



	spdk_json_write_named_object_begin(w, "ns_data");



	spdk_json_write_named_uint32(w, "id", spdk_nvme_ns_get_id(ns));

test/nvmf/host/async_init.sh

+6 −0
Original line number Diff line number Diff line
@@ -35,9 +35,15 @@ $rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode0 -t $TEST_TRANSPOR 
$rpc_py bdev_nvme_attach_controller -b $nvme_bdev -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP \

	-f ipv4 -s $NVMF_PORT -n nqn.2016-06.io.spdk:cnode0



# Make sure the bdev was created successfully

$rpc_py bdev_get_bdevs -b ${nvme_bdev}n1



# Make sure the reset is also asynchronous

$rpc_py bdev_nvme_reset_controller $nvme_bdev



# And that the bdev is still available after a reset

$rpc_py bdev_get_bdevs -b ${nvme_bdev}n1



# Finally, detach the controller to verify the detach path

$rpc_py bdev_nvme_detach_controller $nvme_bdev