Commit 02ad0596 authored by David Miller's avatar David Miller Committed by Alexei Starovoitov

bpf: Use migrate_disable/enabe() in trampoline code.

Instead of preemption disable/enable to reflect the purpose. This allows
PREEMPT_RT to substitute it with an actual migration disable
implementation. On non RT kernels this is still mapped to
preempt_disable/enable().
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200224145643.891428873@linutronix.de
parent 6eac7795
...@@ -367,8 +367,9 @@ void bpf_trampoline_put(struct bpf_trampoline *tr) ...@@ -367,8 +367,9 @@ void bpf_trampoline_put(struct bpf_trampoline *tr)
mutex_unlock(&trampoline_mutex); mutex_unlock(&trampoline_mutex);
} }
/* The logic is similar to BPF_PROG_RUN, but with explicit rcu and preempt that /* The logic is similar to BPF_PROG_RUN, but with an explicit
* are needed for trampoline. The macro is split into * rcu_read_lock() and migrate_disable() which are required
* for the trampoline. The macro is split into
* call _bpf_prog_enter * call _bpf_prog_enter
* call prog->bpf_func * call prog->bpf_func
* call __bpf_prog_exit * call __bpf_prog_exit
...@@ -378,7 +379,7 @@ u64 notrace __bpf_prog_enter(void) ...@@ -378,7 +379,7 @@ u64 notrace __bpf_prog_enter(void)
u64 start = 0; u64 start = 0;
rcu_read_lock(); rcu_read_lock();
preempt_disable(); migrate_disable();
if (static_branch_unlikely(&bpf_stats_enabled_key)) if (static_branch_unlikely(&bpf_stats_enabled_key))
start = sched_clock(); start = sched_clock();
return start; return start;
...@@ -401,7 +402,7 @@ void notrace __bpf_prog_exit(struct bpf_prog *prog, u64 start) ...@@ -401,7 +402,7 @@ void notrace __bpf_prog_exit(struct bpf_prog *prog, u64 start)
stats->nsecs += sched_clock() - start; stats->nsecs += sched_clock() - start;
u64_stats_update_end(&stats->syncp); u64_stats_update_end(&stats->syncp);
} }
preempt_enable(); migrate_enable();
rcu_read_unlock(); rcu_read_unlock();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment