diff options
author | Daniel Borkmann <daniel@iogearbox.net> | 2015-05-29 17:23:06 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-06-01 00:44:44 -0400 |
commit | 17ca8cbf49be3aa94bb1c2b7ee6545fd70094eb4 (patch) | |
tree | 100f160426a26857a776c4b3fd3beb8848bda474 /kernel/trace | |
parent | a24c85abc0815c14d9e5266d06b9acd8a0a57b9a (diff) |
ebpf: allow bpf_ktime_get_ns_proto also for networking
As this is already exported from tracing side via commit d9847d310ab4
("tracing: Allow BPF programs to call bpf_ktime_get_ns()"), we might
as well want to move it to the core, so also networking users can make
use of it, e.g. to measure diffs for certain flows from ingress/egress.
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/trace')
-rw-r--r-- | kernel/trace/bpf_trace.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 646445e41bd4..50c4015a8ad3 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c | |||
@@ -79,18 +79,6 @@ static const struct bpf_func_proto bpf_probe_read_proto = { | |||
79 | .arg3_type = ARG_ANYTHING, | 79 | .arg3_type = ARG_ANYTHING, |
80 | }; | 80 | }; |
81 | 81 | ||
82 | static u64 bpf_ktime_get_ns(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5) | ||
83 | { | ||
84 | /* NMI safe access to clock monotonic */ | ||
85 | return ktime_get_mono_fast_ns(); | ||
86 | } | ||
87 | |||
88 | static const struct bpf_func_proto bpf_ktime_get_ns_proto = { | ||
89 | .func = bpf_ktime_get_ns, | ||
90 | .gpl_only = true, | ||
91 | .ret_type = RET_INTEGER, | ||
92 | }; | ||
93 | |||
94 | /* | 82 | /* |
95 | * limited trace_printk() | 83 | * limited trace_printk() |
96 | * only %d %u %x %ld %lu %lx %lld %llu %llx %p conversion specifiers allowed | 84 | * only %d %u %x %ld %lu %lx %lld %llu %llx %p conversion specifiers allowed |