From patchwork Thu Feb 22 09:59:43 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: 35334 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 5E53EA84F; Thu, 22 Feb 2018 03:21:10 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id D5DB0A493 for ; Thu, 22 Feb 2018 03:21:08 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Feb 2018 18:21:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,376,1515484800"; d="scan'208";a="206063864" Received: from dpdk-dev.sh.intel.com ([10.67.111.147]) by fmsmga006.fm.intel.com with ESMTP; 21 Feb 2018 18:21:05 -0800 From: Junjie Chen To: mtetsuyah@gmail.com, yliu@fridaylinux.org, maxime.coquelin@redhat.com, jianfeng.tan.intel.com@dpdk.org Cc: dev@dpdk.org, Junjie Chen Date: Thu, 22 Feb 2018 04:59:43 -0500 Message-Id: <1519293583-54933-1-git-send-email-junjie.j.chen@intel.com> X-Mailer: git-send-email 2.0.1 Subject: [dpdk-dev] [PATCH] 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 --- drivers/net/vhost/rte_eth_vhost.c | 116 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 4e541e3..f474235 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -552,12 +552,115 @@ 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; + + vq = dev->data->rx_queues[qid]; + if (!vq) { + RTE_LOG(ERR, PMD, "rxq%d is not setup", qid); + return -1; + } + + rte_vhost_get_vhost_vring(vq->vid, qid << 1, &vring); + vring.avail->flags &= (~VRING_AVAIL_F_NO_INTERRUPT); + rte_wmb(); + + return 0; +} + +static int +eth_rxq_intr_disable(struct rte_eth_dev *dev, uint16_t qid) +{ + struct rte_vhost_vring vring; + struct vhost_queue *vq; + + vq = dev->data->rx_queues[qid]; + if (!vq) { + RTE_LOG(ERR, PMD, "rxq%d is not setup", qid); + return -1; + } + + rte_vhost_get_vhost_vring(vq->vid, qid << 1, &vring); + vring.avail->flags |= VRING_AVAIL_F_NO_INTERRUPT; + 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"); + return -ENOMEM; + } + memset(dev->intr_handle, 0, sizeof(*dev->intr_handle)); + + 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"); + return -ENOMEM; + } + + for (i = 0; i < nb_rxq; i++) { + vq = dev->data->rx_queues[i]; + if (!vq) + continue; + ret = rte_vhost_get_vhost_vring(vq->vid, i << 1, &vring); + if (ret < 0) + continue; + RTE_LOG(INFO, PMD, "install intr vec for rxq%d", i); + dev->intr_handle->intr_vec[i] = RTE_INTR_VEC_RXTX_OFFSET + i; + dev->intr_handle->efds[i] = vring.callfd; + count++; + } + + 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 new_device(int vid) { struct rte_eth_dev *eth_dev; struct internal_list *list; struct pmd_internal *internal; struct vhost_queue *vq; + struct rte_eth_conf *dev_conf; unsigned i; char ifname[PATH_MAX]; #ifdef RTE_LIBRTE_VHOST_NUMA @@ -609,6 +712,15 @@ new_device(int vid) RTE_LOG(INFO, PMD, "New connection established\n"); + dev_conf = ð_dev->data->dev_conf; + + if (dev_conf->intr_conf.rxq) { + if (eth_vhost_install_intr(eth_dev) < 0) { + RTE_LOG(INFO, PMD, "Failed to prepare intr handler."); + return -1; + } + } + _rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL); return 0; @@ -663,6 +775,8 @@ destroy_device(int vid) RTE_LOG(INFO, PMD, "Connection closed\n"); + eth_vhost_uninstall_intr(eth_dev); + _rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL); } @@ -1007,6 +1121,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;