From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39561) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyI3-00069I-28 for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:16:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSyI1-000367-GP for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:16:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43736) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyI1-00035j-8a for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:16:45 -0400 Date: Fri, 29 Jul 2016 06:16:41 +0300 From: "Michael S. Tsirkin" Message-ID: <1469762011-7902-29-git-send-email-mst@redhat.com> References: <1469762011-7902-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1469762011-7902-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 28/41] vhost-user: keep vhost_net after a disconnection List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?iso-8859-1?Q?Marc-Andr=E9?= Lureau , Jason Wang From: Marc-Andr=E9 Lureau 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=E9 Lureau Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/net/vhost_net.c | 1 - net/tap.c | 1 + net/vhost-user.c | 36 +++++++++++++++++++----------------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index c11f69c..7b76591 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); } =20 int vhost_net_notify_migration_done(struct vhost_net *net, char* mac_add= r) diff --git a/net/tap.c b/net/tap.c index 40a8c74..6abb962 100644 --- a/net/tap.c +++ b/net/tap.c @@ -312,6 +312,7 @@ static void tap_cleanup(NetClientState *nc) =20 if (s->vhost_net) { vhost_net_cleanup(s->vhost_net); + g_free(s->vhost_net); s->vhost_net =3D NULL; } =20 diff --git a/net/vhost-user.c b/net/vhost-user.c index 2cac32e..d2a984d 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -45,11 +45,6 @@ uint64_t vhost_user_get_acked_features(NetClientState = *nc) return s->acked_features; } =20 -static int vhost_user_running(VhostUserState *s) -{ - return (s->vhost_net) ? 1 : 0; -} - static void vhost_user_stop(int queues, NetClientState *ncs[]) { VhostUserState *s; @@ -59,15 +54,14 @@ static void vhost_user_stop(int queues, NetClientStat= e *ncs[]) assert(ncs[i]->info->type =3D=3D NET_CLIENT_DRIVER_VHOST_USER); =20 s =3D DO_UPCAST(VhostUserState, nc, ncs[i]); - if (!vhost_user_running(s)) { - continue; - } =20 if (s->vhost_net) { /* save acked features */ - s->acked_features =3D vhost_net_get_acked_features(s->vhost_= net); + uint64_t features =3D vhost_net_get_acked_features(s->vhost_= net); + if (features) { + s->acked_features =3D features; + } vhost_net_cleanup(s->vhost_net); - s->vhost_net =3D NULL; } } } @@ -75,6 +69,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 =3D NULL; VhostUserState *s; int max_queues; int i; @@ -85,33 +80,39 @@ static int vhost_user_start(int queues, NetClientStat= e *ncs[]) assert(ncs[i]->info->type =3D=3D NET_CLIENT_DRIVER_VHOST_USER); =20 s =3D DO_UPCAST(VhostUserState, nc, ncs[i]); - if (vhost_user_running(s)) { - continue; - } =20 options.net_backend =3D ncs[i]; options.opaque =3D s->chr; options.busyloop_timeout =3D 0; - s->vhost_net =3D vhost_net_init(&options); - if (!s->vhost_net) { + net =3D vhost_net_init(&options); + if (!net) { error_report("failed to init vhost_net for queue %d", i); goto err; } =20 if (i =3D=3D 0) { - max_queues =3D vhost_net_get_max_queues(s->vhost_net); + max_queues =3D 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 =3D net; } =20 return 0; =20 err: - vhost_user_stop(i + 1, ncs); + if (net) { + vhost_net_cleanup(net); + } + vhost_user_stop(i, ncs); return -1; } =20 @@ -150,6 +151,7 @@ static void vhost_user_cleanup(NetClientState *nc) =20 if (s->vhost_net) { vhost_net_cleanup(s->vhost_net); + g_free(s->vhost_net); s->vhost_net =3D NULL; } if (s->chr) { --=20 MST