* Packet per Second
From: Flávio Pires @ 2007-12-14 15:34 UTC (permalink / raw)
To: netdev; +Cc: bridge
Hi all,
It's my first time using usenet...
Well, I work on an ISP and we have a linux box acting as a
bridge+firewall. With this bridge+firewall we control the packet rate
per second from each client and from our repeaters. But I can`t
measure the packet rate per IP. Is there any tool for this?
Actually, what I want is to measure the packet rate per IP and
generate graphics with mrtg or rrdtool, but for this I must have the
number of packets per second of each client :)
Thank you all
--
Flávio
--
I'm trying a new usenet client for Mac, Nemo OS X.
You can download it at http://www.malcom-mac.com/nemo
^ permalink raw reply
* Re: [Bugme-new] [Bug 9543] New: RTNL: assertion failed at net/ipv6/addrconf.c (2164)/RTNL: assertion failed at net/ipv4/devinet.c (1055)
From: Krzysztof Oledzki @ 2007-12-14 16:14 UTC (permalink / raw)
To: Jay Vosburgh
Cc: Herbert Xu, Andrew Morton, bugme-daemon, shemminger, davem,
netdev, andy
In-Reply-To: <28503.1197481615@death>
[-- Attachment #1: Type: TEXT/PLAIN, Size: 58246 bytes --]
On Wed, 12 Dec 2007, Jay Vosburgh wrote:
> Herbert Xu <herbert@gondor.apana.org.au> wrote:
>
>>> diff -puN drivers/net/bonding/bond_sysfs.c~bonding-locking-fix drivers/net/bonding/bond_sysfs.c
>>> --- a/drivers/net/bonding/bond_sysfs.c~bonding-locking-fix
>>> +++ a/drivers/net/bonding/bond_sysfs.c
>>> @@ -1111,8 +1111,6 @@ static ssize_t bonding_store_primary(str
>>> out:
>>> write_unlock_bh(&bond->lock);
>>>
>>> - rtnl_unlock();
>>> -
>>
>> Looking at the changeset that added this perhaps the intention
>> is to hold the lock? If so we should add an rtnl_lock to the start
>> of the function.
>
> Yes, this function needs to hold locks, and more than just
> what's there now. I believe the following should be correct; I haven't
> tested it, though (I'm supposedly on vacation right now).
>
> The following change should be correct for the
> bonding_store_primary case discussed in this thread, and also corrects
> the bonding_store_active case which performs similar functions.
>
> The bond_change_active_slave and bond_select_active_slave
> functions both require rtnl, bond->lock for read and curr_slave_lock for
> write_bh, and no other locks. This is so that the lower level
> mode-specific functions can release locks down to just rtnl in order to
> call, e.g., dev_set_mac_address with the locks it expects (rtnl only).
>
> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
>
> diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
> index 11b76b3..28a2d80 100644
> --- a/drivers/net/bonding/bond_sysfs.c
> +++ b/drivers/net/bonding/bond_sysfs.c
> @@ -1075,7 +1075,10 @@ static ssize_t bonding_store_primary(struct device *d,
> struct slave *slave;
> struct bonding *bond = to_bond(d);
>
> - write_lock_bh(&bond->lock);
> + rtnl_lock();
> + read_lock(&bond->lock);
> + write_lock_bh(&bond->curr_slave_lock);
> +
> if (!USES_PRIMARY(bond->params.mode)) {
> printk(KERN_INFO DRV_NAME
> ": %s: Unable to set primary slave; %s is in mode %d\n",
> @@ -1109,8 +1112,8 @@ static ssize_t bonding_store_primary(struct device *d,
> }
> }
> out:
> - write_unlock_bh(&bond->lock);
> -
> + write_unlock_bh(&bond->curr_slave_lock);
> + read_unlock(&bond->lock);
> rtnl_unlock();
>
> return count;
> @@ -1190,7 +1193,8 @@ static ssize_t bonding_store_active_slave(struct device *d,
> struct bonding *bond = to_bond(d);
>
> rtnl_lock();
> - write_lock_bh(&bond->lock);
> + read_lock(&bond->lock);
> + write_lock_bh(&bond->curr_slave_lock);
>
> if (!USES_PRIMARY(bond->params.mode)) {
> printk(KERN_INFO DRV_NAME
> @@ -1247,7 +1251,8 @@ static ssize_t bonding_store_active_slave(struct device *d,
> }
> }
> out:
> - write_unlock_bh(&bond->lock);
> + write_unlock_bh(&bond->curr_slave_lock);
> + read_unlock(&bond->lock);
> rtnl_unlock();
>
> return count;
Vanilla 2.6.24-rc5 plus this patch:
=========================================================
[ INFO: possible irq lock inversion dependency detected ]
2.6.24-rc5 #1
---------------------------------------------------------
events/0/9 just changed the state of lock:
(&mc->mca_lock){-+..}, at: [<c0411c7a>] mld_ifc_timer_expire+0x130/0x1fb
but this lock took another, soft-read-irq-unsafe lock in the past:
(&bond->lock){-.--}
and interrupts could create inverse lock ordering between them.
other info that might help us debug this:
4 locks held by events/0/9:
#0: (events){--..}, at: [<c0133c57>] run_workqueue+0x87/0x1b6
#1: ((linkwatch_work).work){--..}, at: [<c0133c57>]
run_workqueue+0x87/0x1b6
#2: (rtnl_mutex){--..}, at: [<c03abd50>] linkwatch_event+0x5/0x22
#3: (&ndev->lock){-.-+}, at: [<c0411b61>]
mld_ifc_timer_expire+0x17/0x1fb
the first lock's dependencies:
-> (&mc->mca_lock){-+..} ops: 10 {
initial-use at:
[<c0104ee2>] dump_trace+0x83/0x8d
[<c014289c>] __lock_acquire+0x4ba/0xc07
[<c0109ef2>] save_stack_trace+0x20/0x3a
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0412452>] ipv6_dev_mc_inc+0x24d/0x31c
[<c0143062>] lock_acquire+0x79/0x93
[<c04120d6>] igmp6_group_added+0x18/0x11d
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c04120d6>] igmp6_group_added+0x18/0x11d
[<c04120d6>] igmp6_group_added+0x18/0x11d
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0412452>] ipv6_dev_mc_inc+0x24d/0x31c
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>] ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c05c5b40>] addrconf_init+0x13/0x193
[<c0199f63>] proc_net_fops_create+0x10/0x21
[<c0419b38>] ip6_flowlabel_init+0x1e/0x20
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
in-softirq-W at:
[<c0142822>] __lock_acquire+0x440/0xc07
[<c013e0f3>] clockevents_program_event+0xe0/0xee
[<c0143062>] lock_acquire+0x79/0x93
[<c0411c7a>] mld_ifc_timer_expire+0x130/0x1fb
[<c0411b4a>] mld_ifc_timer_expire+0x0/0x1fb
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c0411c7a>] mld_ifc_timer_expire+0x130/0x1fb
[<c0411c7a>] mld_ifc_timer_expire+0x130/0x1fb
[<c0411b4a>] mld_ifc_timer_expire+0x0/0x1fb
[<c0141f89>] trace_hardirqs_on+0x10c/0x14c
[<c0411b4a>] mld_ifc_timer_expire+0x0/0x1fb
[<c012df52>] run_timer_softirq+0xfa/0x15d
[<c012a8a6>] __do_softirq+0x56/0xdb
[<c0141f89>] trace_hardirqs_on+0x10c/0x14c
[<c012a8b8>] __do_softirq+0x68/0xdb
[<c012a961>] do_softirq+0x36/0x51
[<c012ae4a>] local_bh_enable_ip+0xad/0xed
[<c03bf107>] rt_run_flush+0x64/0x8b
[<c03e9296>] fib_netdev_event+0x61/0x65
[<c013ac20>] notifier_call_chain+0x2a/0x52
[<c013ac6a>] raw_notifier_call_chain+0x17/0x1a
[<c03a2ae5>] netdev_state_change+0x18/0x29
[<c03abd1d>] __linkwatch_run_queue+0x150/0x17e
[<c03abd68>] linkwatch_event+0x1d/0x22
[<c0133cab>] run_workqueue+0xdb/0x1b6
[<c0133c57>] run_workqueue+0x87/0x1b6
[<c03abd4b>] linkwatch_event+0x0/0x22
[<c01346cb>] worker_thread+0x0/0x85
[<c0134744>] worker_thread+0x79/0x85
[<c0137179>] autoremove_wake_function+0x0/0x35
[<c01370c2>] kthread+0x38/0x5e
[<c013708a>] kthread+0x0/0x5e
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
hardirq-on-W at:
[<c01417ee>] find_usage_backwards+0xbb/0xe2
[<c0104ee2>] dump_trace+0x83/0x8d
[<c014286a>] __lock_acquire+0x488/0xc07
[<c0109ef2>] save_stack_trace+0x20/0x3a
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0412452>] ipv6_dev_mc_inc+0x24d/0x31c
[<c0143062>] lock_acquire+0x79/0x93
[<c04120d6>] igmp6_group_added+0x18/0x11d
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c04120d6>] igmp6_group_added+0x18/0x11d
[<c04120d6>] igmp6_group_added+0x18/0x11d
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0412452>] ipv6_dev_mc_inc+0x24d/0x31c
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>] ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c05c5b40>] addrconf_init+0x13/0x193
[<c0199f63>] proc_net_fops_create+0x10/0x21
[<c0419b38>] ip6_flowlabel_init+0x1e/0x20
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
}
... key at: [<c087e2d8>] __key.30798+0x0/0x8
-> (_xmit_ETHER){-...} ops: 8 {
initial-use at:
[<c014289c>] __lock_acquire+0x4ba/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0412114>] igmp6_group_added+0x56/0x11d
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0410100>] igmp6_mc_seq_start+0xde/0x138
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>]
ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c0401e17>] addrconf_notify+0x60/0x7b7
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c0439066>] mutex_lock_nested+0x286/0x2ac
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c03a3f4d>]
register_netdevice_notifier+0xe/0x126
[<c03a3f4d>]
register_netdevice_notifier+0xe/0x126
[<c03a3f88>]
register_netdevice_notifier+0x49/0x126
[<c05c5bda>] addrconf_init+0xad/0x193
[<c05c5b48>] addrconf_init+0x1b/0x193
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
hardirq-on-W at:
[<c0141986>] mark_lock+0x64/0x451
[<c014286a>] __lock_acquire+0x488/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0412114>] igmp6_group_added+0x56/0x11d
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0410100>] igmp6_mc_seq_start+0xde/0x138
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>]
ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c0401e17>] addrconf_notify+0x60/0x7b7
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c0439066>] mutex_lock_nested+0x286/0x2ac
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c03a3f4d>]
register_netdevice_notifier+0xe/0x126
[<c03a3f4d>]
register_netdevice_notifier+0xe/0x126
[<c03a3f88>]
register_netdevice_notifier+0x49/0x126
[<c05c5bda>] addrconf_init+0xad/0x193
[<c05c5b48>] addrconf_init+0x1b/0x193
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
}
... key at: [<c087adc8>] netdev_xmit_lock_key+0x8/0x1c0
... acquired at:
[<c0142dff>] __lock_acquire+0xa1d/0xc07
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0412114>] igmp6_group_added+0x56/0x11d
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0410100>] igmp6_mc_seq_start+0xde/0x138
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>] ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c0401e17>] addrconf_notify+0x60/0x7b7
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c0439066>] mutex_lock_nested+0x286/0x2ac
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f88>] register_netdevice_notifier+0x49/0x126
[<c05c5bda>] addrconf_init+0xad/0x193
[<c05c5b48>] addrconf_init+0x1b/0x193
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
-> (&bonding_netdev_xmit_lock_key){-...} ops: 6 {
initial-use at:
[<c014289c>] __lock_acquire+0x4ba/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0412114>] igmp6_group_added+0x56/0x11d
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0410100>] igmp6_mc_seq_start+0xde/0x138
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>]
ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c0401e17>] addrconf_notify+0x60/0x7b7
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c0439066>] mutex_lock_nested+0x286/0x2ac
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c03a3f4d>]
register_netdevice_notifier+0xe/0x126
[<c03a3f4d>]
register_netdevice_notifier+0xe/0x126
[<c03a3f88>]
register_netdevice_notifier+0x49/0x126
[<c05c5bda>] addrconf_init+0xad/0x193
[<c05c5b48>] addrconf_init+0x1b/0x193
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
hardirq-on-W at:
[<c0141986>] mark_lock+0x64/0x451
[<c014286a>] __lock_acquire+0x488/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0412114>] igmp6_group_added+0x56/0x11d
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0410100>] igmp6_mc_seq_start+0xde/0x138
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>]
ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c0401e17>] addrconf_notify+0x60/0x7b7
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c0439066>] mutex_lock_nested+0x286/0x2ac
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c03a3f4d>]
register_netdevice_notifier+0xe/0x126
[<c03a3f4d>]
register_netdevice_notifier+0xe/0x126
[<c03a3f88>]
register_netdevice_notifier+0x49/0x126
[<c05c5bda>] addrconf_init+0xad/0x193
[<c05c5b48>] addrconf_init+0x1b/0x193
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
}
... key at: [<c0877804>] bonding_netdev_xmit_lock_key+0x0/0x8
-> (&bond->lock){-.--} ops: 99 {
initial-use at:
[<c013fe35>] put_lock_stats+0xa/0x1e
[<c014289c>] __lock_acquire+0x4ba/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c043a3c5>] _spin_unlock_irqrestore+0x40/0x58
[<c0143062>] lock_acquire+0x79/0x93
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c0439eee>] _read_lock_bh+0x3b/0x64
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c03aa3e7>] rtnl_fill_ifinfo+0x2bf/0x563
[<c03aa965>] rtmsg_ifinfo+0x5d/0xdf
[<c03aaa26>] rtnetlink_event+0x3f/0x42
[<c013ac20>] notifier_call_chain+0x2a/0x52
[<c013ac6a>] raw_notifier_call_chain+0x17/0x1a
[<c03a31de>] register_netdevice+0x2a7/0x2e7
[<c02ed862>] bond_create+0x1f2/0x26a
[<c05bedcd>] bonding_init+0x761/0x7ea
[<c05be635>] e1000_init_module+0x45/0x7c
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
hardirq-on-W at:
[<c014286a>] __lock_acquire+0x488/0xc07
[<c012093c>] try_to_wake_up+0x2ce/0x2d8
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c02eda75>]
bond_set_multicast_list+0x1d/0x241
[<c0439e25>] _write_lock_bh+0x3b/0x64
[<c02eda75>]
bond_set_multicast_list+0x1d/0x241
[<c02eda75>]
bond_set_multicast_list+0x1d/0x241
[<c013fe35>] put_lock_stats+0xa/0x1e
[<c03a14db>] __dev_set_rx_mode+0x7b/0x7d
[<c03a1675>] dev_set_rx_mode+0x23/0x36
[<c03a3d50>] dev_open+0x5e/0x77
[<c03a2a1f>] dev_change_flags+0x9d/0x14b
[<c03a1823>] __dev_get_by_name+0x68/0x73
[<c03e3850>] devinet_ioctl+0x22b/0x536
[<c03a3b45>] dev_ioctl+0x46f/0x5b7
[<c0399c78>] sock_ioctl+0x167/0x18b
[<c0399b11>] sock_ioctl+0x0/0x18b
[<c01725f7>] do_ioctl+0x1f/0x62
[<c0172867>] vfs_ioctl+0x22d/0x23f
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c01728ac>] sys_ioctl+0x33/0x4b
[<c0103e92>] sysenter_past_esp+0x5f/0xa5
[<ffffffff>] 0xffffffff
softirq-on-R at:
[<c0141986>] mark_lock+0x64/0x451
[<c013575e>] __kernel_text_address+0x5/0xe
[<c0104ee2>] dump_trace+0x83/0x8d
[<c0142889>] __lock_acquire+0x4a7/0xc07
[<c013fc76>] save_trace+0x37/0x89
[<c0133c57>] run_workqueue+0x87/0x1b6
[<c0143062>] lock_acquire+0x79/0x93
[<c02eee5d>] bond_mii_monitor+0x19/0x85
[<c0439f4d>] _read_lock+0x36/0x5f
[<c02eee5d>] bond_mii_monitor+0x19/0x85
[<c02eee5d>] bond_mii_monitor+0x19/0x85
[<c0133cab>] run_workqueue+0xdb/0x1b6
[<c0133c57>] run_workqueue+0x87/0x1b6
[<c02eee44>] bond_mii_monitor+0x0/0x85
[<c01346cb>] worker_thread+0x0/0x85
[<c0134744>] worker_thread+0x79/0x85
[<c0137179>] autoremove_wake_function+0x0/0x35
[<c01370c2>] kthread+0x38/0x5e
[<c013708a>] kthread+0x0/0x5e
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
hardirq-on-R at:
[<c013fe0a>] get_lock_stats+0xd/0x2e
[<c013fe35>] put_lock_stats+0xa/0x1e
[<c0142844>] __lock_acquire+0x462/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c043a3c5>] _spin_unlock_irqrestore+0x40/0x58
[<c0143062>] lock_acquire+0x79/0x93
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c0439eee>] _read_lock_bh+0x3b/0x64
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c03aa3e7>] rtnl_fill_ifinfo+0x2bf/0x563
[<c03aa965>] rtmsg_ifinfo+0x5d/0xdf
[<c03aaa26>] rtnetlink_event+0x3f/0x42
[<c013ac20>] notifier_call_chain+0x2a/0x52
[<c013ac6a>] raw_notifier_call_chain+0x17/0x1a
[<c03a31de>] register_netdevice+0x2a7/0x2e7
[<c02ed862>] bond_create+0x1f2/0x26a
[<c05bedcd>] bonding_init+0x761/0x7ea
[<c05be635>] e1000_init_module+0x45/0x7c
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
}
... key at: [<c08777d0>] __key.32969+0x0/0x8
-> (_xmit_ETHER){-...} ops: 8 {
initial-use at:
[<c014289c>] __lock_acquire+0x4ba/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0412114>] igmp6_group_added+0x56/0x11d
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0410100>] igmp6_mc_seq_start+0xde/0x138
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>]
ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c0401e17>] addrconf_notify+0x60/0x7b7
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c0439066>] mutex_lock_nested+0x286/0x2ac
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c03a3f4d>]
register_netdevice_notifier+0xe/0x126
[<c03a3f4d>]
register_netdevice_notifier+0xe/0x126
[<c03a3f88>]
register_netdevice_notifier+0x49/0x126
[<c05c5bda>] addrconf_init+0xad/0x193
[<c05c5b48>] addrconf_init+0x1b/0x193
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
hardirq-on-W at:
[<c0141986>] mark_lock+0x64/0x451
[<c014286a>] __lock_acquire+0x488/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0412114>] igmp6_group_added+0x56/0x11d
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0410100>] igmp6_mc_seq_start+0xde/0x138
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>]
ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c0401e17>] addrconf_notify+0x60/0x7b7
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c0439066>] mutex_lock_nested+0x286/0x2ac
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c03a3f4d>]
register_netdevice_notifier+0xe/0x126
[<c03a3f4d>]
register_netdevice_notifier+0xe/0x126
[<c03a3f88>]
register_netdevice_notifier+0x49/0x126
[<c05c5bda>] addrconf_init+0xad/0x193
[<c05c5b48>] addrconf_init+0x1b/0x193
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
}
... key at: [<c087adc8>] netdev_xmit_lock_key+0x8/0x1c0
... acquired at:
[<c0142dff>] __lock_acquire+0xa1d/0xc07
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c043a3c5>] _spin_unlock_irqrestore+0x40/0x58
[<c0109ef2>] save_stack_trace+0x20/0x3a
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c02ee492>] bond_change_active_slave+0x1a9/0x3bf
[<c02ec7c3>] bond_update_speed_duplex+0x26/0x65
[<c02ee9af>] bond_select_active_slave+0x95/0xcd
[<c02ed22b>] bond_compute_features+0x45/0x84
[<c02ef9be>] bond_enslave+0x6a7/0x884
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c02f6197>] bonding_store_slaves+0x1ae/0x2fb
[<c02f5fe9>] bonding_store_slaves+0x0/0x2fb
[<c02ce8d7>] dev_attr_store+0x27/0x2c
[<c019bcb9>] sysfs_write_file+0xad/0xe0
[<c019bc0c>] sysfs_write_file+0x0/0xe0
[<c0168ddc>] vfs_write+0x8a/0x10c
[<c0118566>] do_page_fault+0x0/0x54a
[<c0169361>] sys_write+0x41/0x67
[<c0103e92>] sysenter_past_esp+0x5f/0xa5
[<ffffffff>] 0xffffffff
-> (lweventlist_lock){.+..} ops: 10 {
initial-use at:
[<c0141986>] mark_lock+0x64/0x451
[<c014289c>] __lock_acquire+0x4ba/0xc07
[<c02e365c>] e1000_read_phy_reg+0x1c7/0x1d3
[<c02e348b>] e1000_write_phy_reg+0xb9/0xc3
[<c024a7de>] delay_tsc+0x25/0x3b
[<c0143062>] lock_acquire+0x79/0x93
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c043a07f>] _spin_lock_irqsave+0x3f/0x6c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abbbb>] linkwatch_fire_event+0x25/0x37
[<c02e1c43>] e1000_probe+0xad1/0xbe8
[<c0257f3f>] pci_device_probe+0x36/0x57
[<c02d0e5f>] driver_probe_device+0xe1/0x15f
[<c043a2f9>] _spin_unlock+0x25/0x3b
[<c04375b2>] klist_next+0x58/0x6d
[<c02d0f6f>] __driver_attach+0x0/0x7f
[<c02d0fb8>] __driver_attach+0x49/0x7f
[<c02d0403>] bus_for_each_dev+0x36/0x58
[<c02d0cb7>] driver_attach+0x16/0x18
[<c02d0f6f>] __driver_attach+0x0/0x7f
[<c02d06fa>] bus_add_driver+0x6d/0x18d
[<c0258089>] __pci_register_driver+0x53/0x7f
[<c05be635>] e1000_init_module+0x45/0x7c
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
in-softirq-W at:
[<c011d20a>] __wake_up_common+0x32/0x5c
[<c0142822>] __lock_acquire+0x440/0xc07
[<c043a3c5>]
_spin_unlock_irqrestore+0x40/0x58
[<c0143062>] lock_acquire+0x79/0x93
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c02dff01>] e1000_watchdog+0x0/0x5c9
[<c043a07f>] _spin_lock_irqsave+0x3f/0x6c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abbbb>] linkwatch_fire_event+0x25/0x37
[<c03aeb42>] netif_carrier_on+0x16/0x27
[<c02e0156>] e1000_watchdog+0x255/0x5c9
[<c02dff01>] e1000_watchdog+0x0/0x5c9
[<c012df52>] run_timer_softirq+0xfa/0x15d
[<c012a8a6>] __do_softirq+0x56/0xdb
[<c0141f89>] trace_hardirqs_on+0x10c/0x14c
[<c012a8b8>] __do_softirq+0x68/0xdb
[<c012a961>] do_softirq+0x36/0x51
[<c012ab07>] irq_exit+0x43/0x4e
[<c0114122>]
smp_apic_timer_interrupt+0x74/0x80
[<c0104a01>] apic_timer_interrupt+0x29/0x38
[<c0104a0b>] apic_timer_interrupt+0x33/0x38
[<c01600d8>] sys_swapon+0x29c/0x9aa
[<c01021a6>] mwait_idle_with_hints+0x3b/0x3f
[<c0102447>] mwait_idle+0x0/0xf
[<c0102581>] cpu_idle+0x99/0xc6
[<c05a98c7>] start_kernel+0x2c7/0x2cf
[<c05a90e0>] unknown_bootoption+0x0/0x195
[<ffffffff>] 0xffffffff
}
... key at: [<c058a194>] lweventlist_lock+0x14/0x40
... acquired at:
[<c0142dff>] __lock_acquire+0xa1d/0xc07
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c043a07f>] _spin_lock_irqsave+0x3f/0x6c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abbbb>] linkwatch_fire_event+0x25/0x37
[<c03aeb42>] netif_carrier_on+0x16/0x27
[<c02ede2c>] bond_set_carrier+0x31/0x55
[<c02ee9b6>] bond_select_active_slave+0x9c/0xcd
[<c02ed22b>] bond_compute_features+0x45/0x84
[<c02ef9be>] bond_enslave+0x6a7/0x884
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c02f6197>] bonding_store_slaves+0x1ae/0x2fb
[<c02f5fe9>] bonding_store_slaves+0x0/0x2fb
[<c02ce8d7>] dev_attr_store+0x27/0x2c
[<c019bcb9>] sysfs_write_file+0xad/0xe0
[<c019bc0c>] sysfs_write_file+0x0/0xe0
[<c0168ddc>] vfs_write+0x8a/0x10c
[<c0118566>] do_page_fault+0x0/0x54a
[<c0169361>] sys_write+0x41/0x67
[<c0103e92>] sysenter_past_esp+0x5f/0xa5
[<ffffffff>] 0xffffffff
... acquired at:
[<c0142dff>] __lock_acquire+0xa1d/0xc07
[<c02eda75>] bond_set_multicast_list+0x1d/0x241
[<c0143062>] lock_acquire+0x79/0x93
[<c02eda75>] bond_set_multicast_list+0x1d/0x241
[<c0439e25>] _write_lock_bh+0x3b/0x64
[<c02eda75>] bond_set_multicast_list+0x1d/0x241
[<c02eda75>] bond_set_multicast_list+0x1d/0x241
[<c013fe35>] put_lock_stats+0xa/0x1e
[<c03a14db>] __dev_set_rx_mode+0x7b/0x7d
[<c03a1675>] dev_set_rx_mode+0x23/0x36
[<c03a3d50>] dev_open+0x5e/0x77
[<c03a2a1f>] dev_change_flags+0x9d/0x14b
[<c03a1823>] __dev_get_by_name+0x68/0x73
[<c03e3850>] devinet_ioctl+0x22b/0x536
[<c03a3b45>] dev_ioctl+0x46f/0x5b7
[<c0399c78>] sock_ioctl+0x167/0x18b
[<c0399b11>] sock_ioctl+0x0/0x18b
[<c01725f7>] do_ioctl+0x1f/0x62
[<c0172867>] vfs_ioctl+0x22d/0x23f
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c01728ac>] sys_ioctl+0x33/0x4b
[<c0103e92>] sysenter_past_esp+0x5f/0xa5
[<ffffffff>] 0xffffffff
... acquired at:
[<c0142dff>] __lock_acquire+0xa1d/0xc07
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0412114>] igmp6_group_added+0x56/0x11d
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0410100>] igmp6_mc_seq_start+0xde/0x138
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>] ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c0401e17>] addrconf_notify+0x60/0x7b7
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c0439066>] mutex_lock_nested+0x286/0x2ac
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f88>] register_netdevice_notifier+0x49/0x126
[<c05c5bda>] addrconf_init+0xad/0x193
[<c05c5b48>] addrconf_init+0x1b/0x193
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
the second lock's dependencies:
-> (&bond->lock){-.--} ops: 99 {
initial-use at:
[<c013fe35>] put_lock_stats+0xa/0x1e
[<c014289c>] __lock_acquire+0x4ba/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c043a3c5>] _spin_unlock_irqrestore+0x40/0x58
[<c0143062>] lock_acquire+0x79/0x93
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c0439eee>] _read_lock_bh+0x3b/0x64
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c03aa3e7>] rtnl_fill_ifinfo+0x2bf/0x563
[<c03aa965>] rtmsg_ifinfo+0x5d/0xdf
[<c03aaa26>] rtnetlink_event+0x3f/0x42
[<c013ac20>] notifier_call_chain+0x2a/0x52
[<c013ac6a>] raw_notifier_call_chain+0x17/0x1a
[<c03a31de>] register_netdevice+0x2a7/0x2e7
[<c02ed862>] bond_create+0x1f2/0x26a
[<c05bedcd>] bonding_init+0x761/0x7ea
[<c05be635>] e1000_init_module+0x45/0x7c
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
hardirq-on-W at:
[<c014286a>] __lock_acquire+0x488/0xc07
[<c012093c>] try_to_wake_up+0x2ce/0x2d8
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c02eda75>] bond_set_multicast_list+0x1d/0x241
[<c0439e25>] _write_lock_bh+0x3b/0x64
[<c02eda75>] bond_set_multicast_list+0x1d/0x241
[<c02eda75>] bond_set_multicast_list+0x1d/0x241
[<c013fe35>] put_lock_stats+0xa/0x1e
[<c03a14db>] __dev_set_rx_mode+0x7b/0x7d
[<c03a1675>] dev_set_rx_mode+0x23/0x36
[<c03a3d50>] dev_open+0x5e/0x77
[<c03a2a1f>] dev_change_flags+0x9d/0x14b
[<c03a1823>] __dev_get_by_name+0x68/0x73
[<c03e3850>] devinet_ioctl+0x22b/0x536
[<c03a3b45>] dev_ioctl+0x46f/0x5b7
[<c0399c78>] sock_ioctl+0x167/0x18b
[<c0399b11>] sock_ioctl+0x0/0x18b
[<c01725f7>] do_ioctl+0x1f/0x62
[<c0172867>] vfs_ioctl+0x22d/0x23f
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c01728ac>] sys_ioctl+0x33/0x4b
[<c0103e92>] sysenter_past_esp+0x5f/0xa5
[<ffffffff>] 0xffffffff
softirq-on-R at:
[<c0141986>] mark_lock+0x64/0x451
[<c013575e>] __kernel_text_address+0x5/0xe
[<c0104ee2>] dump_trace+0x83/0x8d
[<c0142889>] __lock_acquire+0x4a7/0xc07
[<c013fc76>] save_trace+0x37/0x89
[<c0133c57>] run_workqueue+0x87/0x1b6
[<c0143062>] lock_acquire+0x79/0x93
[<c02eee5d>] bond_mii_monitor+0x19/0x85
[<c0439f4d>] _read_lock+0x36/0x5f
[<c02eee5d>] bond_mii_monitor+0x19/0x85
[<c02eee5d>] bond_mii_monitor+0x19/0x85
[<c0133cab>] run_workqueue+0xdb/0x1b6
[<c0133c57>] run_workqueue+0x87/0x1b6
[<c02eee44>] bond_mii_monitor+0x0/0x85
[<c01346cb>] worker_thread+0x0/0x85
[<c0134744>] worker_thread+0x79/0x85
[<c0137179>] autoremove_wake_function+0x0/0x35
[<c01370c2>] kthread+0x38/0x5e
[<c013708a>] kthread+0x0/0x5e
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
hardirq-on-R at:
[<c013fe0a>] get_lock_stats+0xd/0x2e
[<c013fe35>] put_lock_stats+0xa/0x1e
[<c0142844>] __lock_acquire+0x462/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c043a3c5>] _spin_unlock_irqrestore+0x40/0x58
[<c0143062>] lock_acquire+0x79/0x93
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c0439eee>] _read_lock_bh+0x3b/0x64
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c03aa3e7>] rtnl_fill_ifinfo+0x2bf/0x563
[<c03aa965>] rtmsg_ifinfo+0x5d/0xdf
[<c03aaa26>] rtnetlink_event+0x3f/0x42
[<c013ac20>] notifier_call_chain+0x2a/0x52
[<c013ac6a>] raw_notifier_call_chain+0x17/0x1a
[<c03a31de>] register_netdevice+0x2a7/0x2e7
[<c02ed862>] bond_create+0x1f2/0x26a
[<c05bedcd>] bonding_init+0x761/0x7ea
[<c05be635>] e1000_init_module+0x45/0x7c
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
}
... key at: [<c08777d0>] __key.32969+0x0/0x8
-> (_xmit_ETHER){-...} ops: 8 {
initial-use at:
[<c014289c>] __lock_acquire+0x4ba/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0412114>] igmp6_group_added+0x56/0x11d
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0410100>] igmp6_mc_seq_start+0xde/0x138
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>]
ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c0401e17>] addrconf_notify+0x60/0x7b7
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c0439066>] mutex_lock_nested+0x286/0x2ac
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c03a3f4d>]
register_netdevice_notifier+0xe/0x126
[<c03a3f4d>]
register_netdevice_notifier+0xe/0x126
[<c03a3f88>]
register_netdevice_notifier+0x49/0x126
[<c05c5bda>] addrconf_init+0xad/0x193
[<c05c5b48>] addrconf_init+0x1b/0x193
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
hardirq-on-W at:
[<c0141986>] mark_lock+0x64/0x451
[<c014286a>] __lock_acquire+0x488/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0412114>] igmp6_group_added+0x56/0x11d
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0410100>] igmp6_mc_seq_start+0xde/0x138
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>]
ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c0401e17>] addrconf_notify+0x60/0x7b7
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c0439066>] mutex_lock_nested+0x286/0x2ac
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c03a3f4d>]
register_netdevice_notifier+0xe/0x126
[<c03a3f4d>]
register_netdevice_notifier+0xe/0x126
[<c03a3f88>]
register_netdevice_notifier+0x49/0x126
[<c05c5bda>] addrconf_init+0xad/0x193
[<c05c5b48>] addrconf_init+0x1b/0x193
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
}
... key at: [<c087adc8>] netdev_xmit_lock_key+0x8/0x1c0
... acquired at:
[<c0142dff>] __lock_acquire+0xa1d/0xc07
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c043a3c5>] _spin_unlock_irqrestore+0x40/0x58
[<c0109ef2>] save_stack_trace+0x20/0x3a
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c02ee492>] bond_change_active_slave+0x1a9/0x3bf
[<c02ec7c3>] bond_update_speed_duplex+0x26/0x65
[<c02ee9af>] bond_select_active_slave+0x95/0xcd
[<c02ed22b>] bond_compute_features+0x45/0x84
[<c02ef9be>] bond_enslave+0x6a7/0x884
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c02f6197>] bonding_store_slaves+0x1ae/0x2fb
[<c02f5fe9>] bonding_store_slaves+0x0/0x2fb
[<c02ce8d7>] dev_attr_store+0x27/0x2c
[<c019bcb9>] sysfs_write_file+0xad/0xe0
[<c019bc0c>] sysfs_write_file+0x0/0xe0
[<c0168ddc>] vfs_write+0x8a/0x10c
[<c0118566>] do_page_fault+0x0/0x54a
[<c0169361>] sys_write+0x41/0x67
[<c0103e92>] sysenter_past_esp+0x5f/0xa5
[<ffffffff>] 0xffffffff
-> (lweventlist_lock){.+..} ops: 10 {
initial-use at:
[<c0141986>] mark_lock+0x64/0x451
[<c014289c>] __lock_acquire+0x4ba/0xc07
[<c02e365c>] e1000_read_phy_reg+0x1c7/0x1d3
[<c02e348b>] e1000_write_phy_reg+0xb9/0xc3
[<c024a7de>] delay_tsc+0x25/0x3b
[<c0143062>] lock_acquire+0x79/0x93
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c043a07f>] _spin_lock_irqsave+0x3f/0x6c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abbbb>] linkwatch_fire_event+0x25/0x37
[<c02e1c43>] e1000_probe+0xad1/0xbe8
[<c0257f3f>] pci_device_probe+0x36/0x57
[<c02d0e5f>] driver_probe_device+0xe1/0x15f
[<c043a2f9>] _spin_unlock+0x25/0x3b
[<c04375b2>] klist_next+0x58/0x6d
[<c02d0f6f>] __driver_attach+0x0/0x7f
[<c02d0fb8>] __driver_attach+0x49/0x7f
[<c02d0403>] bus_for_each_dev+0x36/0x58
[<c02d0cb7>] driver_attach+0x16/0x18
[<c02d0f6f>] __driver_attach+0x0/0x7f
[<c02d06fa>] bus_add_driver+0x6d/0x18d
[<c0258089>] __pci_register_driver+0x53/0x7f
[<c05be635>] e1000_init_module+0x45/0x7c
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
in-softirq-W at:
[<c011d20a>] __wake_up_common+0x32/0x5c
[<c0142822>] __lock_acquire+0x440/0xc07
[<c043a3c5>] _spin_unlock_irqrestore+0x40/0x58
[<c0143062>] lock_acquire+0x79/0x93
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c02dff01>] e1000_watchdog+0x0/0x5c9
[<c043a07f>] _spin_lock_irqsave+0x3f/0x6c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abbbb>] linkwatch_fire_event+0x25/0x37
[<c03aeb42>] netif_carrier_on+0x16/0x27
[<c02e0156>] e1000_watchdog+0x255/0x5c9
[<c02dff01>] e1000_watchdog+0x0/0x5c9
[<c012df52>] run_timer_softirq+0xfa/0x15d
[<c012a8a6>] __do_softirq+0x56/0xdb
[<c0141f89>] trace_hardirqs_on+0x10c/0x14c
[<c012a8b8>] __do_softirq+0x68/0xdb
[<c012a961>] do_softirq+0x36/0x51
[<c012ab07>] irq_exit+0x43/0x4e
[<c0114122>] smp_apic_timer_interrupt+0x74/0x80
[<c0104a01>] apic_timer_interrupt+0x29/0x38
[<c0104a0b>] apic_timer_interrupt+0x33/0x38
[<c01600d8>] sys_swapon+0x29c/0x9aa
[<c01021a6>] mwait_idle_with_hints+0x3b/0x3f
[<c0102447>] mwait_idle+0x0/0xf
[<c0102581>] cpu_idle+0x99/0xc6
[<c05a98c7>] start_kernel+0x2c7/0x2cf
[<c05a90e0>] unknown_bootoption+0x0/0x195
[<ffffffff>] 0xffffffff
}
... key at: [<c058a194>] lweventlist_lock+0x14/0x40
... acquired at:
[<c0142dff>] __lock_acquire+0xa1d/0xc07
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c043a07f>] _spin_lock_irqsave+0x3f/0x6c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abbbb>] linkwatch_fire_event+0x25/0x37
[<c03aeb42>] netif_carrier_on+0x16/0x27
[<c02ede2c>] bond_set_carrier+0x31/0x55
[<c02ee9b6>] bond_select_active_slave+0x9c/0xcd
[<c02ed22b>] bond_compute_features+0x45/0x84
[<c02ef9be>] bond_enslave+0x6a7/0x884
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c02f6197>] bonding_store_slaves+0x1ae/0x2fb
[<c02f5fe9>] bonding_store_slaves+0x0/0x2fb
[<c02ce8d7>] dev_attr_store+0x27/0x2c
[<c019bcb9>] sysfs_write_file+0xad/0xe0
[<c019bc0c>] sysfs_write_file+0x0/0xe0
[<c0168ddc>] vfs_write+0x8a/0x10c
[<c0118566>] do_page_fault+0x0/0x54a
[<c0169361>] sys_write+0x41/0x67
[<c0103e92>] sysenter_past_esp+0x5f/0xa5
[<ffffffff>] 0xffffffff
stack backtrace:
Pid: 9, comm: events/0 Not tainted 2.6.24-rc5 #1
[<c0140b38>] print_irq_inversion_bug+0x108/0x112
[<c014191d>] check_usage_forwards+0x3c/0x41
[<c0141b09>] mark_lock+0x1e7/0x451
[<c0142822>] __lock_acquire+0x440/0xc07
[<c013e0f3>] clockevents_program_event+0xe0/0xee
[<c0143062>] lock_acquire+0x79/0x93
[<c0411c7a>] mld_ifc_timer_expire+0x130/0x1fb
[<c0411b4a>] mld_ifc_timer_expire+0x0/0x1fb
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c0411c7a>] mld_ifc_timer_expire+0x130/0x1fb
[<c0411c7a>] mld_ifc_timer_expire+0x130/0x1fb
[<c0411b4a>] mld_ifc_timer_expire+0x0/0x1fb
[<c0141f89>] trace_hardirqs_on+0x10c/0x14c
[<c0411b4a>] mld_ifc_timer_expire+0x0/0x1fb
[<c012df52>] run_timer_softirq+0xfa/0x15d
[<c012a8a6>] __do_softirq+0x56/0xdb
[<c0141f89>] trace_hardirqs_on+0x10c/0x14c
[<c012a8b8>] __do_softirq+0x68/0xdb
[<c012a961>] do_softirq+0x36/0x51
[<c012ae4a>] local_bh_enable_ip+0xad/0xed
[<c03bf107>] rt_run_flush+0x64/0x8b
[<c03e9296>] fib_netdev_event+0x61/0x65
[<c013ac20>] notifier_call_chain+0x2a/0x52
[<c013ac6a>] raw_notifier_call_chain+0x17/0x1a
[<c03a2ae5>] netdev_state_change+0x18/0x29
[<c03abd1d>] __linkwatch_run_queue+0x150/0x17e
[<c03abd68>] linkwatch_event+0x1d/0x22
[<c0133cab>] run_workqueue+0xdb/0x1b6
[<c0133c57>] run_workqueue+0x87/0x1b6
[<c03abd4b>] linkwatch_event+0x0/0x22
[<c01346cb>] worker_thread+0x0/0x85
[<c0134744>] worker_thread+0x79/0x85
[<c0137179>] autoremove_wake_function+0x0/0x35
[<c01370c2>] kthread+0x38/0x5e
[<c013708a>] kthread+0x0/0x5e
[<c0104baf>] kernel_thread_helper+0x7/0x10
=======================
Best regards,
Krzysztof Olędzki
^ permalink raw reply
* Re: [Bridge] Packet per Second
From: Stephen Hemminger @ 2007-12-14 16:56 UTC (permalink / raw)
To: Flávio Pires; +Cc: bridge, netdev
In-Reply-To: <nemoFri121407105527@flis.man.torun.pl>
On Fri, 14 Dec 2007 15:34:10 +0000 (UTC)
Flávio Pires <flavio.defreitas@gmail.com> wrote:
> Hi all,
>
> It's my first time using usenet...
>
> Well, I work on an ISP and we have a linux box acting as a
> bridge+firewall. With this bridge+firewall we control the packet rate
> per second from each client and from our repeaters. But I can`t
> measure the packet rate per IP. Is there any tool for this?
>
> Actually, what I want is to measure the packet rate per IP and
> generate graphics with mrtg or rrdtool, but for this I must have the
> number of packets per second of each client :)
>
> Thank you all
> --
> Flávio
>
>
Not that I know of, but you might look at:
http://www.bandwidtharbitrator.com/
--
Stephen Hemminger <shemminger@linux-foundation.org>
^ permalink raw reply
* Re: [Bridge] Packet per Second
From: Flávio Pires @ 2007-12-14 17:30 UTC (permalink / raw)
To: netdev; +Cc: bridge
In-Reply-To: <20071214085602.11a09070@deepthought>
In article <20071214085602.11a09070@deepthought> Stephen
Hemminger<shemminger@linux-foundation.org> wrote:
> On Fri, 14 Dec 2007 15:34:10 +0000 (UTC)
> Fl‡vio Pires <flavio.defreitas@gmail.com> wrote:
>> Hi all,
>>
>> It's my first time using usenet...
>>
>> Well, I work on an ISP and we have a linux box acting as a
>> bridge+firewall. With this bridge+firewall we control the packet
>> rate per second from each client and from our repeaters. But I can`t
>> measure the packet rate per IP. Is there any tool for this?
>>
>> Actually, what I want is to measure the packet rate per IP and
>> generate graphics with mrtg or rrdtool, but for this I must have the
>> number of packets per second of each client :)
>>
>> Thank you all
>> --
>> Fl‡vio
>>
> Not that I know of, but you might look at:
> http://www.bandwidtharbitrator.com/
Yeah, we have a proprietary solution from etinc it does bandwidth
control and firewall... but using his firewall let this machine too
slow, so we created a box just for firewall... Then we need a way to
measure pps per host so we can determine which limits fits better to
our clients and our own needs.
--
I'm trying a new usenet client for Mac, Nemo OS X.
You can download it at http://www.malcom-mac.com/nemo
^ permalink raw reply
* RE: What was the reason for 2.6.22 SMP kernels to change how sendmsg is called?
From: Kevin Wilson @ 2007-12-14 17:55 UTC (permalink / raw)
To: Evgeniy Polyakov; +Cc: netdev
In-Reply-To: <20071214063324.GC26171@2ka.mipt.ru>
>>do not express your frustration ...
wasn't frustration but rather playful sarcasm.
>>This was not a bug report at all...
Wasn't really meant to be a true blue bug report (my bad I guess). Anywho, I know you guys have big fish to fry so I tried to keep it short and to the point. I knew something had changed and I was truly stumped in trying to figure out what it was so I decided to ask for some general guidance.
>>Without having your code it is virtually impossible to say.
I know this is partly my own fault for not stating so explicitly in my first email. However, as I stated in my second email, I would have been happy to send it to anyone that expressed an interest (even though the issue wasn't interesting in itself) in my post. I just thought, being the experts you are, that having only the small subset of code that is actually involved in the offending call, you'd be able to say "go take a look at commit such-n-such" which you have now done. Thanks a million!
I'm not trying to start a nag war here, I know you guys are busy. Having both (mostly me) made pitiful assumptions I think we have reached an understanding on this (now dead) topic. I'm just starting out in the drivers arena with hopes of being a decent contributor to the kernel ecosystem some day so there will be some growing pains and this thread was one of them.
Thanks for the help and suggestions, I appreciate them immensely.
Kevin
-----Original Message-----
From: netdev-owner@vger.kernel.org
[mailto:netdev-owner@vger.kernel.org]On Behalf Of Evgeniy Polyakov
Sent: Friday, December 14, 2007 00:33
To: Kevin Wilson
Cc: David Miller; netdev@vger.kernel.org
Subject: Re: What was the reason for 2.6.22 SMP kernels to change how
sendmsg is called?
Hi Kevin.
On Thu, Dec 13, 2007 at 04:00:02PM -0600, Kevin Wilson (Kevin.Wilson@comtrol.com) wrote:
> I see your point but it just so happens it is a GPL'd driver, as is all of our Linux code we produce for our hardware. Granted it is out of tree, and after you saw it you would want it to stay that way. However, I would have sent you the whole thing if that is a pre-req to cordial exchanges on this list.
>
> Nonetheless, a somewhat recent change in your tree, that I could not pinpoint on my own, caused the driver to stop functioning properly. So after much searching in git/google/sources with no luck, I decided to ask for a little assistance, maybe just a hint as to where the culprit may be in the tree so I could investigate for myself. For SNGs I tried the method that now works but I am still at a loss as to (can't find) what changes in the tree caused it to fail.
Without having your code it is virtually impossible to say, why you have
a bug. And do not express your frustration telling 'zero people
responded to my bug report'. This was not a bug report at all, but empty
message about 'my code stopped working after some network changes, which
broke the stuff.
>Now in 2.6.22 and later kernels you must use the higher level SOCKET to
>make a call to PROTO_OPS then to sendmsg(). e.g., socket->ops->sendmsg().
It was done because of bug found in inet_sendmsg(), which tried to
autobind socket it should not try.
--
Evgeniy Polyakov
--
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
^ permalink raw reply
* Re: [Bugme-new] [Bug 9543] New: RTNL: assertion failed at net/ipv6/addrconf.c (2164)/RTNL: assertion failed at net/ipv4/devinet.c (1055)
From: Andy Gospodarek @ 2007-12-14 18:26 UTC (permalink / raw)
To: Krzysztof Oledzki
Cc: Jay Vosburgh, Herbert Xu, Andrew Morton, bugme-daemon, shemminger,
davem, netdev, andy
In-Reply-To: <Pine.LNX.4.64.0712141707090.30334@bizon.gios.gov.pl>
On Fri, Dec 14, 2007 at 05:14:57PM +0100, Krzysztof Oledzki wrote:
>
>
> On Wed, 12 Dec 2007, Jay Vosburgh wrote:
>
> >Herbert Xu <herbert@gondor.apana.org.au> wrote:
> >
> >>>diff -puN drivers/net/bonding/bond_sysfs.c~bonding-locking-fix
> >>>drivers/net/bonding/bond_sysfs.c
> >>>--- a/drivers/net/bonding/bond_sysfs.c~bonding-locking-fix
> >>>+++ a/drivers/net/bonding/bond_sysfs.c
> >>>@@ -1111,8 +1111,6 @@ static ssize_t bonding_store_primary(str
> >>>out:
> >>> write_unlock_bh(&bond->lock);
> >>>
> >>>- rtnl_unlock();
> >>>-
> >>
> >>Looking at the changeset that added this perhaps the intention
> >>is to hold the lock? If so we should add an rtnl_lock to the start
> >>of the function.
> >
> > Yes, this function needs to hold locks, and more than just
> >what's there now. I believe the following should be correct; I haven't
> >tested it, though (I'm supposedly on vacation right now).
> >
> > The following change should be correct for the
> >bonding_store_primary case discussed in this thread, and also corrects
> >the bonding_store_active case which performs similar functions.
> >
> > The bond_change_active_slave and bond_select_active_slave
> >functions both require rtnl, bond->lock for read and curr_slave_lock for
> >write_bh, and no other locks. This is so that the lower level
> >mode-specific functions can release locks down to just rtnl in order to
> >call, e.g., dev_set_mac_address with the locks it expects (rtnl only).
> >
> >Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
> >
> >diff --git a/drivers/net/bonding/bond_sysfs.c
> >b/drivers/net/bonding/bond_sysfs.c
> >index 11b76b3..28a2d80 100644
> >--- a/drivers/net/bonding/bond_sysfs.c
> >+++ b/drivers/net/bonding/bond_sysfs.c
> >@@ -1075,7 +1075,10 @@ static ssize_t bonding_store_primary(struct device
> >*d,
> > struct slave *slave;
> > struct bonding *bond = to_bond(d);
> >
> >- write_lock_bh(&bond->lock);
> >+ rtnl_lock();
> >+ read_lock(&bond->lock);
> >+ write_lock_bh(&bond->curr_slave_lock);
> >+
> > if (!USES_PRIMARY(bond->params.mode)) {
> > printk(KERN_INFO DRV_NAME
> > ": %s: Unable to set primary slave; %s is in mode
> > %d\n",
> >@@ -1109,8 +1112,8 @@ static ssize_t bonding_store_primary(struct device
> >*d,
> > }
> > }
> >out:
> >- write_unlock_bh(&bond->lock);
> >-
> >+ write_unlock_bh(&bond->curr_slave_lock);
> >+ read_unlock(&bond->lock);
> > rtnl_unlock();
> >
> > return count;
> >@@ -1190,7 +1193,8 @@ static ssize_t bonding_store_active_slave(struct
> >device *d,
> > struct bonding *bond = to_bond(d);
> >
> > rtnl_lock();
> >- write_lock_bh(&bond->lock);
> >+ read_lock(&bond->lock);
> >+ write_lock_bh(&bond->curr_slave_lock);
> >
> > if (!USES_PRIMARY(bond->params.mode)) {
> > printk(KERN_INFO DRV_NAME
> >@@ -1247,7 +1251,8 @@ static ssize_t bonding_store_active_slave(struct
> >device *d,
> > }
> > }
> >out:
> >- write_unlock_bh(&bond->lock);
> >+ write_unlock_bh(&bond->curr_slave_lock);
> >+ read_unlock(&bond->lock);
> > rtnl_unlock();
> >
> > return count;
>
> Vanilla 2.6.24-rc5 plus this patch:
>
> =========================================================
> [ INFO: possible irq lock inversion dependency detected ]
> 2.6.24-rc5 #1
> ---------------------------------------------------------
> events/0/9 just changed the state of lock:
> (&mc->mca_lock){-+..}, at: [<c0411c7a>] mld_ifc_timer_expire+0x130/0x1fb
> but this lock took another, soft-read-irq-unsafe lock in the past:
> (&bond->lock){-.--}
>
> and interrupts could create inverse lock ordering between them.
>
>
Grrr, I should have seen that -- sorry. Try your luck with this instead:
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 11b76b3..0694254 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -1075,7 +1075,10 @@ static ssize_t bonding_store_primary(struct device *d,
struct slave *slave;
struct bonding *bond = to_bond(d);
- write_lock_bh(&bond->lock);
+ rtnl_lock();
+ read_lock_bh(&bond->lock);
+ write_lock_bh(&bond->curr_slave_lock);
+
if (!USES_PRIMARY(bond->params.mode)) {
printk(KERN_INFO DRV_NAME
": %s: Unable to set primary slave; %s is in mode %d\n",
@@ -1109,8 +1112,8 @@ static ssize_t bonding_store_primary(struct device *d,
}
}
out:
- write_unlock_bh(&bond->lock);
-
+ write_unlock_bh(&bond->curr_slave_lock);
+ read_unlock_bh(&bond->lock);
rtnl_unlock();
return count;
@@ -1190,7 +1193,8 @@ static ssize_t bonding_store_active_slave(struct device *d,
struct bonding *bond = to_bond(d);
rtnl_lock();
- write_lock_bh(&bond->lock);
+ read_lock_bh(&bond->lock);
+ write_lock_bh(&bond->curr_slave_lock);
if (!USES_PRIMARY(bond->params.mode)) {
printk(KERN_INFO DRV_NAME
@@ -1247,7 +1251,8 @@ static ssize_t bonding_store_active_slave(struct device *d,
}
}
out:
- write_unlock_bh(&bond->lock);
+ write_unlock_bh(&bond->curr_slave_lock);
+ read_unlock_bh(&bond->lock);
rtnl_unlock();
return count;
^ permalink raw reply related
* Re: [NETFILTER] xt_hashlimit : speedups hash_dst()
From: David Miller @ 2007-12-14 18:30 UTC (permalink / raw)
To: dada1; +Cc: kaber, netfilter-devel, netdev
In-Reply-To: <4762646B.30207@cosmosbay.com>
From: Eric Dumazet <dada1@cosmosbay.com>
Date: Fri, 14 Dec 2007 12:09:31 +0100
> 1) Using jhash2() instead of jhash() is a litle bit faster if applicable.
>
> 2) Thanks to jhash, hash value uses full 32 bits.
> Instead of returning hash % size (implying a divide)
> we return the high 32 bits of the (hash * size) that will
> give results between [0 and size-1] and same hash distribution.
>
> On most cpus, a multiply is less expensive than a divide, by an order
> of magnitude.
>
> Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
As a side note, Jenkins performs nearly optimally (unlike
most traditional hash functions) with power of two hash
table sizes.
Using a pow2 hash table size would completely obviate the
issues solved by #2.
I don't know if that is feasible here in xt_hashlimit, but
if it is that is how we should solve this expensive
modulo.
^ permalink raw reply
* Re: [Bugme-new] [Bug 9543] New: RTNL: assertion failed at net/ipv6/addrconf.c (2164)/RTNL: assertion failed at net/ipv4/devinet.c (1055)
From: Krzysztof Oledzki @ 2007-12-14 18:57 UTC (permalink / raw)
To: Andy Gospodarek
Cc: Jay Vosburgh, Herbert Xu, Andrew Morton, bugme-daemon, shemminger,
davem, netdev
In-Reply-To: <20071214182638.GC25879@gospo.usersys.redhat.com>
[-- Attachment #1: Type: TEXT/PLAIN, Size: 59892 bytes --]
On Fri, 14 Dec 2007, Andy Gospodarek wrote:
> On Fri, Dec 14, 2007 at 05:14:57PM +0100, Krzysztof Oledzki wrote:
>>
>>
>> On Wed, 12 Dec 2007, Jay Vosburgh wrote:
>>
>>> Herbert Xu <herbert@gondor.apana.org.au> wrote:
>>>
>>>>> diff -puN drivers/net/bonding/bond_sysfs.c~bonding-locking-fix
>>>>> drivers/net/bonding/bond_sysfs.c
>>>>> --- a/drivers/net/bonding/bond_sysfs.c~bonding-locking-fix
>>>>> +++ a/drivers/net/bonding/bond_sysfs.c
>>>>> @@ -1111,8 +1111,6 @@ static ssize_t bonding_store_primary(str
>>>>> out:
>>>>> write_unlock_bh(&bond->lock);
>>>>>
>>>>> - rtnl_unlock();
>>>>> -
>>>>
>>>> Looking at the changeset that added this perhaps the intention
>>>> is to hold the lock? If so we should add an rtnl_lock to the start
>>>> of the function.
>>>
>>> Yes, this function needs to hold locks, and more than just
>>> what's there now. I believe the following should be correct; I haven't
>>> tested it, though (I'm supposedly on vacation right now).
>>>
>>> The following change should be correct for the
>>> bonding_store_primary case discussed in this thread, and also corrects
>>> the bonding_store_active case which performs similar functions.
>>>
>>> The bond_change_active_slave and bond_select_active_slave
>>> functions both require rtnl, bond->lock for read and curr_slave_lock for
>>> write_bh, and no other locks. This is so that the lower level
>>> mode-specific functions can release locks down to just rtnl in order to
>>> call, e.g., dev_set_mac_address with the locks it expects (rtnl only).
>>>
>>> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
>>>
>>> diff --git a/drivers/net/bonding/bond_sysfs.c
>>> b/drivers/net/bonding/bond_sysfs.c
>>> index 11b76b3..28a2d80 100644
>>> --- a/drivers/net/bonding/bond_sysfs.c
>>> +++ b/drivers/net/bonding/bond_sysfs.c
>>> @@ -1075,7 +1075,10 @@ static ssize_t bonding_store_primary(struct device
>>> *d,
>>> struct slave *slave;
>>> struct bonding *bond = to_bond(d);
>>>
>>> - write_lock_bh(&bond->lock);
>>> + rtnl_lock();
>>> + read_lock(&bond->lock);
>>> + write_lock_bh(&bond->curr_slave_lock);
>>> +
>>> if (!USES_PRIMARY(bond->params.mode)) {
>>> printk(KERN_INFO DRV_NAME
>>> ": %s: Unable to set primary slave; %s is in mode
>>> %d\n",
>>> @@ -1109,8 +1112,8 @@ static ssize_t bonding_store_primary(struct device
>>> *d,
>>> }
>>> }
>>> out:
>>> - write_unlock_bh(&bond->lock);
>>> -
>>> + write_unlock_bh(&bond->curr_slave_lock);
>>> + read_unlock(&bond->lock);
>>> rtnl_unlock();
>>>
>>> return count;
>>> @@ -1190,7 +1193,8 @@ static ssize_t bonding_store_active_slave(struct
>>> device *d,
>>> struct bonding *bond = to_bond(d);
>>>
>>> rtnl_lock();
>>> - write_lock_bh(&bond->lock);
>>> + read_lock(&bond->lock);
>>> + write_lock_bh(&bond->curr_slave_lock);
>>>
>>> if (!USES_PRIMARY(bond->params.mode)) {
>>> printk(KERN_INFO DRV_NAME
>>> @@ -1247,7 +1251,8 @@ static ssize_t bonding_store_active_slave(struct
>>> device *d,
>>> }
>>> }
>>> out:
>>> - write_unlock_bh(&bond->lock);
>>> + write_unlock_bh(&bond->curr_slave_lock);
>>> + read_unlock(&bond->lock);
>>> rtnl_unlock();
>>>
>>> return count;
>>
>> Vanilla 2.6.24-rc5 plus this patch:
>>
>> =========================================================
>> [ INFO: possible irq lock inversion dependency detected ]
>> 2.6.24-rc5 #1
>> ---------------------------------------------------------
>> events/0/9 just changed the state of lock:
>> (&mc->mca_lock){-+..}, at: [<c0411c7a>] mld_ifc_timer_expire+0x130/0x1fb
>> but this lock took another, soft-read-irq-unsafe lock in the past:
>> (&bond->lock){-.--}
>>
>> and interrupts could create inverse lock ordering between them.
>>
>>
>
> Grrr, I should have seen that -- sorry. Try your luck with this instead:
<CUT>
No luck.
bonding: bond0: setting mode to active-backup (1).
bonding: bond0: Setting MII monitoring interval to 100.
ADDRCONF(NETDEV_UP): bond0: link is not ready
bonding: bond0: Adding slave eth0.
e1000: eth0: e1000_watchdog: NIC Link is Up 1000 Mbps Full Duplex, Flow
Control: RX/TX
bonding: bond0: making interface eth0 the new active one.
bonding: bond0: first active interface up!
bonding: bond0: enslaving eth0 as an active interface with an up link.
bonding: bond0: Adding slave eth1.
ADDRCONF(NETDEV_CHANGE): bond0: link becomes ready
=========================================================
[ INFO: possible irq lock inversion dependency detected ]
2.6.24-rc5 #1
---------------------------------------------------------
events/0/9 just changed the state of lock:
(&mc->mca_lock){-+..}, at: [<c0411c7a>] mld_ifc_timer_expire+0x130/0x1fb
but this lock took another, soft-read-irq-unsafe lock in the past:
(&bond->lock){-.--}
and interrupts could create inverse lock ordering between them.
other info that might help us debug this:
4 locks held by events/0/9:
#0: (events){--..}, at: [<c0133c57>] run_workqueue+0x87/0x1b6
#1: ((linkwatch_work).work){--..}, at: [<c0133c57>] run_workqueue+0x87/0x1b6
#2: (rtnl_mutex){--..}, at: [<c03abd50>] linkwatch_event+0x5/0x22
#3: (&ndev->lock){-.-+}, at: [<c0411b61>] mld_ifc_timer_expire+0x17/0x1fb
the first lock's dependencies:
-> (&mc->mca_lock){-+..} ops: 10 {
initial-use at:
[<c0104ee2>] dump_trace+0x83/0x8d
[<c014289c>] __lock_acquire+0x4ba/0xc07
[<c0109ef2>] save_stack_trace+0x20/0x3a
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0412452>] ipv6_dev_mc_inc+0x24d/0x31c
[<c0143062>] lock_acquire+0x79/0x93
[<c04120d6>] igmp6_group_added+0x18/0x11d
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c04120d6>] igmp6_group_added+0x18/0x11d
[<c04120d6>] igmp6_group_added+0x18/0x11d
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0412452>] ipv6_dev_mc_inc+0x24d/0x31c
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>] ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c05c5b40>] addrconf_init+0x13/0x193
[<c0199f63>] proc_net_fops_create+0x10/0x21
[<c0419b38>] ip6_flowlabel_init+0x1e/0x20
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
in-softirq-W at:
[<c0142822>] __lock_acquire+0x440/0xc07
[<c013fe0a>] get_lock_stats+0xd/0x2e
[<c013fe35>] put_lock_stats+0xa/0x1e
[<c0143062>] lock_acquire+0x79/0x93
[<c0411c7a>] mld_ifc_timer_expire+0x130/0x1fb
[<c0411b4a>] mld_ifc_timer_expire+0x0/0x1fb
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c0411c7a>] mld_ifc_timer_expire+0x130/0x1fb
[<c0411c7a>] mld_ifc_timer_expire+0x130/0x1fb
[<c0411b4a>] mld_ifc_timer_expire+0x0/0x1fb
[<c0141f89>] trace_hardirqs_on+0x10c/0x14c
[<c0411b4a>] mld_ifc_timer_expire+0x0/0x1fb
[<c012df52>] run_timer_softirq+0xfa/0x15d
[<c012a8a6>] __do_softirq+0x56/0xdb
[<c0141f89>] trace_hardirqs_on+0x10c/0x14c
[<c012a8b8>] __do_softirq+0x68/0xdb
[<c012a961>] do_softirq+0x36/0x51
[<c012ae4a>] local_bh_enable_ip+0xad/0xed
[<c03bf107>] rt_run_flush+0x64/0x8b
[<c03e9296>] fib_netdev_event+0x61/0x65
[<c013ac20>] notifier_call_chain+0x2a/0x52
[<c013ac6a>] raw_notifier_call_chain+0x17/0x1a
[<c03a2ae5>] netdev_state_change+0x18/0x29
[<c03abd1d>] __linkwatch_run_queue+0x150/0x17e
[<c03abd68>] linkwatch_event+0x1d/0x22
[<c0133cab>] run_workqueue+0xdb/0x1b6
[<c0133c57>] run_workqueue+0x87/0x1b6
[<c03abd4b>] linkwatch_event+0x0/0x22
[<c01346cb>] worker_thread+0x0/0x85
[<c0134744>] worker_thread+0x79/0x85
[<c0137179>] autoremove_wake_function+0x0/0x35
[<c01370c2>] kthread+0x38/0x5e
[<c013708a>] kthread+0x0/0x5e
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
hardirq-on-W at:
[<c01417ee>] find_usage_backwards+0xbb/0xe2
[<c0104ee2>] dump_trace+0x83/0x8d
[<c014286a>] __lock_acquire+0x488/0xc07
[<c0109ef2>] save_stack_trace+0x20/0x3a
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0412452>] ipv6_dev_mc_inc+0x24d/0x31c
[<c0143062>] lock_acquire+0x79/0x93
[<c04120d6>] igmp6_group_added+0x18/0x11d
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c04120d6>] igmp6_group_added+0x18/0x11d
[<c04120d6>] igmp6_group_added+0x18/0x11d
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0412452>] ipv6_dev_mc_inc+0x24d/0x31c
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>] ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c05c5b40>] addrconf_init+0x13/0x193
[<c0199f63>] proc_net_fops_create+0x10/0x21
[<c0419b38>] ip6_flowlabel_init+0x1e/0x20
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
}
... key at: [<c087e2d8>] __key.30798+0x0/0x8
-> (_xmit_ETHER){-...} ops: 8 {
initial-use at:
[<c014289c>] __lock_acquire+0x4ba/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0412114>] igmp6_group_added+0x56/0x11d
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0410100>] igmp6_mc_seq_start+0xde/0x138
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>]
ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c0401e17>] addrconf_notify+0x60/0x7b7
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c0439066>] mutex_lock_nested+0x286/0x2ac
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f88>] register_netdevice_notifier+0x49/0x126
[<c05c5bda>] addrconf_init+0xad/0x193
[<c05c5b48>] addrconf_init+0x1b/0x193
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
hardirq-on-W at:
[<c0141986>] mark_lock+0x64/0x451
[<c014286a>] __lock_acquire+0x488/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0412114>] igmp6_group_added+0x56/0x11d
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0410100>] igmp6_mc_seq_start+0xde/0x138
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>] ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c0401e17>] addrconf_notify+0x60/0x7b7
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c0439066>] mutex_lock_nested+0x286/0x2ac
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f88>] register_netdevice_notifier+0x49/0x126
[<c05c5bda>] addrconf_init+0xad/0x193
[<c05c5b48>] addrconf_init+0x1b/0x193
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
}
... key at: [<c087adc8>] netdev_xmit_lock_key+0x8/0x1c0
... acquired at:
[<c0142dff>] __lock_acquire+0xa1d/0xc07
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0412114>] igmp6_group_added+0x56/0x11d
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0410100>] igmp6_mc_seq_start+0xde/0x138
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>] ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c0401e17>] addrconf_notify+0x60/0x7b7
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c0439066>] mutex_lock_nested+0x286/0x2ac
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f88>] register_netdevice_notifier+0x49/0x126
[<c05c5bda>] addrconf_init+0xad/0x193
[<c05c5b48>] addrconf_init+0x1b/0x193
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
-> (&bonding_netdev_xmit_lock_key){-...} ops: 6 {
initial-use at:
[<c014289c>] __lock_acquire+0x4ba/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0412114>] igmp6_group_added+0x56/0x11d
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0410100>] igmp6_mc_seq_start+0xde/0x138
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>] ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c0401e17>] addrconf_notify+0x60/0x7b7
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c0439066>] mutex_lock_nested+0x286/0x2ac
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f88>] register_netdevice_notifier+0x49/0x126
[<c05c5bda>] addrconf_init+0xad/0x193
[<c05c5b48>] addrconf_init+0x1b/0x193
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
hardirq-on-W at:
[<c0141986>] mark_lock+0x64/0x451
[<c014286a>] __lock_acquire+0x488/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0412114>] igmp6_group_added+0x56/0x11d
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0410100>] igmp6_mc_seq_start+0xde/0x138
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>] ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c0401e17>] addrconf_notify+0x60/0x7b7
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c0439066>] mutex_lock_nested+0x286/0x2ac
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f88>] register_netdevice_notifier+0x49/0x126
[<c05c5bda>] addrconf_init+0xad/0x193
[<c05c5b48>] addrconf_init+0x1b/0x193
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
}
... key at: [<c0877804>] bonding_netdev_xmit_lock_key+0x0/0x8
-> (&bond->lock){-.--} ops: 98 {
initial-use at:
[<c013fe35>] put_lock_stats+0xa/0x1e
[<c014289c>] __lock_acquire+0x4ba/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c043a3c5>] _spin_unlock_irqrestore+0x40/0x58
[<c0143062>] lock_acquire+0x79/0x93
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c0439eee>] _read_lock_bh+0x3b/0x64
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c03aa3e7>] rtnl_fill_ifinfo+0x2bf/0x563
[<c03aa965>] rtmsg_ifinfo+0x5d/0xdf
[<c03aaa26>] rtnetlink_event+0x3f/0x42
[<c013ac20>] notifier_call_chain+0x2a/0x52
[<c013ac6a>] raw_notifier_call_chain+0x17/0x1a
[<c03a31de>] register_netdevice+0x2a7/0x2e7
[<c02ed862>] bond_create+0x1f2/0x26a
[<c05bedcd>] bonding_init+0x761/0x7ea
[<c05be635>] e1000_init_module+0x45/0x7c
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
hardirq-on-W at:
[<c014286a>] __lock_acquire+0x488/0xc07
[<c012093c>] try_to_wake_up+0x2ce/0x2d8
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c02eda75>] bond_set_multicast_list+0x1d/0x241
[<c0439e25>] _write_lock_bh+0x3b/0x64
[<c02eda75>] bond_set_multicast_list+0x1d/0x241
[<c02eda75>] bond_set_multicast_list+0x1d/0x241
[<c013fe35>] put_lock_stats+0xa/0x1e
[<c03a14db>] __dev_set_rx_mode+0x7b/0x7d
[<c03a1675>] dev_set_rx_mode+0x23/0x36
[<c03a3d50>] dev_open+0x5e/0x77
[<c03a2a1f>] dev_change_flags+0x9d/0x14b
[<c03a1823>] __dev_get_by_name+0x68/0x73
[<c03e3850>] devinet_ioctl+0x22b/0x536
[<c03a3b45>] dev_ioctl+0x46f/0x5b7
[<c0399c78>] sock_ioctl+0x167/0x18b
[<c0399b11>] sock_ioctl+0x0/0x18b
[<c01725f7>] do_ioctl+0x1f/0x62
[<c0172867>] vfs_ioctl+0x22d/0x23f
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c01728ac>] sys_ioctl+0x33/0x4b
[<c0103e92>] sysenter_past_esp+0x5f/0xa5
[<ffffffff>] 0xffffffff
softirq-on-R at:
[<c0141986>] mark_lock+0x64/0x451
[<c013575e>] __kernel_text_address+0x5/0xe
[<c0104ee2>] dump_trace+0x83/0x8d
[<c0142889>] __lock_acquire+0x4a7/0xc07
[<c013fc76>] save_trace+0x37/0x89
[<c0133c57>] run_workqueue+0x87/0x1b6
[<c0143062>] lock_acquire+0x79/0x93
[<c02eee5d>] bond_mii_monitor+0x19/0x85
[<c0439f4d>] _read_lock+0x36/0x5f
[<c02eee5d>] bond_mii_monitor+0x19/0x85
[<c02eee5d>] bond_mii_monitor+0x19/0x85
[<c0133cab>] run_workqueue+0xdb/0x1b6
[<c0133c57>] run_workqueue+0x87/0x1b6
[<c02eee44>] bond_mii_monitor+0x0/0x85
[<c01346cb>] worker_thread+0x0/0x85
[<c0134744>] worker_thread+0x79/0x85
[<c0137179>] autoremove_wake_function+0x0/0x35
[<c01370c2>] kthread+0x38/0x5e
[<c013708a>] kthread+0x0/0x5e
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
hardirq-on-R at:
[<c013fe0a>] get_lock_stats+0xd/0x2e
[<c013fe35>] put_lock_stats+0xa/0x1e
[<c0142844>] __lock_acquire+0x462/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c043a3c5>] _spin_unlock_irqrestore+0x40/0x58
[<c0143062>] lock_acquire+0x79/0x93
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c0439eee>] _read_lock_bh+0x3b/0x64
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c03aa3e7>] rtnl_fill_ifinfo+0x2bf/0x563
[<c03aa965>] rtmsg_ifinfo+0x5d/0xdf
[<c03aaa26>] rtnetlink_event+0x3f/0x42
[<c013ac20>] notifier_call_chain+0x2a/0x52
[<c013ac6a>] raw_notifier_call_chain+0x17/0x1a
[<c03a31de>] register_netdevice+0x2a7/0x2e7
[<c02ed862>] bond_create+0x1f2/0x26a
[<c05bedcd>] bonding_init+0x761/0x7ea
[<c05be635>] e1000_init_module+0x45/0x7c
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
}
... key at: [<c08777d0>] __key.32969+0x0/0x8
-> (_xmit_ETHER){-...} ops: 8 {
initial-use at:
[<c014289c>] __lock_acquire+0x4ba/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0412114>] igmp6_group_added+0x56/0x11d
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0410100>] igmp6_mc_seq_start+0xde/0x138
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>] ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c0401e17>] addrconf_notify+0x60/0x7b7
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c0439066>] mutex_lock_nested+0x286/0x2ac
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f88>] register_netdevice_notifier+0x49/0x126
[<c05c5bda>] addrconf_init+0xad/0x193
[<c05c5b48>] addrconf_init+0x1b/0x193
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
hardirq-on-W at:
[<c0141986>] mark_lock+0x64/0x451
[<c014286a>] __lock_acquire+0x488/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0412114>] igmp6_group_added+0x56/0x11d
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0410100>] igmp6_mc_seq_start+0xde/0x138
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>] ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c0401e17>] addrconf_notify+0x60/0x7b7
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c0439066>] mutex_lock_nested+0x286/0x2ac
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f88>] register_netdevice_notifier+0x49/0x126
[<c05c5bda>] addrconf_init+0xad/0x193
[<c05c5b48>] addrconf_init+0x1b/0x193
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
}
... key at: [<c087adc8>] netdev_xmit_lock_key+0x8/0x1c0
... acquired at:
[<c0142dff>] __lock_acquire+0xa1d/0xc07
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c043a3c5>] _spin_unlock_irqrestore+0x40/0x58
[<c0109ef2>] save_stack_trace+0x20/0x3a
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c02ee492>] bond_change_active_slave+0x1a9/0x3bf
[<c02ec7c3>] bond_update_speed_duplex+0x26/0x65
[<c02ee9af>] bond_select_active_slave+0x95/0xcd
[<c02ed22b>] bond_compute_features+0x45/0x84
[<c02ef9be>] bond_enslave+0x6a7/0x884
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c02f6197>] bonding_store_slaves+0x1ae/0x2fb
[<c02f5fe9>] bonding_store_slaves+0x0/0x2fb
[<c02ce8d7>] dev_attr_store+0x27/0x2c
[<c019bcb9>] sysfs_write_file+0xad/0xe0
[<c019bc0c>] sysfs_write_file+0x0/0xe0
[<c0168ddc>] vfs_write+0x8a/0x10c
[<c0118566>] do_page_fault+0x0/0x54a
[<c0169361>] sys_write+0x41/0x67
[<c0103e92>] sysenter_past_esp+0x5f/0xa5
[<ffffffff>] 0xffffffff
-> (lweventlist_lock){.+..} ops: 10 {
initial-use at:
[<c0141986>] mark_lock+0x64/0x451
[<c014289c>] __lock_acquire+0x4ba/0xc07
[<c02e365c>] e1000_read_phy_reg+0x1c7/0x1d3
[<c02e348b>] e1000_write_phy_reg+0xb9/0xc3
[<c024a7de>] delay_tsc+0x25/0x3b
[<c0143062>] lock_acquire+0x79/0x93
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c043a07f>] _spin_lock_irqsave+0x3f/0x6c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abbbb>] linkwatch_fire_event+0x25/0x37
[<c02e1c43>] e1000_probe+0xad1/0xbe8
[<c0257f3f>] pci_device_probe+0x36/0x57
[<c02d0e5f>] driver_probe_device+0xe1/0x15f
[<c043a2f9>] _spin_unlock+0x25/0x3b
[<c04375b2>] klist_next+0x58/0x6d
[<c02d0f6f>] __driver_attach+0x0/0x7f
[<c02d0fb8>] __driver_attach+0x49/0x7f
[<c02d0403>] bus_for_each_dev+0x36/0x58
[<c02d0cb7>] driver_attach+0x16/0x18
[<c02d0f6f>] __driver_attach+0x0/0x7f
[<c02d06fa>] bus_add_driver+0x6d/0x18d
[<c0258089>] __pci_register_driver+0x53/0x7f
[<c05be635>] e1000_init_module+0x45/0x7c
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
in-softirq-W at:
[<c011d20a>] __wake_up_common+0x32/0x5c
[<c0142822>] __lock_acquire+0x440/0xc07
[<c043a3c5>] _spin_unlock_irqrestore+0x40/0x58
[<c0143062>] lock_acquire+0x79/0x93
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c02dff01>] e1000_watchdog+0x0/0x5c9
[<c043a07f>] _spin_lock_irqsave+0x3f/0x6c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abbbb>] linkwatch_fire_event+0x25/0x37
[<c03aeb42>] netif_carrier_on+0x16/0x27
[<c02e0156>] e1000_watchdog+0x255/0x5c9
[<c02dff01>] e1000_watchdog+0x0/0x5c9
[<c012df52>] run_timer_softirq+0xfa/0x15d
[<c012a8a6>] __do_softirq+0x56/0xdb
[<c0141f89>] trace_hardirqs_on+0x10c/0x14c
[<c012a8b8>] __do_softirq+0x68/0xdb
[<c012a961>] do_softirq+0x36/0x51
[<c012ab07>] irq_exit+0x43/0x4e
[<c0114122>] smp_apic_timer_interrupt+0x74/0x80
[<c0104a01>] apic_timer_interrupt+0x29/0x38
[<c0104a0b>] apic_timer_interrupt+0x33/0x38
[<c01600d8>] sys_swapon+0x29c/0x9aa
[<c01021a6>] mwait_idle_with_hints+0x3b/0x3f
[<c0102447>] mwait_idle+0x0/0xf
[<c0102581>] cpu_idle+0x99/0xc6
[<c05a98c7>] start_kernel+0x2c7/0x2cf
[<c05a90e0>] unknown_bootoption+0x0/0x195
[<ffffffff>] 0xffffffff
}
... key at: [<c058a194>] lweventlist_lock+0x14/0x40
... acquired at:
[<c0142dff>] __lock_acquire+0xa1d/0xc07
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c043a07f>] _spin_lock_irqsave+0x3f/0x6c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abbbb>] linkwatch_fire_event+0x25/0x37
[<c03aeb42>] netif_carrier_on+0x16/0x27
[<c02ede2c>] bond_set_carrier+0x31/0x55
[<c02ee9b6>] bond_select_active_slave+0x9c/0xcd
[<c02ed22b>] bond_compute_features+0x45/0x84
[<c02ef9be>] bond_enslave+0x6a7/0x884
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c02f6197>] bonding_store_slaves+0x1ae/0x2fb
[<c02f5fe9>] bonding_store_slaves+0x0/0x2fb
[<c02ce8d7>] dev_attr_store+0x27/0x2c
[<c019bcb9>] sysfs_write_file+0xad/0xe0
[<c019bc0c>] sysfs_write_file+0x0/0xe0
[<c0168ddc>] vfs_write+0x8a/0x10c
[<c0118566>] do_page_fault+0x0/0x54a
[<c0169361>] sys_write+0x41/0x67
[<c0103e92>] sysenter_past_esp+0x5f/0xa5
[<ffffffff>] 0xffffffff
... acquired at:
[<c0142dff>] __lock_acquire+0xa1d/0xc07
[<c02eda75>] bond_set_multicast_list+0x1d/0x241
[<c0143062>] lock_acquire+0x79/0x93
[<c02eda75>] bond_set_multicast_list+0x1d/0x241
[<c0439e25>] _write_lock_bh+0x3b/0x64
[<c02eda75>] bond_set_multicast_list+0x1d/0x241
[<c02eda75>] bond_set_multicast_list+0x1d/0x241
[<c013fe35>] put_lock_stats+0xa/0x1e
[<c03a14db>] __dev_set_rx_mode+0x7b/0x7d
[<c03a1675>] dev_set_rx_mode+0x23/0x36
[<c03a3d50>] dev_open+0x5e/0x77
[<c03a2a1f>] dev_change_flags+0x9d/0x14b
[<c03a1823>] __dev_get_by_name+0x68/0x73
[<c03e3850>] devinet_ioctl+0x22b/0x536
[<c03a3b45>] dev_ioctl+0x46f/0x5b7
[<c0399c78>] sock_ioctl+0x167/0x18b
[<c0399b11>] sock_ioctl+0x0/0x18b
[<c01725f7>] do_ioctl+0x1f/0x62
[<c0172867>] vfs_ioctl+0x22d/0x23f
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c01728ac>] sys_ioctl+0x33/0x4b
[<c0103e92>] sysenter_past_esp+0x5f/0xa5
[<ffffffff>] 0xffffffff
... acquired at:
[<c0142dff>] __lock_acquire+0xa1d/0xc07
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0412114>] igmp6_group_added+0x56/0x11d
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0410100>] igmp6_mc_seq_start+0xde/0x138
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>] ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c0401e17>] addrconf_notify+0x60/0x7b7
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c0439066>] mutex_lock_nested+0x286/0x2ac
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f88>] register_netdevice_notifier+0x49/0x126
[<c05c5bda>] addrconf_init+0xad/0x193
[<c05c5b48>] addrconf_init+0x1b/0x193
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
the second lock's dependencies:
-> (&bond->lock){-.--} ops: 98 {
initial-use at:
[<c013fe35>] put_lock_stats+0xa/0x1e
[<c014289c>] __lock_acquire+0x4ba/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c043a3c5>] _spin_unlock_irqrestore+0x40/0x58
[<c0143062>] lock_acquire+0x79/0x93
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c0439eee>] _read_lock_bh+0x3b/0x64
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c03aa3e7>] rtnl_fill_ifinfo+0x2bf/0x563
[<c03aa965>] rtmsg_ifinfo+0x5d/0xdf
[<c03aaa26>] rtnetlink_event+0x3f/0x42
[<c013ac20>] notifier_call_chain+0x2a/0x52
[<c013ac6a>] raw_notifier_call_chain+0x17/0x1a
[<c03a31de>] register_netdevice+0x2a7/0x2e7
[<c02ed862>] bond_create+0x1f2/0x26a
[<c05bedcd>] bonding_init+0x761/0x7ea
[<c05be635>] e1000_init_module+0x45/0x7c
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
hardirq-on-W at:
[<c014286a>] __lock_acquire+0x488/0xc07
[<c012093c>] try_to_wake_up+0x2ce/0x2d8
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c02eda75>] bond_set_multicast_list+0x1d/0x241
[<c0439e25>] _write_lock_bh+0x3b/0x64
[<c02eda75>] bond_set_multicast_list+0x1d/0x241
[<c02eda75>] bond_set_multicast_list+0x1d/0x241
[<c013fe35>] put_lock_stats+0xa/0x1e
[<c03a14db>] __dev_set_rx_mode+0x7b/0x7d
[<c03a1675>] dev_set_rx_mode+0x23/0x36
[<c03a3d50>] dev_open+0x5e/0x77
[<c03a2a1f>] dev_change_flags+0x9d/0x14b
[<c03a1823>] __dev_get_by_name+0x68/0x73
[<c03e3850>] devinet_ioctl+0x22b/0x536
[<c03a3b45>] dev_ioctl+0x46f/0x5b7
[<c0399c78>] sock_ioctl+0x167/0x18b
[<c0399b11>] sock_ioctl+0x0/0x18b
[<c01725f7>] do_ioctl+0x1f/0x62
[<c0172867>] vfs_ioctl+0x22d/0x23f
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c01728ac>] sys_ioctl+0x33/0x4b
[<c0103e92>] sysenter_past_esp+0x5f/0xa5
[<ffffffff>] 0xffffffff
softirq-on-R at:
[<c0141986>] mark_lock+0x64/0x451
[<c013575e>] __kernel_text_address+0x5/0xe
[<c0104ee2>] dump_trace+0x83/0x8d
[<c0142889>] __lock_acquire+0x4a7/0xc07
[<c013fc76>] save_trace+0x37/0x89
[<c0133c57>] run_workqueue+0x87/0x1b6
[<c0143062>] lock_acquire+0x79/0x93
[<c02eee5d>] bond_mii_monitor+0x19/0x85
[<c0439f4d>] _read_lock+0x36/0x5f
[<c02eee5d>] bond_mii_monitor+0x19/0x85
[<c02eee5d>] bond_mii_monitor+0x19/0x85
[<c0133cab>] run_workqueue+0xdb/0x1b6
[<c0133c57>] run_workqueue+0x87/0x1b6
[<c02eee44>] bond_mii_monitor+0x0/0x85
[<c01346cb>] worker_thread+0x0/0x85
[<c0134744>] worker_thread+0x79/0x85
[<c0137179>] autoremove_wake_function+0x0/0x35
[<c01370c2>] kthread+0x38/0x5e
[<c013708a>] kthread+0x0/0x5e
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
hardirq-on-R at:
[<c013fe0a>] get_lock_stats+0xd/0x2e
[<c013fe35>] put_lock_stats+0xa/0x1e
[<c0142844>] __lock_acquire+0x462/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c043a3c5>] _spin_unlock_irqrestore+0x40/0x58
[<c0143062>] lock_acquire+0x79/0x93
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c0439eee>] _read_lock_bh+0x3b/0x64
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c02edcc1>] bond_get_stats+0x28/0xd0
[<c03aa3e7>] rtnl_fill_ifinfo+0x2bf/0x563
[<c03aa965>] rtmsg_ifinfo+0x5d/0xdf
[<c03aaa26>] rtnetlink_event+0x3f/0x42
[<c013ac20>] notifier_call_chain+0x2a/0x52
[<c013ac6a>] raw_notifier_call_chain+0x17/0x1a
[<c03a31de>] register_netdevice+0x2a7/0x2e7
[<c02ed862>] bond_create+0x1f2/0x26a
[<c05bedcd>] bonding_init+0x761/0x7ea
[<c05be635>] e1000_init_module+0x45/0x7c
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
}
... key at: [<c08777d0>] __key.32969+0x0/0x8
-> (_xmit_ETHER){-...} ops: 8 {
initial-use at:
[<c014289c>] __lock_acquire+0x4ba/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0412114>] igmp6_group_added+0x56/0x11d
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0410100>] igmp6_mc_seq_start+0xde/0x138
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>] ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c0401e17>] addrconf_notify+0x60/0x7b7
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c0439066>] mutex_lock_nested+0x286/0x2ac
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f88>] register_netdevice_notifier+0x49/0x126
[<c05c5bda>] addrconf_init+0xad/0x193
[<c05c5b48>] addrconf_init+0x1b/0x193
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
hardirq-on-W at:
[<c0141986>] mark_lock+0x64/0x451
[<c014286a>] __lock_acquire+0x488/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0412114>] igmp6_group_added+0x56/0x11d
[<c04124a8>] ipv6_dev_mc_inc+0x2a3/0x31c
[<c0410100>] igmp6_mc_seq_start+0xde/0x138
[<c04124dd>] ipv6_dev_mc_inc+0x2d8/0x31c
[<c0412205>] ipv6_dev_mc_inc+0x0/0x31c
[<c0401834>] ipv6_add_dev+0x21c/0x24b
[<c040b07d>]
ndisc_ifinfo_sysctl_change+0x0/0x1ef
[<c0401e17>] addrconf_notify+0x60/0x7b7
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0141dac>] mark_held_locks+0x39/0x53
[<c0439066>] mutex_lock_nested+0x286/0x2ac
[<c0141f9f>] trace_hardirqs_on+0x122/0x14c
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f4d>] register_netdevice_notifier+0xe/0x126
[<c03a3f88>] register_netdevice_notifier+0x49/0x126
[<c05c5bda>] addrconf_init+0xad/0x193
[<c05c5b48>] addrconf_init+0x1b/0x193
[<c05c5a20>] inet6_init+0x1f0/0x2ad
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
}
... key at: [<c087adc8>] netdev_xmit_lock_key+0x8/0x1c0
... acquired at:
[<c0142dff>] __lock_acquire+0xa1d/0xc07
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c043a3c5>] _spin_unlock_irqrestore+0x40/0x58
[<c0109ef2>] save_stack_trace+0x20/0x3a
[<c0143062>] lock_acquire+0x79/0x93
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c03a5aa1>] dev_mc_add+0x1a/0x6a
[<c02ee492>] bond_change_active_slave+0x1a9/0x3bf
[<c02ec7c3>] bond_update_speed_duplex+0x26/0x65
[<c02ee9af>] bond_select_active_slave+0x95/0xcd
[<c02ed22b>] bond_compute_features+0x45/0x84
[<c02ef9be>] bond_enslave+0x6a7/0x884
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c02f6197>] bonding_store_slaves+0x1ae/0x2fb
[<c02f5fe9>] bonding_store_slaves+0x0/0x2fb
[<c02ce8d7>] dev_attr_store+0x27/0x2c
[<c019bcb9>] sysfs_write_file+0xad/0xe0
[<c019bc0c>] sysfs_write_file+0x0/0xe0
[<c0168ddc>] vfs_write+0x8a/0x10c
[<c0118566>] do_page_fault+0x0/0x54a
[<c0169361>] sys_write+0x41/0x67
[<c0103e92>] sysenter_past_esp+0x5f/0xa5
[<ffffffff>] 0xffffffff
-> (lweventlist_lock){.+..} ops: 10 {
initial-use at:
[<c0141986>] mark_lock+0x64/0x451
[<c014289c>] __lock_acquire+0x4ba/0xc07
[<c02e365c>] e1000_read_phy_reg+0x1c7/0x1d3
[<c02e348b>] e1000_write_phy_reg+0xb9/0xc3
[<c024a7de>] delay_tsc+0x25/0x3b
[<c0143062>] lock_acquire+0x79/0x93
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c043a07f>] _spin_lock_irqsave+0x3f/0x6c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abbbb>] linkwatch_fire_event+0x25/0x37
[<c02e1c43>] e1000_probe+0xad1/0xbe8
[<c0257f3f>] pci_device_probe+0x36/0x57
[<c02d0e5f>] driver_probe_device+0xe1/0x15f
[<c043a2f9>] _spin_unlock+0x25/0x3b
[<c04375b2>] klist_next+0x58/0x6d
[<c02d0f6f>] __driver_attach+0x0/0x7f
[<c02d0fb8>] __driver_attach+0x49/0x7f
[<c02d0403>] bus_for_each_dev+0x36/0x58
[<c02d0cb7>] driver_attach+0x16/0x18
[<c02d0f6f>] __driver_attach+0x0/0x7f
[<c02d06fa>] bus_add_driver+0x6d/0x18d
[<c0258089>] __pci_register_driver+0x53/0x7f
[<c05be635>] e1000_init_module+0x45/0x7c
[<c05a9499>] kernel_init+0x150/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c05a9349>] kernel_init+0x0/0x2b7
[<c0104baf>] kernel_thread_helper+0x7/0x10
[<ffffffff>] 0xffffffff
in-softirq-W at:
[<c011d20a>] __wake_up_common+0x32/0x5c
[<c0142822>] __lock_acquire+0x440/0xc07
[<c043a3c5>] _spin_unlock_irqrestore+0x40/0x58
[<c0143062>] lock_acquire+0x79/0x93
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c02dff01>] e1000_watchdog+0x0/0x5c9
[<c043a07f>] _spin_lock_irqsave+0x3f/0x6c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abbbb>] linkwatch_fire_event+0x25/0x37
[<c03aeb42>] netif_carrier_on+0x16/0x27
[<c02e0156>] e1000_watchdog+0x255/0x5c9
[<c02dff01>] e1000_watchdog+0x0/0x5c9
[<c012df52>] run_timer_softirq+0xfa/0x15d
[<c012a8a6>] __do_softirq+0x56/0xdb
[<c0141f89>] trace_hardirqs_on+0x10c/0x14c
[<c012a8b8>] __do_softirq+0x68/0xdb
[<c012a961>] do_softirq+0x36/0x51
[<c012ab07>] irq_exit+0x43/0x4e
[<c0114122>] smp_apic_timer_interrupt+0x74/0x80
[<c0104a01>] apic_timer_interrupt+0x29/0x38
[<c0104a0b>] apic_timer_interrupt+0x33/0x38
[<c01600d8>] sys_swapon+0x29c/0x9aa
[<c01021a6>] mwait_idle_with_hints+0x3b/0x3f
[<c0102447>] mwait_idle+0x0/0xf
[<c0102581>] cpu_idle+0x99/0xc6
[<c05a98c7>] start_kernel+0x2c7/0x2cf
[<c05a90e0>] unknown_bootoption+0x0/0x195
[<ffffffff>] 0xffffffff
}
... key at: [<c058a194>] lweventlist_lock+0x14/0x40
... acquired at:
[<c0142dff>] __lock_acquire+0xa1d/0xc07
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c0142fa1>] __lock_acquire+0xbbf/0xc07
[<c0143062>] lock_acquire+0x79/0x93
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c043a07f>] _spin_lock_irqsave+0x3f/0x6c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abaf7>] linkwatch_add_event+0xd/0x2c
[<c03abbbb>] linkwatch_fire_event+0x25/0x37
[<c03aeb42>] netif_carrier_on+0x16/0x27
[<c02ede2c>] bond_set_carrier+0x31/0x55
[<c02ee9b6>] bond_select_active_slave+0x9c/0xcd
[<c02ed22b>] bond_compute_features+0x45/0x84
[<c02ef9be>] bond_enslave+0x6a7/0x884
[<c0439084>] mutex_lock_nested+0x2a4/0x2ac
[<c02f6197>] bonding_store_slaves+0x1ae/0x2fb
[<c02f5fe9>] bonding_store_slaves+0x0/0x2fb
[<c02ce8d7>] dev_attr_store+0x27/0x2c
[<c019bcb9>] sysfs_write_file+0xad/0xe0
[<c019bc0c>] sysfs_write_file+0x0/0xe0
[<c0168ddc>] vfs_write+0x8a/0x10c
[<c0118566>] do_page_fault+0x0/0x54a
[<c0169361>] sys_write+0x41/0x67
[<c0103e92>] sysenter_past_esp+0x5f/0xa5
[<ffffffff>] 0xffffffff
stack backtrace:
Pid: 9, comm: events/0 Not tainted 2.6.24-rc5 #1
[<c0140b38>] print_irq_inversion_bug+0x108/0x112
[<c014191d>] check_usage_forwards+0x3c/0x41
[<c0141b09>] mark_lock+0x1e7/0x451
[<c0142822>] __lock_acquire+0x440/0xc07
[<c013fe0a>] get_lock_stats+0xd/0x2e
[<c013fe35>] put_lock_stats+0xa/0x1e
[<c0143062>] lock_acquire+0x79/0x93
[<c0411c7a>] mld_ifc_timer_expire+0x130/0x1fb
[<c0411b4a>] mld_ifc_timer_expire+0x0/0x1fb
[<c0439d62>] _spin_lock_bh+0x3b/0x64
[<c0411c7a>] mld_ifc_timer_expire+0x130/0x1fb
[<c0411c7a>] mld_ifc_timer_expire+0x130/0x1fb
[<c0411b4a>] mld_ifc_timer_expire+0x0/0x1fb
[<c0141f89>] trace_hardirqs_on+0x10c/0x14c
[<c0411b4a>] mld_ifc_timer_expire+0x0/0x1fb
[<c012df52>] run_timer_softirq+0xfa/0x15d
[<c012a8a6>] __do_softirq+0x56/0xdb
[<c0141f89>] trace_hardirqs_on+0x10c/0x14c
[<c012a8b8>] __do_softirq+0x68/0xdb
[<c012a961>] do_softirq+0x36/0x51
[<c012ae4a>] local_bh_enable_ip+0xad/0xed
[<c03bf107>] rt_run_flush+0x64/0x8b
[<c03e9296>] fib_netdev_event+0x61/0x65
[<c013ac20>] notifier_call_chain+0x2a/0x52
[<c013ac6a>] raw_notifier_call_chain+0x17/0x1a
[<c03a2ae5>] netdev_state_change+0x18/0x29
[<c03abd1d>] __linkwatch_run_queue+0x150/0x17e
[<c03abd68>] linkwatch_event+0x1d/0x22
[<c0133cab>] run_workqueue+0xdb/0x1b6
[<c0133c57>] run_workqueue+0x87/0x1b6
[<c03abd4b>] linkwatch_event+0x0/0x22
[<c01346cb>] worker_thread+0x0/0x85
[<c0134744>] worker_thread+0x79/0x85
[<c0137179>] autoremove_wake_function+0x0/0x35
[<c01370c2>] kthread+0x38/0x5e
[<c013708a>] kthread+0x0/0x5e
[<c0104baf>] kernel_thread_helper+0x7/0x10
=======================
bonding: bond0: enslaving eth1 as a backup interface with a down link.
bonding: bond0: Setting eth0 as primary slave.
bond0: no IPv6 routers present
Best regards,
Krzysztof Olędzki
^ permalink raw reply
* Re: [PATCH 1/2] add driver for enc28j60 ethernet chip
From: Stephen Hemminger @ 2007-12-14 18:56 UTC (permalink / raw)
To: Claudio Lanconelli; +Cc: netdev
In-Reply-To: <47624B2F.9010503@eptar.com>
On Fri, 14 Dec 2007 10:21:51 +0100
Claudio Lanconelli <lanconelli.claudio@eptar.com> wrote:
> Hi Stephen,
> thank you for your suggestions.
> I already applied trivial fixes, but I have questions on some points,
> see inline.
>
> Stephen Hemminger wrote:
> > General comments:
> > * device driver does no carrier detection. This makes it useless
> > for bridging, bonding, or any form of failover.
> >
> > * use msglevel method (via ethtool) to control debug messages
> > rather than kernel configuration. This allows enabling debugging
> > without recompilation which is important in distributions.
> >
> > * Please add ethtool support
> >
> > * Consider using NAPI
> >
> >
> Can you point me to a possibly simple driver that uses ethtool and NAPI?
No driver stays simple! but look at tg3, sky2, r8169 for examples.
> Or other example that I can use for reference.
> May be the skeleton should be updated.
>
> > * use netdev_priv(netdev) rather than netdev->priv
>
> I can't find where I used netdev->priv, may be do you mean priv->netdev?
yes
(skipping other comments)
> >
> > +static int __devinit enc28j60_probe(struct spi_device *spi)
> > +{
> > + struct net_device *dev;
> > + struct enc28j60_net_local *priv;
> > + int ret = 0;
> > +
> > + dev_dbg(&spi->dev, "%s() start\n", __FUNCTION__);
> > +
> > + dev = alloc_etherdev(sizeof(struct enc28j60_net_local));
> > + if (!dev) {
> > + ret = -ENOMEM;
> > + goto error_alloc;
> > + }
> > + priv = netdev_priv(dev);
> > +
> > + priv->netdev = dev; /* priv to netdev reference */
> > + priv->spi = spi; /* priv to spi reference */
> > + priv->spi_transfer_buf = kmalloc(SPI_TRANSFER_BUF_LEN, GFP_KERNEL);
> >
> > Why not declare the transfer buffer as an array in spi?
> >
> I don't understand exactly what do you mean here.
> spi field point to struct spi_device from SPI subsystem.
> Other SPI client driver uses an allocated buffer too.
I just noticed that you alloc an ether device then do an additional
allocation for the buffer. It makes sense if there is other uses.
You do need to be careful for cases where transfer_buf might be used
after free: module unload (your probably safe), and client driver
using during shutdown.
--
Stephen Hemminger <shemminger@linux-foundation.org>
^ permalink raw reply
* Re: [PATCH net-2.6.25 6/8] sctp: Use ipv4_is_<type>
From: Vlad Yasevich @ 2007-12-14 19:11 UTC (permalink / raw)
To: Joe Perches; +Cc: netdev, Sridhar Samudrala, lksctp-developers
In-Reply-To: <1197589141-7020-6-git-send-email-joe@perches.com>
Joe Perches wrote:
> Signed-off-by: Joe Perches <joe@perches.com>
Thanks Joe. I've put this into my tree.
-vlad
^ permalink raw reply
* Re: [PATCH net-2.6.25 6/8] sctp: Use ipv4_is_<type>
From: David Miller @ 2007-12-14 19:14 UTC (permalink / raw)
To: vladislav.yasevich; +Cc: joe, netdev, sri, lksctp-developers
In-Reply-To: <4762D570.7060207@hp.com>
From: Vlad Yasevich <vladislav.yasevich@hp.com>
Date: Fri, 14 Dec 2007 14:11:44 -0500
> Joe Perches wrote:
> > Signed-off-by: Joe Perches <joe@perches.com>
>
> Thanks Joe. I've put this into my tree.
You can't, because your tree won't build without his first patch and I
have to approve that and stick it into my tree first.
Just let me review and potentially pick up all of
Joe's stuff since we have this dependency.
^ permalink raw reply
* Re: [patch 2/4] net: use mutex_is_locked() for ASSERT_RTNL()
From: David Miller @ 2007-12-14 19:15 UTC (permalink / raw)
To: herbert; +Cc: akpm, netdev
In-Reply-To: <20071214083037.GA15602@gondor.apana.org.au>
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Fri, 14 Dec 2007 16:30:37 +0800
> On Fri, Dec 14, 2007 at 12:22:09AM -0800, Andrew Morton wrote:
> >
> > I don't see how it could warn about that. Nor should it - one might want
> > to check that rtnl_lock is held inside preempt_disable() or spin_lock or
> > whatever.
> >
> > It might make sense to warn if ASSERT_RTNL is called in in_interrupt()
> > contexts though.
>
> Well the paths where ASSERT_RTNL is used should never be in an
> atomic context. In the past it has been quite useful in pointing
> out bogus locking practices.
>
> There is currently one path where it's known to warn because of
> this and it (promiscuous mode) is on my todo list.
>
> Oh and it only warns when you have mutex debugging enabled.
Right, this change is just totally bogus.
I'm all for using existing facilities to replace hand-crafted copies,
but this case is removing useful debugging functionality so it's
wrong.
^ permalink raw reply
* Re: [PATCH net-2.6.25 6/8] sctp: Use ipv4_is_<type>
From: Vlad Yasevich @ 2007-12-14 19:17 UTC (permalink / raw)
To: David Miller; +Cc: joe, netdev, sri, lksctp-developers
In-Reply-To: <20071214.111436.32787690.davem@davemloft.net>
David Miller wrote:
> From: Vlad Yasevich <vladislav.yasevich@hp.com>
> Date: Fri, 14 Dec 2007 14:11:44 -0500
>
>> Joe Perches wrote:
>>> Signed-off-by: Joe Perches <joe@perches.com>
>> Thanks Joe. I've put this into my tree.
>
> You can't, because your tree won't build without his first patch and I
> have to approve that and stick it into my tree first.
>
> Just let me review and potentially pick up all of
> Joe's stuff since we have this dependency.
>
Ok. In that case, you can have my ACK for the SCTP stuff.
-vlad
^ permalink raw reply
* Re: [GIT PULL] [NET]: Use {hton{s,l},cpu_to_be{16,32}}() where appropriate.
From: David Miller @ 2007-12-14 19:19 UTC (permalink / raw)
To: yoshfuji; +Cc: netdev
In-Reply-To: <20071214.162835.105268271.yoshfuji@linux-ipv6.org>
From: YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>
Date: Fri, 14 Dec 2007 16:28:35 +0900 (JST)
> Please consider pulling the following changes from the branch
> net-2.6-dev-20071214
> available at
> <git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-dev.git>
> which is on top of your net-2.6-devel tree.
Pulled, thank you.
Could you please provide the full pull URL all in one
line, instead of splitting the base URL and the HEAD
name onto seperate lines?
I have to cut and paste from multiple places in your mail in order to
compose the pull command line and I wish I didn't have to do that
every time. I should be able to just cut and paste one line, which
should be the fully specified URL, for maximum efficiency.
Thanks.
^ permalink raw reply
* [PATCH 01/29] mm: gfp_to_alloc_flags()
From: Peter Zijlstra @ 2007-12-14 15:39 UTC (permalink / raw)
To: Linus Torvalds, Andrew Morton, linux-kernel, linux-mm, netdev,
trond.myklebust
Cc: Peter Zijlstra
In-Reply-To: <20071214153907.770251000@chello.nl>
[-- Attachment #1: mm-gfp-to-alloc_flags.patch --]
[-- Type: text/plain, Size: 5556 bytes --]
Factor out the gfp to alloc_flags mapping so it can be used in other places.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
mm/internal.h | 11 ++++++
mm/page_alloc.c | 98 ++++++++++++++++++++++++++++++++------------------------
2 files changed, 67 insertions(+), 42 deletions(-)
Index: linux-2.6/mm/internal.h
===================================================================
--- linux-2.6.orig/mm/internal.h
+++ linux-2.6/mm/internal.h
@@ -47,4 +47,15 @@ static inline unsigned long page_order(s
VM_BUG_ON(!PageBuddy(page));
return page_private(page);
}
+
+#define ALLOC_HARDER 0x01 /* try to alloc harder */
+#define ALLOC_HIGH 0x02 /* __GFP_HIGH set */
+#define ALLOC_WMARK_MIN 0x04 /* use pages_min watermark */
+#define ALLOC_WMARK_LOW 0x08 /* use pages_low watermark */
+#define ALLOC_WMARK_HIGH 0x10 /* use pages_high watermark */
+#define ALLOC_NO_WATERMARKS 0x20 /* don't check watermarks at all */
+#define ALLOC_CPUSET 0x40 /* check for correct cpuset */
+
+int gfp_to_alloc_flags(gfp_t gfp_mask);
+
#endif
Index: linux-2.6/mm/page_alloc.c
===================================================================
--- linux-2.6.orig/mm/page_alloc.c
+++ linux-2.6/mm/page_alloc.c
@@ -1139,14 +1139,6 @@ failed:
return NULL;
}
-#define ALLOC_NO_WATERMARKS 0x01 /* don't check watermarks at all */
-#define ALLOC_WMARK_MIN 0x02 /* use pages_min watermark */
-#define ALLOC_WMARK_LOW 0x04 /* use pages_low watermark */
-#define ALLOC_WMARK_HIGH 0x08 /* use pages_high watermark */
-#define ALLOC_HARDER 0x10 /* try to alloc harder */
-#define ALLOC_HIGH 0x20 /* __GFP_HIGH set */
-#define ALLOC_CPUSET 0x40 /* check for correct cpuset */
-
#ifdef CONFIG_FAIL_PAGE_ALLOC
static struct fail_page_alloc_attr {
@@ -1535,6 +1527,44 @@ static void set_page_owner(struct page *
#endif /* CONFIG_PAGE_OWNER */
/*
+ * get the deepest reaching allocation flags for the given gfp_mask
+ */
+int gfp_to_alloc_flags(gfp_t gfp_mask)
+{
+ struct task_struct *p = current;
+ int alloc_flags = ALLOC_WMARK_MIN | ALLOC_CPUSET;
+ const gfp_t wait = gfp_mask & __GFP_WAIT;
+
+ /*
+ * The caller may dip into page reserves a bit more if the caller
+ * cannot run direct reclaim, or if the caller has realtime scheduling
+ * policy or is asking for __GFP_HIGH memory. GFP_ATOMIC requests will
+ * set both ALLOC_HARDER (!wait) and ALLOC_HIGH (__GFP_HIGH).
+ */
+ if (gfp_mask & __GFP_HIGH)
+ alloc_flags |= ALLOC_HIGH;
+
+ if (!wait) {
+ alloc_flags |= ALLOC_HARDER;
+ /*
+ * Ignore cpuset if GFP_ATOMIC (!wait) rather than fail alloc.
+ * See also cpuset_zone_allowed() comment in kernel/cpuset.c.
+ */
+ alloc_flags &= ~ALLOC_CPUSET;
+ } else if (unlikely(rt_task(p)) && !in_interrupt())
+ alloc_flags |= ALLOC_HARDER;
+
+ if (likely(!(gfp_mask & __GFP_NOMEMALLOC))) {
+ if (!in_interrupt() &&
+ ((p->flags & PF_MEMALLOC) ||
+ unlikely(test_thread_flag(TIF_MEMDIE))))
+ alloc_flags |= ALLOC_NO_WATERMARKS;
+ }
+
+ return alloc_flags;
+}
+
+/*
* This is the 'heart' of the zoned buddy allocator.
*/
struct page * fastcall
@@ -1589,48 +1619,28 @@ restart:
* OK, we're below the kswapd watermark and have kicked background
* reclaim. Now things get more complex, so set up alloc_flags according
* to how we want to proceed.
- *
- * The caller may dip into page reserves a bit more if the caller
- * cannot run direct reclaim, or if the caller has realtime scheduling
- * policy or is asking for __GFP_HIGH memory. GFP_ATOMIC requests will
- * set both ALLOC_HARDER (!wait) and ALLOC_HIGH (__GFP_HIGH).
*/
- alloc_flags = ALLOC_WMARK_MIN;
- if ((unlikely(rt_task(p)) && !in_interrupt()) || !wait)
- alloc_flags |= ALLOC_HARDER;
- if (gfp_mask & __GFP_HIGH)
- alloc_flags |= ALLOC_HIGH;
- if (wait)
- alloc_flags |= ALLOC_CPUSET;
+ alloc_flags = gfp_to_alloc_flags(gfp_mask);
- /*
- * Go through the zonelist again. Let __GFP_HIGH and allocations
- * coming from realtime tasks go deeper into reserves.
- *
- * This is the last chance, in general, before the goto nopage.
- * Ignore cpuset if GFP_ATOMIC (!wait) rather than fail alloc.
- * See also cpuset_zone_allowed() comment in kernel/cpuset.c.
- */
- page = get_page_from_freelist(gfp_mask, order, zonelist, alloc_flags);
+ /* This is the last chance, in general, before the goto nopage. */
+ page = get_page_from_freelist(gfp_mask, order, zonelist,
+ alloc_flags & ~ALLOC_NO_WATERMARKS);
if (page)
goto got_pg;
/* This allocation should allow future memory freeing. */
-
rebalance:
- if (((p->flags & PF_MEMALLOC) || unlikely(test_thread_flag(TIF_MEMDIE)))
- && !in_interrupt()) {
- if (!(gfp_mask & __GFP_NOMEMALLOC)) {
+ if (alloc_flags & ALLOC_NO_WATERMARKS) {
nofail_alloc:
- /* go through the zonelist yet again, ignoring mins */
- page = get_page_from_freelist(gfp_mask, order,
- zonelist, ALLOC_NO_WATERMARKS);
- if (page)
- goto got_pg;
- if (gfp_mask & __GFP_NOFAIL) {
- congestion_wait(WRITE, HZ/50);
- goto nofail_alloc;
- }
+ /* go through the zonelist yet again, ignoring mins */
+ page = get_page_from_freelist(gfp_mask, order, zonelist,
+ ALLOC_NO_WATERMARKS);
+ if (page)
+ goto got_pg;
+
+ if (wait && (gfp_mask & __GFP_NOFAIL)) {
+ congestion_wait(WRITE, HZ/50);
+ goto nofail_alloc;
}
goto nopage;
}
@@ -1639,6 +1649,10 @@ nofail_alloc:
if (!wait)
goto nopage;
+ /* Avoid recursion of direct reclaim */
+ if (p->flags & PF_MEMALLOC)
+ goto nopage;
+
cond_resched();
/* We now go into synchronous reclaim */
--
^ permalink raw reply
* [PATCH 00/29] Swap over NFS -v15
From: Peter Zijlstra @ 2007-12-14 15:39 UTC (permalink / raw)
To: Linus Torvalds, Andrew Morton, linux-kernel, linux-mm, netdev,
trond.myklebust
Cc: Peter Zijlstra
Hi,
Another posting of the full swap over NFS series.
Andrew/Linus, could we start thinking of sticking this in -mm?
[ patches against 2.6.24-rc5-mm1, also to be found online at:
http://programming.kicks-ass.net/kernel-patches/vm_deadlock/v2.6.24-rc5-mm1/ ]
The patch-set can be split in roughtly 5 parts, for each of which I shall give
a description.
Part 1, patches 1-11
The problem with swap over network is the generic swap problem: needing memory
to free memory. Normally this is solved using mempools, as can be seen in the
BIO layer.
Swap over network has the problem that the network subsystem does not use fixed
sized allocations, but heavily relies on kmalloc(). This makes mempools
unusable.
This first part provides a generic reserve framework.
Care is taken to only affect the slow paths - when we're low on memory.
Caveats: it currently doesn't do SLOB.
1 - mm: gfp_to_alloc_flags()
2 - mm: tag reseve pages
3 - mm: sl[au]b: add knowledge of reserve pages
4 - mm: kmem_estimate_pages()
5 - mm: allow PF_MEMALLOC from softirq context
6 - mm: serialize access to min_free_kbytes
7 - mm: emergency pool
8 - mm: system wide ALLOC_NO_WATERMARK
9 - mm: __GFP_MEMALLOC
10 - mm: memory reserve management
11 - selinux: tag avc cache alloc as non-critical
Part 2, patches 12-14
Provide some generic network infrastructure needed later on.
12 - net: wrap sk->sk_backlog_rcv()
13 - net: packet split receive api
14 - net: sk_allocation() - concentrate socket related allocations
Part 3, patches 15-21
Now that we have a generic memory reserve system, use it on the network stack.
The thing that makes this interesting is that, contrary to BIO, both the
transmit and receive path require memory allocations.
That is, in the BIO layer write back completion is usually just an ISR flipping
a bit and waking stuff up. A network write back completion involved receiving
packets, which when there is no memory, is rather hard. And even when there is
memory there is no guarantee that the required packet comes in in the window
that that memory buys us.
The solution to this problem is found in the fact that network is to be assumed
lossy. Even now, when there is no memory to receive packets the network card
will have to discard packets. What we do is move this into the network stack.
So we reserve a little pool to act as a receive buffer, this allows us to
inspect packets before tossing them. This way, we can filter out those packets
that ensure progress (writeback completion) and disregard the others (as would
have happened anyway). [ NOTE: this is a stable mode of operation with limited
memory usage, exactly the kind of thing we need ]
Again, care is taken to keep much of the overhead of this to only affect the
slow path. Only packets allocated from the reserves will suffer the extra
atomic overhead needed for accounting.
15 - netvm: network reserve infrastructure
16 - netvm: INET reserves.
17 - netvm: hook skb allocation to reserves
18 - netvm: filter emergency skbs.
19 - netvm: prevent a TCP specific deadlock
20 - netfilter: NF_QUEUE vs emergency skbs
21 - netvm: skb processing
Part 4, patches 22-24
Generic vm infrastructure to handle swapping to a filesystem instead of a block
device.
This provides new a_ops to handle swapcache pages and could be used to obsolete
the bmap usage for swapfiles.
22 - mm: prepare swap entry methods for use in page methods
23 - mm: add support for non block device backed swap files
24 - mm: methods for teaching filesystems about PG_swapcache pages
Part 5, patches 25-29
Finally, convert NFS to make use of the new network and vm infrastructure to
provide swap over NFS.
25 - nfs: remove mempools
26 - nfs: teach the NFS client how to treat PG_swapcache pages
27 - nfs: disable data cache revalidation for swapfiles
28 - nfs: enable swap on NFS
29 - nfs: fix various memory recursions possible with swap over NFS.
Changes since -v14:
- SLAB support
- a_ops rework
- various bug fixes and cleanups
^ permalink raw reply
* [PATCH 07/29] mm: emergency pool
From: Peter Zijlstra @ 2007-12-14 15:39 UTC (permalink / raw)
To: Linus Torvalds, Andrew Morton, linux-kernel, linux-mm, netdev,
trond.myklebust
Cc: Peter Zijlstra
In-Reply-To: <20071214153907.770251000@chello.nl>
[-- Attachment #1: mm-page_alloc-emerg.patch --]
[-- Type: text/plain, Size: 6606 bytes --]
Provide means to reserve a specific amount of pages.
The emergency pool is separated from the min watermark because ALLOC_HARDER
and ALLOC_HIGH modify the watermark in a relative way and thus do not ensure
a strict minimum.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
include/linux/mmzone.h | 3 +
mm/page_alloc.c | 82 +++++++++++++++++++++++++++++++++++++++++++------
mm/vmstat.c | 6 +--
3 files changed, 78 insertions(+), 13 deletions(-)
Index: linux-2.6/include/linux/mmzone.h
===================================================================
--- linux-2.6.orig/include/linux/mmzone.h
+++ linux-2.6/include/linux/mmzone.h
@@ -213,7 +213,7 @@ enum zone_type {
struct zone {
/* Fields commonly accessed by the page allocator */
- unsigned long pages_min, pages_low, pages_high;
+ unsigned long pages_emerg, pages_min, pages_low, pages_high;
/*
* We don't know if the memory that we're going to allocate will be freeable
* or/and it will be released eventually, so to avoid totally wasting several
@@ -682,6 +682,7 @@ int sysctl_min_unmapped_ratio_sysctl_han
struct file *, void __user *, size_t *, loff_t *);
int sysctl_min_slab_ratio_sysctl_handler(struct ctl_table *, int,
struct file *, void __user *, size_t *, loff_t *);
+int adjust_memalloc_reserve(int pages);
extern int numa_zonelist_order_handler(struct ctl_table *, int,
struct file *, void __user *, size_t *, loff_t *);
Index: linux-2.6/mm/page_alloc.c
===================================================================
--- linux-2.6.orig/mm/page_alloc.c
+++ linux-2.6/mm/page_alloc.c
@@ -118,6 +118,8 @@ static char * const zone_names[MAX_NR_ZO
static DEFINE_SPINLOCK(min_free_lock);
int min_free_kbytes = 1024;
+static DEFINE_MUTEX(var_free_mutex);
+int var_free_kbytes;
unsigned long __meminitdata nr_kernel_pages;
unsigned long __meminitdata nr_all_pages;
@@ -1252,7 +1254,7 @@ int zone_watermark_ok(struct zone *z, in
if (alloc_flags & ALLOC_HARDER)
min -= min / 4;
- if (free_pages <= min + z->lowmem_reserve[classzone_idx])
+ if (free_pages <= min + z->lowmem_reserve[classzone_idx] + z->pages_emerg)
return 0;
for (o = 0; o < order; o++) {
/* At the next order, this order's pages become unavailable */
@@ -1733,8 +1735,8 @@ nofail_alloc:
nopage:
if (!(gfp_mask & __GFP_NOWARN) && printk_ratelimit()) {
printk(KERN_WARNING "%s: page allocation failure."
- " order:%d, mode:0x%x\n",
- p->comm, order, gfp_mask);
+ " order:%d, mode:0x%x, alloc_flags:0x%x, pflags:0x%x\n",
+ p->comm, order, gfp_mask, alloc_flags, p->flags);
dump_stack();
show_mem();
}
@@ -1952,9 +1954,9 @@ void show_free_areas(void)
"\n",
zone->name,
K(zone_page_state(zone, NR_FREE_PAGES)),
- K(zone->pages_min),
- K(zone->pages_low),
- K(zone->pages_high),
+ K(zone->pages_emerg + zone->pages_min),
+ K(zone->pages_emerg + zone->pages_low),
+ K(zone->pages_emerg + zone->pages_high),
K(zone_page_state(zone, NR_ACTIVE)),
K(zone_page_state(zone, NR_INACTIVE)),
K(zone->present_pages),
@@ -4113,7 +4115,7 @@ static void calculate_totalreserve_pages
}
/* we treat pages_high as reserved pages. */
- max += zone->pages_high;
+ max += zone->pages_high + zone->pages_emerg;
if (max > zone->present_pages)
max = zone->present_pages;
@@ -4170,7 +4172,8 @@ static void setup_per_zone_lowmem_reserv
*/
static void __setup_per_zone_pages_min(void)
{
- unsigned long pages_min = min_free_kbytes >> (PAGE_SHIFT - 10);
+ unsigned pages_min = min_free_kbytes >> (PAGE_SHIFT - 10);
+ unsigned pages_emerg = var_free_kbytes >> (PAGE_SHIFT - 10);
unsigned long lowmem_pages = 0;
struct zone *zone;
unsigned long flags;
@@ -4182,11 +4185,13 @@ static void __setup_per_zone_pages_min(v
}
for_each_zone(zone) {
- u64 tmp;
+ u64 tmp, tmp_emerg;
spin_lock_irqsave(&zone->lru_lock, flags);
tmp = (u64)pages_min * zone->present_pages;
do_div(tmp, lowmem_pages);
+ tmp_emerg = (u64)pages_emerg * zone->present_pages;
+ do_div(tmp_emerg, lowmem_pages);
if (is_highmem(zone)) {
/*
* __GFP_HIGH and PF_MEMALLOC allocations usually don't
@@ -4205,12 +4210,14 @@ static void __setup_per_zone_pages_min(v
if (min_pages > 128)
min_pages = 128;
zone->pages_min = min_pages;
+ zone->pages_emerg = 0;
} else {
/*
* If it's a lowmem zone, reserve a number of pages
* proportionate to the zone's size.
*/
zone->pages_min = tmp;
+ zone->pages_emerg = tmp_emerg;
}
zone->pages_low = zone->pages_min + (tmp >> 2);
@@ -4232,6 +4239,63 @@ void setup_per_zone_pages_min(void)
spin_unlock_irqrestore(&min_free_lock, flags);
}
+static void __adjust_memalloc_reserve(int pages)
+{
+ var_free_kbytes += pages << (PAGE_SHIFT - 10);
+ BUG_ON(var_free_kbytes < 0);
+ setup_per_zone_pages_min();
+}
+
+static int test_reserve_limits(void)
+{
+ struct zone *zone;
+ int node;
+
+ for_each_zone(zone)
+ wakeup_kswapd(zone, 0);
+
+ for_each_online_node(node) {
+ struct page *page = alloc_pages_node(node, GFP_KERNEL, 0);
+ if (!page)
+ return -ENOMEM;
+
+ __free_page(page);
+ }
+
+ return 0;
+}
+
+/**
+ * adjust_memalloc_reserve - adjust the memalloc reserve
+ * @pages: number of pages to add
+ *
+ * It adds a number of pages to the memalloc reserve; if
+ * the number was positive it kicks reclaim into action to
+ * satisfy the higher watermarks.
+ *
+ * returns -ENOMEM when it failed to satisfy the watermarks.
+ */
+int adjust_memalloc_reserve(int pages)
+{
+ int err = 0;
+
+ mutex_lock(&var_free_mutex);
+ __adjust_memalloc_reserve(pages);
+ if (pages > 0) {
+ err = test_reserve_limits();
+ if (err) {
+ __adjust_memalloc_reserve(-pages);
+ goto unlock;
+ }
+ }
+ printk(KERN_DEBUG "Emergency reserve: %d\n", var_free_kbytes);
+
+unlock:
+ mutex_unlock(&var_free_mutex);
+ return err;
+}
+EXPORT_SYMBOL_GPL(adjust_memalloc_reserve);
+
/*
* Initialise min_free_kbytes.
*
Index: linux-2.6/mm/vmstat.c
===================================================================
--- linux-2.6.orig/mm/vmstat.c
+++ linux-2.6/mm/vmstat.c
@@ -752,9 +752,9 @@ static void zoneinfo_show_print(struct s
"\n spanned %lu"
"\n present %lu",
zone_page_state(zone, NR_FREE_PAGES),
- zone->pages_min,
- zone->pages_low,
- zone->pages_high,
+ zone->pages_emerg + zone->pages_min,
+ zone->pages_emerg + zone->pages_low,
+ zone->pages_emerg + zone->pages_high,
zone->pages_scanned,
zone->nr_scan_active, zone->nr_scan_inactive,
zone->spanned_pages,
--
^ permalink raw reply
* [PATCH 05/29] mm: allow PF_MEMALLOC from softirq context
From: Peter Zijlstra @ 2007-12-14 15:39 UTC (permalink / raw)
To: Linus Torvalds, Andrew Morton, linux-kernel, linux-mm, netdev,
trond.myklebust
Cc: Peter Zijlstra
In-Reply-To: <20071214153907.770251000@chello.nl>
[-- Attachment #1: mm-PF_MEMALLOC-softirq.patch --]
[-- Type: text/plain, Size: 2287 bytes --]
Allow PF_MEMALLOC to be set in softirq context. When running softirqs from
a borrowed context save current->flags, ksoftirqd will have its own
task_struct.
This is needed to allow network softirq packet processing to make use of
PF_MEMALLOC.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
include/linux/sched.h | 4 ++++
kernel/softirq.c | 3 +++
mm/page_alloc.c | 7 ++++---
3 files changed, 11 insertions(+), 3 deletions(-)
Index: linux-2.6/mm/page_alloc.c
===================================================================
--- linux-2.6.orig/mm/page_alloc.c
+++ linux-2.6/mm/page_alloc.c
@@ -1557,9 +1557,10 @@ int gfp_to_alloc_flags(gfp_t gfp_mask)
alloc_flags |= ALLOC_HARDER;
if (likely(!(gfp_mask & __GFP_NOMEMALLOC))) {
- if (!in_interrupt() &&
- ((p->flags & PF_MEMALLOC) ||
- unlikely(test_thread_flag(TIF_MEMDIE))))
+ if (!in_irq() && (p->flags & PF_MEMALLOC))
+ alloc_flags |= ALLOC_NO_WATERMARKS;
+ else if (!in_interrupt() &&
+ unlikely(test_thread_flag(TIF_MEMDIE)))
alloc_flags |= ALLOC_NO_WATERMARKS;
}
Index: linux-2.6/kernel/softirq.c
===================================================================
--- linux-2.6.orig/kernel/softirq.c
+++ linux-2.6/kernel/softirq.c
@@ -211,6 +211,8 @@ asmlinkage void __do_softirq(void)
__u32 pending;
int max_restart = MAX_SOFTIRQ_RESTART;
int cpu;
+ unsigned long pflags = current->flags;
+ current->flags &= ~PF_MEMALLOC;
pending = local_softirq_pending();
account_system_vtime(current);
@@ -249,6 +251,7 @@ restart:
account_system_vtime(current);
_local_bh_enable();
+ tsk_restore_flags(current, pflags, PF_MEMALLOC);
}
#ifndef __ARCH_HAS_DO_SOFTIRQ
Index: linux-2.6/include/linux/sched.h
===================================================================
--- linux-2.6.orig/include/linux/sched.h
+++ linux-2.6/include/linux/sched.h
@@ -1389,6 +1389,10 @@ static inline void put_task_struct(struc
#define tsk_used_math(p) ((p)->flags & PF_USED_MATH)
#define used_math() tsk_used_math(current)
+#define tsk_restore_flags(p, pflags, mask) \
+ do { (p)->flags &= ~(mask); \
+ (p)->flags |= ((pflags) & (mask)); } while (0)
+
#ifdef CONFIG_SMP
extern int set_cpus_allowed(struct task_struct *p, cpumask_t new_mask);
#else
--
^ permalink raw reply
* [PATCH 06/29] mm: serialize access to min_free_kbytes
From: Peter Zijlstra @ 2007-12-14 15:39 UTC (permalink / raw)
To: Linus Torvalds, Andrew Morton, linux-kernel, linux-mm, netdev,
trond.myklebust
Cc: Peter Zijlstra
In-Reply-To: <20071214153907.770251000@chello.nl>
[-- Attachment #1: mm-setup_per_zone_pages_min.patch --]
[-- Type: text/plain, Size: 1836 bytes --]
There is a small race between the procfs caller and the memory hotplug caller
of setup_per_zone_pages_min(). Not a big deal, but the next patch will add yet
another caller. Time to close the gap.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
mm/page_alloc.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
Index: linux-2.6/mm/page_alloc.c
===================================================================
--- linux-2.6.orig/mm/page_alloc.c
+++ linux-2.6/mm/page_alloc.c
@@ -116,6 +116,7 @@ static char * const zone_names[MAX_NR_ZO
"Movable",
};
+static DEFINE_SPINLOCK(min_free_lock);
int min_free_kbytes = 1024;
unsigned long __meminitdata nr_kernel_pages;
@@ -4162,12 +4163,12 @@ static void setup_per_zone_lowmem_reserv
}
/**
- * setup_per_zone_pages_min - called when min_free_kbytes changes.
+ * __setup_per_zone_pages_min - called when min_free_kbytes changes.
*
* Ensures that the pages_{min,low,high} values for each zone are set correctly
* with respect to min_free_kbytes.
*/
-void setup_per_zone_pages_min(void)
+static void __setup_per_zone_pages_min(void)
{
unsigned long pages_min = min_free_kbytes >> (PAGE_SHIFT - 10);
unsigned long lowmem_pages = 0;
@@ -4222,6 +4223,15 @@ void setup_per_zone_pages_min(void)
calculate_totalreserve_pages();
}
+void setup_per_zone_pages_min(void)
+{
+ unsigned long flags;
+
+ spin_lock_irqsave(&min_free_lock, flags);
+ __setup_per_zone_pages_min();
+ spin_unlock_irqrestore(&min_free_lock, flags);
+}
+
/*
* Initialise min_free_kbytes.
*
@@ -4257,7 +4267,7 @@ static int __init init_per_zone_pages_mi
min_free_kbytes = 128;
if (min_free_kbytes > 65536)
min_free_kbytes = 65536;
- setup_per_zone_pages_min();
+ __setup_per_zone_pages_min();
setup_per_zone_lowmem_reserve();
return 0;
}
--
^ permalink raw reply
* [PATCH 04/29] mm: kmem_estimate_pages()
From: Peter Zijlstra @ 2007-12-14 15:39 UTC (permalink / raw)
To: Linus Torvalds, Andrew Morton, linux-kernel, linux-mm, netdev,
trond.myklebust
Cc: Peter Zijlstra
In-Reply-To: <20071214153907.770251000@chello.nl>
[-- Attachment #1: mm-kmem_estimate_pages.patch --]
[-- Type: text/plain, Size: 6376 bytes --]
Provide a method to get the upper bound on the pages needed to allocate
a given number of objects from a given kmem_cache.
This lays the foundation for a generic reserve framework as presented in
a later patch in this series. This framework needs to convert object demand
(kmalloc() bytes, kmem_cache_alloc() objects) to pages.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
include/linux/slab.h | 3 +
mm/slab.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++
mm/slub.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 159 insertions(+)
Index: linux-2.6/include/linux/slab.h
===================================================================
--- linux-2.6.orig/include/linux/slab.h
+++ linux-2.6/include/linux/slab.h
@@ -60,6 +60,7 @@ void kmem_cache_free(struct kmem_cache *
unsigned int kmem_cache_size(struct kmem_cache *);
const char *kmem_cache_name(struct kmem_cache *);
int kmem_ptr_validate(struct kmem_cache *cachep, const void *ptr);
+unsigned kmem_estimate_pages(struct kmem_cache *cachep, gfp_t flags, int objects);
/*
* Please use this macro to create slab caches. Simply specify the
@@ -94,6 +95,8 @@ int kmem_ptr_validate(struct kmem_cache
void * __must_check krealloc(const void *, size_t, gfp_t);
void kfree(const void *);
size_t ksize(const void *);
+unsigned kestimate_single(size_t, gfp_t, int);
+unsigned kestimate(gfp_t, size_t);
/*
* Allocator specific definitions. These are mainly used to establish optimized
Index: linux-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c
+++ linux-2.6/mm/slub.c
@@ -2446,6 +2446,37 @@ const char *kmem_cache_name(struct kmem_
EXPORT_SYMBOL(kmem_cache_name);
/*
+ * return the max number of pages required to allocated count
+ * objects from the given cache
+ */
+unsigned kmem_estimate_pages(struct kmem_cache *s, gfp_t flags, int objects)
+{
+ unsigned long slabs;
+
+ if (WARN_ON(!s) || WARN_ON(!s->objects))
+ return 0;
+
+ slabs = DIV_ROUND_UP(objects, s->objects);
+
+ /*
+ * Account the possible additional overhead if the slab holds more that
+ * one object.
+ */
+ if (s->objects > 1) {
+ /*
+ * Account the possible additional overhead if per cpu slabs
+ * are currently empty and have to be allocated. This is very
+ * unlikely but a possible scenario immediately after
+ * kmem_cache_shrink.
+ */
+ slabs += num_online_cpus();
+ }
+
+ return slabs << s->order;
+}
+EXPORT_SYMBOL_GPL(kmem_estimate_pages);
+
+/*
* Attempt to free all slabs on a node. Return the number of slabs we
* were unable to free.
*/
@@ -2800,6 +2831,57 @@ static unsigned long count_partial(struc
}
/*
+ * return the max number of pages required to allocate @count objects
+ * of @size bytes from kmalloc given @flags.
+ */
+unsigned kestimate_single(size_t size, gfp_t flags, int count)
+{
+ struct kmem_cache *s = get_slab(size, flags);
+ if (!s)
+ return 0;
+
+ return kmem_estimate_pages(s, flags, count);
+
+}
+EXPORT_SYMBOL_GPL(kestimate_single);
+
+/*
+ * return the max number of pages required to allocate @bytes from kmalloc
+ * in an unspecified number of allocation of heterogeneous size.
+ */
+unsigned kestimate(gfp_t flags, size_t bytes)
+{
+ int i;
+ unsigned long pages;
+
+ /*
+ * multiply by two, in order to account the worst case slack space
+ * due to the power-of-two allocation sizes.
+ */
+ pages = DIV_ROUND_UP(2 * bytes, PAGE_SIZE);
+
+ /*
+ * add the kmem_cache overhead of each possible kmalloc cache
+ */
+ for (i = 1; i < PAGE_SHIFT; i++) {
+ struct kmem_cache *s;
+
+#ifdef CONFIG_ZONE_DMA
+ if (unlikely(flags & SLUB_DMA))
+ s = dma_kmalloc_cache(i, flags);
+ else
+#endif
+ s = &kmalloc_caches[i];
+
+ if (s)
+ pages += kmem_estimate_pages(s, flags, 0);
+ }
+
+ return pages;
+}
+EXPORT_SYMBOL_GPL(kestimate);
+
+/*
* kmem_cache_shrink removes empty slabs from the partial lists and sorts
* the remaining slabs by the number of items in use. The slabs with the
* most items in use come first. New allocations will then fill those up
Index: linux-2.6/mm/slab.c
===================================================================
--- linux-2.6.orig/mm/slab.c
+++ linux-2.6/mm/slab.c
@@ -3844,6 +3844,80 @@ const char *kmem_cache_name(struct kmem_
EXPORT_SYMBOL_GPL(kmem_cache_name);
/*
+ * return the max number of pages required to allocated count
+ * objects from the given cache
+ */
+unsigned kmem_estimate_pages(struct kmem_cache *cachep, gfp_t flags, int objects)
+{
+ /*
+ * (1) memory for objects,
+ */
+ unsigned nr_slabs = DIV_ROUND_UP(objects, cachep->num);
+ unsigned nr_pages = nr_slabs << cachep->gfporder;
+
+ /*
+ * (2) memory for each per-cpu queue (nr_cpu_ids),
+ * (3) memory for each per-node alien queues (nr_cpu_ids), and
+ * (4) some amount of memory for the slab management structures
+ *
+ * XXX: truely account these
+ */
+ nr_pages += 1 + ilog2(nr_pages);
+
+ return nr_pages;
+}
+
+/*
+ * return the max number of pages required to allocate @count objects
+ * of @size bytes from kmalloc given @flags.
+ */
+unsigned kestimate_single(size_t size, gfp_t flags, int count)
+{
+ struct kmem_cache *s = kmem_find_general_cachep(size, flags);
+ if (!s)
+ return 0;
+
+ return kmem_estimate_pages(s, flags, count);
+}
+EXPORT_SYMBOL_GPL(kestimate_single);
+
+/*
+ * return the max number of pages required to allocate @bytes from kmalloc
+ * in an unspecified number of allocation of heterogeneous size.
+ */
+unsigned kestimate(gfp_t flags, size_t bytes)
+{
+ unsigned long pages;
+ struct cache_sizes *csizep = malloc_sizes;
+
+ /*
+ * multiply by two, in order to account the worst case slack space
+ * due to the power-of-two allocation sizes.
+ */
+ pages = DIV_ROUND_UP(2 * bytes, PAGE_SIZE);
+
+ /*
+ * add the kmem_cache overhead of each possible kmalloc cache
+ */
+ for (csizep = malloc_sizes; csizep->cs_cachep; csizep++) {
+ struct kmem_cache *s;
+
+#ifdef CONFIG_ZONE_DMA
+ if (unlikely(flags & __GFP_DMA))
+ s = csizep->cs_dmacachep;
+ else
+#endif
+ s = csizep->cs_cachep;
+
+ if (s)
+ pages += kmem_estimate_pages(s, flags, 0);
+ }
+
+ return pages;
+}
+EXPORT_SYMBOL_GPL(kestimate);
+
+/*
* This initializes kmem_list3 or resizes various caches for all nodes.
*/
static int alloc_kmemlist(struct kmem_cache *cachep)
--
^ permalink raw reply
* [PATCH 02/29] mm: tag reseve pages
From: Peter Zijlstra @ 2007-12-14 15:39 UTC (permalink / raw)
To: Linus Torvalds, Andrew Morton, linux-kernel, linux-mm, netdev,
trond.myklebust
Cc: Peter Zijlstra
In-Reply-To: <20071214153907.770251000@chello.nl>
[-- Attachment #1: page_alloc-reserve.patch --]
[-- Type: text/plain, Size: 1265 bytes --]
Tag pages allocated from the reserves with a non-zero page->reserve.
This allows us to distinguish and account reserve pages.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
include/linux/mm_types.h | 1 +
mm/page_alloc.c | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
Index: linux-2.6/include/linux/mm_types.h
===================================================================
--- linux-2.6.orig/include/linux/mm_types.h
+++ linux-2.6/include/linux/mm_types.h
@@ -70,6 +70,7 @@ struct page {
union {
pgoff_t index; /* Our offset within mapping. */
void *freelist; /* SLUB: freelist req. slab lock */
+ int reserve; /* page_alloc: page is a reserve page */
};
struct list_head lru; /* Pageout list, eg. active_list
* protected by zone->lru_lock !
Index: linux-2.6/mm/page_alloc.c
===================================================================
--- linux-2.6.orig/mm/page_alloc.c
+++ linux-2.6/mm/page_alloc.c
@@ -1448,8 +1448,10 @@ zonelist_scan:
}
page = buffered_rmqueue(zonelist, zone, order, gfp_mask);
- if (page)
+ if (page) {
+ page->reserve = !!(alloc_flags & ALLOC_NO_WATERMARKS);
break;
+ }
this_zone_full:
if (NUMA_BUILD)
zlc_mark_zone_full(zonelist, z);
--
^ permalink raw reply
* [PATCH 09/29] mm: __GFP_MEMALLOC
From: Peter Zijlstra @ 2007-12-14 15:39 UTC (permalink / raw)
To: Linus Torvalds, Andrew Morton, linux-kernel, linux-mm, netdev,
trond.myklebust
Cc: Peter Zijlstra
In-Reply-To: <20071214153907.770251000@chello.nl>
[-- Attachment #1: mm-page_alloc-GFP_EMERGENCY.patch --]
[-- Type: text/plain, Size: 2048 bytes --]
__GFP_MEMALLOC will allow the allocation to disregard the watermarks,
much like PF_MEMALLOC.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
include/linux/gfp.h | 3 ++-
mm/page_alloc.c | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
Index: linux-2.6/include/linux/gfp.h
===================================================================
--- linux-2.6.orig/include/linux/gfp.h
+++ linux-2.6/include/linux/gfp.h
@@ -43,6 +43,7 @@ struct vm_area_struct;
#define __GFP_REPEAT ((__force gfp_t)0x400u) /* Retry the allocation. Might fail */
#define __GFP_NOFAIL ((__force gfp_t)0x800u) /* Retry for ever. Cannot fail */
#define __GFP_NORETRY ((__force gfp_t)0x1000u)/* Do not retry. Might fail */
+#define __GFP_MEMALLOC ((__force gfp_t)0x2000u)/* Use emergency reserves */
#define __GFP_COMP ((__force gfp_t)0x4000u)/* Add compound page metadata */
#define __GFP_ZERO ((__force gfp_t)0x8000u)/* Return zeroed page on success */
#define __GFP_NOMEMALLOC ((__force gfp_t)0x10000u) /* Don't use emergency reserves */
@@ -88,7 +89,7 @@ struct vm_area_struct;
/* Control page allocator reclaim behavior */
#define GFP_RECLAIM_MASK (__GFP_WAIT|__GFP_HIGH|__GFP_IO|__GFP_FS|\
__GFP_NOWARN|__GFP_REPEAT|__GFP_NOFAIL|\
- __GFP_NORETRY|__GFP_NOMEMALLOC)
+ __GFP_NORETRY|__GFP_MEMALLOC|__GFP_NOMEMALLOC)
/* Control allocation constraints */
#define GFP_CONSTRAINT_MASK (__GFP_HARDWALL|__GFP_THISNODE)
Index: linux-2.6/mm/page_alloc.c
===================================================================
--- linux-2.6.orig/mm/page_alloc.c
+++ linux-2.6/mm/page_alloc.c
@@ -1560,7 +1560,9 @@ int gfp_to_alloc_flags(gfp_t gfp_mask)
alloc_flags |= ALLOC_HARDER;
if (likely(!(gfp_mask & __GFP_NOMEMALLOC))) {
- if (!in_irq() && (p->flags & PF_MEMALLOC))
+ if (gfp_mask & __GFP_MEMALLOC)
+ alloc_flags |= ALLOC_NO_WATERMARKS;
+ else if (!in_irq() && (p->flags & PF_MEMALLOC))
alloc_flags |= ALLOC_NO_WATERMARKS;
else if (!in_interrupt() &&
unlikely(test_thread_flag(TIF_MEMDIE)))
--
^ permalink raw reply
* [PATCH 14/29] net: sk_allocation() - concentrate socket related allocations
From: Peter Zijlstra @ 2007-12-14 15:39 UTC (permalink / raw)
To: Linus Torvalds, Andrew Morton, linux-kernel, linux-mm, netdev,
trond.myklebust
Cc: Peter Zijlstra
In-Reply-To: <20071214153907.770251000@chello.nl>
[-- Attachment #1: net-sk_allocation.patch --]
[-- Type: text/plain, Size: 5232 bytes --]
Introduce sk_allocation(), this function allows to inject sock specific
flags to each sock related allocation.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
include/net/sock.h | 5 +++++
net/ipv4/tcp.c | 2 +-
net/ipv4/tcp_output.c | 11 ++++++-----
net/ipv6/tcp_ipv6.c | 14 +++++++++-----
4 files changed, 21 insertions(+), 11 deletions(-)
Index: linux-2.6/net/ipv4/tcp_output.c
===================================================================
--- linux-2.6.orig/net/ipv4/tcp_output.c
+++ linux-2.6/net/ipv4/tcp_output.c
@@ -2063,7 +2063,7 @@ void tcp_send_fin(struct sock *sk)
} else {
/* Socket is locked, keep trying until memory is available. */
for (;;) {
- skb = alloc_skb_fclone(MAX_TCP_HEADER, GFP_KERNEL);
+ skb = alloc_skb_fclone(MAX_TCP_HEADER, sk->sk_allocation);
if (skb)
break;
yield();
@@ -2096,7 +2096,7 @@ void tcp_send_active_reset(struct sock *
struct sk_buff *skb;
/* NOTE: No TCP options attached and we never retransmit this. */
- skb = alloc_skb(MAX_TCP_HEADER, priority);
+ skb = alloc_skb(MAX_TCP_HEADER, sk_allocation(sk, priority));
if (!skb) {
NET_INC_STATS(LINUX_MIB_TCPABORTFAILED);
return;
@@ -2169,7 +2169,8 @@ struct sk_buff * tcp_make_synack(struct
__u8 *md5_hash_location;
#endif
- skb = sock_wmalloc(sk, MAX_TCP_HEADER + 15, 1, GFP_ATOMIC);
+ skb = sock_wmalloc(sk, MAX_TCP_HEADER + 15, 1,
+ sk_allocation(sk, GFP_ATOMIC));
if (skb == NULL)
return NULL;
@@ -2428,7 +2429,7 @@ void tcp_send_ack(struct sock *sk)
* tcp_transmit_skb() will set the ownership to this
* sock.
*/
- buff = alloc_skb(MAX_TCP_HEADER, GFP_ATOMIC);
+ buff = alloc_skb(MAX_TCP_HEADER, sk_allocation(sk, GFP_ATOMIC));
if (buff == NULL) {
inet_csk_schedule_ack(sk);
inet_csk(sk)->icsk_ack.ato = TCP_ATO_MIN;
@@ -2470,7 +2471,7 @@ static int tcp_xmit_probe_skb(struct soc
struct sk_buff *skb;
/* We don't queue it, tcp_transmit_skb() sets ownership. */
- skb = alloc_skb(MAX_TCP_HEADER, GFP_ATOMIC);
+ skb = alloc_skb(MAX_TCP_HEADER, sk_allocation(sk, GFP_ATOMIC));
if (skb == NULL)
return -1;
Index: linux-2.6/include/net/sock.h
===================================================================
--- linux-2.6.orig/include/net/sock.h
+++ linux-2.6/include/net/sock.h
@@ -425,6 +425,11 @@ static inline int sock_flag(struct sock
return test_bit(flag, &sk->sk_flags);
}
+static inline gfp_t sk_allocation(struct sock *sk, gfp_t gfp_mask)
+{
+ return gfp_mask;
+}
+
static inline void sk_acceptq_removed(struct sock *sk)
{
sk->sk_ack_backlog--;
Index: linux-2.6/net/ipv6/tcp_ipv6.c
===================================================================
--- linux-2.6.orig/net/ipv6/tcp_ipv6.c
+++ linux-2.6/net/ipv6/tcp_ipv6.c
@@ -574,7 +574,8 @@ static int tcp_v6_md5_do_add(struct sock
} else {
/* reallocate new list if current one is full. */
if (!tp->md5sig_info) {
- tp->md5sig_info = kzalloc(sizeof(*tp->md5sig_info), GFP_ATOMIC);
+ tp->md5sig_info = kzalloc(sizeof(*tp->md5sig_info),
+ sk_allocation(sk, GFP_ATOMIC));
if (!tp->md5sig_info) {
kfree(newkey);
return -ENOMEM;
@@ -587,7 +588,8 @@ static int tcp_v6_md5_do_add(struct sock
}
if (tp->md5sig_info->alloced6 == tp->md5sig_info->entries6) {
keys = kmalloc((sizeof (tp->md5sig_info->keys6[0]) *
- (tp->md5sig_info->entries6 + 1)), GFP_ATOMIC);
+ (tp->md5sig_info->entries6 + 1)),
+ sk_allocation(sk, GFP_ATOMIC));
if (!keys) {
tcp_free_md5sig_pool();
@@ -711,7 +713,7 @@ static int tcp_v6_parse_md5_keys (struct
struct tcp_sock *tp = tcp_sk(sk);
struct tcp_md5sig_info *p;
- p = kzalloc(sizeof(struct tcp_md5sig_info), GFP_KERNEL);
+ p = kzalloc(sizeof(struct tcp_md5sig_info), sk->sk_allocation);
if (!p)
return -ENOMEM;
@@ -1012,7 +1014,7 @@ static void tcp_v6_send_reset(struct soc
*/
buff = alloc_skb(MAX_HEADER + sizeof(struct ipv6hdr) + tot_len,
- GFP_ATOMIC);
+ sk_allocation(sk, GFP_ATOMIC));
if (buff == NULL)
return;
@@ -1091,10 +1093,12 @@ static void tcp_v6_send_ack(struct tcp_t
struct tcp_md5sig_key *key;
struct tcp_md5sig_key tw_key;
#endif
+ gfp_t gfp_mask = GFP_ATOMIC;
#ifdef CONFIG_TCP_MD5SIG
if (!tw && skb->sk) {
key = tcp_v6_md5_do_lookup(skb->sk, &ipv6_hdr(skb)->daddr);
+ gfp_mask = sk_allocation(skb->sk, gfp_mask);
} else if (tw && tw->tw_md5_keylen) {
tw_key.key = tw->tw_md5_key;
tw_key.keylen = tw->tw_md5_keylen;
@@ -1112,7 +1116,7 @@ static void tcp_v6_send_ack(struct tcp_t
#endif
buff = alloc_skb(MAX_HEADER + sizeof(struct ipv6hdr) + tot_len,
- GFP_ATOMIC);
+ gfp_mask);
if (buff == NULL)
return;
Index: linux-2.6/net/ipv4/tcp.c
===================================================================
--- linux-2.6.orig/net/ipv4/tcp.c
+++ linux-2.6/net/ipv4/tcp.c
@@ -636,7 +636,7 @@ struct sk_buff *sk_stream_alloc_skb(stru
/* The TCP header must be at least 32-bit aligned. */
size = ALIGN(size, 4);
- skb = alloc_skb_fclone(size + sk->sk_prot->max_header, gfp);
+ skb = alloc_skb_fclone(size + sk->sk_prot->max_header, sk_allocation(sk, gfp));
if (skb) {
if (sk_stream_wmem_schedule(sk, skb->truesize)) {
/*
--
^ permalink raw reply
* [PATCH 12/29] net: wrap sk->sk_backlog_rcv()
From: Peter Zijlstra @ 2007-12-14 15:39 UTC (permalink / raw)
To: Linus Torvalds, Andrew Morton, linux-kernel, linux-mm, netdev,
trond.myklebust
Cc: Peter Zijlstra
In-Reply-To: <20071214153907.770251000@chello.nl>
[-- Attachment #1: net-backlog.patch --]
[-- Type: text/plain, Size: 2412 bytes --]
Wrap calling sk->sk_backlog_rcv() in a function. This will allow extending the
generic sk_backlog_rcv behaviour.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
include/net/sock.h | 5 +++++
net/core/sock.c | 4 ++--
net/ipv4/tcp.c | 2 +-
net/ipv4/tcp_timer.c | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
Index: linux-2.6/include/net/sock.h
===================================================================
--- linux-2.6.orig/include/net/sock.h
+++ linux-2.6/include/net/sock.h
@@ -485,6 +485,11 @@ static inline void sk_add_backlog(struct
skb->next = NULL;
}
+static inline int sk_backlog_rcv(struct sock *sk, struct sk_buff *skb)
+{
+ return sk->sk_backlog_rcv(sk, skb);
+}
+
#define sk_wait_event(__sk, __timeo, __condition) \
({ int __rc; \
release_sock(__sk); \
Index: linux-2.6/net/core/sock.c
===================================================================
--- linux-2.6.orig/net/core/sock.c
+++ linux-2.6/net/core/sock.c
@@ -320,7 +320,7 @@ int sk_receive_skb(struct sock *sk, stru
*/
mutex_acquire(&sk->sk_lock.dep_map, 0, 1, _RET_IP_);
- rc = sk->sk_backlog_rcv(sk, skb);
+ rc = sk_backlog_rcv(sk, skb);
mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
} else
@@ -1312,7 +1312,7 @@ static void __release_sock(struct sock *
struct sk_buff *next = skb->next;
skb->next = NULL;
- sk->sk_backlog_rcv(sk, skb);
+ sk_backlog_rcv(sk, skb);
/*
* We are in process context here with softirqs
Index: linux-2.6/net/ipv4/tcp.c
===================================================================
--- linux-2.6.orig/net/ipv4/tcp.c
+++ linux-2.6/net/ipv4/tcp.c
@@ -1134,7 +1134,7 @@ static void tcp_prequeue_process(struct
* necessary */
local_bh_disable();
while ((skb = __skb_dequeue(&tp->ucopy.prequeue)) != NULL)
- sk->sk_backlog_rcv(sk, skb);
+ sk_backlog_rcv(sk, skb);
local_bh_enable();
/* Clear memory counter. */
Index: linux-2.6/net/ipv4/tcp_timer.c
===================================================================
--- linux-2.6.orig/net/ipv4/tcp_timer.c
+++ linux-2.6/net/ipv4/tcp_timer.c
@@ -196,7 +196,7 @@ static void tcp_delack_timer(unsigned lo
NET_INC_STATS_BH(LINUX_MIB_TCPSCHEDULERFAILED);
while ((skb = __skb_dequeue(&tp->ucopy.prequeue)) != NULL)
- sk->sk_backlog_rcv(sk, skb);
+ sk_backlog_rcv(sk, skb);
tp->ucopy.memory = 0;
}
--
^ permalink raw reply
* [PATCH 13/29] net: packet split receive api
From: Peter Zijlstra @ 2007-12-14 15:39 UTC (permalink / raw)
To: Linus Torvalds, Andrew Morton, linux-kernel, linux-mm, netdev,
trond.myklebust
Cc: Peter Zijlstra
In-Reply-To: <20071214153907.770251000@chello.nl>
[-- Attachment #1: net-ps_rx.patch --]
[-- Type: text/plain, Size: 5645 bytes --]
Add some packet-split receive hooks.
For one this allows to do NUMA node affine page allocs. Later on these hooks
will be extended to do emergency reserve allocations for fragments.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
drivers/net/e1000/e1000_main.c | 8 ++------
drivers/net/sky2.c | 16 ++++++----------
include/linux/skbuff.h | 23 +++++++++++++++++++++++
net/core/skbuff.c | 20 ++++++++++++++++++++
4 files changed, 51 insertions(+), 16 deletions(-)
Index: linux-2.6/drivers/net/e1000/e1000_main.c
===================================================================
--- linux-2.6.orig/drivers/net/e1000/e1000_main.c
+++ linux-2.6/drivers/net/e1000/e1000_main.c
@@ -4392,12 +4392,8 @@ e1000_clean_rx_irq_ps(struct e1000_adapt
pci_unmap_page(pdev, ps_page_dma->ps_page_dma[j],
PAGE_SIZE, PCI_DMA_FROMDEVICE);
ps_page_dma->ps_page_dma[j] = 0;
- skb_fill_page_desc(skb, j, ps_page->ps_page[j], 0,
- length);
+ skb_add_rx_frag(skb, j, ps_page->ps_page[j], 0, length);
ps_page->ps_page[j] = NULL;
- skb->len += length;
- skb->data_len += length;
- skb->truesize += length;
}
/* strip the ethernet crc, problem is we're using pages now so
@@ -4605,7 +4601,7 @@ e1000_alloc_rx_buffers_ps(struct e1000_a
if (j < adapter->rx_ps_pages) {
if (likely(!ps_page->ps_page[j])) {
ps_page->ps_page[j] =
- alloc_page(GFP_ATOMIC);
+ netdev_alloc_page(netdev);
if (unlikely(!ps_page->ps_page[j])) {
adapter->alloc_rx_buff_failed++;
goto no_buffers;
Index: linux-2.6/include/linux/skbuff.h
===================================================================
--- linux-2.6.orig/include/linux/skbuff.h
+++ linux-2.6/include/linux/skbuff.h
@@ -851,6 +851,9 @@ static inline void skb_fill_page_desc(st
skb_shinfo(skb)->nr_frags = i + 1;
}
+extern void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page,
+ int off, int size);
+
#define SKB_PAGE_ASSERT(skb) BUG_ON(skb_shinfo(skb)->nr_frags)
#define SKB_FRAG_ASSERT(skb) BUG_ON(skb_shinfo(skb)->frag_list)
#define SKB_LINEAR_ASSERT(skb) BUG_ON(skb_is_nonlinear(skb))
@@ -1344,6 +1347,26 @@ static inline struct sk_buff *netdev_all
return __netdev_alloc_skb(dev, length, GFP_ATOMIC);
}
+extern struct page *__netdev_alloc_page(struct net_device *dev, gfp_t gfp_mask);
+
+/**
+ * netdev_alloc_page - allocate a page for ps-rx on a specific device
+ * @dev: network device to receive on
+ *
+ * Allocate a new page node local to the specified device.
+ *
+ * %NULL is returned if there is no free memory.
+ */
+static inline struct page *netdev_alloc_page(struct net_device *dev)
+{
+ return __netdev_alloc_page(dev, GFP_ATOMIC);
+}
+
+static inline void netdev_free_page(struct net_device *dev, struct page *page)
+{
+ __free_page(page);
+}
+
/**
* skb_clone_writable - is the header of a clone writable
* @skb: buffer to check
Index: linux-2.6/net/core/skbuff.c
===================================================================
--- linux-2.6.orig/net/core/skbuff.c
+++ linux-2.6/net/core/skbuff.c
@@ -263,6 +263,24 @@ struct sk_buff *__netdev_alloc_skb(struc
return skb;
}
+struct page *__netdev_alloc_page(struct net_device *dev, gfp_t gfp_mask)
+{
+ int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
+ struct page *page;
+
+ page = alloc_pages_node(node, gfp_mask, 0);
+ return page;
+}
+
+void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off,
+ int size)
+{
+ skb_fill_page_desc(skb, i, page, off, size);
+ skb->len += size;
+ skb->data_len += size;
+ skb->truesize += size;
+}
+
static void skb_drop_list(struct sk_buff **listp)
{
struct sk_buff *list = *listp;
@@ -2466,6 +2484,8 @@ EXPORT_SYMBOL(kfree_skb);
EXPORT_SYMBOL(__pskb_pull_tail);
EXPORT_SYMBOL(__alloc_skb);
EXPORT_SYMBOL(__netdev_alloc_skb);
+EXPORT_SYMBOL(__netdev_alloc_page);
+EXPORT_SYMBOL(skb_add_rx_frag);
EXPORT_SYMBOL(pskb_copy);
EXPORT_SYMBOL(pskb_expand_head);
EXPORT_SYMBOL(skb_checksum);
Index: linux-2.6/drivers/net/sky2.c
===================================================================
--- linux-2.6.orig/drivers/net/sky2.c
+++ linux-2.6/drivers/net/sky2.c
@@ -1198,7 +1198,7 @@ static struct sk_buff *sky2_rx_alloc(str
}
for (i = 0; i < sky2->rx_nfrags; i++) {
- struct page *page = alloc_page(GFP_ATOMIC);
+ struct page *page = netdev_alloc_page(sky2->netdev);
if (!page)
goto free_partial;
@@ -2072,8 +2072,8 @@ static struct sk_buff *receive_copy(stru
}
/* Adjust length of skb with fragments to match received data */
-static void skb_put_frags(struct sk_buff *skb, unsigned int hdr_space,
- unsigned int length)
+static void skb_put_frags(struct sky2_port *sky2, struct sk_buff *skb,
+ unsigned int hdr_space, unsigned int length)
{
int i, num_frags;
unsigned int size;
@@ -2090,15 +2090,11 @@ static void skb_put_frags(struct sk_buff
if (length == 0) {
/* don't need this page */
- __free_page(frag->page);
+ netdev_free_page(sky2->netdev, frag->page);
--skb_shinfo(skb)->nr_frags;
} else {
size = min(length, (unsigned) PAGE_SIZE);
-
- frag->size = size;
- skb->data_len += size;
- skb->truesize += size;
- skb->len += size;
+ skb_add_rx_frag(skb, i, frag->page, 0, size);
length -= size;
}
}
@@ -2125,7 +2121,7 @@ static struct sk_buff *receive_new(struc
sky2_rx_map_skb(sky2->hw->pdev, re, hdr_space);
if (skb_shinfo(skb)->nr_frags)
- skb_put_frags(skb, hdr_space, length);
+ skb_put_frags(sky2, skb, hdr_space, length);
else
skb_put(skb, length);
return skb;
--
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox