ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vhost: introduce g_vhost_init_thread

Browse Source 
Enforce spdk_vhost_fini() to be called on the same
thread which called spdk_vhost_init(). We'll also use
the newly added g_vhost_init_thread for other purposes
later on.

Change-Id: I99aebeda2d8ddaf42554aa422c32ed935634595f
Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459159
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Darek Stojaczyk 2019-06-24 09:00:19 +02:00 committed by Ben Walker
parent ccdc0b615f
commit 5fb7330151
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/vhost/vhost.c
View File

@ -57,7 +57,9 @@ static struct spdk_cpuset *g_tmp_cpuset;
/* Path to folder where character device will be created. Can be set by user. */ /* Path to folder where character device will be created. Can be set by user. */
static char dev_dirname[PATH_MAX] = ""; static char dev_dirname[PATH_MAX] = "";
static struct spdk_thread *g_fini_thread; /* Thread performing all vhost management operations */
static struct spdk_thread *g_vhost_init_thread;
static spdk_vhost_fini_cb g_fini_cpl_cb; static spdk_vhost_fini_cb g_fini_cpl_cb;
struct spdk_vhost_session_fn_ctx { struct spdk_vhost_session_fn_ctx {
@ -1489,6 +1491,9 @@ spdk_vhost_init(spdk_vhost_init_cb init_cb)
size_t len; size_t len;
int ret; int ret;
g_vhost_init_thread = spdk_get_thread();
assert(g_vhost_init_thread != NULL);
if (dev_dirname[0] == '\0') { if (dev_dirname[0] == '\0') {
if (getcwd(dev_dirname, sizeof(dev_dirname) - 1) == NULL) { if (getcwd(dev_dirname, sizeof(dev_dirname) - 1) == NULL) {
SPDK_ERRLOG("getcwd failed (%d): %s\n", errno, spdk_strerror(errno)); SPDK_ERRLOG("getcwd failed (%d): %s\n", errno, spdk_strerror(errno));
@ -1553,7 +1558,7 @@ session_shutdown(void *arg)
} }
SPDK_INFOLOG(SPDK_LOG_VHOST, "Exiting\n"); SPDK_INFOLOG(SPDK_LOG_VHOST, "Exiting\n");
spdk_thread_send_msg(g_fini_thread, _spdk_vhost_fini, NULL); spdk_thread_send_msg(g_vhost_init_thread, _spdk_vhost_fini, NULL);
return NULL; return NULL;
} }
@ -1563,7 +1568,7 @@ spdk_vhost_fini(spdk_vhost_fini_cb fini_cb)
pthread_t tid; pthread_t tid;
int rc; int rc;
g_fini_thread = spdk_get_thread(); assert(spdk_get_thread() == g_vhost_init_thread);
g_fini_cpl_cb = fini_cb; g_fini_cpl_cb = fini_cb;
/* rte_vhost API for removing sockets is not asynchronous. Since it may call SPDK /* rte_vhost API for removing sockets is not asynchronous. Since it may call SPDK