Skip to content

bpf: Remove migrate_disable in kprobe_multi_link_prog_run #5686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kernel-patches-daemon-bpf-rc wants to merge 1 commit into from
Closed

bpf: Remove migrate_disable in kprobe_multi_link_prog_run #5686

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions kernel/trace/bpf_trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2734,14 +2734,19 @@ kprobe_multi_link_prog_run(struct bpf_kprobe_multi_link *link,
goto out;
}

migrate_disable();
/*
* bpf program should run under migration disabled, kprobe_multi_link_prog_run
* called all the way from graph tracer, which disables preemption in
* function_graph_enter_regs, so there is no need to use migrate_disable.
* Accessing the above percpu data bpf_prog_active is also safe for the same
* reason.
*/
rcu_read_lock();
regs = ftrace_partial_regs(fregs, bpf_kprobe_multi_pt_regs_ptr());
old_run_ctx = bpf_set_run_ctx(&run_ctx.session_ctx.run_ctx);
err = bpf_prog_run(link->link.prog, regs);
bpf_reset_run_ctx(old_run_ctx);
rcu_read_unlock();
migrate_enable();

out:
__this_cpu_dec(bpf_prog_active);
Expand Down
Loading