diff options
| author | Daniel Borkmann <daniel@iogearbox.net> | 2016-06-28 12:18:26 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-30 11:54:40 +0200 |
| commit | 80b48c445797a634d869c7e5a53e182ba2688931 (patch) | |
| tree | 18b46e8be4b541b966929a478c26c184e2ac3862 /kernel/bpf | |
| parent | bpf, trace: add BPF_F_CURRENT_CPU flag for bpf_perf_event_read (diff) | |
| download | linux-80b48c445797a634d869c7e5a53e182ba2688931.tar.xz linux-80b48c445797a634d869c7e5a53e182ba2688931.zip | |
bpf: don't use raw processor id in generic helper
Use smp_processor_id() for the generic helper bpf_get_smp_processor_id()
instead of the raw variant. This allows for preemption checks when we
have DEBUG_PREEMPT, and otherwise uses the raw variant anyway. We only
need to keep the raw variant for socket filters, but we can reuse the
helper that is already there from cBPF side.
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/bpf')
| -rw-r--r-- | kernel/bpf/helpers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c index ad7a0573f71b..1ea3afba1a4f 100644 --- a/kernel/bpf/helpers.c +++ b/kernel/bpf/helpers.c @@ -101,7 +101,7 @@ const struct bpf_func_proto bpf_get_prandom_u32_proto = { static u64 bpf_get_smp_processor_id(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5) { - return raw_smp_processor_id(); + return smp_processor_id(); } const struct bpf_func_proto bpf_get_smp_processor_id_proto = { |