Commit 6ea299df authored by Jim Harris's avatar Jim Harris
Browse files

bdev/nvme: show `numa_id` for bdev_nvme_get_controllers 



Only show the numa_id if we know what it is, omit it if
the nvme driver returns SPDK_ENV_NUMA_ID_ANY.

Signed-off-by: default avatarJim Harris <jim.harris@samsung.com>
Change-Id: I3ab93d4be0ddc73f0b7317ba0bd6295ca9514569
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/24147


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarBen Walker <ben@nvidia.com>
parent a8048042

module/bdev/nvme/bdev_nvme.c

+5 −0
Original line number Diff line number Diff line
@@ -3616,6 +3616,7 @@ nvme_ctrlr_info_json(struct spdk_json_write_ctx *w, struct nvme_ctrlr *nvme_ctrl 
	const struct spdk_nvme_ctrlr_opts *opts;

	const struct spdk_nvme_ctrlr_data *cdata;

	struct nvme_path_id *path_id;

	int32_t numa_id;



	spdk_json_write_object_begin(w);
@@ -3659,6 +3660,10 @@ nvme_ctrlr_info_json(struct spdk_json_write_ctx *w, struct nvme_ctrlr *nvme_ctrl 
	spdk_json_write_named_string(w, "svcid", opts->src_svcid);

	spdk_json_write_object_end(w);



	numa_id = spdk_nvme_ctrlr_get_numa_id(nvme_ctrlr->ctrlr);

	if (numa_id != SPDK_ENV_NUMA_ID_ANY) {

		spdk_json_write_named_uint32(w, "numa_id", numa_id);

	}

	spdk_json_write_object_end(w);

}

test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ DEFINE_STUB_V(spdk_nvme_ctrlr_set_remove_cb, (struct spdk_nvme_ctrlr *ctrlr, 


DEFINE_STUB(spdk_nvme_ctrlr_get_flags, uint64_t, (struct spdk_nvme_ctrlr *ctrlr), 0);

DEFINE_STUB(spdk_nvme_ctrlr_get_max_sges, uint16_t, (const struct spdk_nvme_ctrlr *ctrlr), 0);

DEFINE_STUB(spdk_nvme_ctrlr_get_numa_id, int32_t, (struct spdk_nvme_ctrlr *ctrlr),

	    SPDK_ENV_NUMA_ID_ANY);



DEFINE_STUB(accel_channel_create, int, (void *io_device, void *ctx_buf), 0);

DEFINE_STUB_V(accel_channel_destroy, (void *io_device, void *ctx_buf));