diff options
author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2017-09-05 11:31:23 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-09-05 17:48:29 -0400 |
commit | 2c8468dcf8303c68712f11c782d7d8724de07a73 (patch) | |
tree | 9d4b98733684b7554737987f4553c7ecc99b1e23 | |
parent | 8b949bef9172ca69d918e93509a4ecb03d0355e0 (diff) |
net: sched: don't use GFP_KERNEL under spin lock
The new TC IDR code uses GFP_KERNEL under spin lock. Which leads
to:
[ 582.621091] BUG: sleeping function called from invalid context at ../mm/slab.h:416
[ 582.629721] in_atomic(): 1, irqs_disabled(): 0, pid: 3379, name: tc
[ 582.636939] 2 locks held by tc/3379:
[ 582.641049] #0: (rtnl_mutex){+.+.+.}, at: [<ffffffff910354ce>] rtnetlink_rcv_msg+0x92e/0x1400
[ 582.650958] #1: (&(&tn->idrinfo->lock)->rlock){+.-.+.}, at: [<ffffffff9110a5e0>] tcf_idr_create+0x2f0/0x8e0
[ 582.662217] Preemption disabled at:
[ 582.662222] [<ffffffff9110a5e0>] tcf_idr_create+0x2f0/0x8e0
[ 582.672592] CPU: 9 PID: 3379 Comm: tc Tainted: G W 4.13.0-rc7-debug-00648-g43503a79b9f0 #287
[ 582.683432] Hardware name: Dell Inc. PowerEdge R730/072T6D, BIOS 2.3.4 11/08/2016
[ 582.691937] Call Trace:
...
[ 582.742460] kmem_cache_alloc+0x286/0x540
[ 582.747055] radix_tree_node_alloc.constprop.6+0x4a/0x450
[ 582.753209] idr_get_free_cmn+0x627/0xf80
...
[ 582.815525] idr_alloc_cmn+0x1a8/0x270
...
[ 582.833804] tcf_idr_create+0x31b/0x8e0
...
Try to preallocate the memory with idr_prealloc(GFP_KERNEL)
(as suggested by Eric Dumazet), and change the allocation
flags under spin lock.
Fixes: 65a206c01e8e ("net/sched: Change act_api and act_xxx modules to use IDR")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/sched/act_api.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/sched/act_api.c b/net/sched/act_api.c index 0eb545bcb247..a306974e2fb4 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c | |||
@@ -296,10 +296,12 @@ err2: | |||
296 | spin_lock_init(&p->tcfa_lock); | 296 | spin_lock_init(&p->tcfa_lock); |
297 | /* user doesn't specify an index */ | 297 | /* user doesn't specify an index */ |
298 | if (!index) { | 298 | if (!index) { |
299 | idr_preload(GFP_KERNEL); | ||
299 | spin_lock_bh(&idrinfo->lock); | 300 | spin_lock_bh(&idrinfo->lock); |
300 | err = idr_alloc_ext(idr, NULL, &idr_index, 1, 0, | 301 | err = idr_alloc_ext(idr, NULL, &idr_index, 1, 0, |
301 | GFP_KERNEL); | 302 | GFP_ATOMIC); |
302 | spin_unlock_bh(&idrinfo->lock); | 303 | spin_unlock_bh(&idrinfo->lock); |
304 | idr_preload_end(); | ||
303 | if (err) { | 305 | if (err) { |
304 | err3: | 306 | err3: |
305 | free_percpu(p->cpu_qstats); | 307 | free_percpu(p->cpu_qstats); |
@@ -307,10 +309,12 @@ err3: | |||
307 | } | 309 | } |
308 | p->tcfa_index = idr_index; | 310 | p->tcfa_index = idr_index; |
309 | } else { | 311 | } else { |
312 | idr_preload(GFP_KERNEL); | ||
310 | spin_lock_bh(&idrinfo->lock); | 313 | spin_lock_bh(&idrinfo->lock); |
311 | err = idr_alloc_ext(idr, NULL, NULL, index, index + 1, | 314 | err = idr_alloc_ext(idr, NULL, NULL, index, index + 1, |
312 | GFP_KERNEL); | 315 | GFP_ATOMIC); |
313 | spin_unlock_bh(&idrinfo->lock); | 316 | spin_unlock_bh(&idrinfo->lock); |
317 | idr_preload_end(); | ||
314 | if (err) | 318 | if (err) |
315 | goto err3; | 319 | goto err3; |
316 | p->tcfa_index = index; | 320 | p->tcfa_index = index; |