From patchwork Thu Jan 9 15:00:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonios Motakis X-Patchwork-Id: 308853 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 F1A0C2C00BB for ; Fri, 10 Jan 2014 02:05:24 +1100 (EST) Received: from localhost ([::1]:52471 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W1HAg-0005Sv-Fn for incoming@patchwork.ozlabs.org; Thu, 09 Jan 2014 10:05:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53948) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W1H6w-0000YN-BK for qemu-devel@nongnu.org; Thu, 09 Jan 2014 10:01:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W1H6q-0000SE-AI for qemu-devel@nongnu.org; Thu, 09 Jan 2014 10:01:30 -0500 Received: from mail-wi0-f177.google.com ([209.85.212.177]:58537) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W1H6q-0000Pa-2F for qemu-devel@nongnu.org; Thu, 09 Jan 2014 10:01:24 -0500 Received: by mail-wi0-f177.google.com with SMTP id cc10so3574186wib.4 for ; Thu, 09 Jan 2014 07:01:23 -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=LONbgERv3AM2dAhV6IgU8HHMmmIH7DYt7SXkcDrHmLM=; b=lhhYkqHgQ9PM+pxDx7n5OlvDzc5PSeQfUo3fsoo6cPU2fN/1HDkWSudCZdt9nOGIAR zK4XVs0GE7JdkRkmko8eQStl3Ng5YgaOrw0M0PEz1vn4l4wlbFUOU4poCP88VT1WPFr2 g6KNgifpqml6AqjdOZXl0kLPD0h3snEn460TBtwvXxjtz4WLVyUGRuoLy5EbyOZZ7DhD 30RthaFjJH1gCo0roqKwRaEfbq0PLr317zEPpItftPDPOjweu7FN92en9pzEPordFJKq iPvN4Kh9y5VL9ozwUwOSm3y//cbJ4r35eYKJfy5K4EiFDs+/xV0n7i93r9swq3BsXEPt tciw== X-Gm-Message-State: ALoCoQmTXFBjSwT7O4dDVnzl0ZdBjJ1vwlBq9Gdt/Jefhsl60ktRvzZ9V9sVkkCYgRnPh9c3RKtT X-Received: by 10.194.92.7 with SMTP id ci7mr3352099wjb.58.1389279683305; Thu, 09 Jan 2014 07:01:23 -0800 (PST) Received: from localhost.localdomain (home.tvelocity.eu. [82.67.68.96]) by mx.google.com with ESMTPSA id k10sm1765683wjf.11.2014.01.09.07.01.21 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 09 Jan 2014 07:01:22 -0800 (PST) From: Antonios Motakis To: qemu-devel@nongnu.org, snabb-devel@googlegroups.com Date: Thu, 9 Jan 2014 16:00:01 +0100 Message-Id: <1389279601-1924-8-git-send-email-a.motakis@virtualopensystems.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1389279601-1924-1-git-send-email-a.motakis@virtualopensystems.com> References: <1389279601-1924-1-git-send-email-a.motakis@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" , Jason Wang , n.nikolaev@virtualopensystems.com, Anthony Liguori , Paolo Bonzini , lukego@gmail.com, Antonios Motakis , tech@virtualopensystems.com Subject: [Qemu-devel] [PATCH v5 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 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 | 16 +++++++++++ include/hw/virtio/vhost-backend.h | 2 ++ include/net/vhost_net.h | 1 + net/vhost-user.c | 56 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 91 insertions(+) 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 50ea307..fcd274f 100644 --- a/hw/virtio/vhost-backend.c +++ b/hw/virtio/vhost-backend.c @@ -350,9 +350,23 @@ static int vhost_user_call(struct vhost_dev *dev, unsigned long int request, } } + /* mark the backend non operational */ + if (result < 0) { + error_report("%s: Connection break detected\n", __func__); + vhost_user_cleanup(dev); + return 0; + } + return result; } +static int vhost_user_status(struct vhost_dev *dev) +{ + vhost_user_echo(dev); + + return (dev->control >= 0); +} + static int vhost_user_init(struct vhost_dev *dev, const char *devpath) { int fd = -1; @@ -432,6 +446,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 }; @@ -464,6 +479,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; }