Skip to content

Commit eabb8a9

Browse files
hkallweitPaolo Abeni
authored andcommitted
Revert "r8169: don't try to disable interrupts if NAPI is, scheduled already"
This reverts commit 7274c41. Ken reported that RTL8125b can lock up if gro_flush_timeout has the default value of 20000 and napi_defer_hard_irqs is set to 0. In this scenario device interrupts aren't disabled, what seems to trigger some silicon bug under heavy load. I was able to reproduce this behavior on RTL8168h. Fix this by reverting 7274c41. Fixes: 7274c41 ("r8169: don't try to disable interrupts if NAPI is scheduled already") Cc: stable@vger.kernel.org Reported-by: Ken Milmore <ken.milmore@gmail.com> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Link: https://lore.kernel.org/r/9b5b6f4c-4f54-4b90-b0b3-8d8023c2e780@gmail.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent e4a87ab commit eabb8a9

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/net/ethernet/realtek/r8169_main.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4657,10 +4657,8 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
46574657
rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING);
46584658
}
46594659

4660-
if (napi_schedule_prep(&tp->napi)) {
4661-
rtl_irq_disable(tp);
4662-
__napi_schedule(&tp->napi);
4663-
}
4660+
rtl_irq_disable(tp);
4661+
napi_schedule(&tp->napi);
46644662
out:
46654663
rtl_ack_events(tp, status);
46664664

0 commit comments

Comments
 (0)