Merge branch 'ebpf_helpers'

Daniel Borkmann says: ==================== eBPF updates Two small eBPF helper additions to better match up with ancillary classic BPF functionality. ====================

David S. Miller committed 11 years ago

Commit a498cfe2 parents 1202882 c04167c5 files · +36 −0Browse files

Unified · Split

5 files

include/linux/bpf.h +3 −0
include/uapi/linux/bpf.h +2 −0
kernel/bpf/core.c +3 −0
kernel/bpf/helpers.c +24 −0
net/core/filter.c +4 −0

include/linux/bpf.h+3−0

@@ -154,4 +154,7 @@ extern const struct bpf_func_proto bpf_map_lookup_elem_proto; · 153 unmodified lines
154	154	extern const struct bpf_func_proto bpf_map_update_elem_proto;
155	155	extern const struct bpf_func_proto bpf_map_delete_elem_proto;
156	156
	157	+extern const struct bpf_func_proto bpf_get_prandom_u32_proto;
	158	+extern const struct bpf_func_proto bpf_get_smp_processor_id_proto;
	159	+
157	160	#endif /* _LINUX_BPF_H */

include/uapi/linux/bpf.h+2−0

@@ -165,6 +165,8 @@ enum bpf_func_id { · 164 unmodified lines
165	165	BPF_FUNC_map_lookup_elem, /* void map_lookup_elem(&map, &key) /
166	166	BPF_FUNC_map_update_elem, /* int map_update_elem(&map, &key, &value, flags) */
167	167	BPF_FUNC_map_delete_elem, /* int map_delete_elem(&map, &key) */
	168	+ BPF_FUNC_get_prandom_u32, /* u32 prandom_u32(void) */
	169	+ BPF_FUNC_get_smp_processor_id, /* u32 raw_smp_processor_id(void) */
168	170	__BPF_FUNC_MAX_ID,
169	171	};
170	172

kernel/bpf/core.c+3−0

@@ -661,6 +661,9 @@ const struct bpf_func_proto bpf_map_lookup_elem_proto __weak; · 660 unmodified lines
661	661	const struct bpf_func_proto bpf_map_update_elem_proto __weak;
662	662	const struct bpf_func_proto bpf_map_delete_elem_proto __weak;
663	663
	664	+const struct bpf_func_proto bpf_get_prandom_u32_proto __weak;
	665	+const struct bpf_func_proto bpf_get_smp_processor_id_proto __weak;
	666	+
664	667	/* To execute LD_ABS/LD_IND instructions __bpf_prog_run() may call
665	668	* skb_copy_bits(), so provide a weak definition of it for NET-less config.
666	669	*/

kernel/bpf/helpers.c+24−0

@@ -11,6 +11,8 @@ · 10 unmodified lines
11	11	*/
12	12	#include <linux/bpf.h>
13	13	#include <linux/rcupdate.h>
	14	+#include <linux/random.h>
	15	+#include <linux/smp.h>
14	16
15	17	/* If kernel subsystem is allowing eBPF programs to call this function,
16	18	* inside its own verifier_ops->get_func_proto() callback it should return
@@ -87,3 +89,25 @@ const struct bpf_func_proto bpf_map_delete_elem_proto = { · 70 unmodified lines
87	89	.arg1_type = ARG_CONST_MAP_PTR,
88	90	.arg2_type = ARG_PTR_TO_MAP_KEY,
89	91	};
	92	+
	93	+static u64 bpf_get_prandom_u32(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5)
	94	+{
	95	+ return prandom_u32();
	96	+}
	97	+
	98	+const struct bpf_func_proto bpf_get_prandom_u32_proto = {
	99	+ .func = bpf_get_prandom_u32,
	100	+ .gpl_only = false,
	101	+ .ret_type = RET_INTEGER,
	102	+};
	103	+
	104	+static u64 bpf_get_smp_processor_id(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5)
	105	+{
	106	+ return raw_smp_processor_id();
	107	+}
	108	+
	109	+const struct bpf_func_proto bpf_get_smp_processor_id_proto = {
	110	+ .func = bpf_get_smp_processor_id,
	111	+ .gpl_only = false,
	112	+ .ret_type = RET_INTEGER,
	113	+};

net/core/filter.c+4−0

@@ -1139,6 +1139,10 @@ sk_filter_func_proto(enum bpf_func_id func_id) · 1138 unmodified lines
1139	1139	return &bpf_map_update_elem_proto;
1140	1140	case BPF_FUNC_map_delete_elem:
1141	1141	return &bpf_map_delete_elem_proto;
	1142	+ case BPF_FUNC_get_prandom_u32:
	1143	+ return &bpf_get_prandom_u32_proto;
	1144	+ case BPF_FUNC_get_smp_processor_id:
	1145	+ return &bpf_get_smp_processor_id_proto;
1142	1146	default:
1143	1147	return NULL;
1144	1148	}

Merge branch 'ebpf_helpers'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code