From patchwork Mon Dec 19 05:59:08 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: 9479749 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 AD7A5606DB for ; Mon, 19 Dec 2016 06:44:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FBDD28459 for ; Mon, 19 Dec 2016 06:44:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 945B72845B; Mon, 19 Dec 2016 06:44:09 +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 3E29028459 for ; Mon, 19 Dec 2016 06:44:09 +0000 (UTC) Received: from localhost ([::1]:43697 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cIrg8-0000k6-CQ for patchwork-qemu-devel@patchwork.kernel.org; Mon, 19 Dec 2016 01:44:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cIr0h-00040P-Tf for qemu-devel@nongnu.org; Mon, 19 Dec 2016 01:01:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cIr0h-0004ss-2c for qemu-devel@nongnu.org; Mon, 19 Dec 2016 01:01:20 -0500 Received: from mga06.intel.com ([134.134.136.31]:33815) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cIr0g-0004Vl-Rj for qemu-devel@nongnu.org; Mon, 19 Dec 2016 01:01:19 -0500 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP; 18 Dec 2016 22:01:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,372,1477983600"; d="scan'208";a="44550204" Received: from devel-ww.sh.intel.com ([10.239.48.105]) by fmsmga006.fm.intel.com with ESMTP; 18 Dec 2016 22:01:16 -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: Mon, 19 Dec 2016 13:59:08 +0800 Message-Id: <1482127152-84732-34-git-send-email-wei.w.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482127152-84732-1-git-send-email-wei.w.wang@intel.com> References: <1482127152-84732-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: 134.134.136.31 Subject: [Qemu-devel] [RESEND Patch v1 33/37] 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 actively sends the negotiated feature bits to the master. "need_send" is used to detect if the 64-bit feature bits are ready to be sent. Signed-off-by: Wei Wang --- hw/net/vhost-pci-net.c | 13 +++++++++++++ hw/virtio/vhost-pci-slave.c | 21 +++++++++++++++++++++ include/hw/virtio/vhost-pci-slave.h | 2 ++ 3 files changed, 36 insertions(+) diff --git a/hw/net/vhost-pci-net.c b/hw/net/vhost-pci-net.c index 5ad4a9f..8e30281 100644 --- a/hw/net/vhost-pci-net.c +++ b/hw/net/vhost-pci-net.c @@ -15,6 +15,7 @@ #include "qemu/osdep.h" #include "qemu/iov.h" +#include "qemu/error-report.h" #include "hw/virtio/virtio-access.h" #include "hw/virtio/vhost-pci-net.h" @@ -139,6 +140,18 @@ static uint64_t vpnet_get_features(VirtIODevice *vdev, uint64_t features, static void vpnet_set_features(VirtIODevice *vdev, uint64_t features) { + static bool need_send; + int ret; + + if (need_send) { + need_send = 0; + ret = vp_slave_send_feature_bits(features); + if (ret < 0) { + error_report("failed to send feature bits to the master"); + } + } 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 de08324..a966885 100644 --- a/hw/virtio/vhost-pci-slave.c +++ b/hw/virtio/vhost-pci-slave.c @@ -88,6 +88,27 @@ 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) { + return -1; + } + + return 0; +} + +int vp_slave_send_feature_bits(uint64_t features) +{ + return vp_slave_send_u64(VHOST_USER_SET_FEATURES, features); +} + static DeviceState *virtio_to_pci_dev(VirtIODevice *vdev, uint16_t virtio_id) { DeviceState *qdev; diff --git a/include/hw/virtio/vhost-pci-slave.h b/include/hw/virtio/vhost-pci-slave.h index 79e1ffd..e60580a 100644 --- a/include/hw/virtio/vhost-pci-slave.h +++ b/include/hw/virtio/vhost-pci-slave.h @@ -40,4 +40,6 @@ 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); + #endif