Attachment 161084 Details for Bug 242572 – avoid useless NAPI poll scheduling (against 2.6.22.2)

[patch] avoid useless NAPI poll scheduling (against 2.6.22.2)

0001-r8169-avoid-needless-NAPI-poll-scheduling.patch (text/plain), 1.66 KB, created by Francois Romieu on 2007-08-10 21:11:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Francois Romieu

Created: 2007-08-10 21:11:04 UTC

Size: 1.66 KB

patch

obsolete

>From b6b5a84ef66e42a9118a06470bfb48fdf8f9d326 Mon Sep 17 00:00:00 2001
>From: Francois Romieu <romieu@fr.zoreil.com>
>Date: Thu, 2 Aug 2007 00:00:48 +0200
>Subject: [PATCH] r8169: avoid needless NAPI poll scheduling
>
>Theory  : though needless, it should not have hurt.
>Practice: it does not play nice with DEBUG_SHIRQ + LOCKDEP + UP
>(see https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=242572).
>
>The patch makes sense in itself but I should dig why it has an effect
>on #242572 (assuming that NAPI do not change in a near future).
>
>Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
>Cc: Edward Hsu <edward_hsu@realtek.com.tw>
>---
> drivers/net/r8169.c |   18 ++++++++++--------
> 1 files changed, 10 insertions(+), 8 deletions(-)
>
>diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
>index 5ec7752..7375fcd 100644
>--- a/drivers/net/r8169.c
>+++ b/drivers/net/r8169.c
>@@ -2649,14 +2649,16 @@ rtl8169_interrupt(int irq, void *dev_instance)
> 			rtl8169_check_link_status(dev, tp, ioaddr);
> 
> #ifdef CONFIG_R8169_NAPI
>-		RTL_W16(IntrMask, rtl8169_intr_mask & ~rtl8169_napi_event);
>-		tp->intr_mask = ~rtl8169_napi_event;
>-
>-		if (likely(netif_rx_schedule_prep(dev)))
>-			__netif_rx_schedule(dev);
>-		else if (netif_msg_intr(tp)) {
>-			printk(KERN_INFO "%s: interrupt %04x taken in poll\n",
>-			       dev->name, status);
>+		if (status & rtl8169_napi_event) {
>+			RTL_W16(IntrMask, rtl8169_napi_event & ~rtl8169_napi_event);
>+			tp->intr_mask = ~rtl8169_napi_event;
>+
>+			if (likely(netif_rx_schedule_prep(dev)))
>+				__netif_rx_schedule(dev);
>+			else if (netif_msg_intr(tp)) {
>+				printk(KERN_INFO "%s: interrupt %04x in poll\n",
>+				       dev->name, status);
>+			}
> 		}
> 		break;
> #else
>-- 
>1.4.4.2
>

Actions: View | Diff

Attachments on bug 242572: 156603 | 156759 | 156815 | 156816 | 156817 | 158726 | 159748 | 160162 | 160173 | 160185 | 160277 | 160280 | 160474 | 160507 | 161084