diff mbox

[net-next-2.6] ifb: fix a lockdep splat

Message ID 1292493175.2883.56.camel@edumazet-laptop
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Eric Dumazet Dec. 16, 2010, 9:52 a.m. UTC
After recent ifb changes, we must use lockless __skb_dequeue() since
lock is not anymore initialized.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Jamal Hadi Salim <hadi@cyberus.ca>
Cc: Changli Gao <xiaosuo@gmail.com>
---
 drivers/net/ifb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



--
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

Comments

Changli Gao Dec. 16, 2010, 10 a.m. UTC | #1
On Thu, Dec 16, 2010 at 5:52 PM, Eric Dumazet <eric.dumazet@gmail.com> wrote:
> After recent ifb changes, we must use lockless __skb_dequeue() since
> lock is not anymore initialized.
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
> Cc: Jamal Hadi Salim <hadi@cyberus.ca>
> Cc: Changli Gao <xiaosuo@gmail.com>

Acked-by: Changli Gao <xiaosuo@gmail.com>

Then, I have to refine my patch series. Thanks.
David Miller Dec. 16, 2010, 10:55 p.m. UTC | #2
From: Changli Gao <xiaosuo@gmail.com>
Date: Thu, 16 Dec 2010 18:00:50 +0800

> On Thu, Dec 16, 2010 at 5:52 PM, Eric Dumazet <eric.dumazet@gmail.com> wrote:
>> After recent ifb changes, we must use lockless __skb_dequeue() since
>> lock is not anymore initialized.
>>
>> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
>> Cc: Jamal Hadi Salim <hadi@cyberus.ca>
>> Cc: Changli Gao <xiaosuo@gmail.com>
> 
> Acked-by: Changli Gao <xiaosuo@gmail.com>

Applied, thanks.
--
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
jamal Dec. 17, 2010, 1:09 p.m. UTC | #3
On Thu, 2010-12-16 at 10:52 +0100, Eric Dumazet wrote:
> After recent ifb changes, we must use lockless __skb_dequeue() since
> lock is not anymore initialized.
> 
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
> Cc: Jamal Hadi Salim <hadi@cyberus.ca>
> Cc: Changli Gao <xiaosuo@gmail.com>

Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>

cheers,
jamal

--
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
Eric Dumazet Dec. 17, 2010, 1:15 p.m. UTC | #4
Le vendredi 17 décembre 2010 à 08:09 -0500, jamal a écrit :
> On Thu, 2010-12-16 at 10:52 +0100, Eric Dumazet wrote:
> > After recent ifb changes, we must use lockless __skb_dequeue() since
> > lock is not anymore initialized.
> > 
> > Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
> > Cc: Jamal Hadi Salim <hadi@cyberus.ca>
> > Cc: Changli Gao <xiaosuo@gmail.com>
> 
> Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>

Thanks for reviewing Jamal !


--
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
diff mbox

Patch

diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index bfa03db..8bcacd7 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -71,7 +71,7 @@  static void ri_tasklet(unsigned long dev)
 		}
 	}
 
-	while ((skb = skb_dequeue(&dp->tq)) != NULL) {
+	while ((skb = __skb_dequeue(&dp->tq)) != NULL) {
 		u32 from = G_TC_FROM(skb->tc_verd);
 
 		skb->tc_verd = 0;