From patchwork Sat Dec 17 10:43:17 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: 9478927 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 8E3A960827 for ; Sat, 17 Dec 2016 10:46:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 865762793A for ; Sat, 17 Dec 2016 10:46:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B2D328588; Sat, 17 Dec 2016 10:46:01 +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 E10AB2793A for ; Sat, 17 Dec 2016 10:46:00 +0000 (UTC) Received: from localhost ([::1]:35970 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cICV5-0007Qu-Sf for patchwork-qemu-devel@patchwork.kernel.org; Sat, 17 Dec 2016 05:45:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53191) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cICUL-0007MR-82 for qemu-devel@nongnu.org; Sat, 17 Dec 2016 05:45:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cICUI-000834-5k for qemu-devel@nongnu.org; Sat, 17 Dec 2016 05:45:13 -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 1cICUH-0007ss-Ta for qemu-devel@nongnu.org; Sat, 17 Dec 2016 05:45:10 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP; 17 Dec 2016 02:45:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.33,363,1477983600"; d="scan'208"; a="1073174403" Received: from devel-ww.sh.intel.com ([10.239.48.105]) by orsmga001.jf.intel.com with ESMTP; 17 Dec 2016 02:45:07 -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:17 +0800 Message-Id: <1481971427-11094-8-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 07/37] vhost-pci-slave/msg: VHOST_USER_GET_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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Offer the initial feature bits, which haven't been negotiated with the slave driver, to the master. Signed-off-by: Wei Wang --- hw/virtio/vhost-pci-slave.c | 42 +++++++++++++++++++++++++++++++++++++ include/hw/virtio/vhost-pci-slave.h | 1 + 2 files changed, 43 insertions(+) diff --git a/hw/virtio/vhost-pci-slave.c b/hw/virtio/vhost-pci-slave.c index 2278f63..4f445c2 100644 --- a/hw/virtio/vhost-pci-slave.c +++ b/hw/virtio/vhost-pci-slave.c @@ -14,11 +14,42 @@ #include "qapi/error.h" #include "qemu/error-report.h" +#include "hw/virtio/virtio-pci.h" #include "hw/virtio/vhost-pci-slave.h" #include "hw/virtio/vhost-user.h" +#define VHOST_PCI_FEATURE_BITS (1ULL << VIRTIO_F_VERSION_1) + +#define VHOST_PCI_NET_FEATURE_BITS (1ULL << VIRTIO_NET_F_MRG_RXBUF) | \ + (1ULL << VIRTIO_NET_F_CTRL_VQ) | \ + (1ULL << VIRTIO_NET_F_MQ) + VhostPCISlave *vp_slave; +static int vp_slave_write(CharBackend *chr_be, VhostUserMsg *msg) +{ + int size; + + if (!msg) + return 0; + + size = msg->size + VHOST_USER_HDR_SIZE; + msg->flags &= ~VHOST_USER_VERSION_MASK; + msg->flags |= VHOST_USER_VERSION; + + return qemu_chr_fe_write_all(chr_be, (const uint8_t *)msg, size) + == size ? 0 : -1; +} + +static int vp_slave_get_features(CharBackend *chr_be, VhostUserMsg *msg) +{ + msg->payload.u64 = vp_slave->feature_bits; + msg->size = sizeof(msg->payload.u64); + msg->flags |= VHOST_USER_REPLY_MASK; + + return vp_slave_write(chr_be, msg); +} + static void vp_slave_event(void *opaque, int event) { switch (event) { @@ -36,6 +67,7 @@ static int vp_slave_can_read(void *opaque) static void vp_slave_read(void *opaque, const uint8_t *buf, int size) { + int ret; VhostUserMsg msg; uint8_t *p = (uint8_t *) &msg; CharBackend *chr_be = (CharBackend *)opaque; @@ -61,11 +93,20 @@ static void vp_slave_read(void *opaque, const uint8_t *buf, int size) error_report("vhost-pci-slave read incorrect msg"); switch(msg.request) { + case VHOST_USER_GET_FEATURES: + ret = vp_slave_get_features(chr_be, &msg); + if (ret < 0) + goto err_handling; + break; default: error_report("vhost-pci-slave does not support msg request = %d", msg.request); break; } + return; + +err_handling: + error_report("vhost-pci-slave handle request %d failed", msg.request); } static CharDriverState *vp_slave_parse_chardev(const char *id) @@ -89,6 +130,7 @@ int vhost_pci_slave_init(QemuOpts *opts) if (!chr) { return -1; } + vp_slave->feature_bits = 1ULL << VHOST_USER_F_PROTOCOL_FEATURES; qemu_chr_fe_init(&vp_slave->chr_be, chr, &error_abort); qemu_chr_fe_set_handlers(&vp_slave->chr_be, vp_slave_can_read, vp_slave_read, vp_slave_event, diff --git a/include/hw/virtio/vhost-pci-slave.h b/include/hw/virtio/vhost-pci-slave.h index c82c775..4ec25d4 100644 --- a/include/hw/virtio/vhost-pci-slave.h +++ b/include/hw/virtio/vhost-pci-slave.h @@ -5,6 +5,7 @@ typedef struct VhostPCISlave { CharBackend chr_be; + uint64_t feature_bits; } VhostPCISlave; extern VhostPCISlave *vp_slave;