Commit ac31590b authored by Changpeng Liu's avatar Changpeng Liu Committed by Tomasz Zawadzki
Browse files

nvme: make `spdk_nvme_ctrlr_free_io_qpair` multi-process safe 



In the multi-process case, a process may call `spdk_nvme_ctrlr_free_io_qpair` on
a foreign I/O qpair (i.e. one that this process did not create) when that qpairs
process exits unexpectedly.

The variable `qpair->poll_group` isn't multi-process safe, we can't use it
in `spdk_nvme_ctrlr_free_io_qpair` and related transport poll group APIs.

Change-Id: Ic13a6a2c7d760477be5be5a56a45caa2b5518717
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13573


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 <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
parent 427cbb46

lib/nvme/nvme_ctrlr.c

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ spdk_nvme_ctrlr_free_io_qpair(struct spdk_nvme_qpair *qpair) 


	nvme_transport_ctrlr_disconnect_qpair(ctrlr, qpair);



	if (qpair->poll_group) {

	if (qpair->poll_group && (qpair->active_proc == nvme_ctrlr_get_current_process(ctrlr))) {

		spdk_nvme_poll_group_remove(qpair->poll_group->group, qpair);

	}

lib/nvme/nvme_transport.c

+5 −2
Original line number Diff line number Diff line
@@ -508,7 +508,8 @@ nvme_transport_ctrlr_disconnect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk 


	nvme_qpair_set_state(qpair, NVME_QPAIR_DISCONNECTING);

	assert(transport != NULL);

	if (qpair->poll_group) {



	if (qpair->poll_group && (qpair->active_proc == nvme_ctrlr_get_current_process(ctrlr))) {

		nvme_poll_group_disconnect_qpair(qpair);

	}
@@ -518,7 +519,9 @@ nvme_transport_ctrlr_disconnect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk 
void

nvme_transport_ctrlr_disconnect_qpair_done(struct spdk_nvme_qpair *qpair)

{

	if (qpair->active_proc == nvme_ctrlr_get_current_process(qpair->ctrlr)) {

		nvme_qpair_abort_all_queued_reqs(qpair, 0);

	}

	nvme_qpair_set_state(qpair, NVME_QPAIR_DISCONNECTED);

}

test/unit/lib/nvme/nvme_transport.c/nvme_transport_ut.c

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ DEFINE_STUB(spdk_nvme_qpair_process_completions, int32_t, (struct spdk_nvme_qpai 
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);

DEFINE_STUB(nvme_ctrlr_get_current_process, struct spdk_nvme_ctrlr_process *,

	    (struct spdk_nvme_ctrlr *ctrlr), NULL);



static void

ut_construct_transport(struct spdk_nvme_transport *transport, const char name[])