From patchwork Sat Dec 17 10:43:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Wei W" X-Patchwork-Id: 706696 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 3tglJr6SK6z9vDV for ; Sat, 17 Dec 2016 22:27:24 +1100 (AEDT) Received: from localhost ([::1]:36179 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cID98-0002HR-UG for incoming@patchwork.ozlabs.org; Sat, 17 Dec 2016 06:27:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53645) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cICVC-0000Pe-JH for qemu-devel@nongnu.org; Sat, 17 Dec 2016 05:46:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cICV8-000064-9e for qemu-devel@nongnu.org; Sat, 17 Dec 2016 05:46:06 -0500 Received: from mga05.intel.com ([192.55.52.43]:21540) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cICV8-0007ss-15 for qemu-devel@nongnu.org; Sat, 17 Dec 2016 05:46:02 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP; 17 Dec 2016 02:46:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.33,363,1477983600"; d="scan'208"; a="1073174669" Received: from devel-ww.sh.intel.com ([10.239.48.105]) by orsmga001.jf.intel.com with ESMTP; 17 Dec 2016 02:45:59 -0800 From: Wei Wang To: marcandre.lureau@gmail.com, mst@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org, virtio-dev@lists.oasis-open.org Date: Sat, 17 Dec 2016 18:43:46 +0800 Message-Id: <1481971427-11094-37-git-send-email-wei.w.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1481971427-11094-1-git-send-email-wei.w.wang@intel.com> References: <1481971427-11094-1-git-send-email-wei.w.wang@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.43 Subject: [Qemu-devel] [PATCH v1 36/37] vhost-user/msg: handling VHOST_USER_SET_FEATURES 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: Wei Wang Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" If the featuer bits sent by the slave are not equal to the ones that were sent by the master, perform a reset of the master device. Signed-off-by: Wei Wang --- hw/net/vhost_net.c | 2 ++ hw/virtio/vhost-user.c | 19 +++++++++++++++++++ hw/virtio/virtio-pci.c | 20 ++++++++++++++++++++ hw/virtio/virtio-pci.h | 2 ++ include/net/vhost-user.h | 14 ++++++++++++++ net/vhost-user.c | 14 +++++--------- 6 files changed, 62 insertions(+), 9 deletions(-) diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index 7f64be3..b8dbc61 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -348,6 +348,8 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs, goto err_start; } + vhost_user_set_master_dev(ncs[0].peer, dev); + return 0; err_start: diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 800b8ed..08d5e86 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -12,6 +12,7 @@ #include "qapi/error.h" #include "hw/virtio/vhost.h" #include "hw/virtio/vhost-backend.h" +#include "hw/virtio/virtio-pci.h" #include "hw/virtio/vhost-user.h" #include "hw/virtio/virtio-net.h" #include "net/vhost-user.h" @@ -75,6 +76,21 @@ fail: return -1; } +static void handle_slave_acked_features(const char *name, VhostUserMsg *msg) +{ + CharBackend *chr_be = net_name_to_chr_be(name); + VhostUserState *s = container_of(chr_be, VhostUserState, chr); + VirtIODevice *vdev = s->vdev; + uint64_t master_features, slave_features; + + master_features = vhost_net_get_acked_features(s->vhost_net) + & ~(1 << VHOST_USER_F_PROTOCOL_FEATURES); + slave_features = msg->payload.u64; + + if (master_features != slave_features) + master_reset_virtio_net(vdev); +} + int vhost_user_can_read(void *opaque) { return VHOST_USER_HDR_SIZE; @@ -108,6 +124,9 @@ void vhost_user_asyn_read(void *opaque, const uint8_t *buf, int size) error_report("vhost-user master read incorrect msg \n"); switch(msg.request) { + case VHOST_USER_SET_FEATURES: + handle_slave_acked_features(name, &msg); + break; default: error_report("vhost-user master does not support msg request = %d\n", msg.request); diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 20cbefc..82b2920 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -38,6 +38,7 @@ #include "qemu/range.h" #include "hw/virtio/virtio-bus.h" #include "qapi/visitor.h" +#include "monitor/qdev.h" #define VIRTIO_PCI_REGION_SIZE(dev) VIRTIO_PCI_CONFIG_OFF(msix_present(dev)) @@ -2257,6 +2258,25 @@ static const TypeInfo virtio_serial_pci_info = { /* virtio-net-pci */ +void master_reset_virtio_net(VirtIODevice *vdev) +{ + VirtIONet *net = VIRTIO_NET(vdev); + VirtIONetPCI *net_pci = container_of(net, VirtIONetPCI, vdev); + VirtIOPCIProxy *proxy = &net_pci->parent_obj; + DeviceState *qdev = DEVICE(proxy); + DeviceState *qdev_new; + Error *err = NULL; + + virtio_pci_reset(qdev); + qdev_unplug(qdev, &err); + qdev->realized = false; + qdev_new = qdev_device_add(qdev->opts, &err); + if (!qdev_new) { + qemu_opts_del(qdev->opts); + } + object_unref(OBJECT(qdev)); +} + static Property virtio_net_properties[] = { DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, false), diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h index 0b4b04f..c41c621 100644 --- a/hw/virtio/virtio-pci.h +++ b/hw/virtio/virtio-pci.h @@ -383,4 +383,6 @@ struct VirtIOCryptoPCI { /* Virtio ABI version, if we increment this, we break the guest driver. */ #define VIRTIO_PCI_ABI_VERSION 0 +void master_reset_virtio_net(VirtIODevice *vdev); + #endif diff --git a/include/net/vhost-user.h b/include/net/vhost-user.h index 1bb5f1a..4cd14c9 100644 --- a/include/net/vhost-user.h +++ b/include/net/vhost-user.h @@ -12,6 +12,18 @@ #define NET_VHOST_USER_H #include "sysemu/char.h" +#include "net/vhost_net.h" + +typedef struct VhostUserState { + NetClientState nc; + CharBackend chr; /* only queue index 0 */ + VHostNetState *vhost_net; + guint watch; + uint64_t acked_features; + bool started; + /* Pointer to the master device */ + VirtIODevice *vdev; +} VhostUserState; struct vhost_net; struct vhost_net *vhost_user_get_vhost_net(NetClientState *nc); @@ -19,4 +31,6 @@ uint64_t vhost_user_get_acked_features(NetClientState *nc); CharBackend *net_name_to_chr_be(const char *name); +void vhost_user_set_master_dev(NetClientState *nc, VirtIODevice *vdev); + #endif /* VHOST_USER_H */ diff --git a/net/vhost-user.c b/net/vhost-user.c index 58eee6a..5f4b568 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -10,7 +10,6 @@ #include "qemu/osdep.h" #include "clients.h" -#include "net/vhost_net.h" #include "net/vhost-user.h" #include "hw/virtio/vhost-user.h" #include "qemu/config-file.h" @@ -18,14 +17,11 @@ #include "qmp-commands.h" #include "trace.h" -typedef struct VhostUserState { - NetClientState nc; - CharBackend chr; /* only queue index 0 */ - VHostNetState *vhost_net; - guint watch; - uint64_t acked_features; - bool started; -} VhostUserState; +void vhost_user_set_master_dev(NetClientState *nc, VirtIODevice *vdev) +{ + VhostUserState *s = DO_UPCAST(VhostUserState, nc, nc); + s->vdev = vdev; +} VHostNetState *vhost_user_get_vhost_net(NetClientState *nc) {