From patchwork Fri May 12 08:35:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Wei W" X-Patchwork-Id: 9723773 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 69FEE600CB for ; Fri, 12 May 2017 08:50:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E31A287D8 for ; Fri, 12 May 2017 08:50:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5082A28810; Fri, 12 May 2017 08:50:54 +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 9C48E287D8 for ; Fri, 12 May 2017 08:50:53 +0000 (UTC) Received: from localhost ([::1]:52102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d96Hk-0004fr-Lz for patchwork-qemu-devel@patchwork.kernel.org; Fri, 12 May 2017 04:50:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44935) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d968t-0005k6-1H for qemu-devel@nongnu.org; Fri, 12 May 2017 04:41:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d968s-0001yU-6g for qemu-devel@nongnu.org; Fri, 12 May 2017 04:41:43 -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 1d968r-0001je-UQ for qemu-devel@nongnu.org; Fri, 12 May 2017 04:41:42 -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:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,328,1491289200"; d="scan'208";a="967616279" Received: from devel-ww.sh.intel.com ([10.239.48.105]) by orsmga003.jf.intel.com with ESMTP; 12 May 2017 01:41:39 -0700 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:42 +0800 Message-Id: <1494578148-102868-11-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 10/16] vhost-pci-net: send the negotiated feature bits to the master 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The slave device actively sends the negotiated feature bits to the master. Signed-off-by: Wei Wang --- hw/net/vhost-pci-net.c | 18 ++++++++++++++++++ hw/virtio/vhost-pci-slave.c | 22 ++++++++++++++++++++++ include/hw/virtio/vhost-pci-slave.h | 2 ++ 3 files changed, 42 insertions(+) diff --git a/hw/net/vhost-pci-net.c b/hw/net/vhost-pci-net.c index 0235511..1379204 100644 --- a/hw/net/vhost-pci-net.c +++ b/hw/net/vhost-pci-net.c @@ -181,6 +181,24 @@ static uint64_t vpnet_get_features(VirtIODevice *vdev, uint64_t features, static void vpnet_set_features(VirtIODevice *vdev, uint64_t features) { + /* + * The implementation split the write of the 64-bit "features" into 2 + * 32-bit writes, so the function is called twice. need_send is used to + * detect the second write which finishes the write of "features", and + * need to send to the remote device. + */ + static bool need_send; + int ret; + + if (need_send) { + need_send = 0; + ret = vp_slave_send_feature_bits(features); + if (ret < 0) { + error_report("%s failed to send feature bits", __func__); + } + } else { + need_send = 1; + } } static void vpnet_get_config(VirtIODevice *vdev, uint8_t *config) diff --git a/hw/virtio/vhost-pci-slave.c b/hw/virtio/vhost-pci-slave.c index ab1d06b..6cc9c21 100644 --- a/hw/virtio/vhost-pci-slave.c +++ b/hw/virtio/vhost-pci-slave.c @@ -122,6 +122,28 @@ static void vp_slave_set_features(VhostUserMsg *msg) ~(1 << VHOST_USER_F_PROTOCOL_FEATURES); } +static int vp_slave_send_u64(int request, uint64_t u64) +{ + VhostUserMsg msg = { + .request = request, + .flags = VHOST_USER_VERSION, + .payload.u64 = u64, + .size = sizeof(msg.payload.u64), + }; + + if (vp_slave_write(&vp_slave->chr_be, &msg) < 0) { + error_report("%s: failed to send", __func__); + return -1; + } + + return 0; +} + +int vp_slave_send_feature_bits(uint64_t features) +{ + return vp_slave_send_u64(VHOST_USER_SET_FEATURES, features); +} + static void vp_slave_event(void *opaque, int event) { switch (event) { diff --git a/include/hw/virtio/vhost-pci-slave.h b/include/hw/virtio/vhost-pci-slave.h index b5bf02a..ab21e70 100644 --- a/include/hw/virtio/vhost-pci-slave.h +++ b/include/hw/virtio/vhost-pci-slave.h @@ -56,6 +56,8 @@ extern int vhost_pci_slave_init(QemuOpts *opts); extern int vhost_pci_slave_cleanup(void); +extern int vp_slave_send_feature_bits(uint64_t features); + VhostPCIDev *get_vhost_pci_dev(void); #endif