From patchwork Mon Dec 19 05:59:03 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: 9479717 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 3223C601C0 for ; Mon, 19 Dec 2016 06:28:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2422D28339 for ; Mon, 19 Dec 2016 06:28:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 17A692845B; Mon, 19 Dec 2016 06:28:33 +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 80E4628339 for ; Mon, 19 Dec 2016 06:28:32 +0000 (UTC) Received: from localhost ([::1]:43603 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cIrR1-0003d5-Ia for patchwork-qemu-devel@patchwork.kernel.org; Mon, 19 Dec 2016 01:28:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53944) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cIr0Z-0003PY-BG for qemu-devel@nongnu.org; Mon, 19 Dec 2016 01:01:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cIr0Y-0004mq-E5 for qemu-devel@nongnu.org; Mon, 19 Dec 2016 01:01:11 -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 1cIr0Y-0004Vl-6R for qemu-devel@nongnu.org; Mon, 19 Dec 2016 01:01:10 -0500 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP; 18 Dec 2016 22:01:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,372,1477983600"; d="scan'208";a="44550162" Received: from devel-ww.sh.intel.com ([10.239.48.105]) by fmsmga006.fm.intel.com with ESMTP; 18 Dec 2016 22:01:08 -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:03 +0800 Message-Id: <1482127152-84732-29-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 28/37] vhost-pci-net: pass the mem and vring info to the driver 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 When DRIVER_OK, the device sends the mem and vring info to the driver via the controlq. Signed-off-by: Wei Wang --- hw/net/vhost-pci-net.c | 68 ++++++++++++++++++++++++++ include/standard-headers/linux/vhost_pci_net.h | 17 +++++++ 2 files changed, 85 insertions(+) diff --git a/hw/net/vhost-pci-net.c b/hw/net/vhost-pci-net.c index b3475c2..2560e3d 100644 --- a/hw/net/vhost-pci-net.c +++ b/hw/net/vhost-pci-net.c @@ -14,6 +14,7 @@ */ #include "qemu/osdep.h" +#include "qemu/iov.h" #include "hw/virtio/virtio-access.h" #include "hw/virtio/vhost-pci-net.h" @@ -57,8 +58,75 @@ static void vpnet_handle_crq(VirtIODevice *vdev, VirtQueue *vq) { } +static size_t vpnet_send_crq_msg(VhostPCINet *vpnet, + struct vpnet_controlq_msg *msg) +{ + VirtQueueElement *elem; + VirtQueue *vq; + size_t msg_len = VPNET_CQ_MSG_HDR_SIZE + msg->size; + + vq = vpnet->crq; + if (!virtio_queue_ready(vq)) { + return 0; + } + + elem = virtqueue_pop(vq, sizeof(VirtQueueElement)); + if (!elem) { + return 0; + } + + /* TODO: detect a buffer that's too short, set NEEDS_RESET */ + iov_from_buf(elem->in_sg, elem->in_num, 0, msg, msg_len); + + virtqueue_push(vq, elem, msg_len); + virtio_notify(VIRTIO_DEVICE(vpnet), vq); + g_free(elem); + + return msg_len; +} + +static void vpnet_send_peer_mem_msg(VhostPCINet *vpnet) +{ + struct vpnet_controlq_msg msg = { + .class = VHOST_PCI_CTRL_PEER_MEM_MSG, + .size = sizeof(struct peer_mem_msg), + }; + memcpy(&msg.payload.pmem_msg, &vp_slave->pmem_msg, msg.size); + vpnet_send_crq_msg(vpnet, &msg); +} + +static void vpnet_send_peer_vq_msg(VhostPCINet *vpnet) +{ + struct vpnet_controlq_msg *msg; + struct peer_vqs_msg *pvqs_msg; + struct peer_vq_msg *pvq_msg; + uint16_t pvq_num, msg_size, payload_size; + + pvq_num = vpnet->peer_vq_num; + payload_size = sizeof(struct peer_vqs_msg) + + sizeof(struct peer_vq_msg) * pvq_num; + msg_size = VPNET_CQ_MSG_HDR_SIZE + payload_size; + msg = g_malloc(msg_size); + msg->class = VHOST_PCI_CTRL_PEER_VQ_MSG, + msg->size = msg_size; + + pvqs_msg = &msg->payload.pvqs_msg; + pvqs_msg->nvqs = pvq_num; + pvq_msg = pvqs_msg->pvq_msg; + memcpy(pvq_msg, vpnet->pvq_msg, payload_size); + + vpnet_send_crq_msg(vpnet, msg); + g_free(msg); +} + static void vpnet_set_status(struct VirtIODevice *vdev, uint8_t status) { + VhostPCINet *vpnet = VHOST_PCI_NET(vdev); + + if (status & VIRTIO_CONFIG_S_DRIVER_OK) { + vpnet_send_peer_mem_msg(vpnet); + vpnet_send_peer_vq_msg(vpnet); + } } static uint64_t vpnet_get_features(VirtIODevice *vdev, uint64_t features, diff --git a/include/standard-headers/linux/vhost_pci_net.h b/include/standard-headers/linux/vhost_pci_net.h index e525569..770171e 100644 --- a/include/standard-headers/linux/vhost_pci_net.h +++ b/include/standard-headers/linux/vhost_pci_net.h @@ -65,4 +65,21 @@ struct peer_vqs_msg { struct peer_vq_msg pvq_msg[]; }; +#define VHOST_PCI_CTRL_PEER_MEM_MSG 0 +#define VHOST_PCI_CTRL_PEER_VQ_MSG 1 +struct vpnet_controlq_msg { + uint8_t class; + uint8_t cmd; + uint16_t size; + union { + struct peer_mem_msg pmem_msg; + struct peer_vqs_msg pvqs_msg; + } payload; +} __attribute__((packed)); + +static struct vpnet_controlq_msg vpnet_msg __attribute__ ((unused)); +#define VPNET_CQ_MSG_HDR_SIZE (sizeof(vpnet_msg.class) \ + + sizeof(vpnet_msg.cmd) \ + + sizeof(vpnet_msg.size)) + #endif