* [PATCH] fix a race at the end of NAPI
@ 2010-06-08 6:48 Figo.zhang
2010-06-08 7:07 ` Eric Dumazet
2010-06-08 7:13 ` [PATCH v2] net8139: " Figo.zhang
0 siblings, 2 replies; 4+ messages in thread
From: Figo.zhang @ 2010-06-08 6:48 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev
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>
---
drivers/net/8139cp.c | 2 +-
drivers/net/8139too.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
old mode 100644
new mode 100755
index 9c14975..284a5f4
--- 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
old mode 100644
new mode 100755
index 4ba7293..a7bca8c
--- 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);
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] fix a race at the end of NAPI
2010-06-08 6:48 [PATCH] fix a race at the end of NAPI Figo.zhang
@ 2010-06-08 7:07 ` Eric Dumazet
2010-06-08 7:13 ` [PATCH v2] net8139: " Figo.zhang
1 sibling, 0 replies; 4+ messages in thread
From: Eric Dumazet @ 2010-06-08 7:07 UTC (permalink / raw)
To: Figo.zhang; +Cc: David S. Miller, netdev
Le mardi 08 juin 2010 à 14:48 +0800, Figo.zhang a écrit :
> 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>
Patch title is misleading
> ---
> drivers/net/8139cp.c | 2 +-
> drivers/net/8139too.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
> old mode 100644
> new mode 100755
Why do you change file modes ?
> index 9c14975..284a5f4
> --- 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
> old mode 100644
> new mode 100755
> index 4ba7293..a7bca8c
> --- 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);
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] net8139: fix a race at the end of NAPI
2010-06-08 6:48 [PATCH] fix a race at the end of NAPI Figo.zhang
2010-06-08 7:07 ` Eric Dumazet
@ 2010-06-08 7:13 ` Figo.zhang
2010-06-11 6:17 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Figo.zhang @ 2010-06-08 7:13 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev
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(-)
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);
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] net8139: fix a race at the end of NAPI
2010-06-08 7:13 ` [PATCH v2] net8139: " Figo.zhang
@ 2010-06-11 6:17 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2010-06-11 6:17 UTC (permalink / raw)
To: zhangtianfei; +Cc: netdev
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-06-11 6:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-08 6:48 [PATCH] fix a race at the end of NAPI Figo.zhang
2010-06-08 7:07 ` Eric Dumazet
2010-06-08 7:13 ` [PATCH v2] net8139: " Figo.zhang
2010-06-11 6:17 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).