r8169: don't read interrupt mask register in interrupt handler
Heiner Kallweit
maintainerPATCH 1/1 r8169: don't read interrupt mask register in interrupt handler
After the original patch network starts to crash on heavy load. It's not fully clear why this additional register read has such side effects, but removing it fixes the issue.
Thanks also to Alex for his contribution and hints.
[0] https://marc.info/?t=155268170400002&r=1&w=2
--- drivers/net/ethernet/realtek/r8169.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/realtek/r8169.c +4 -2
@@ -678,6 +678,7 @@ struct rtl8169_private {struct work_struct work; } wk; + unsigned irq_enabled:1; unsigned supports_gmii:1;dma_addr_t counters_phys_addr;struct rtl8169_counters *counters;
@@ -1293,6 +1294,7 @@ static void rtl_ack_events(struct rtl8169_private *tp, u16 bits)static void rtl_irq_disable (struct rtl8169_private *tp) {RTL_W16 (tp, IntrMask,0 ); + tp->irq_enabled =0 ; }#define RTL_EVENT_NAPI_RX (RxOK | RxErr)
@@ -1301,6 +1303,7 @@ static void rtl_irq_disable(struct rtl8169_private *tp)static void rtl_irq_enable (struct rtl8169_private *tp) { + tp->irq_enabled =1 ;RTL_W16 (tp, IntrMask, tp->irq_mask); }
@@ -6520,9 +6523,8 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) {struct rtl8169_private *tp = dev_instance;u16 status =RTL_R16 (tp, IntrStatus); -u16 irq_mask =RTL_R16 (tp, IntrMask); -if (status ==0xffff || !(status & irq_mask)) +if (!tp->irq_enabled || status ==0xffff || !(status & tp->irq_mask))return IRQ_NONE ;if (unlikely (status & SYSErr)) {
Signature · 1 line
2.21.0
Quoted 4 lines · Heiner Kallweit
After the original patch network starts to crash on heavy load. It's not fully clear why this additional register read has such side effects, but removing it fixes the issue.
Quoted 8 lines
Thanks also to Alex for his contribution and hints.
[0] https://marc.info/?t=155268170400002&r=1&w=2
Fixes e782410ed237 ("r8169: improve spurious interrupt detection")Reported-by VDR User <[email protected]>Tested-by VDR User <[email protected]>Signed-off-by Heiner Kallweit <[email protected]>
Looks good to me.
Quoted 43 lines
--- drivers/net/ethernet/realtek/r8169.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/net/ethernet/realtek/r8169.c +4
-2@@ -678,6 +678,7 @@ struct rtl8169_private {struct work_struct work; } wk; + unsigned irq_enabled:1; unsigned supports_gmii:1;dma_addr_t counters_phys_addr;struct rtl8169_counters *counters;@@ -1293,6 +1294,7 @@ static void rtl_ack_events(struct rtl8169_private *tp, u16 bits)static void rtl_irq_disable (struct rtl8169_private *tp) {RTL_W16 (tp, IntrMask,0 ); + tp->irq_enabled =0 ; }#define RTL_EVENT_NAPI_RX (RxOK | RxErr)@@ -1301,6 +1303,7 @@ static void rtl_irq_disable(struct rtl8169_private *tp)static void rtl_irq_enable (struct rtl8169_private *tp) { + tp->irq_enabled =1 ;RTL_W16 (tp, IntrMask, tp->irq_mask); }@@ -6520,9 +6523,8 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) {struct rtl8169_private *tp = dev_instance;u16 status =RTL_R16 (tp, IntrStatus); -u16 irq_mask =RTL_R16 (tp, IntrMask); -if (status ==0xffff || !(status & irq_mask)) +if (!tp->irq_enabled || status ==0xffff || !(status & tp->irq_mask))return IRQ_NONE ;if (unlikely (status & SYSErr)) {
David Miller
maintainerFrom: Heiner Kallweit <[email protected]>
Date: Thu, 21 Mar 2019 21:23:14 +0100
Quoted 4 lines
After the original patch network starts to crash on heavy load. It's not fully clear why this additional register read has such side effects, but removing it fixes the issue.
Quoted 8 lines
Thanks also to Alex for his contribution and hints.
[0] https://marc.info/?t=155268170400002&r=1&w=2
Fixes e782410ed237 ("r8169: improve spurious interrupt detection")Reported-by VDR User <[email protected]>Tested-by VDR User <[email protected]>Signed-off-by Heiner Kallweit <[email protected]>
Applied and queued up for -stable.