From patchwork Thu Jul 7 01:00:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 9217639 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 00D9560467 for ; Thu, 7 Jul 2016 01:27:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E4A9E285C9 for ; Thu, 7 Jul 2016 01:27:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D9221285CB; Thu, 7 Jul 2016 01:27:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 74C5E285C9 for ; Thu, 7 Jul 2016 01:27:50 +0000 (UTC) Received: from localhost ([::1]:36737 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKy6X-0005j8-HE for patchwork-qemu-devel@patchwork.kernel.org; Wed, 06 Jul 2016 21:27:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56665) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKxh0-0005Cq-7H for qemu-devel@nongnu.org; Wed, 06 Jul 2016 21:01:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKxgz-0006ds-5i for qemu-devel@nongnu.org; Wed, 06 Jul 2016 21:01:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52012) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKxgy-0006dV-Tj for qemu-devel@nongnu.org; Wed, 06 Jul 2016 21:01:25 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 68DD680082; Thu, 7 Jul 2016 01:01:24 +0000 (UTC) Received: from localhost (ovpn-116-37.phx2.redhat.com [10.3.116.37]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6711NLI005922; Wed, 6 Jul 2016 21:01:23 -0400 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Thu, 7 Jul 2016 03:00:40 +0200 Message-Id: <20160707010053.28008-17-marcandre.lureau@redhat.com> In-Reply-To: <20160707010053.28008-1-marcandre.lureau@redhat.com> References: <20160707010053.28008-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 07 Jul 2016 01:01:24 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 16/29] vhost-user: keep vhost_net after a disconnection X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yuanhan.liu@linux.intel.com, victork@redhat.com, mst@redhat.com, jonshin@cisco.com, mukawa@igel.co.jp, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Marc-André 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é Lureau --- 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) {