[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 16/29] vhost-user: keep vhost_net after a disconn
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH v4 16/29] vhost-user: keep vhost_net after a disconnection |
Date: |
Thu, 7 Jul 2016 03:00:40 +0200 |
From: Marc-André Lureau <address@hidden>
Many code paths assume get_vhost_net() returns non-null.
Keep VhostUserState.vhost_net after a successful vhost_net_init(),
instead of freeing it in vhost_net_cleanup().
VhostUserState.vhost_net is thus freed before after being recreated or
on final vhost_user_cleanup() and there is no need to save the acked
features.
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/net/vhost_net.c | 1 -
net/tap.c | 1 +
net/vhost-user.c | 37 +++++++++++++++++--------------------
3 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index 1da05d0..08c7d1e 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -378,7 +378,6 @@ void vhost_net_stop(VirtIODevice *dev, NetClientState *ncs,
void vhost_net_cleanup(struct vhost_net *net)
{
vhost_dev_cleanup(&net->dev);
- g_free(net);
}
int vhost_net_notify_migration_done(struct vhost_net *net, char* mac_addr)
diff --git a/net/tap.c b/net/tap.c
index 49817c7..31726e7 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -299,6 +299,7 @@ static void tap_cleanup(NetClientState *nc)
if (s->vhost_net) {
vhost_net_cleanup(s->vhost_net);
+ g_free(s->vhost_net);
s->vhost_net = NULL;
}
diff --git a/net/vhost-user.c b/net/vhost-user.c
index 18bd170..a80f008 100644
--- a/net/vhost-user.c
+++ b/net/vhost-user.c
@@ -23,7 +23,6 @@ typedef struct VhostUserState {
CharDriverState *chr;
VHostNetState *vhost_net;
guint watch;
- uint64_t acked_features;
} VhostUserState;
typedef struct VhostUserChardevProps {
@@ -42,12 +41,7 @@ uint64_t vhost_user_get_acked_features(NetClientState *nc)
{
VhostUserState *s = DO_UPCAST(VhostUserState, nc, nc);
assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_VHOST_USER);
- return s->acked_features;
-}
-
-static int vhost_user_running(VhostUserState *s)
-{
- return (s->vhost_net) ? 1 : 0;
+ return s->vhost_net ? vhost_net_get_acked_features(s->vhost_net) : 0;
}
static void vhost_user_stop(int queues, NetClientState *ncs[])
@@ -59,15 +53,9 @@ static void vhost_user_stop(int queues, NetClientState
*ncs[])
assert (ncs[i]->info->type == NET_CLIENT_OPTIONS_KIND_VHOST_USER);
s = DO_UPCAST(VhostUserState, nc, ncs[i]);
- if (!vhost_user_running(s)) {
- continue;
- }
if (s->vhost_net) {
- /* save acked features */
- s->acked_features = vhost_net_get_acked_features(s->vhost_net);
vhost_net_cleanup(s->vhost_net);
- s->vhost_net = NULL;
}
}
}
@@ -75,6 +63,7 @@ static void vhost_user_stop(int queues, NetClientState *ncs[])
static int vhost_user_start(int queues, NetClientState *ncs[])
{
VhostNetOptions options;
+ struct vhost_net *net = NULL;
VhostUserState *s;
int max_queues;
int i;
@@ -85,32 +74,39 @@ static int vhost_user_start(int queues, NetClientState
*ncs[])
assert (ncs[i]->info->type == NET_CLIENT_OPTIONS_KIND_VHOST_USER);
s = DO_UPCAST(VhostUserState, nc, ncs[i]);
- if (vhost_user_running(s)) {
- continue;
- }
options.net_backend = ncs[i];
options.opaque = s->chr;
- s->vhost_net = vhost_net_init(&options);
- if (!s->vhost_net) {
+
+ net = vhost_net_init(&options);
+ if (!net) {
error_report("failed to init vhost_net for queue %d", i);
goto err;
}
if (i == 0) {
- max_queues = vhost_net_get_max_queues(s->vhost_net);
+ max_queues = vhost_net_get_max_queues(net);
if (queues > max_queues) {
error_report("you are asking more queues than supported: %d",
max_queues);
goto err;
}
}
+
+ if (s->vhost_net) {
+ vhost_net_cleanup(s->vhost_net);
+ g_free(s->vhost_net);
+ }
+ s->vhost_net = net;
}
return 0;
err:
- vhost_user_stop(i + 1, ncs);
+ if (net) {
+ vhost_net_cleanup(net);
+ }
+ vhost_user_stop(i, ncs);
return -1;
}
@@ -149,6 +145,7 @@ static void vhost_user_cleanup(NetClientState *nc)
if (s->vhost_net) {
vhost_net_cleanup(s->vhost_net);
+ g_free(s->vhost_net);
s->vhost_net = NULL;
}
if (s->chr) {
--
2.9.0
- [Qemu-devel] [PATCH v4 08/29] vhost-net: always call vhost_dev_cleanup() on failure, (continued)
- [Qemu-devel] [PATCH v4 08/29] vhost-net: always call vhost_dev_cleanup() on failure, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 09/29] vhost: fix calling vhost_dev_cleanup() after vhost_dev_init(), marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 07/29] vhost: make vhost_dev_cleanup() idempotent, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 10/29] vhost: do not assert() on vhost_ops failure, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 11/29] vhost: use error_report() instead of fprintf(stderr, ...), marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 12/29] qemu-char: fix qemu_chr_fe_set_msgfds() crash when disconnected, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 15/29] vhost-user: check vhost_user_{read, write}() return value, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 14/29] vhost-user: check qemu_chr_fe_set_msgfds() return value, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 13/29] vhost-user: call set_msgfds unconditionally, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 17/29] vhost-user: add get_vhost_net() assertions, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 16/29] vhost-user: keep vhost_net after a disconnection,
marcandre . lureau <=
- [Qemu-devel] [PATCH v4 18/29] Revert "vhost-net: do not crash if backend is not present", marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 19/29] vhost-net: vhost_migration_done is vhost-user specific, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 20/29] vhost: add assert() to check runtime behaviour, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 22/29] char: add and use tcp_chr_wait_connected, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 21/29] char: add chr_wait_connected callback, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 23/29] vhost-user: wait until backend init is completed, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 24/29] tests: plug some leaks in virtio-net-test, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 25/29] tests: fix vhost-user-test leak, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 26/29] tests: add /vhost-user/connect-fail test, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 27/29] tests: add a simple /vhost-user/multiqueue test, marcandre . lureau, 2016/07/06