From patchwork Tue Jan 30 10:01:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guo, Jia" X-Patchwork-Id: 34695 X-Patchwork-Delegate: thomas@monjalon.net 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 955CA1B3FE; Tue, 30 Jan 2018 11:01:47 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id D15CC1B3FC for ; Tue, 30 Jan 2018 11:01:46 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Jan 2018 02:01:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,434,1511856000"; d="scan'208";a="199749383" Received: from jeffguo-z170x-ud5.sh.intel.com (HELO localhost.localdomain) ([10.67.104.10]) by fmsmga005.fm.intel.com with ESMTP; 30 Jan 2018 02:01:44 -0800 From: Jeff Guo To: ferruh.yigit@intel.com, jingjing.wu@intel.com, jianfeng.tan@intel.com Cc: thomas@monjalon.net, dev@dpdk.org, Jeff Guo Date: Tue, 30 Jan 2018 18:01:15 +0800 Message-Id: <1517306475-2153-1-git-send-email-jia.guo@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [dpdk-dev] [PATCH] igb_uio: fix uevent montior issue 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" udev could not detect remove and add event of device when hotplug in and out devices, that related with the fix about using pointer of rte_uio_pci_dev as dev_id instead of uio_device for irq device handler, that would result igb uio irq failure when kernel version after than 3.17. so this patch correct it by use kernel version check before handle the pci interrupt. Fixes: 6b9ed026a870 ("igb_uio: fix build with kernel <= 3.17") Signed-off-by: Jeff Guo Reviewed-by: Jingjing Wu --- lib/librte_eal/linuxapp/igb_uio/igb_uio.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c index 9f0fb5e..14ce2ea 100644 --- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c +++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c @@ -192,9 +192,14 @@ igbuio_pci_irqcontrol(struct uio_info *info, s32 irq_state) static irqreturn_t igbuio_pci_irqhandler(int irq, void *dev_id) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) struct rte_uio_pci_dev *udev = (struct rte_uio_pci_dev *)dev_id; struct uio_info *info = &udev->info; - +#else + struct uio_device *idev = (struct uio_device *)dev_id; + struct uio_info *info = idev->info; + struct rte_uio_pci_dev *udev = info->priv; +#endif /* Legacy mode need to mask in hardware */ if (udev->mode == RTE_INTR_MODE_LEGACY && !pci_check_and_mask_intx(udev->pdev)) @@ -279,9 +284,15 @@ igbuio_pci_enable_interrupts(struct rte_uio_pci_dev *udev) } if (udev->info.irq != UIO_IRQ_NONE) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) err = request_irq(udev->info.irq, igbuio_pci_irqhandler, udev->info.irq_flags, udev->info.name, udev); +#else + err = request_irq(udev->info.irq, igbuio_pci_irqhandler, + udev->info.irq_flags, udev->info.name, + udev->info.uio_dev); +#endif dev_info(&udev->pdev->dev, "uio device registered with irq %lx\n", udev->info.irq); @@ -292,7 +303,11 @@ static void igbuio_pci_disable_interrupts(struct rte_uio_pci_dev *udev) { if (udev->info.irq) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) free_irq(udev->info.irq, udev); +#else + free_irq(udev->info.irq, udev->info.uio_dev); +#endif udev->info.irq = 0; }