r8169: fix operation under forced interrupt threading

[ Upstream commit 424a646e072a887aa87283b53aa6f8b19c2a7bef ]

For several network drivers it was reported that using
__napi_schedule_irqoff() is unsafe with forced threading. One way to
fix this is switching back to __napi_schedule, but then we lose the
benefit of the irqoff version in general. As stated by Eric it doesn't
make sense to make the minimal hard irq handlers in drivers using NAPI
a thread. Therefore ensure that the hard irq handler is never
thread-ified.

Fixes: 9a899a35b0d6 ("r8169: switch to napi_schedule_irqoff")
Link: https://lkml.org/lkml/2020/10/18/19
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Link: https://lore.kernel.org/r/4d3ef84a-c812-5072-918a-22a6f6468310@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index eba609bf4f1b967457e2bf4f506f5c1c6f410e2c..b1feef473b746db876146271e45f1d57d57fd5b3 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -4675,7 +4675,7 @@ static int rtl8169_close(struct net_device *dev)
 
        phy_disconnect(tp->phydev);
 
-       pci_free_irq(pdev, 0, tp);
+       free_irq(pci_irq_vector(pdev, 0), tp);
 
        dma_free_coherent(&pdev->dev, R8169_RX_RING_BYTES, tp->RxDescArray,
                          tp->RxPhyAddr);
@@ -4726,8 +4726,8 @@ static int rtl_open(struct net_device *dev)
 
        rtl_request_firmware(tp);
 
-       retval = pci_request_irq(pdev, 0, rtl8169_interrupt, NULL, tp,
-                                dev->name);
+       retval = request_irq(pci_irq_vector(pdev, 0), rtl8169_interrupt,
+                            IRQF_NO_THREAD | IRQF_SHARED, dev->name, tp);
        if (retval < 0)
                goto err_release_fw_2;
 
@@ -4759,7 +4759,7 @@ out:
        return retval;
 
 err_free_irq:
-       pci_free_irq(pdev, 0, tp);
+       free_irq(pci_irq_vector(pdev, 0), tp);
 err_release_fw_2:
        rtl_release_firmware(tp);
        rtl8169_rx_clear(tp);