Skip to content

Commit ba3eee1

Browse files
Sahil ChandnaKernel Patches Daemon
authored andcommitted
bpf: test_run: Fix timer mode initialization to NO_MIGRATE mode
By default, the timer mode is being initialized to `NO_PREEMPT`. This disables preemption and forces execution in atomic context. This can cause issue with PREEMPT_RT when calling spin_lock_bh() due to sleeping nature of the lock. ... BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:48 in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 6107, name: syz.0.17 preempt_count: 1, expected: 0 RCU nest depth: 1, expected: 1 Preemption disabled at: [<ffffffff891fce58>] bpf_test_timer_enter+0xf8/0x140 net/bpf/test_run.c:42 Call Trace: <TASK> dump_stack_lvl+0x189/0x250 lib/dump_stack.c:120 __might_resched+0x44b/0x5d0 kernel/sched/core.c:8957 __rt_spin_lock kernel/locking/spinlock_rt.c:48 [inline] rt_spin_lock+0xc7/0x2c0 kernel/locking/spinlock_rt.c:57 spin_lock_bh include/linux/spinlock_rt.h:88 [inline] __sock_map_delete net/core/sock_map.c:421 [inline] sock_map_delete_elem+0xb7/0x170 net/core/sock_map.c:452 bpf_prog_2c29ac5cdc6b1842+0x43/0x4b bpf_dispatcher_nop_func include/linux/bpf.h:1332 [inline] ... Change initialization to NO_MIGRATE mode to prevent this. Reported-by: [email protected] Closes: https://syzkaller.appspot.com/bug?extid=1f1fbecb9413cdbfbef8 Tested-by: [email protected] Signed-off-by: Sahil Chandna <[email protected]>
1 parent 879ec96 commit ba3eee1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

net/bpf/test_run.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,7 +1377,7 @@ int bpf_prog_test_run_flow_dissector(struct bpf_prog *prog,
13771377
const union bpf_attr *kattr,
13781378
union bpf_attr __user *uattr)
13791379
{
1380-
struct bpf_test_timer t = { NO_PREEMPT };
1380+
struct bpf_test_timer t = { NO_MIGRATE };
13811381
u32 size = kattr->test.data_size_in;
13821382
struct bpf_flow_dissector ctx = {};
13831383
u32 repeat = kattr->test.repeat;
@@ -1445,7 +1445,7 @@ int bpf_prog_test_run_flow_dissector(struct bpf_prog *prog,
14451445
int bpf_prog_test_run_sk_lookup(struct bpf_prog *prog, const union bpf_attr *kattr,
14461446
union bpf_attr __user *uattr)
14471447
{
1448-
struct bpf_test_timer t = { NO_PREEMPT };
1448+
struct bpf_test_timer t = { NO_MIGRATE };
14491449
struct bpf_prog_array *progs = NULL;
14501450
struct bpf_sk_lookup_kern ctx = {};
14511451
u32 repeat = kattr->test.repeat;

0 commit comments

Comments
 (0)