aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Borkmann <daniel@iogearbox.net>2015-03-13 21:27:16 -0400
committerDavid S. Miller <davem@davemloft.net>2015-03-15 21:57:25 -0400
commit03e69b508b6f7c51743055c9f61d1dfeadf4b635 (patch)
tree4c9199cde0fe876871e20352666d40721d4c1d5f
parent12028820423bd7705beb5e09889faab95c545ea1 (diff)
ebpf: add prandom helper for packet sampling
This work is similar to commit 4cd3675ebf74 ("filter: added BPF random opcode") and adds a possibility for packet sampling in eBPF. Currently, this is only possible in classic BPF and useful to combine sampling with f.e. packet sockets, possible also with tc. Example function proto-type looks like: u32 (*prandom_u32)(void) = (void *)BPF_FUNC_get_prandom_u32; Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/bpf.h2
-rw-r--r--include/uapi/linux/bpf.h1
-rw-r--r--kernel/bpf/core.c2
-rw-r--r--kernel/bpf/helpers.c12
-rw-r--r--net/core/filter.c2
5 files changed, 19 insertions, 0 deletions
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 80f2e0fc3d02..50bf95e29a96 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -154,4 +154,6 @@ extern const struct bpf_func_proto bpf_map_lookup_elem_proto;
154extern const struct bpf_func_proto bpf_map_update_elem_proto; 154extern const struct bpf_func_proto bpf_map_update_elem_proto;
155extern const struct bpf_func_proto bpf_map_delete_elem_proto; 155extern const struct bpf_func_proto bpf_map_delete_elem_proto;
156 156
157extern const struct bpf_func_proto bpf_get_prandom_u32_proto;
158
157#endif /* _LINUX_BPF_H */ 159#endif /* _LINUX_BPF_H */
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 3fa1af8a58d7..1c2ca2b477c8 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -165,6 +165,7 @@ enum bpf_func_id {
165 BPF_FUNC_map_lookup_elem, /* void *map_lookup_elem(&map, &key) */ 165 BPF_FUNC_map_lookup_elem, /* void *map_lookup_elem(&map, &key) */
166 BPF_FUNC_map_update_elem, /* int map_update_elem(&map, &key, &value, flags) */ 166 BPF_FUNC_map_update_elem, /* int map_update_elem(&map, &key, &value, flags) */
167 BPF_FUNC_map_delete_elem, /* int map_delete_elem(&map, &key) */ 167 BPF_FUNC_map_delete_elem, /* int map_delete_elem(&map, &key) */
168 BPF_FUNC_get_prandom_u32, /* u32 prandom_u32(void) */
168 __BPF_FUNC_MAX_ID, 169 __BPF_FUNC_MAX_ID,
169}; 170};
170 171
diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index 50603aec766a..c1dbbb5d289b 100644
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -661,6 +661,8 @@ const struct bpf_func_proto bpf_map_lookup_elem_proto __weak;
661const struct bpf_func_proto bpf_map_update_elem_proto __weak; 661const struct bpf_func_proto bpf_map_update_elem_proto __weak;
662const struct bpf_func_proto bpf_map_delete_elem_proto __weak; 662const struct bpf_func_proto bpf_map_delete_elem_proto __weak;
663 663
664const struct bpf_func_proto bpf_get_prandom_u32_proto __weak;
665
664/* To execute LD_ABS/LD_IND instructions __bpf_prog_run() may call 666/* To execute LD_ABS/LD_IND instructions __bpf_prog_run() may call
665 * skb_copy_bits(), so provide a weak definition of it for NET-less config. 667 * skb_copy_bits(), so provide a weak definition of it for NET-less config.
666 */ 668 */
diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c
index a3c7701a8b5e..95eb59a045ea 100644
--- a/kernel/bpf/helpers.c
+++ b/kernel/bpf/helpers.c
@@ -11,6 +11,7 @@
11 */ 11 */
12#include <linux/bpf.h> 12#include <linux/bpf.h>
13#include <linux/rcupdate.h> 13#include <linux/rcupdate.h>
14#include <linux/random.h>
14 15
15/* If kernel subsystem is allowing eBPF programs to call this function, 16/* If kernel subsystem is allowing eBPF programs to call this function,
16 * inside its own verifier_ops->get_func_proto() callback it should return 17 * inside its own verifier_ops->get_func_proto() callback it should return
@@ -87,3 +88,14 @@ const struct bpf_func_proto bpf_map_delete_elem_proto = {
87 .arg1_type = ARG_CONST_MAP_PTR, 88 .arg1_type = ARG_CONST_MAP_PTR,
88 .arg2_type = ARG_PTR_TO_MAP_KEY, 89 .arg2_type = ARG_PTR_TO_MAP_KEY,
89}; 90};
91
92static u64 bpf_get_prandom_u32(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5)
93{
94 return prandom_u32();
95}
96
97const struct bpf_func_proto bpf_get_prandom_u32_proto = {
98 .func = bpf_get_prandom_u32,
99 .gpl_only = false,
100 .ret_type = RET_INTEGER,
101};
diff --git a/net/core/filter.c b/net/core/filter.c
index 7a4eb7030dba..4344db39af2e 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -1139,6 +1139,8 @@ sk_filter_func_proto(enum bpf_func_id func_id)
1139 return &bpf_map_update_elem_proto; 1139 return &bpf_map_update_elem_proto;
1140 case BPF_FUNC_map_delete_elem: 1140 case BPF_FUNC_map_delete_elem:
1141 return &bpf_map_delete_elem_proto; 1141 return &bpf_map_delete_elem_proto;
1142 case BPF_FUNC_get_prandom_u32:
1143 return &bpf_get_prandom_u32_proto;
1142 default: 1144 default:
1143 return NULL; 1145 return NULL;
1144 } 1146 }