On 9/4/2017 7:17 PM, Markus Theil wrote: > igb_uio already allocates irqs using pci_alloc_irq_vectors on > recent kernels >= 4.8. The interrupt disable code was not > using the corresponding pci_free_irq_vectors, but the also > deprecated pci_disable_msix, before this fix. > > Fixes: 99bb58f3adc7 ("igb_uio: switch to new irq function for MSI-X") > Cc: nicolas.dich...@6wind.com > > Signed-off-by: Markus Theil <markus.th...@tu-ilmenau.de>
<...> > -#ifdef HAVE_PCI_ENABLE_MSIX > +#ifndef HAVE_ALLOC_IRQ_VECTORS > msix_entry.entry = 0; > if (pci_enable_msix(udev->pdev, &msix_entry, 1) == 0) { > dev_dbg(&udev->pdev->dev, "using MSI-X"); > - udev->info.irq_flags = IRQF_NO_THREAD; This and below one [1] seems merge artifact, needs to be removed from this patch. > udev->info.irq = msix_entry.vector; > udev->mode = RTE_INTR_MODE_MSIX; > break; > @@ -331,6 +330,7 @@ igbuio_pci_enable_interrupts(struct rte_uio_pci_dev *udev) > #else > if (pci_alloc_irq_vectors(udev->pdev, 1, 1, PCI_IRQ_MSIX) == 1) > { > dev_dbg(&udev->pdev->dev, "using MSI-X"); > + udev->info.irq_flags = IRQF_NO_THREAD; [1] > udev->info.irq = pci_irq_vector(udev->pdev, 0); > udev->mode = RTE_INTR_MODE_MSIX; > break; <...>