diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2020-02-24 11:27:15 -0800 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2020-02-24 16:17:14 -0800 |
| commit | 70ed0706a48e3da3eb4515214fef658ff1184b9f (patch) | |
| tree | 5386280db17266282a2020c44e3a15c47c484e6b /kernel/trace | |
| parent | 1b7a51a63b031092b8b8acda3f6820b62a8b5e5d (diff) | |
bpf: disable preemption for bpf progs attached to uprobe
trace_call_bpf() no longer disables preemption on its own.
All callers of this function has to do it explicitly.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace_uprobe.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index 18d16f3ef980..2a8e8e9c1c75 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -1333,8 +1333,15 @@ static void __uprobe_perf_func(struct trace_uprobe *tu, int size, esize; int rctx; - if (bpf_prog_array_valid(call) && !trace_call_bpf(call, regs)) - return; + if (bpf_prog_array_valid(call)) { + u32 ret; + + preempt_disable(); + ret = trace_call_bpf(call, regs); + preempt_enable(); + if (!ret) + return; + } esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu)); |