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

Commit c7ddbbaf authored by Yonghong Song's avatar Yonghong Song Committed by Alexei Starovoitov
Browse files

tools/bpf: sync uapi bpf.h for bpf_get_current_cgroup_id() helper 



Sync kernel uapi/linux/bpf.h with tools uapi/linux/bpf.h.
Also add the necessary helper define in bpf_helpers.h.

Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarYonghong Song <yhs@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent bf6fa2c8

tools/include/uapi/linux/bpf.h

+7 −1
Original line number Diff line number Diff line
@@ -2070,6 +2070,11 @@ union bpf_attr { 
 * 		**CONFIG_SOCK_CGROUP_DATA** configuration option.

 * 	Return

 * 		The id is returned or 0 in case the id could not be retrieved.

 *

 * u64 bpf_get_current_cgroup_id(void)

 * 	Return

 * 		A 64-bit integer containing the current cgroup id based

 * 		on the cgroup within which the current task is running.

 */

#define __BPF_FUNC_MAPPER(FN)		\

	FN(unspec),			\
@@ -2151,7 +2156,8 @@ union bpf_attr { 
	FN(lwt_seg6_action),		\

	FN(rc_repeat),			\

	FN(rc_keydown),			\

	FN(skb_cgroup_id),

	FN(skb_cgroup_id),		\

	FN(get_current_cgroup_id),



/* integer value in 'imm' field of BPF_CALL instruction selects which helper

 * function eBPF program intends to call

tools/testing/selftests/bpf/bpf_helpers.h

+2 −0
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ static int (*bpf_rc_repeat)(void *ctx) = 
static int (*bpf_rc_keydown)(void *ctx, unsigned int protocol,

			     unsigned long long scancode, unsigned int toggle) =

	(void *) BPF_FUNC_rc_keydown;

static unsigned long long (*bpf_get_current_cgroup_id)(void) =

	(void *) BPF_FUNC_get_current_cgroup_id;



/* llvm builtin functions that eBPF C program may use to

 * emit BPF_LD_ABS and BPF_LD_IND instructions