From patchwork Tue Mar 21 12:09:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zhang X-Patchwork-Id: 22041 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 3E5641075; Tue, 21 Mar 2017 12:19:15 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id DC9E23B5; Tue, 21 Mar 2017 12:19:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1490095153; x=1521631153; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=e1XHOxU3PhqxHVxCILCV+haYOJogtd6AT257nk4Wmbw=; b=mSAfHiCuGAuUIjuamyUeQrUUYSwbUd/QWPye2Ak5xZjAoHc3oG3okuiy r1pMxpqFwrN2fe96XkcGQ2vdsHhbDg==; Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Mar 2017 04:19:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,198,1486454400"; d="scan'208";a="63097897" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.239.129.229]) by orsmga002.jf.intel.com with ESMTP; 21 Mar 2017 04:19:10 -0700 From: Qi Zhang To: jingjing.wu@intel.com, helin.zhang@intel.com Cc: dev@dpdk.org, Qi Zhang , stable@dpdk.org Date: Tue, 21 Mar 2017 08:09:53 -0400 Message-Id: <20170321120953.73051-1-qi.z.zhang@intel.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <1486670573-5447-1-git-send-email-qi.z.zhang@intel.com> References: <1486670573-5447-1-git-send-email-qi.z.zhang@intel.com> Subject: [dpdk-dev] [PATCH v2] net/i40e: fix wrong handle when enable interrupt 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 i40e_dev_interrupt_handler, when call rte_intr_enable, the intr_handle is the copy when we registered. According to interrupt handle framework, if the requirement of intr_handle is changed, we need to unregister then register a new copy. This happens on i40e driver when bind to vfio-pci, the rte_intr_efd_enable function will modify the max_intr according the queue number, so a new copy of intr_handle need to be registered. Without this fix, we saw lw3fwd-power does not work due to wrong interrupt count in vfio_irq_set when set vfio interrupt. Fixes: 2ce7a1ed09fc ("net/i40e: localize mapping of ethdev to PCI device") Cc: stable@dpdk.org Signed-off-by: Qi Zhang --- v2: - follow current design, when intr_handle is modified, unregister the old one and register the new one. - there should be a patch set to fix on other devices. drivers/net/i40e/i40e_ethdev.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 9c76baa..e7bbea5 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -1886,6 +1886,14 @@ i40e_dev_start(struct rte_eth_dev *dev) ret = rte_intr_efd_enable(intr_handle, intr_vector); if (ret) return ret; + /** + * intr_handle may be modified in rte_intr_efd_enable + * so unregster the old one and register the new one. + */ + rte_intr_callback_unregister(intr_handle, + i40e_dev_interrupt_handler, dev); + rte_intr_callback_register(intr_handle, + i40e_dev_interrupt_handler, dev); } if (rte_intr_dp_is_en(intr_handle) && !intr_handle->intr_vec) {