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

vhost: add vhost_dev_event_ctx->vdev_id

Browse Source 
A vdev can change between the time the event
is enqueued and executed on proper reactor.
To detect this case, the event callback
was looking up vdev with the same name and
comparing it with old vdev pointer (from
the enqueue). This is now being simplified,
by looking up the current vdev just by
it's ID.

Change-Id: I33de03809b9d56840dd99caa8ccdf190a631ef31
Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/380647
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Dariusz Stojaczyk 2017-09-28 19:00:00 +02:00 committed by Jim Harris
parent d4e19ecc1c
commit 2fe6947669
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/vhost/vhost.c
View File

@ -53,8 +53,8 @@ struct spdk_vhost_dev_event_ctx {
/** Pointer to the controller obtained before enqueuing the event */ /** Pointer to the controller obtained before enqueuing the event */
struct spdk_vhost_dev *vdev; struct spdk_vhost_dev *vdev;
/** Name of the ctrlr to send event to */ /** Index of the ctrlr to send event to. */
char *ctrlr_name; unsigned vdev_id;
/** User callback function to be executed on given lcore. */ /** User callback function to be executed on given lcore. */
spdk_vhost_event_fn cb_fn; spdk_vhost_event_fn cb_fn;
@ -286,8 +286,8 @@ spdk_vhost_free_reactor(uint32_t lcore)
g_num_ctrlrs[lcore]--; g_num_ctrlrs[lcore]--;
} }
struct spdk_vhost_dev * static int
spdk_vhost_dev_find(const char *ctrlr_name) spdk_vhost_dev_find_id(const char *ctrlr_name)
{ {
unsigned i; unsigned i;
size_t dev_dirname_len = strlen(dev_dirname); size_t dev_dirname_len = strlen(dev_dirname);
@ -302,11 +302,24 @@ spdk_vhost_dev_find(const char *ctrlr_name)
} }
if (strcmp(g_spdk_vhost_devices[i]->name, ctrlr_name) == 0) { if (strcmp(g_spdk_vhost_devices[i]->name, ctrlr_name) == 0) {
return g_spdk_vhost_devices[i]; return i;
} }
} }
return -1;
}
struct spdk_vhost_dev *
spdk_vhost_dev_find(const char *ctrlr_name)
{
int id;
id = spdk_vhost_dev_find_id(ctrlr_name);
if (id == -1) {
return NULL; return NULL;
}
return g_spdk_vhost_devices[id];
} }
static int static int
@ -569,7 +582,7 @@ spdk_vhost_event_async_fn(void *arg1, void *arg2)
return; return;
} }
vdev = spdk_vhost_dev_find(ctx->ctrlr_name); vdev = g_spdk_vhost_devices[ctx->vdev_id];
if (vdev != ctx->vdev) { if (vdev != ctx->vdev) {
/* vdev has been changed after enqueuing this event */ /* vdev has been changed after enqueuing this event */
vdev = NULL; vdev = NULL;
@ -578,7 +591,6 @@ spdk_vhost_event_async_fn(void *arg1, void *arg2)
ctx->cb_fn(vdev, arg2); ctx->cb_fn(vdev, arg2);
pthread_mutex_unlock(&g_spdk_vhost_mutex); pthread_mutex_unlock(&g_spdk_vhost_mutex);
free(ctx->ctrlr_name);
free(ctx); free(ctx);
} }
@ -598,7 +610,6 @@ spdk_vhost_event_send(struct spdk_vhost_dev *vdev, spdk_vhost_event_fn cb_fn,
} }
ev_ctx.vdev = vdev; ev_ctx.vdev = vdev;
ev_ctx.ctrlr_name = strdup(vdev->name);
ev_ctx.cb_fn = cb_fn; ev_ctx.cb_fn = cb_fn;
ev = spdk_event_allocate(vdev->lcore, spdk_vhost_event_cb, &ev_ctx, NULL); ev = spdk_event_allocate(vdev->lcore, spdk_vhost_event_cb, &ev_ctx, NULL);
@ -615,13 +626,11 @@ spdk_vhost_event_send(struct spdk_vhost_dev *vdev, spdk_vhost_event_fn cb_fn,
} }
sem_destroy(&ev_ctx.sem); sem_destroy(&ev_ctx.sem);
free(ev_ctx.ctrlr_name);
return ev_ctx.response; return ev_ctx.response;
} }
static int static int
spdk_vhost_event_async_send(struct spdk_vhost_dev *vdev, spdk_vhost_event_fn cb_fn, void *arg) spdk_vhost_event_async_send(unsigned vdev_id, spdk_vhost_event_fn cb_fn, void *arg)
{ {
struct spdk_vhost_dev_event_ctx *ev_ctx; struct spdk_vhost_dev_event_ctx *ev_ctx;
struct spdk_event *ev; struct spdk_event *ev;
@ -632,11 +641,11 @@ spdk_vhost_event_async_send(struct spdk_vhost_dev *vdev, spdk_vhost_event_fn cb_
return -ENOMEM; return -ENOMEM;
} }
ev_ctx->vdev = vdev; ev_ctx->vdev = g_spdk_vhost_devices[vdev_id];
ev_ctx->ctrlr_name = strdup(vdev->name); ev_ctx->vdev_id = vdev_id;
ev_ctx->cb_fn = cb_fn; ev_ctx->cb_fn = cb_fn;
ev = spdk_event_allocate(vdev->lcore, spdk_vhost_event_async_fn, ev_ctx, arg); ev = spdk_event_allocate(ev_ctx->vdev->lcore, spdk_vhost_event_async_fn, ev_ctx, arg);
assert(ev); assert(ev);
spdk_event_call(ev); spdk_event_call(ev);
@ -895,20 +904,22 @@ void
spdk_vhost_call_external_event(const char *ctrlr_name, spdk_vhost_event_fn fn, void *arg) spdk_vhost_call_external_event(const char *ctrlr_name, spdk_vhost_event_fn fn, void *arg)
{ {
struct spdk_vhost_dev *vdev; struct spdk_vhost_dev *vdev;
int vdev_id;
pthread_mutex_lock(&g_spdk_vhost_mutex); pthread_mutex_lock(&g_spdk_vhost_mutex);
vdev = spdk_vhost_dev_find(ctrlr_name); vdev_id = spdk_vhost_dev_find_id(ctrlr_name);
if (vdev == NULL) { if (vdev_id == -1) {
pthread_mutex_unlock(&g_spdk_vhost_mutex); pthread_mutex_unlock(&g_spdk_vhost_mutex);
fn(NULL, arg); fn(NULL, arg);
return; return;
} }
vdev = g_spdk_vhost_devices[vdev_id];
if (vdev->lcore == -1) { if (vdev->lcore == -1) {
fn(vdev, arg); fn(vdev, arg);
} else { } else {
spdk_vhost_event_async_send(vdev, fn, arg); spdk_vhost_event_async_send(vdev_id, fn, arg);
} }
pthread_mutex_unlock(&g_spdk_vhost_mutex); pthread_mutex_unlock(&g_spdk_vhost_mutex);