bpf: add bpf_skb_cgroup_id helper (cb20b08e) · Commits · 戴 / test

include/uapi/linux/bpf.h

+18 −1

Original line number	Diff line number	Diff line
		@@ -2054,6 +2054,22 @@ union bpf_attr {
		*
		* Return
		* 0
		*
		* uint64_t bpf_skb_cgroup_id(struct sk_buff *skb)
		* Description
		* Return the cgroup v2 id of the socket associated with the skb.
		* This is roughly similar to the bpf_get_cgroup_classid\ ()
		* helper for cgroup v1 by providing a tag resp. identifier that
		* can be matched on or used for map lookups e.g. to implement
		* policy. The cgroup v2 id of a given path in the hierarchy is
		* exposed in user space through the f_handle API in order to get
		* to the same 64-bit id.
		*
		* This helper can be used on TC egress path, but not on ingress,
		* and is available only if the kernel was compiled with the
		* CONFIG_SOCK_CGROUP_DATA configuration option.
		* Return
		* The id is returned or 0 in case the id could not be retrieved.
		*/
		#define __BPF_FUNC_MAPPER(FN) \
		FN(unspec), \
		@@ -2134,7 +2150,8 @@ union bpf_attr {
		FN(lwt_seg6_adjust_srh), \
		FN(lwt_seg6_action), \
		FN(rc_repeat), \
		FN(rc_keydown),
		FN(rc_keydown), \
		FN(skb_cgroup_id),

		/* integer value in 'imm' field of BPF_CALL instruction selects which helper
		* function eBPF program intends to call

+27 −2

Original line number	Diff line number	Diff line
		@@ -3661,6 +3661,27 @@ static const struct bpf_func_proto bpf_skb_under_cgroup_proto = {
		.arg3_type = ARG_ANYTHING,
		};

		#ifdef CONFIG_SOCK_CGROUP_DATA
		BPF_CALL_1(bpf_skb_cgroup_id, const struct sk_buff *, skb)
		{
		struct sock *sk = skb_to_full_sk(skb);
		struct cgroup *cgrp;

		if (!sk \|\| !sk_fullsock(sk))
		return 0;

		cgrp = sock_cgroup_ptr(&sk->sk_cgrp_data);
		return cgrp->kn->id.id;
		}

		static const struct bpf_func_proto bpf_skb_cgroup_id_proto = {
		.func = bpf_skb_cgroup_id,
		.gpl_only = false,
		.ret_type = RET_INTEGER,
		.arg1_type = ARG_PTR_TO_CTX,
		};
		#endif

		static unsigned long bpf_xdp_copy(void dst_buff, const void src_buff,
		unsigned long off, unsigned long len)
		{
		@@ -4747,12 +4768,16 @@ tc_cls_act_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
		return &bpf_get_socket_cookie_proto;
		case BPF_FUNC_get_socket_uid:
		return &bpf_get_socket_uid_proto;
		case BPF_FUNC_fib_lookup:
		return &bpf_skb_fib_lookup_proto;
		#ifdef CONFIG_XFRM
		case BPF_FUNC_skb_get_xfrm_state:
		return &bpf_skb_get_xfrm_state_proto;
		#endif
		case BPF_FUNC_fib_lookup:
		return &bpf_skb_fib_lookup_proto;
		#ifdef CONFIG_SOCK_CGROUP_DATA
		case BPF_FUNC_skb_cgroup_id:
		return &bpf_skb_cgroup_id_proto;
		#endif
		default:
		return bpf_base_func_proto(func_id);
		}