Patchwork [v2] net8139: fix a race at the end of NAPI

login
register
mail settings
Submitter Figo.zhang
Date June 8, 2010, 7:13 a.m.
Message ID <1275981202.1927.6.camel@myhost>
Download mbox | patch
Permalink /patch/54942/
State Accepted
Delegated to: David Miller
Headers show

Comments

Figo.zhang - June 8, 2010, 7:13 a.m.
fix a race at the end of NAPI complete processing, it had
better do __napi_complete() first before re-enable interrupt.

in v2, i motify it using vim.

Signed-off-by:Figo.zhang <figo1802@gmail.com>
---
 drivers/net/8139cp.c  |    2 +-
 drivers/net/8139too.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - June 11, 2010, 6:17 a.m.
From: "Figo.zhang" <zhangtianfei@leadcoretech.com>
Date: Tue, 08 Jun 2010 15:13:22 +0800

>  
> fix a race at the end of NAPI complete processing, it had
> better do __napi_complete() first before re-enable interrupt.
> 
> Signed-off-by:Figo.zhang <figo1802@gmail.com>

Applied, thank you.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 9c14975..284a5f4 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -598,8 +598,8 @@  rx_next:
 			goto rx_status_loop;
 
 		spin_lock_irqsave(&cp->lock, flags);
-		cpw16_f(IntrMask, cp_intr_mask);
 		__napi_complete(napi);
+		cpw16_f(IntrMask, cp_intr_mask);
 		spin_unlock_irqrestore(&cp->lock, flags);
 	}
 
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 4ba7293..a7bca8c 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -2088,8 +2088,8 @@  static int rtl8139_poll(struct napi_struct *napi, int budget)
 		 * again when we think we are done.
 		 */
 		spin_lock_irqsave(&tp->lock, flags);
-		RTL_W16_F(IntrMask, rtl8139_intr_mask);
 		__napi_complete(napi);
+		RTL_W16_F(IntrMask, rtl8139_intr_mask);
 		spin_unlock_irqrestore(&tp->lock, flags);
 	}
 	spin_unlock(&tp->rx_lock);