From patchwork Tue Jun 21 10:02:44 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: 9190191 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 503A06075E for ; Tue, 21 Jun 2016 10:16:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3DEC528156 for ; Tue, 21 Jun 2016 10:16:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 31D852815E; Tue, 21 Jun 2016 10:16:47 +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 CE50228156 for ; Tue, 21 Jun 2016 10:16:46 +0000 (UTC) Received: from localhost ([::1]:50432 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFIjd-0003D3-PA for patchwork-qemu-devel@patchwork.kernel.org; Tue, 21 Jun 2016 06:16:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46426) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFIWa-0005Gy-Ne for qemu-devel@nongnu.org; Tue, 21 Jun 2016 06:03:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFIWZ-0000MF-Iv for qemu-devel@nongnu.org; Tue, 21 Jun 2016 06:03:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37905) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFIWZ-0000LV-AY for qemu-devel@nongnu.org; Tue, 21 Jun 2016 06:03:15 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (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 D7D5946202; Tue, 21 Jun 2016 10:03:14 +0000 (UTC) Received: from localhost ([10.41.1.246]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5LA3EoZ010649; Tue, 21 Jun 2016 06:03:14 -0400 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Tue, 21 Jun 2016 12:02:44 +0200 Message-Id: <1466503372-28334-17-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1466503372-28334-1-git-send-email-marcandre.lureau@redhat.com> References: <1466503372-28334-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 21 Jun 2016 10:03:14 +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 16/24] 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 Lot of code path assumes get_vhost_net() return non-null. Keep it after a successful vhost_net_init(). vhost_net_cleanup() will clear the vhost-dev connection-related data after vhost_user_stop(). Signed-off-by: Marc-André Lureau --- hw/net/vhost_net.c | 1 - net/tap.c | 1 + net/vhost-user.c | 21 ++++++++------------- 3 files changed, 9 insertions(+), 14 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 392f982..4c7702f 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; } -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,11 @@ 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); + s->acked_features |= vhost_net_get_acked_features(s->vhost_net); vhost_net_cleanup(s->vhost_net); - s->vhost_net = NULL; } } } @@ -85,12 +76,15 @@ 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; + + if (s->vhost_net) { + vhost_net_cleanup(s->vhost_net); + g_free(s->vhost_net); + } + s->vhost_net = vhost_net_init(&options); if (!s->vhost_net) { error_report("failed to init vhost_net for queue %d", i); @@ -149,6 +143,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; }