From patchwork Fri Nov 3 07:14:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Dai X-Patchwork-Id: 31149 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 092691B5E3; Fri, 3 Nov 2017 08:25:24 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 292601B3B9; Fri, 3 Nov 2017 08:25:22 +0100 (CET) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Nov 2017 00:25:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,337,1505804400"; d="scan'208";a="171473945" Received: from dpdk4.bj.intel.com ([172.16.182.85]) by fmsmga006.fm.intel.com with ESMTP; 03 Nov 2017 00:25:20 -0700 From: Wei Dai To: jingjing.wu@intel.com, beilei.xing@intel.com, cunming.liang@intel.com Cc: dev@dpdk.org, Wei Dai , stable@dpdk.org Date: Fri, 3 Nov 2017 15:14:02 +0800 Message-Id: <1509693243-43101-2-git-send-email-wei.dai@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1509693243-43101-1-git-send-email-wei.dai@intel.com> References: <1509628256-16300-1-git-send-email-wei.dai@intel.com> <1509693243-43101-1-git-send-email-wei.dai@intel.com> Subject: [dpdk-dev] [PATCH v2 1/2] net/i40e: fix VFIO interrupt mapping in VF 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" When a VF port is bound to VFIO-PIC, only miscellaneous interrupt is mapped to VFIO vector 0 in i40evf_dev_init( ). In i40evf_dev_interrupt_handle( ) and i40evf_dev_rx_queue_intr_enable( ), if previous VFIO interrupt mapping set in i40evf_dev_init( ) is not cleared, it will fail when PMD tries to map Rx queue interrupt to other VFIO vectors by calling rte_intr_enable( ). This patch clears the VFIO interrupt mappings before setting both miscellaneous and Rx queue interrupt mappings again to avoid failure. And remove the calling of rte_intr_enable( ) in i40evf_dev_interrupt_handle( ) and i40evf_dev_rx_queue_intr_enable( ) as VFIO interrupt mapping can only be set in i40e_dev_start( ) and it is not necessary to be set in above 2 functions repeatedly. Fixes: 4b90a3ff26c5 ("i40evf: support Rx interrupt") Cc: stable@dpdk.org Signed-off-by: Wei Dai --- drivers/net/i40e/i40e_ethdev_vf.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index 3b76c9e..46dac86 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -1433,7 +1433,6 @@ i40evf_dev_interrupt_handler(void *param) done: i40evf_enable_irq0(hw); - rte_intr_enable(dev->intr_handle); } static int @@ -1888,8 +1887,6 @@ i40evf_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id) I40EVF_WRITE_FLUSH(hw); - rte_intr_enable(&pci_dev->intr_handle); - return 0; } @@ -2041,7 +2038,20 @@ i40evf_dev_start(struct rte_eth_dev *dev) goto err_mac; } + /* When a VF port is bound to VFIO-PCI, only miscellaneous interrupt + * is mapped to VFIO vector 0 in i40evf_dev_init( ). + * If previous VFIO interrupt mapping set in i40evf_dev_init( ) is + * not cleared, it will fail when rte_intr_enable( ) tries to map Rx + * queue interrupt to other VFIO vectors. + * So clear uio/vfio intr/evevnfd first to avoid failure. + */ + if (dev->data->dev_conf.intr_conf.rxq != 0) { + rte_intr_disable(intr_handle); + rte_intr_enable(intr_handle); + } + i40evf_enable_queues_intr(dev); + return 0; err_mac: