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

lib/vhost: Simplify vhost_dev_foreach_session()

Browse Source 
By sending message to the thread with which controller is associated,
we can simplify vhost_dev_foreach_session(). We can iterate
sessions list and we do not have to differentiate if session is
started or not.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I59767a5788c190545a81976e75871609da703f45
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1147
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Shuhei Matsumoto 2020-03-05 01:03:10 -05:00 committed by Tomasz Zawadzki
parent baf3e12c09
commit 34f53ab7cc
1 changed files with 12 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
lib/vhost/vhost.c
View File

@ -692,20 +692,6 @@ vhost_dev_unregister(struct spdk_vhost_dev *vdev)
return 0; return 0;
} }
static struct spdk_vhost_session *
vhost_session_next(struct spdk_vhost_dev *vdev, unsigned prev_id)
{
struct spdk_vhost_session *vsession;
TAILQ_FOREACH(vsession, &vdev->vsessions, tailq) {
if (vsession->id > prev_id) {
return vsession;
}
}
return NULL;
}
const char * const char *
spdk_vhost_dev_get_name(struct spdk_vhost_dev *vdev) spdk_vhost_dev_get_name(struct spdk_vhost_dev *vdev)
{ {
@ -805,9 +791,6 @@ vhost_session_send_event(struct spdk_vhost_session *vsession,
return g_dpdk_response; return g_dpdk_response;
} }
static void foreach_session_continue(struct vhost_session_fn_ctx *ev_ctx,
struct spdk_vhost_session *vsession);
static void static void
foreach_session_finish_cb(void *arg1) foreach_session_finish_cb(void *arg1)
{ {
@ -831,67 +814,31 @@ foreach_session_finish_cb(void *arg1)
} }
static void static void
foreach_session_continue_cb(void *arg1) foreach_session(void *arg1)
{ {
struct vhost_session_fn_ctx *ctx = arg1; struct vhost_session_fn_ctx *ctx = arg1;
struct spdk_vhost_session *vsession = NULL; struct spdk_vhost_session *vsession;
struct spdk_vhost_dev *vdev = ctx->vdev; struct spdk_vhost_dev *vdev = ctx->vdev;
int rc; int rc;
if (pthread_mutex_trylock(&g_vhost_mutex) != 0) { if (pthread_mutex_trylock(&g_vhost_mutex) != 0) {
spdk_thread_send_msg(spdk_get_thread(), spdk_thread_send_msg(spdk_get_thread(), foreach_session, arg1);
foreach_session_continue_cb, arg1);
return; return;
} }
vsession = vhost_session_find_by_id(vdev, ctx->vsession_id); TAILQ_FOREACH(vsession, &vdev->vsessions, tailq) {
if (vsession == NULL || !vsession->initialized) {
/* The session must have been removed in the meantime, so we
* just skip it in our foreach chain
*/
goto out_unlock_continue;
}
rc = ctx->cb_fn(vdev, vsession, ctx->user_ctx);
if (rc < 0) {
pthread_mutex_unlock(&g_vhost_mutex);
free(ctx);
return;
}
out_unlock_continue:
vsession = vhost_session_next(vdev, ctx->vsession_id);
foreach_session_continue(ctx, vsession);
pthread_mutex_unlock(&g_vhost_mutex);
}
static void
foreach_session_continue(struct vhost_session_fn_ctx *ev_ctx,
struct spdk_vhost_session *vsession)
{
struct spdk_vhost_dev *vdev = ev_ctx->vdev;
int rc;
while (vsession != NULL && !vsession->started) {
if (vsession->initialized) { if (vsession->initialized) {
rc = ev_ctx->cb_fn(vdev, vsession, ev_ctx->user_ctx); rc = ctx->cb_fn(vdev, vsession, ctx);
if (rc < 0) { if (rc < 0) {
return; goto out;
}
} }
} }
vsession = vhost_session_next(vdev, vsession->id); out:
} pthread_mutex_unlock(&g_vhost_mutex);
if (vsession != NULL) { spdk_thread_send_msg(g_vhost_init_thread, foreach_session_finish_cb, arg1);
ev_ctx->vsession_id = vsession->id;
spdk_thread_send_msg(vdev->thread,
foreach_session_continue_cb, ev_ctx);
} else {
ev_ctx->vsession_id = UINT32_MAX;
spdk_thread_send_msg(g_vhost_init_thread,
foreach_session_finish_cb, ev_ctx);
}
} }
void void
@ -900,7 +847,6 @@ vhost_dev_foreach_session(struct spdk_vhost_dev *vdev,
spdk_vhost_dev_fn cpl_fn, spdk_vhost_dev_fn cpl_fn,
void *arg) void *arg)
{ {
struct spdk_vhost_session *vsession = TAILQ_FIRST(&vdev->vsessions);
struct vhost_session_fn_ctx *ev_ctx; struct vhost_session_fn_ctx *ev_ctx;
ev_ctx = calloc(1, sizeof(*ev_ctx)); ev_ctx = calloc(1, sizeof(*ev_ctx));
@ -917,7 +863,8 @@ vhost_dev_foreach_session(struct spdk_vhost_dev *vdev,
assert(vdev->pending_async_op_num < UINT32_MAX); assert(vdev->pending_async_op_num < UINT32_MAX);
vdev->pending_async_op_num++; vdev->pending_async_op_num++;
foreach_session_continue(ev_ctx, vsession);
spdk_thread_send_msg(vdev->thread, foreach_session, ev_ctx);
} }
static int static int