From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (xvm-189-124.dc0.ghst.net [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3108EA09FF; Thu, 7 Jan 2021 08:59:41 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9DD49140ED3; Thu, 7 Jan 2021 08:59:36 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id 2F836140EC7 for ; Thu, 7 Jan 2021 08:59:33 +0100 (CET) IronPort-SDR: gQXgdVleEl6Vza4/dv83VjAYelQg+WRrV1v8/w6lfip9KIVRdFy8YJe4kaBkWbGE3V6jdfgAag v3whOViBi8/g== X-IronPort-AV: E=McAfee;i="6000,8403,9856"; a="241467696" X-IronPort-AV: E=Sophos;i="5.79,329,1602572400"; d="scan'208";a="241467696" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jan 2021 23:59:33 -0800 IronPort-SDR: EbuZmK4+4LPF+KQ/LS6h9YZQ5je0JV9TjLvkp4Bn+nO+e3FmQW7n7Q26EUDAxKvrb/Ld8JiihM nUg5TJiSMiBQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,329,1602572400"; d="scan'208";a="351171644" Received: from dpdk-wujingji.sh.intel.com ([10.67.119.101]) by fmsmga008.fm.intel.com with ESMTP; 06 Jan 2021 23:59:24 -0800 From: Jingjing Wu To: dev@dpdk.org Cc: jingjing.wu@intel.com, beilei.xing@intel.com, chenbo.xia@intel.com, xiuchun.lu@intel.com Date: Thu, 7 Jan 2021 15:45:32 +0800 Message-Id: <20210107074533.15465-4-jingjing.wu@intel.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20210107074533.15465-1-jingjing.wu@intel.com> References: <20201219143816.64174-1-jingjing.wu@intel.com> <20210107074533.15465-1-jingjing.wu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 3/4] net/iavf_client: enable interrupt of control queue X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" Signed-off-by: Jingjing Wu --- drivers/net/iavf/iavf_client_ethdev.c | 29 +++++++++++++++++++++------ drivers/net/iavf/iavf_ethdev.c | 9 +++------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/drivers/net/iavf/iavf_client_ethdev.c b/drivers/net/iavf/iavf_client_ethdev.c index 770a7a8200..27daaed0e8 100644 --- a/drivers/net/iavf/iavf_client_ethdev.c +++ b/drivers/net/iavf/iavf_client_ethdev.c @@ -59,6 +59,7 @@ iavf_client_vfio_user_setup(struct rte_eth_dev *dev, const char *path) IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); struct iavf_hw *hw = IAVF_DEV_PRIVATE_TO_HW(adapter); struct vfio_device *vfio_dev; + uint32_t max_fds, i; vfio_dev = client_vfio_user_setup(path, dev->device->numa_node); if (vfio_dev == NULL) { @@ -87,11 +88,21 @@ iavf_client_vfio_user_setup(struct rte_eth_dev *dev, const char *path) } } - dev->intr_handle->fd = vfio_dev->irqfds[0]; dev->intr_handle->type = RTE_INTR_HANDLE_VDEV; dev->intr_handle->max_intr = 1; + /* Assign rxq fds */ + if (vfio_dev->nb_irqs > 1) { + max_fds = RTE_MIN((uint32_t)RTE_MAX_RXTX_INTR_VEC_ID, + vfio_dev->nb_irqs - 1); + dev->intr_handle->nb_efd = max_fds; + for (i = 0; i < max_fds; ++i) + dev->intr_handle->efds[i] = + vfio_dev->irqfds[i + RTE_INTR_VEC_RXTX_OFFSET]; + dev->intr_handle->efd_counter_size = 0; + dev->intr_handle->max_intr += max_fds; + } return 0; } @@ -108,8 +119,6 @@ avf_client_init_eth_ops(void) iavf_client_eth_dev_ops.reta_query = NULL; iavf_client_eth_dev_ops.rss_hash_update = NULL; iavf_client_eth_dev_ops.rss_hash_conf_get = NULL; - iavf_client_eth_dev_ops.rx_queue_intr_enable = NULL; - iavf_client_eth_dev_ops.rx_queue_intr_disable = NULL; } #define IAVF_CLIENT_ALARM_INTERVAL 50000 /* us */ @@ -227,11 +236,12 @@ iavf_client_dev_close(struct rte_eth_dev *dev) struct iavf_adapter *adapter = IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); struct iavf_hw *hw = IAVF_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct rte_intr_handle *intr_handle = dev->intr_handle; if (adapter->intr_mode) { iavf_disable_irq0(hw); /* unregister callback func from eal lib */ - rte_intr_callback_unregister(dev->intr_handle, + rte_intr_callback_unregister(intr_handle, iavf_client_event_handler, dev); } else { rte_eal_alarm_cancel(iavf_client_dev_alarm_handler, dev); @@ -240,8 +250,15 @@ iavf_client_dev_close(struct rte_eth_dev *dev) if (!adapter->stopped) { iavf_stop_queues(dev); - if (dev->intr_handle) { - rte_free(dev->intr_handle); + if (intr_handle) { + /* Disable the interrupt for Rx */ + rte_intr_efd_disable(intr_handle); + /* Rx interrupt vector mapping free */ + if (intr_handle->intr_vec) { + rte_free(intr_handle->intr_vec); + intr_handle->intr_vec = NULL; + } + rte_free(intr_handle); dev->intr_handle = NULL; } diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index bc07ecbed7..06395f852b 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -1368,11 +1368,10 @@ iavf_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id) { struct iavf_adapter *adapter = IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); - struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); struct iavf_hw *hw = IAVF_DEV_PRIVATE_TO_HW(adapter); uint16_t msix_intr; - msix_intr = pci_dev->intr_handle.intr_vec[queue_id]; + msix_intr = dev->intr_handle->intr_vec[queue_id]; if (msix_intr == IAVF_MISC_VEC_ID) { PMD_DRV_LOG(INFO, "MISC is also enabled for control"); IAVF_WRITE_REG(hw, IAVF_VFINT_DYN_CTL01, @@ -1387,10 +1386,9 @@ iavf_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id) IAVF_VFINT_DYN_CTL01_CLEARPBA_MASK | IAVF_VFINT_DYN_CTLN1_ITR_INDX_MASK); } - IAVF_WRITE_FLUSH(hw); - rte_intr_ack(&pci_dev->intr_handle); + rte_intr_ack(dev->intr_handle); return 0; } @@ -1398,11 +1396,10 @@ iavf_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id) static int iavf_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id) { - struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); struct iavf_hw *hw = IAVF_DEV_PRIVATE_TO_HW(dev->data->dev_private); uint16_t msix_intr; - msix_intr = pci_dev->intr_handle.intr_vec[queue_id]; + msix_intr = dev->intr_handle->intr_vec[queue_id]; if (msix_intr == IAVF_MISC_VEC_ID) { PMD_DRV_LOG(ERR, "MISC is used for control, cannot disable it"); return -EIO; -- 2.21.1