From patchwork Tue Apr 3 16:33:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: junjie.j.chen@intel.com X-Patchwork-Id: 36913 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6703D1B674; Tue, 3 Apr 2018 10:55:10 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 56A5F1B673 for ; Tue, 3 Apr 2018 10:55:08 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Apr 2018 01:55:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,400,1517904000"; d="scan'208";a="217186723" Received: from dpdk-dev.sh.intel.com ([10.67.111.147]) by fmsmga005.fm.intel.com with ESMTP; 03 Apr 2018 01:55:06 -0700 From: Junjie Chen To: jianfeng.tan@intel.com, maxime.coquelin@redhat.com, mtetsuyah@gmail.com Cc: dev@dpdk.org, Junjie Chen Date: Tue, 3 Apr 2018 12:33:33 -0400 Message-Id: <1522773213-132764-1-git-send-email-junjie.j.chen@intel.com> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1522334234-98309-1-git-send-email-junjie.j.chen@intel.com> References: <1522334234-98309-1-git-send-email-junjie.j.chen@intel.com> Subject: [dpdk-dev] [PATCH v3] vhost: add support for interrupt mode X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" In some cases we want vhost dequeue work in interrupt mode to release cpus to others when no data to transmit. So we install interrupt handler of vhost device and interrupt vectors for each rx queue when creating new backend according to vhost intrerupt configuration. Thus, applications could register a epoll event fd to associate rx queues with interrupt vectors. Signed-off-by: Junjie Chen --- Changes in v3: - handle failure in the middle of intr setup. - use vhost API to enable interrupt. - rebase to check rxq existence. - update vhost API to support guest notification. Changes in v2: - update rx queue index. - fill efd_counter_size for intr handler. - update log. drivers/net/vhost/rte_eth_vhost.c | 201 ++++++++++++++++++++++++++++++-------- lib/librte_vhost/vhost.c | 13 ++- 2 files changed, 167 insertions(+), 47 deletions(-) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 11b6076..c14caae 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -1,35 +1,7 @@ -/*- - * BSD LICENSE - * - * Copyright (c) 2016 IGEL Co., Ltd. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of IGEL Co.,Ltd. nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2016 Intel Corporation */ + #include #include #include @@ -554,28 +526,174 @@ update_queuing_status(struct rte_eth_dev *dev) } } +static int +eth_rxq_intr_enable(struct rte_eth_dev *dev, uint16_t qid) +{ + struct rte_vhost_vring vring; + struct vhost_queue *vq; + int ret = 0; + + vq = dev->data->rx_queues[qid]; + if (!vq) { + RTE_LOG(ERR, PMD, "rxq%d is not setup yet\n", qid); + return -1; + } + + ret = rte_vhost_get_vhost_vring(vq->vid, (qid << 1) + 1, &vring); + if (ret < 0) { + RTE_LOG(ERR, PMD, "Failed to get rxq%d's vring\n", qid); + return ret; + } + RTE_LOG(INFO, PMD, "Enable interrupt for rxq%d\n", qid); + rte_vhost_enable_guest_notification(vq->vid, (qid << 1) + 1, 1); + rte_wmb(); + + return ret; +} + +static int +eth_rxq_intr_disable(struct rte_eth_dev *dev, uint16_t qid) +{ + struct rte_vhost_vring vring; + struct vhost_queue *vq; + int ret = 0; + + vq = dev->data->rx_queues[qid]; + if (!vq) { + RTE_LOG(ERR, PMD, "rxq%d is not setup yet\n", qid); + return -1; + } + + ret = rte_vhost_get_vhost_vring(vq->vid, (qid << 1) + 1, &vring); + if (ret < 0) { + RTE_LOG(ERR, PMD, "Failed to get rxq%d's vring", qid); + return ret; + } + RTE_LOG(INFO, PMD, "Disable interrupt for rxq%d\n", qid); + rte_vhost_enable_guest_notification(vq->vid, (qid << 1) + 1, 0); + rte_wmb(); + + return 0; +} + static void +eth_vhost_uninstall_intr(struct rte_eth_dev *dev) +{ + struct rte_intr_handle *intr_handle = dev->intr_handle; + + if (intr_handle) { + if (intr_handle->intr_vec) + free(intr_handle->intr_vec); + free(intr_handle); + } + + dev->intr_handle = NULL; +} + +static int +eth_vhost_install_intr(struct rte_eth_dev *dev) +{ + struct rte_vhost_vring vring; + struct vhost_queue *vq; + int count = 0; + int nb_rxq = dev->data->nb_rx_queues; + int i; + int ret; + + /* uninstall firstly if we are reconnecting */ + if (dev->intr_handle) + eth_vhost_uninstall_intr(dev); + + dev->intr_handle = malloc(sizeof(*dev->intr_handle)); + if (!dev->intr_handle) { + RTE_LOG(ERR, PMD, "Fail to allocate intr_handle\n"); + return -ENOMEM; + } + memset(dev->intr_handle, 0, sizeof(*dev->intr_handle)); + + dev->intr_handle->efd_counter_size = sizeof(uint64_t); + + dev->intr_handle->intr_vec = + malloc(nb_rxq * sizeof(dev->intr_handle->intr_vec[0])); + + if (!dev->intr_handle->intr_vec) { + RTE_LOG(ERR, PMD, + "Failed to allocate memory for interrupt vector\n"); + free(dev->intr_handle); + return -ENOMEM; + } + + RTE_LOG(INFO, PMD, "Prepare intr vec\n"); + for (i = 0; i < nb_rxq; i++) { + vq = dev->data->rx_queues[i]; + if (!vq) { + RTE_LOG(INFO, PMD, "rxq-%d not setup yet, skip!\n", i); + continue; + } + + ret = rte_vhost_get_vhost_vring(vq->vid, (i << 1) + 1, &vring); + if (ret < 0) { + RTE_LOG(INFO, PMD, + "Failed to get rxq-%d's vring, skip!\n", i); + continue; + } + + if (vring.kickfd < 0) { + RTE_LOG(INFO, PMD, + "rxq-%d's kickfd is invalid, skip!\n", i); + continue; + } + dev->intr_handle->intr_vec[i] = RTE_INTR_VEC_RXTX_OFFSET + i; + dev->intr_handle->efds[i] = vring.kickfd; + count++; + RTE_LOG(INFO, PMD, "Installed intr vec for rxq-%d\n", i); + } + + dev->intr_handle->nb_efd = count; + dev->intr_handle->max_intr = count + 1; + dev->intr_handle->type = RTE_INTR_HANDLE_VDEV; + + return 0; +} + +static int queue_setup(struct rte_eth_dev *eth_dev, struct pmd_internal *internal) { struct vhost_queue *vq; + struct rte_eth_conf *dev_conf = ð_dev->data->dev_conf; + int vid = internal->vid; int i; for (i = 0; i < eth_dev->data->nb_rx_queues; i++) { vq = eth_dev->data->rx_queues[i]; if (!vq) continue; - vq->vid = internal->vid; + vq->vid = vid; vq->internal = internal; vq->port = eth_dev->data->port_id; } + for (i = 0; i < eth_dev->data->nb_tx_queues; i++) { vq = eth_dev->data->tx_queues[i]; if (!vq) continue; - vq->vid = internal->vid; + vq->vid = vid; vq->internal = internal; vq->port = eth_dev->data->port_id; } + + for (i = 0; i < rte_vhost_get_vring_num(vid); i++) + rte_vhost_enable_guest_notification(vid, i, 0); + + if (dev_conf->intr_conf.rxq) { + if (eth_vhost_install_intr(eth_dev) < 0) { + RTE_LOG(INFO, PMD, + "Failed to install interrupt handler."); + return -1; + } + } + + return 0; } static int @@ -584,7 +702,6 @@ new_device(int vid) struct rte_eth_dev *eth_dev; struct internal_list *list; struct pmd_internal *internal; - unsigned i; char ifname[PATH_MAX]; #ifdef RTE_LIBRTE_VHOST_NUMA int newnode; @@ -608,16 +725,13 @@ new_device(int vid) internal->vid = vid; if (eth_dev->data->rx_queues && eth_dev->data->tx_queues) { - queue_setup(eth_dev, internal); - rte_atomic32_set(&internal->dev_attached, 1); + if (!queue_setup(eth_dev, internal)) + rte_atomic32_set(&internal->dev_attached, 1); } else { RTE_LOG(INFO, PMD, "RX/TX queues have not setup yet\n"); rte_atomic32_set(&internal->dev_attached, 0); } - for (i = 0; i < rte_vhost_get_vring_num(vid); i++) - rte_vhost_enable_guest_notification(vid, i, 0); - rte_vhost_get_mtu(vid, ð_dev->data->mtu); eth_dev->data->dev_link.link_status = ETH_LINK_UP; @@ -681,6 +795,8 @@ destroy_device(int vid) RTE_LOG(INFO, PMD, "Vhost device %d destroyed\n", vid); + eth_vhost_uninstall_intr(eth_dev); + _rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL); } @@ -793,7 +909,10 @@ eth_dev_start(struct rte_eth_dev *eth_dev) struct pmd_internal *internal = eth_dev->data->dev_private; if (unlikely(rte_atomic32_read(&internal->dev_attached) == 0)) { - queue_setup(eth_dev, internal); + if (!queue_setup(eth_dev, internal)) { + RTE_LOG(ERR, PMD, "Failed to set up rx queue\n"); + return -1; + } rte_atomic32_set(&internal->dev_attached, 1); } @@ -1030,6 +1149,8 @@ static const struct eth_dev_ops ops = { .xstats_reset = vhost_dev_xstats_reset, .xstats_get = vhost_dev_xstats_get, .xstats_get_names = vhost_dev_xstats_get_names, + .rx_queue_intr_enable = eth_rxq_intr_enable, + .rx_queue_intr_disable = eth_rxq_intr_disable, }; static struct rte_vdev_driver pmd_vhost_drv; diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c index f6f12a0..68e9340 100644 --- a/lib/librte_vhost/vhost.c +++ b/lib/librte_vhost/vhost.c @@ -545,16 +545,15 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable) { struct virtio_net *dev = get_device(vid); - if (dev == NULL) + if (!dev) return -1; - if (enable) { - RTE_LOG(ERR, VHOST_CONFIG, - "guest notification isn't supported.\n"); - return -1; - } + if (enable) + dev->virtqueue[queue_id]->used->flags &= + ~VRING_USED_F_NO_NOTIFY; + else + dev->virtqueue[queue_id]->used->flags = VRING_USED_F_NO_NOTIFY; - dev->virtqueue[queue_id]->used->flags = VRING_USED_F_NO_NOTIFY; return 0; }