Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a498cfe9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ebpf_helpers' 



Daniel Borkmann says:

====================
eBPF updates

Two small eBPF helper additions to better match up with ancillary
classic BPF functionality.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 12028820 c04167ce

include/linux/bpf.h

+3 −0
Original line number Diff line number Diff line
@@ -154,4 +154,7 @@ extern const struct bpf_func_proto bpf_map_lookup_elem_proto; 
extern const struct bpf_func_proto bpf_map_update_elem_proto;

extern const struct bpf_func_proto bpf_map_delete_elem_proto;



extern const struct bpf_func_proto bpf_get_prandom_u32_proto;

extern const struct bpf_func_proto bpf_get_smp_processor_id_proto;



#endif /* _LINUX_BPF_H */

include/uapi/linux/bpf.h

+2 −0
Original line number Diff line number Diff line
@@ -165,6 +165,8 @@ enum bpf_func_id { 
	BPF_FUNC_map_lookup_elem, /* void *map_lookup_elem(&map, &key) */

	BPF_FUNC_map_update_elem, /* int map_update_elem(&map, &key, &value, flags) */

	BPF_FUNC_map_delete_elem, /* int map_delete_elem(&map, &key) */

	BPF_FUNC_get_prandom_u32, /* u32 prandom_u32(void) */

	BPF_FUNC_get_smp_processor_id, /* u32 raw_smp_processor_id(void) */

	__BPF_FUNC_MAX_ID,

};

kernel/bpf/core.c

+3 −0
Original line number Diff line number Diff line
@@ -661,6 +661,9 @@ const struct bpf_func_proto bpf_map_lookup_elem_proto __weak; 
const struct bpf_func_proto bpf_map_update_elem_proto __weak;

const struct bpf_func_proto bpf_map_delete_elem_proto __weak;



const struct bpf_func_proto bpf_get_prandom_u32_proto __weak;

const struct bpf_func_proto bpf_get_smp_processor_id_proto __weak;



/* To execute LD_ABS/LD_IND instructions __bpf_prog_run() may call

 * skb_copy_bits(), so provide a weak definition of it for NET-less config.

 */

kernel/bpf/helpers.c

+24 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
 */

#include <linux/bpf.h>

#include <linux/rcupdate.h>

#include <linux/random.h>

#include <linux/smp.h>



/* If kernel subsystem is allowing eBPF programs to call this function,

 * 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 = { 
	.arg1_type = ARG_CONST_MAP_PTR,

	.arg2_type = ARG_PTR_TO_MAP_KEY,

};



static u64 bpf_get_prandom_u32(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5)

{

	return prandom_u32();

}



const struct bpf_func_proto bpf_get_prandom_u32_proto = {

	.func		= bpf_get_prandom_u32,

	.gpl_only	= false,

	.ret_type	= RET_INTEGER,

};



static u64 bpf_get_smp_processor_id(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5)

{

	return raw_smp_processor_id();

}



const struct bpf_func_proto bpf_get_smp_processor_id_proto = {

	.func		= bpf_get_smp_processor_id,

	.gpl_only	= false,

	.ret_type	= RET_INTEGER,

};

net/core/filter.c

+4 −0
Original line number Diff line number Diff line
@@ -1139,6 +1139,10 @@ sk_filter_func_proto(enum bpf_func_id func_id) 
		return &bpf_map_update_elem_proto;

	case BPF_FUNC_map_delete_elem:

		return &bpf_map_delete_elem_proto;

	case BPF_FUNC_get_prandom_u32:

		return &bpf_get_prandom_u32_proto;

	case BPF_FUNC_get_smp_processor_id:

		return &bpf_get_smp_processor_id_proto;

	default:

		return NULL;

	}