From nobody Tue Feb 10 17:08:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494579405285667.7395841658121; Fri, 12 May 2017 01:56:45 -0700 (PDT) Received: from localhost ([::1]:52152 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d96NQ-0001ht-0R for importer@patchew.org; Fri, 12 May 2017 04:56:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44985) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d968y-0005pj-Qy for qemu-devel@nongnu.org; Fri, 12 May 2017 04:41:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d968x-00022D-Dm for qemu-devel@nongnu.org; Fri, 12 May 2017 04:41:48 -0400 Received: from mga11.intel.com ([192.55.52.93]:62480) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d968x-0001je-33 for qemu-devel@nongnu.org; Fri, 12 May 2017 04:41:47 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 May 2017 01:41:46 -0700 Received: from devel-ww.sh.intel.com ([10.239.48.105]) by orsmga003.jf.intel.com with ESMTP; 12 May 2017 01:41:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,328,1491289200"; d="scan'208";a="967616299" From: Wei Wang To: stefanha@gmail.com, marcandre.lureau@gmail.com, mst@redhat.com, jasowang@redhat.com, pbonzini@redhat.com, virtio-dev@lists.oasis-open.org, qemu-devel@nongnu.org Date: Fri, 12 May 2017 16:35:45 +0800 Message-Id: <1494578148-102868-14-git-send-email-wei.w.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494578148-102868-1-git-send-email-wei.w.wang@intel.com> References: <1494578148-102868-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.93 Subject: [Qemu-devel] [PATCH v2 13/16] vhost-pci-slave: add "reset_virtio" 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" After the vhost-pci-net device being hotplugged to the VM, the device uses the features bits that have been negotiated with the remote virtio device to negotiate with the driver. If the driver accepts a subset of the feature bits, it implies that the vhost-pci-net can only suppoort a subset of the features supported by the remote virtio device. In this case, the remote virtio_device will be reset, and re-start the vhost-user protocol. Add the "reset_virtio" field as an indicator to the slave in this case. Signed-off-by: Wei Wang --- hw/net/vhost-pci-net.c | 11 +++++++++++ hw/virtio/vhost-pci-slave.c | 15 +++++++++++++-- include/hw/virtio/vhost-pci-slave.h | 1 + 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/hw/net/vhost-pci-net.c b/hw/net/vhost-pci-net.c index 1379204..a2dca50 100644 --- a/hw/net/vhost-pci-net.c +++ b/hw/net/vhost-pci-net.c @@ -189,8 +189,19 @@ static void vpnet_set_features(VirtIODevice *vdev, uin= t64_t features) */ static bool need_send; int ret; + VhostPCIDev *vp_dev =3D get_vhost_pci_dev(); =20 if (need_send) { + /* + * If the remote negotiated feature bits are not equal to the + * feature bits that have been negotiated between the device and + * driver, the remote virtio device needs a reset. Set reset_virtio + * to indicate to the slave about this case. + */ + if (vp_dev->feature_bits !=3D features) { + vp_dev->feature_bits =3D features; + vp_dev->reset_virtio =3D 1; + } need_send =3D 0; ret =3D vp_slave_send_feature_bits(features); if (ret < 0) { diff --git a/hw/virtio/vhost-pci-slave.c b/hw/virtio/vhost-pci-slave.c index 6cc9c21..a7d3c8d 100644 --- a/hw/virtio/vhost-pci-slave.c +++ b/hw/virtio/vhost-pci-slave.c @@ -171,8 +171,15 @@ static void vp_slave_set_device_type(VhostUserMsg *msg) =20 switch (vp_dev->dev_type) { case VIRTIO_ID_NET: - vp_dev->feature_bits |=3D VHOST_PCI_FEATURE_BITS | - VHOST_PCI_NET_FEATURE_BITS; + /* + * The setting of reset_virtio implies that the feature_bits has b= een + * remotely negotiated. So, skip adding the supported features to + * feature_bits in this case. + */ + if (!vp_dev->reset_virtio) { + vp_dev->feature_bits |=3D VHOST_PCI_FEATURE_BITS | + VHOST_PCI_NET_FEATURE_BITS; + } break; default: error_report("%s: device type %d is not supported", @@ -400,6 +407,9 @@ static int vp_slave_set_vhost_pci(VhostUserMsg *msg) =20 switch (cmd) { case VHOST_USER_SET_VHOST_PCI_START: + if (vp_dev->reset_virtio) { + vp_dev->reset_virtio =3D 0; + } ret =3D vp_slave_device_create(vp_dev->dev_type); if (ret < 0) { return ret; @@ -585,6 +595,7 @@ static void vp_dev_init(VhostPCIDev *vp_dev) vp_dev->vdev =3D NULL; QLIST_INIT(&vp_dev->remoteq_list); vp_dev->remoteq_num =3D 0; + vp_dev->reset_virtio =3D 0; } =20 int vhost_pci_slave_init(QemuOpts *opts) diff --git a/include/hw/virtio/vhost-pci-slave.h b/include/hw/virtio/vhost-= pci-slave.h index ab21e70..594917f 100644 --- a/include/hw/virtio/vhost-pci-slave.h +++ b/include/hw/virtio/vhost-pci-slave.h @@ -29,6 +29,7 @@ typedef struct RemoteMem { typedef struct VhostPCIDev { /* Ponnter to the slave device */ VirtIODevice *vdev; + bool reset_virtio; uint16_t dev_type; uint64_t feature_bits; /* Records the end (offset to the BAR) of the last mapped region */ --=20 2.7.4