Commit 253cca4f authored by Zhanghongtao2417's avatar Zhanghongtao2417 Committed by Tomasz Zawadzki
Browse files

nvme/cuse: Add ctrlr_lock for cuse register and unregister 



spdk_nvme_cuse_unregister and spdk_nvme_ctrlr_process_admin_completions
 running at the same time, concurrently operate external_io_msgs.
So we add locks to protect.

Fixes #3353

Change-Id: Id5176975676c29a475e8e2a0d7c93e44646c00dc
Signed-off-by: default avatarZhanghongtao2417 <651380626@qq.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/22927


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent c3870302

lib/nvme/nvme_io_msg.c

+11 −0
Original line number Diff line number Diff line
@@ -111,13 +111,16 @@ nvme_io_msg_ctrlr_register(struct spdk_nvme_ctrlr *ctrlr, 
		return -EINVAL;

	}



	nvme_robust_mutex_lock(&ctrlr->ctrlr_lock);

	if (nvme_io_msg_is_producer_registered(ctrlr, io_msg_producer)) {

		nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);

		return -EEXIST;

	}



	if (!STAILQ_EMPTY(&ctrlr->io_producers) || ctrlr->is_resetting) {

		/* There are registered producers - IO messaging already started */

		STAILQ_INSERT_TAIL(&ctrlr->io_producers, io_msg_producer, link);

		nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);

		return 0;

	}
@@ -129,6 +132,7 @@ nvme_io_msg_ctrlr_register(struct spdk_nvme_ctrlr *ctrlr, 
	ctrlr->external_io_msgs = spdk_ring_create(SPDK_RING_TYPE_MP_SC, 65536, SPDK_ENV_SOCKET_ID_ANY);

	if (!ctrlr->external_io_msgs) {

		SPDK_ERRLOG("Unable to allocate memory for message ring\n");

		nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);

		return -ENOMEM;

	}
@@ -137,10 +141,12 @@ nvme_io_msg_ctrlr_register(struct spdk_nvme_ctrlr *ctrlr, 
		SPDK_ERRLOG("spdk_nvme_ctrlr_alloc_io_qpair() failed\n");

		spdk_ring_free(ctrlr->external_io_msgs);

		ctrlr->external_io_msgs = NULL;

		nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);

		return -ENOMEM;

	}



	STAILQ_INSERT_TAIL(&ctrlr->io_producers, io_msg_producer, link);

	nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);



	return 0;

}
@@ -156,9 +162,11 @@ nvme_io_msg_ctrlr_update(struct spdk_nvme_ctrlr *ctrlr) 
	}



	/* Update all producers */

	nvme_robust_mutex_lock(&ctrlr->ctrlr_lock);

	STAILQ_FOREACH(io_msg_producer, &ctrlr->io_producers, link) {

		io_msg_producer->update(ctrlr);

	}

	nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);

}



void
@@ -195,7 +203,9 @@ nvme_io_msg_ctrlr_unregister(struct spdk_nvme_ctrlr *ctrlr, 
{

	assert(io_msg_producer != NULL);



	nvme_robust_mutex_lock(&ctrlr->ctrlr_lock);

	if (!nvme_io_msg_is_producer_registered(ctrlr, io_msg_producer)) {

		nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);

		return;

	}
@@ -203,4 +213,5 @@ nvme_io_msg_ctrlr_unregister(struct spdk_nvme_ctrlr *ctrlr, 
	if (STAILQ_EMPTY(&ctrlr->io_producers)) {

		nvme_io_msg_ctrlr_detach(ctrlr);

	}

	nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);

}