r8169: use napi_complete_done return value
Heiner Kallweit
maintainercover r8169: use napi_complete_done return value
Consider the return value of napi_complete_done(), this allows users to use the gro_flush_timeout sysfs attribute as an alternative to classic interrupt coalescing.
Heiner Kallweit (2):
r8169: use napi_complete_done return value
r8169: remove member irq_enabled from struct rtl8169_private
drivers/net/ethernet/realtek/r8169_main.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
Signature · 1 line
2.28.0
Heiner Kallweit
maintainerPATCH 1/2 r8169: use napi_complete_done return value
Consider the return value of napi_complete_done(), this allows users to use the gro_flush_timeout sysfs attribute as an alternative to classic interrupt coalescing.
--- drivers/net/ethernet/realtek/r8169_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/realtek/r8169_main.c +1 -3
@@ -4596,10 +4596,8 @@ static int rtl8169_poll(struct napi_struct *napi, int budget)rtl_tx (dev, tp, budget); -if (work_done < budget) { -napi_complete_done (napi, work_done); +if (work_done < budget &&napi_complete_done (napi, work_done))rtl_irq_enable (tp); - }return work_done; }
Signature · 1 line
2.28.0
Heiner Kallweit
maintainerPATCH 2/2 r8169: remove member irq_enabled from struct rtl8169_private
In reply to Heiner KallweitAfter making use of the gro_flush_timeout attribute I once got a tx timeout due to an interrupt that wasn't handled. Seems using irq_enabled can be racy, and it's not needed any longer anyway, so remove it. I've never seen a report about such a race before, therefore treat the change as an improvement.
There's just one small drawback: If a legacy PCI interrupt is used, and if this interrupt is shared with a device with high interrupt rate, then we may handle interrupts even if NAPI disabled them, and we may see a certain performance decrease under high network load.
--- drivers/net/ethernet/realtek/r8169_main.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/net/ethernet/realtek/r8169_main.c +1 -5
@@ -617,7 +617,6 @@ struct rtl8169_private {struct work_struct work; } wk; - unsigned irq_enabled:1; unsigned supports_gmii:1; unsigned aspm_manageable:1;dma_addr_t counters_phys_addr;
@@ -1280,12 +1279,10 @@ static void rtl_irq_disable(struct rtl8169_private *tp)RTL_W32 (tp, IntrMask_8125,0 ); else RTL_W16(tp, IntrMask, 0); - tp->irq_enabled = 0; } static void rtl_irq_enable(struct rtl8169_private *tp) { - tp->irq_enabled =1 ;if (rtl_is_8125 (tp))RTL_W32 (tp, IntrMask_8125, tp->irq_mask);else
@@ -4541,8 +4538,7 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)struct rtl8169_private *tp = dev_instance;u32 status =rtl_get_events (tp); -if (!tp->irq_enabled || (status &0xffff ) ==0xffff || - !(status & tp->irq_mask)) +if ((status &0xffff ) ==0xffff || !(status & tp->irq_mask))return IRQ_NONE ;if (unlikely (status & SYSErr)) {
Signature · 1 line
2.28.0
David Miller
maintainerFrom: Heiner Kallweit <[email protected]>
Date: Wed, 19 Aug 2020 13:00:57 +0200
Quoted 3 lines
Consider the return value of
napi_complete_done(), this allows users to use thegro_flush_timeoutsysfs attribute as an alternative to classic interrupt coalescing.
Series applied, thanks Heiner.