diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2024-05-15 08:18:01 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2024-05-21 11:18:55 +0200 |
| commit | eabb8a9be1e4a12f3bf37ceb7411083e3775672d (patch) | |
| tree | 489fe32cb7062d0e8b81cde3f6ce6184ccf04b50 /drivers/net/ethernet/realtek | |
| parent | nfc: nci: Fix uninit-value in nci_rx_work (diff) | |
| download | linux-eabb8a9be1e4a12f3bf37ceb7411083e3775672d.tar.xz linux-eabb8a9be1e4a12f3bf37ceb7411083e3775672d.zip | |
Revert "r8169: don't try to disable interrupts if NAPI is, scheduled already"
This reverts commit 7274c4147afbf46f45b8501edbdad6da8cd013b9.
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 7274c4147afb.
Fixes: 7274c4147afb ("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>
Diffstat (limited to 'drivers/net/ethernet/realtek')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169_main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 5abbea91bc07..86a6d4225bc2 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4657,10 +4657,8 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING); } - if (napi_schedule_prep(&tp->napi)) { - rtl_irq_disable(tp); - __napi_schedule(&tp->napi); - } + rtl_irq_disable(tp); + napi_schedule(&tp->napi); out: rtl_ack_events(tp, status); |