Commit 912b2116 authored by Changpeng Liu's avatar Changpeng Liu Committed by Jim Harris
Browse files

nvmf/vfio-user: fix the race condition when creating new connection 



We used the controller ready field to indicate ADMIN queue connection,
but the accept poller and ADMIN poll group may run in different
threads, this may lead vfu_attach_ctx() be called several times, so
change the 'ready' to true when a new socket connection is created.

Fix issue #1854.

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


Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 8c4ac1f2

lib/nvmf/vfio_user.c

+2 −2
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ struct nvmf_vfio_user_ctrlr { 
	struct nvmf_vfio_user_endpoint		*endpoint;

	struct nvmf_vfio_user_transport		*transport;



	/* True when the admin queue is connected */

	/* True when the socket connection is active */

	bool					ready;

	/* Number of connected queue pairs */

	uint32_t				num_connected_qps;
@@ -1547,6 +1547,7 @@ nvmf_vfio_user_create_ctrlr(struct nvmf_vfio_user_transport *transport, 
		goto out;

	}

	endpoint->ctrlr = ctrlr;

	ctrlr->ready = true;



	/* Notify the generic layer about the new admin queue pair */

	TAILQ_INSERT_TAIL(&ctrlr->transport->new_qps, ctrlr->qp[0], link);
@@ -1838,7 +1839,6 @@ handle_queue_connect_rsp(struct nvmf_vfio_user_req *req, void *cb_arg) 
	pthread_mutex_lock(&endpoint->lock);

	if (nvmf_qpair_is_admin_queue(&qpair->qpair)) {

		ctrlr->cntlid = qpair->qpair.ctrlr->cntlid;

		ctrlr->ready = true;

	}

	ctrlr->num_connected_qps++;

	pthread_mutex_unlock(&endpoint->lock);