diff options
author | Eric Dumazet <edumazet@google.com> | 2012-06-10 17:11:57 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 11:47:37 -0400 |
commit | 7dd0931198ce3e25901ffb56036bb070efe9f987 (patch) | |
tree | 10bbc06400be41b656dc4e5f9465fceb5b949e3a | |
parent | e99e096f4b388824e49ce5c6568eacf46c94438f (diff) |
dummy: fix rcu_sched self-detected stalls
[ Upstream commit 16b0dc29c1af9df341428f4c49ada4f626258082 ]
Trying to "modprobe dummy numdummies=30000" triggers :
INFO: rcu_sched self-detected stall on CPU { 8} (t=60000 jiffies)
After this splat, RTNL is locked and reboot is needed.
We must call cond_resched() to avoid this, even holding RTNL.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/net/dummy.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c index 3fa19c16211..098ff315694 100644 --- a/drivers/net/dummy.c +++ b/drivers/net/dummy.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include <linux/rtnetlink.h> | 37 | #include <linux/rtnetlink.h> |
38 | #include <net/rtnetlink.h> | 38 | #include <net/rtnetlink.h> |
39 | #include <linux/u64_stats_sync.h> | 39 | #include <linux/u64_stats_sync.h> |
40 | #include <linux/sched.h> | ||
40 | 41 | ||
41 | static int numdummies = 1; | 42 | static int numdummies = 1; |
42 | 43 | ||
@@ -186,8 +187,10 @@ static int __init dummy_init_module(void) | |||
186 | rtnl_lock(); | 187 | rtnl_lock(); |
187 | err = __rtnl_link_register(&dummy_link_ops); | 188 | err = __rtnl_link_register(&dummy_link_ops); |
188 | 189 | ||
189 | for (i = 0; i < numdummies && !err; i++) | 190 | for (i = 0; i < numdummies && !err; i++) { |
190 | err = dummy_init_one(); | 191 | err = dummy_init_one(); |
192 | cond_resched(); | ||
193 | } | ||
191 | if (err < 0) | 194 | if (err < 0) |
192 | __rtnl_link_unregister(&dummy_link_ops); | 195 | __rtnl_link_unregister(&dummy_link_ops); |
193 | rtnl_unlock(); | 196 | rtnl_unlock(); |