From patchwork Fri Dec 20 14:10:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mian M. Hamayun" X-Patchwork-Id: 304094 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 85BC72C00AA for ; Sat, 21 Dec 2013 01:16:11 +1100 (EST) Received: from localhost ([::1]:49781 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vu0s4-0000Y1-Gy for incoming@patchwork.ozlabs.org; Fri, 20 Dec 2013 09:16:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vu0nS-0001dK-5Z for qemu-devel@nongnu.org; Fri, 20 Dec 2013 09:11:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vu0nM-0003bb-2f for qemu-devel@nongnu.org; Fri, 20 Dec 2013 09:11:22 -0500 Received: from mail-wi0-f177.google.com ([209.85.212.177]:60892) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vu0nL-0003bV-QK for qemu-devel@nongnu.org; Fri, 20 Dec 2013 09:11:16 -0500 Received: by mail-wi0-f177.google.com with SMTP id cc10so3728366wib.16 for ; Fri, 20 Dec 2013 06:11:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NjJMqWq2XIKozGGk9ZJ2o/1Fv2/jaQvMJeNGG906IvM=; b=KDdwSjGKsOwJN+rl3Xxw2WAbvtzKdhTMw4qhgy7nyjS7G0WUPiJfmzB3uue+MzxuGk app/NiNfHLRDNdw0nwjDoktCP1ubsFLZ3SuBF4puigrFjcpp/u4Y8Z4sx0pOWqTTJ+8i I5gYN9Fm7lhCdF7R2dqxMRW96I4P3J21uxajyIIN0cOWHEHG+wakgElIf0eyEIC+Pqec sATdf6AdoXfKbn07/gKJswvgtzGMPcyqb/JkRnv97iD7crX38mjF4SJfkzTVPpZ2Rsri XUGc7N+F9udlFg6j3FD2vD/KNXNyf2BBLfPQNKFPAP3fYNkYTiZo5/kCpeLsOXOl438g smLQ== X-Gm-Message-State: ALoCoQl8S2/kxCwNFolMMx3gP35djjgbPzAvul7k3AaFwf1E6GCaSfETXC8kQ7T4st3NtDWb0IEL X-Received: by 10.194.84.72 with SMTP id w8mr2457695wjy.55.1387548675171; Fri, 20 Dec 2013 06:11:15 -0800 (PST) Received: from localhost.localdomain (59.219.193.77.rev.sfr.net. [77.193.219.59]) by mx.google.com with ESMTPSA id mt2sm17616546wic.7.2013.12.20.06.11.12 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 20 Dec 2013 06:11:14 -0800 (PST) From: "Mian M. Hamayun" To: qemu-devel@nongnu.org, snabb-devel@googlegroups.com Date: Fri, 20 Dec 2013 15:10:40 +0100 Message-Id: <1387548640-7120-8-git-send-email-m.hamayun@virtualopensystems.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1387548640-7120-1-git-send-email-m.hamayun@virtualopensystems.com> References: <1387548640-7120-1-git-send-email-m.hamayun@virtualopensystems.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.212.177 Cc: Stefan Hajnoczi , "Michael S. Tsirkin" , n.nikolaev@virtualopensystems.com, Anthony Liguori , Paolo Bonzini , lukego@gmail.com, Antonios Motakis , tech@virtualopensystems.com Subject: [Qemu-devel] [PATCH v4 7/7] Add vhost-user reconnection X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Antonios Motakis At runtime vhost-user netdev will detect if the vhost backend is up or down. Upon disconnection it will set link_down accordingly and notify virtio-net. Signed-off-by: Antonios Motakis Signed-off-by: Nikolay Nikolaev --- hw/net/vhost_net.c | 16 +++++++++++ hw/virtio/vhost-backend.c | 28 ++++++++++++++++++-- include/hw/virtio/vhost-backend.h | 2 ++ include/net/vhost_net.h | 1 + net/vhost-user.c | 56 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 101 insertions(+), 2 deletions(-) diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index e42f4d6..56c218e 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -304,6 +304,17 @@ void vhost_net_virtqueue_mask(VHostNetState *net, VirtIODevice *dev, vhost_virtqueue_mask(&net->dev, dev, idx, mask); } +int vhost_net_link_status(VHostNetState *net) +{ + int r = 0; + + if (net->dev.vhost_ops->vhost_status) { + r = net->dev.vhost_ops->vhost_status(&net->dev); + } + + return r; +} + VHostNetState *get_vhost_net(NetClientState *nc) { VHostNetState *vhost_net = 0; @@ -372,6 +383,11 @@ void vhost_net_virtqueue_mask(VHostNetState *net, VirtIODevice *dev, { } +int vhost_net_link_status(VHostNetState *net) +{ + return 0; +} + VHostNetState *get_vhost_net(NetClientState *nc) { return 0; diff --git a/hw/virtio/vhost-backend.c b/hw/virtio/vhost-backend.c index 17f59ec..10f813b 100644 --- a/hw/virtio/vhost-backend.c +++ b/hw/virtio/vhost-backend.c @@ -171,6 +171,10 @@ static int vhost_user_call(struct vhost_dev *dev, unsigned long int request, assert(dev->vhost_ops->backend_type == VHOST_BACKEND_TYPE_USER); + if (fd < 0) { + return 0; + } + msg.request = vhost_user_request_translate(request); msg.flags = 0; @@ -254,9 +258,25 @@ static int vhost_user_call(struct vhost_dev *dev, unsigned long int request, } } + /* mark the backend non operational */ + if (result < 0) { + fprintf(stderr, "%s: Connection break detected\n", __func__); + vhost_user_cleanup(dev); + return 0; + } + return result; } +static int vhost_user_status(struct vhost_dev *dev) +{ + uint64_t features = 0; + + vhost_user_call(dev, VHOST_GET_FEATURES, &features); + + return (dev->control >= 0); +} + static int vhost_user_init(struct vhost_dev *dev, const char *devpath) { int fd = -1; @@ -316,11 +336,13 @@ fail: static int vhost_user_cleanup(struct vhost_dev *dev) { - int r; + int r = 0; assert(dev->vhost_ops->backend_type == VHOST_BACKEND_TYPE_USER); - r = close(dev->control); + if (dev->control >= 0) { + r = close(dev->control); + } dev->control = -1; return r; @@ -329,6 +351,7 @@ static int vhost_user_cleanup(struct vhost_dev *dev) static const VhostOps user_ops = { .backend_type = VHOST_BACKEND_TYPE_USER, .vhost_call = vhost_user_call, + .vhost_status = vhost_user_status, .vhost_backend_init = vhost_user_init, .vhost_backend_cleanup = vhost_user_cleanup }; @@ -361,6 +384,7 @@ static int vhost_kernel_cleanup(struct vhost_dev *dev) static const VhostOps kernel_ops = { .backend_type = VHOST_BACKEND_TYPE_KERNEL, .vhost_call = vhost_kernel_call, + .vhost_status = 0, .vhost_backend_init = vhost_kernel_init, .vhost_backend_cleanup = vhost_kernel_cleanup }; diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-backend.h index ef87ffa..f2b4a6c 100644 --- a/include/hw/virtio/vhost-backend.h +++ b/include/hw/virtio/vhost-backend.h @@ -22,12 +22,14 @@ struct vhost_dev; typedef int (*vhost_call)(struct vhost_dev *dev, unsigned long int request, void *arg); +typedef int (*vhost_status)(struct vhost_dev *dev); typedef int (*vhost_backend_init)(struct vhost_dev *dev, const char *devpath); typedef int (*vhost_backend_cleanup)(struct vhost_dev *dev); typedef struct VhostOps { VhostBackendType backend_type; vhost_call vhost_call; + vhost_status vhost_status; vhost_backend_init vhost_backend_init; vhost_backend_cleanup vhost_backend_cleanup; } VhostOps; diff --git a/include/net/vhost_net.h b/include/net/vhost_net.h index abd3d0b..6390907 100644 --- a/include/net/vhost_net.h +++ b/include/net/vhost_net.h @@ -31,5 +31,6 @@ void vhost_net_ack_features(VHostNetState *net, unsigned features); bool vhost_net_virtqueue_pending(VHostNetState *net, int n); void vhost_net_virtqueue_mask(VHostNetState *net, VirtIODevice *dev, int idx, bool mask); +int vhost_net_link_status(VHostNetState *net); VHostNetState *get_vhost_net(NetClientState *nc); #endif diff --git a/net/vhost-user.c b/net/vhost-user.c index 6fd5afc..56f7dd4 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -12,6 +12,7 @@ #include "net/vhost_net.h" #include "net/vhost-user.h" #include "qemu/error-report.h" +#include "qemu/timer.h" typedef struct VhostUserState { NetClientState nc; @@ -19,6 +20,9 @@ typedef struct VhostUserState { char *devpath; } VhostUserState; +static QEMUTimer *vhost_user_timer; +#define VHOST_USER_TIMEOUT (1*1000) + VHostNetState *vhost_user_get_vhost_net(NetClientState *nc) { VhostUserState *s = DO_UPCAST(VhostUserState, nc, nc); @@ -31,6 +35,11 @@ static int vhost_user_running(VhostUserState *s) return (s->vhost_net) ? 1 : 0; } +static int vhost_user_link_status(VhostUserState *s) +{ + return (!s->nc.link_down) && vhost_net_link_status(s->vhost_net); +} + static int vhost_user_start(VhostUserState *s) { VhostNetOptions options; @@ -59,6 +68,48 @@ static void vhost_user_stop(VhostUserState *s) s->vhost_net = 0; } +static void vhost_user_timer_handler(void *opaque) +{ + VhostUserState *s = opaque; + int link_down = 0; + + if (vhost_user_running(s)) { + if (!vhost_user_link_status(s)) { + link_down = 1; + } + } else { + vhost_user_start(s); + if (!vhost_user_running(s)) { + link_down = 1; + } + } + + if (link_down != s->nc.link_down) { + + s->nc.link_down = link_down; + + if (s->nc.peer) { + s->nc.peer->link_down = link_down; + } + + if (s->nc.info->link_status_changed) { + s->nc.info->link_status_changed(&s->nc); + } + + if (s->nc.peer && s->nc.peer->info->link_status_changed) { + s->nc.peer->info->link_status_changed(s->nc.peer); + } + + if (link_down) { + vhost_user_stop(s); + } + } + + /* reschedule */ + timer_mod(vhost_user_timer, + qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + VHOST_USER_TIMEOUT); +} + static void vhost_user_cleanup(NetClientState *nc) { VhostUserState *s = DO_UPCAST(VhostUserState, nc, nc); @@ -93,6 +144,11 @@ static int net_vhost_user_init(NetClientState *peer, const char *device, r = vhost_user_start(s); + vhost_user_timer = timer_new_ms(QEMU_CLOCK_REALTIME, + vhost_user_timer_handler, s); + timer_mod(vhost_user_timer, + qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + VHOST_USER_TIMEOUT); + return r; }