diff mbox series

[net] r8169: fix issue with forced threading in combination with shared interrupts

Message ID b5b53bfe-35ac-3768-85bf-74d1290cf394@gmail.com (mailing list archive)
State Not Applicable
Delegated to: Netdev Maintainers
Headers show
Series [net] r8169: fix issue with forced threading in combination with shared interrupts | expand

Commit Message

Heiner Kallweit Oct. 29, 2020, 9:18 a.m. UTC
As reported by Serge flag IRQF_NO_THREAD causes an error if the
interrupt is actually shared and the other driver(s) don't have this
flag set. This situation can occur if a PCI(e) legacy interrupt is
used in combination with forced threading.
There's no good way to deal with this properly, therefore we have to
remove flag IRQF_NO_THREAD. For fixing the original forced threading
issue switch to napi_schedule().

Fixes: 424a646e072a ("r8169: fix operation under forced interrupt threading")
Link: https://www.spinics.net/lists/netdev/msg694960.html
Reported-by: Serge Belyshev <belyshev@depni.sinp.msu.ru>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/net/ethernet/realtek/r8169_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Serge Belyshev Oct. 29, 2020, 11:37 a.m. UTC | #1
> As reported by Serge flag IRQF_NO_THREAD causes an error if the
> interrupt is actually shared and the other driver(s) don't have this
> flag set. This situation can occur if a PCI(e) legacy interrupt is
> used in combination with forced threading.
> There's no good way to deal with this properly, therefore we have to
> remove flag IRQF_NO_THREAD. For fixing the original forced threading
> issue switch to napi_schedule().
>
> Fixes: 424a646e072a ("r8169: fix operation under forced interrupt threading")
> Link: https://www.spinics.net/lists/netdev/msg694960.html
> Reported-by: Serge Belyshev <belyshev@depni.sinp.msu.ru>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> ---

Thanks, that works for me.

Tested-by: Serge Belyshev <belyshev@depni.sinp.msu.ru>
Jakub Kicinski Oct. 29, 2020, 6:48 p.m. UTC | #2
On Thu, 29 Oct 2020 14:37:35 +0300 Serge Belyshev wrote:
> > As reported by Serge flag IRQF_NO_THREAD causes an error if the
> > interrupt is actually shared and the other driver(s) don't have this
> > flag set. This situation can occur if a PCI(e) legacy interrupt is
> > used in combination with forced threading.
> > There's no good way to deal with this properly, therefore we have to
> > remove flag IRQF_NO_THREAD. For fixing the original forced threading
> > issue switch to napi_schedule().
> >
> > Fixes: 424a646e072a ("r8169: fix operation under forced interrupt threading")
> > Link: https://www.spinics.net/lists/netdev/msg694960.html
> > Reported-by: Serge Belyshev <belyshev@depni.sinp.msu.ru>
> > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> 
> Tested-by: Serge Belyshev <belyshev@depni.sinp.msu.ru>

Applied, thanks!
diff mbox series

Patch

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 3b6ddc706..00f13805c 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -4573,7 +4573,7 @@  static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
 	}
 
 	rtl_irq_disable(tp);
-	napi_schedule_irqoff(&tp->napi);
+	napi_schedule(&tp->napi);
 out:
 	rtl_ack_events(tp, status);
 
@@ -4746,7 +4746,7 @@  static int rtl_open(struct net_device *dev)
 	rtl_request_firmware(tp);
 
 	retval = request_irq(pci_irq_vector(pdev, 0), rtl8169_interrupt,
-			     IRQF_NO_THREAD | IRQF_SHARED, dev->name, tp);
+			     IRQF_SHARED, dev->name, tp);
 	if (retval < 0)
 		goto err_release_fw_2;