* [patch 1/9] bonding: lockdep annotation
@ 2006-11-09 3:51 akpm
2006-11-10 0:05 ` David Miller
2006-11-10 16:09 ` Jeff Garzik
0 siblings, 2 replies; 7+ messages in thread
From: akpm @ 2006-11-09 3:51 UTC (permalink / raw)
To: davem; +Cc: netdev, akpm, a.p.zijlstra, mingo, shemminger
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
=============================================
[ INFO: possible recursive locking detected ]
2.6.17-1.2600.fc6 #1
---------------------------------------------
ifconfig/2411 is trying to acquire lock:
(&dev->_xmit_lock){-...}, at: [<ffffffff80429b9f>] dev_mc_add+0x45/0x15f
but task is already holding lock:
(&dev->_xmit_lock){-...}, at: [<ffffffff80429b9f>] dev_mc_add+0x45/0x15f
other info that might help us debug this:
3 locks held by ifconfig/2411:
#0: (rtnl_mutex){--..}, at: [<ffffffff802664af>] mutex_lock+0x2a/0x2e
#1: (&dev->_xmit_lock){-...}, at: [<ffffffff80429b9f>] dev_mc_add+0x45/0x15f
#2: (&bond->lock){-.-+}, at: [<ffffffff8831b7f7>] bond_set_multicast_list+0x2c/0x26a [bonding]
stack backtrace:
Call Trace:
[<ffffffff8026e97d>] show_trace+0xae/0x319
[<ffffffff8026ebfd>] dump_stack+0x15/0x17
[<ffffffff802a839b>] __lock_acquire+0x135/0xa64
[<ffffffff802a926d>] lock_acquire+0x4b/0x69
[<ffffffff80267981>] _spin_lock_bh+0x2a/0x36
[<ffffffff80429b9f>] dev_mc_add+0x45/0x15f
[<ffffffff8831b903>] :bonding:bond_set_multicast_list+0x138/0x26a
[<ffffffff80429901>] __dev_mc_upload+0x22/0x24
[<ffffffff80429c74>] dev_mc_add+0x11a/0x15f
[<ffffffff8045d154>] igmp_group_added+0x55/0x10f
[<ffffffff8045d4ab>] ip_mc_inc_group+0x1d6/0x21a
[<ffffffff8045d535>] ip_mc_up+0x46/0x61
[<ffffffff804594b8>] inetdev_init+0x11c/0x136
[<ffffffff8045a0b7>] devinet_ioctl+0x3eb/0x5e9
[<ffffffff8045a56c>] inet_ioctl+0x71/0x8f
[<ffffffff8041ed74>] sock_ioctl+0x1e8/0x20a
[<ffffffff80243ae0>] do_ioctl+0x2a/0x77
[<ffffffff802325cc>] vfs_ioctl+0x25a/0x277
[<ffffffff8024ea4b>] sys_ioctl+0x5f/0x82
[<ffffffff8026060e>] system_call+0x7e/0x83
The bonding driver nests other drivers, give the bonding driver its own
lock class.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Ingo Molnar <mingo@elte.hu>
Cc: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
drivers/net/bonding/bond_main.c | 5 +++++
1 file changed, 5 insertions(+)
diff -puN drivers/net/bonding/bond_main.c~bonding-lockdep-annotation drivers/net/bonding/bond_main.c
--- a/drivers/net/bonding/bond_main.c~bonding-lockdep-annotation
+++ a/drivers/net/bonding/bond_main.c
@@ -4692,6 +4692,8 @@ static int bond_check_params(struct bond
return 0;
}
+static struct lock_class_key bonding_netdev_xmit_lock_key;
+
/* Create a new bond based on the specified name and bonding parameters.
* Caller must NOT hold rtnl_lock; we need to release it here before we
* set up our sysfs entries.
@@ -4727,6 +4729,9 @@ int bond_create(char *name, struct bond_
if (res < 0) {
goto out_bond;
}
+
+ lockdep_set_class(&bond_dev->_xmit_lock, &bonding_netdev_xmit_lock_key);
+
if (newbond)
*newbond = bond_dev->priv;
_
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [patch 1/9] bonding: lockdep annotation
2006-11-09 3:51 [patch 1/9] bonding: lockdep annotation akpm
@ 2006-11-10 0:05 ` David Miller
2006-11-10 16:09 ` Jeff Garzik
1 sibling, 0 replies; 7+ messages in thread
From: David Miller @ 2006-11-10 0:05 UTC (permalink / raw)
To: akpm; +Cc: netdev, a.p.zijlstra, mingo, shemminger
From: akpm@osdl.org
Date: Wed, 08 Nov 2006 19:51:01 -0800
> The bonding driver nests other drivers, give the bonding driver its own
> lock class.
>
> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
> Acked-by: Ingo Molnar <mingo@elte.hu>
> Cc: Stephen Hemminger <shemminger@osdl.org>
> Signed-off-by: Andrew Morton <akpm@osdl.org>
Applied, thanks Peter.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [patch 1/9] bonding: lockdep annotation
2006-11-09 3:51 [patch 1/9] bonding: lockdep annotation akpm
2006-11-10 0:05 ` David Miller
@ 2006-11-10 16:09 ` Jeff Garzik
2006-11-10 20:45 ` David Miller
1 sibling, 1 reply; 7+ messages in thread
From: Jeff Garzik @ 2006-11-10 16:09 UTC (permalink / raw)
To: akpm; +Cc: davem, netdev, a.p.zijlstra, mingo, shemminger
akpm@osdl.org wrote:
> From: Peter Zijlstra <a.p.zijlstra@chello.nl>
>
> =============================================
> [ INFO: possible recursive locking detected ]
> 2.6.17-1.2600.fc6 #1
> ---------------------------------------------
applied; please CC me on this drivers/net stuff
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [patch 1/9] bonding: lockdep annotation
2006-11-10 16:09 ` Jeff Garzik
@ 2006-11-10 20:45 ` David Miller
2006-11-12 16:40 ` Jeff Garzik
0 siblings, 1 reply; 7+ messages in thread
From: David Miller @ 2006-11-10 20:45 UTC (permalink / raw)
To: jeff; +Cc: akpm, netdev, a.p.zijlstra, mingo, shemminger
From: Jeff Garzik <jeff@garzik.org>
Date: Fri, 10 Nov 2006 11:09:25 -0500
> akpm@osdl.org wrote:
> > From: Peter Zijlstra <a.p.zijlstra@chello.nl>
> >
> > =============================================
> > [ INFO: possible recursive locking detected ]
> > 2.6.17-1.2600.fc6 #1
> > ---------------------------------------------
>
> applied; please CC me on this drivers/net stuff
Jeff, I put this one in my net-2.6.20 tree already.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [patch 1/9] bonding: lockdep annotation
2006-11-10 20:45 ` David Miller
@ 2006-11-12 16:40 ` Jeff Garzik
2006-11-13 1:46 ` David Miller
0 siblings, 1 reply; 7+ messages in thread
From: Jeff Garzik @ 2006-11-12 16:40 UTC (permalink / raw)
To: David Miller; +Cc: akpm, netdev, a.p.zijlstra, mingo, shemminger
David Miller wrote:
> From: Jeff Garzik <jeff@garzik.org>
> Date: Fri, 10 Nov 2006 11:09:25 -0500
>
>> akpm@osdl.org wrote:
>>> From: Peter Zijlstra <a.p.zijlstra@chello.nl>
>>>
>>> =============================================
>>> [ INFO: possible recursive locking detected ]
>>> 2.6.17-1.2600.fc6 #1
>>> ---------------------------------------------
>> applied; please CC me on this drivers/net stuff
>
> Jeff, I put this one in my net-2.6.20 tree already.
Well, it was drivers/net/bonding/* which usually goes in through my
tree, what did you expect? :)
Jeff
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [patch 1/9] bonding: lockdep annotation
2006-11-12 16:40 ` Jeff Garzik
@ 2006-11-13 1:46 ` David Miller
0 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2006-11-13 1:46 UTC (permalink / raw)
To: jeff; +Cc: akpm, netdev, a.p.zijlstra, mingo, shemminger
From: Jeff Garzik <jeff@garzik.org>
Date: Sun, 12 Nov 2006 11:40:02 -0500
> David Miller wrote:
> > Jeff, I put this one in my net-2.6.20 tree already.
>
> Well, it was drivers/net/bonding/* which usually goes in through my
> tree, what did you expect? :)
It's not problem, it will all come out in the wash :)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [patch 1/9] bonding: lockdep annotation
@ 2006-10-20 21:43 akpm
0 siblings, 0 replies; 7+ messages in thread
From: akpm @ 2006-10-20 21:43 UTC (permalink / raw)
To: davem; +Cc: netdev, akpm, a.p.zijlstra, mingo, shemminger
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
=============================================
[ INFO: possible recursive locking detected ]
2.6.17-1.2600.fc6 #1
---------------------------------------------
ifconfig/2411 is trying to acquire lock:
(&dev->_xmit_lock){-...}, at: [<ffffffff80429b9f>] dev_mc_add+0x45/0x15f
but task is already holding lock:
(&dev->_xmit_lock){-...}, at: [<ffffffff80429b9f>] dev_mc_add+0x45/0x15f
other info that might help us debug this:
3 locks held by ifconfig/2411:
#0: (rtnl_mutex){--..}, at: [<ffffffff802664af>] mutex_lock+0x2a/0x2e
#1: (&dev->_xmit_lock){-...}, at: [<ffffffff80429b9f>] dev_mc_add+0x45/0x15f
#2: (&bond->lock){-.-+}, at: [<ffffffff8831b7f7>] bond_set_multicast_list+0x2c/0x26a [bonding]
stack backtrace:
Call Trace:
[<ffffffff8026e97d>] show_trace+0xae/0x319
[<ffffffff8026ebfd>] dump_stack+0x15/0x17
[<ffffffff802a839b>] __lock_acquire+0x135/0xa64
[<ffffffff802a926d>] lock_acquire+0x4b/0x69
[<ffffffff80267981>] _spin_lock_bh+0x2a/0x36
[<ffffffff80429b9f>] dev_mc_add+0x45/0x15f
[<ffffffff8831b903>] :bonding:bond_set_multicast_list+0x138/0x26a
[<ffffffff80429901>] __dev_mc_upload+0x22/0x24
[<ffffffff80429c74>] dev_mc_add+0x11a/0x15f
[<ffffffff8045d154>] igmp_group_added+0x55/0x10f
[<ffffffff8045d4ab>] ip_mc_inc_group+0x1d6/0x21a
[<ffffffff8045d535>] ip_mc_up+0x46/0x61
[<ffffffff804594b8>] inetdev_init+0x11c/0x136
[<ffffffff8045a0b7>] devinet_ioctl+0x3eb/0x5e9
[<ffffffff8045a56c>] inet_ioctl+0x71/0x8f
[<ffffffff8041ed74>] sock_ioctl+0x1e8/0x20a
[<ffffffff80243ae0>] do_ioctl+0x2a/0x77
[<ffffffff802325cc>] vfs_ioctl+0x25a/0x277
[<ffffffff8024ea4b>] sys_ioctl+0x5f/0x82
[<ffffffff8026060e>] system_call+0x7e/0x83
The bonding driver nests other drivers, give the bonding driver its own
lock class.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Ingo Molnar <mingo@elte.hu>
Cc: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
drivers/net/bonding/bond_main.c | 5 +++++
1 files changed, 5 insertions(+)
diff -puN drivers/net/bonding/bond_main.c~bonding-lockdep-annotation drivers/net/bonding/bond_main.c
--- a/drivers/net/bonding/bond_main.c~bonding-lockdep-annotation
+++ a/drivers/net/bonding/bond_main.c
@@ -4692,6 +4692,8 @@ static int bond_check_params(struct bond
return 0;
}
+static struct lock_class_key bonding_netdev_xmit_lock_key;
+
/* Create a new bond based on the specified name and bonding parameters.
* Caller must NOT hold rtnl_lock; we need to release it here before we
* set up our sysfs entries.
@@ -4727,6 +4729,9 @@ int bond_create(char *name, struct bond_
if (res < 0) {
goto out_bond;
}
+
+ lockdep_set_class(&bond_dev->_xmit_lock, &bonding_netdev_xmit_lock_key);
+
if (newbond)
*newbond = bond_dev->priv;
_
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2006-11-13 1:46 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-09 3:51 [patch 1/9] bonding: lockdep annotation akpm
2006-11-10 0:05 ` David Miller
2006-11-10 16:09 ` Jeff Garzik
2006-11-10 20:45 ` David Miller
2006-11-12 16:40 ` Jeff Garzik
2006-11-13 1:46 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2006-10-20 21:43 akpm
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).