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

vhost: remove legacy spdk_event from shutdown path

Browse Source 
Switch to the new spdk_thread_send_msg() API instead.

Change-Id: I810465cc49d5c4ef23e04953aa29d369f48f68b1
Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/452391
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Darek Stojaczyk 2019-04-29 11:42:29 +02:00 committed by Ben Walker
parent f50d3d7759
commit b9d23be188
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/vhost/vhost.c
View File

@ -48,6 +48,9 @@ static uint32_t *g_num_ctrlrs;
/* 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;
static spdk_vhost_fini_cb g_fini_cpl_cb;
struct spdk_vhost_session_fn_ctx { struct spdk_vhost_session_fn_ctx {
/** Device pointer obtained before enqueuing the event */ /** Device pointer obtained before enqueuing the event */
struct spdk_vhost_dev *vdev; struct spdk_vhost_dev *vdev;
@ -1270,6 +1273,8 @@ spdk_vhost_set_socket_path(const char *basename)
return 0; return 0;
} }
static void _spdk_vhost_fini(void *arg1);
static void * static void *
session_shutdown(void *arg) session_shutdown(void *arg)
{ {
@ -1281,7 +1286,7 @@ session_shutdown(void *arg)
} }
SPDK_INFOLOG(SPDK_LOG_VHOST, "Exiting\n"); SPDK_INFOLOG(SPDK_LOG_VHOST, "Exiting\n");
spdk_event_call((struct spdk_event *)arg); spdk_thread_send_msg(g_fini_thread, _spdk_vhost_fini, NULL);
return NULL; return NULL;
} }
@ -1497,9 +1502,8 @@ spdk_vhost_init(void)
} }
static void static void
_spdk_vhost_fini(void *arg1, void *arg2) _spdk_vhost_fini(void *arg1)
{ {
spdk_vhost_fini_cb fini_cb = arg1;
struct spdk_vhost_dev *vdev, *tmp; struct spdk_vhost_dev *vdev, *tmp;
spdk_vhost_lock(); spdk_vhost_lock();
@ -1514,7 +1518,7 @@ _spdk_vhost_fini(void *arg1, void *arg2)
/* All devices are removed now. */ /* All devices are removed now. */
free(g_num_ctrlrs); free(g_num_ctrlrs);
fini_cb(); g_fini_cpl_cb();
} }
void void
@ -1522,15 +1526,15 @@ spdk_vhost_fini(spdk_vhost_fini_cb fini_cb)
{ {
pthread_t tid; pthread_t tid;
int rc; int rc;
struct spdk_event *fini_ev;
fini_ev = spdk_event_allocate(spdk_env_get_current_core(), _spdk_vhost_fini, fini_cb, NULL); g_fini_thread = spdk_get_thread();
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
* ops for stopping a device or removing a connection, we need to call it from * ops for stopping a device or removing a connection, we need to call it from
* a separate thread to avoid deadlock. * a separate thread to avoid deadlock.
*/ */
rc = pthread_create(&tid, NULL, &session_shutdown, fini_ev); rc = pthread_create(&tid, NULL, &session_shutdown, NULL);
if (rc < 0) { if (rc < 0) {
SPDK_ERRLOG("Failed to start session shutdown thread (%d): %s\n", rc, spdk_strerror(rc)); SPDK_ERRLOG("Failed to start session shutdown thread (%d): %s\n", rc, spdk_strerror(rc));
abort(); abort();