Commit 9d1f340f authored by Li Feng's avatar Li Feng Committed by Tomasz Zawadzki
Browse files

vhost: stop device should wait the async start session_start 



The start_device() will call the vhost_user_session_start asynchronously.
At the same time, if the GET_VRING_BASE cmd is received, then the stop_device
is called immediately. It will invalidate the vring, and when the
vhost_user_session_start is running, it will encounter null pointer error.

Change-Id: Id933231f9a3b13384491a300f250fbc6f62e2e70
Signed-off-by: default avatarLi Feng <fengli@smartx.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/19588


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@gmail.com>
Community-CI: Mellanox Build Bot
parent 9b81235f

lib/vhost/rte_vhost_user.c

+8 −3
Original line number Diff line number Diff line
@@ -966,6 +966,7 @@ new_connection(int vid) 
		return -1;

	}

	vsession->started = false;

	vsession->starting = false;

	vsession->next_stats_check_time = 0;

	vsession->stats_check_interval = SPDK_VHOST_STATS_CHECK_INTERVAL_MS *

					 spdk_get_ticks_hz() / 1000UL;
@@ -985,7 +986,9 @@ vhost_user_session_start(void *arg1) 
	const struct spdk_vhost_user_dev_backend *backend;

	int rc;



	SPDK_INFOLOG(vhost, "Starting new session for device %s with vid %d\n", vdev->name, vsession->vid);

	pthread_mutex_lock(&user_dev->lock);

	vsession->starting = false;

	backend = user_dev->user_backend;

	rc = backend->start_session(vdev, vsession, NULL);

	if (rc == 0) {
@@ -1147,6 +1150,8 @@ start_device(int vid) 
		goto out;

	}



	vsession->starting = true;

	SPDK_INFOLOG(vhost, "Session %s is scheduled to start\n", vsession->name);

	vhost_user_session_set_coalescing(vdev, vsession, NULL);

	spdk_thread_send_msg(vdev->thread, vhost_user_session_start, vsession);
@@ -1169,7 +1174,7 @@ stop_device(int vid) 
	user_dev = to_user_dev(vsession->vdev);



	pthread_mutex_lock(&user_dev->lock);

	if (!vsession->started) {

	if (!vsession->started && !vsession->starting) {

		pthread_mutex_unlock(&user_dev->lock);

		/* already stopped, nothing to do */

		return;
@@ -1193,7 +1198,7 @@ destroy_connection(int vid) 
	user_dev = to_user_dev(vsession->vdev);



	pthread_mutex_lock(&user_dev->lock);

	if (vsession->started) {

	if (vsession->started || vsession->starting) {

		if (_stop_session(vsession) != 0) {

			pthread_mutex_unlock(&user_dev->lock);

			return;
@@ -1907,7 +1912,7 @@ vhost_user_session_shutdown(void *vhost_cb) 
		user_dev = to_user_dev(vdev);

		pthread_mutex_lock(&user_dev->lock);

		TAILQ_FOREACH(vsession, &user_dev->vsessions, tailq) {

			if (vsession->started) {

			if (vsession->started || vsession->starting) {

				_stop_session(vsession);

			}

		}

lib/vhost/vhost_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ struct spdk_vhost_session { 
	char *name;



	bool started;

	bool starting;

	bool interrupt_mode;



	struct rte_vhost_memory *mem;