Commit 70dccebe authored by Jim Harris's avatar Jim Harris Committed by Konrad Sztyber
Browse files

nvme: populate numa.id for tcp controllers 



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


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

lib/nvme/nvme_tcp.c

+5 −0
Original line number Diff line number Diff line
@@ -2665,6 +2665,7 @@ nvme_tcp_ctrlr_construct(const struct spdk_nvme_transport_id *trid, 
			 void *devhandle)

{

	struct nvme_tcp_ctrlr *tctrlr;

	struct nvme_tcp_qpair *tqpair;

	int rc;



	tctrlr = calloc(1, sizeof(*tctrlr));
@@ -2718,6 +2719,10 @@ nvme_tcp_ctrlr_construct(const struct spdk_nvme_transport_id *trid, 
		return NULL;

	}



	tqpair = nvme_tcp_qpair(tctrlr->ctrlr.adminq);

	tctrlr->ctrlr.numa.id_valid = 1;

	tctrlr->ctrlr.numa.id = spdk_sock_get_numa_id(tqpair->sock);



	if (nvme_ctrlr_add_process(&tctrlr->ctrlr, 0) != 0) {

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

		nvme_ctrlr_destruct(&tctrlr->ctrlr);

test/unit/lib/nvme/nvme_tcp.c/nvme_tcp_ut.c

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ DEFINE_STUB(spdk_sock_group_get_ctx, 
	    void *,

	    (struct spdk_sock_group *group),

	    NULL);

DEFINE_STUB(spdk_sock_get_numa_id, int32_t, (struct spdk_sock *sock), SPDK_ENV_NUMA_ID_ANY);



DEFINE_STUB(spdk_nvme_poll_group_process_completions, int64_t, (struct spdk_nvme_poll_group *group,

		uint32_t completions_per_qpair, spdk_nvme_disconnected_qpair_cb disconnected_qpair_cb), 0);