Commit c501bf55 authored by Tejun Heo's avatar Tejun Heo Committed by Alexei Starovoitov
Browse files

bpf: Make bpf_get_current_[ancestor_]cgroup_id() available for all program types 



These helpers are safe to call from any context and there's no reason to
restrict access to them. Remove them from bpf_trace and filter lists and add
to bpf_base_func_proto() under perfmon_capable().

v2: After consulting with Andrii, relocated in bpf_base_func_proto() so that
    they require bpf_capable() but not perfomon_capable() as it doesn't read
    from or affect others on the system.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/ZAD8QyoszMZiTzBY@slm.duckdns.org


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent cacad346

kernel/bpf/cgroup.c

+0 −4
Original line number Diff line number Diff line
@@ -2529,10 +2529,6 @@ cgroup_current_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) 
		return &bpf_get_current_pid_tgid_proto;

	case BPF_FUNC_get_current_comm:

		return &bpf_get_current_comm_proto;

	case BPF_FUNC_get_current_cgroup_id:

		return &bpf_get_current_cgroup_id_proto;

	case BPF_FUNC_get_current_ancestor_cgroup_id:

		return &bpf_get_current_ancestor_cgroup_id_proto;

#ifdef CONFIG_CGROUP_NET_CLASSID

	case BPF_FUNC_get_cgroup_classid:

		return &bpf_get_cgroup_classid_curr_proto;

kernel/bpf/helpers.c

+4 −0
Original line number Diff line number Diff line
@@ -1748,6 +1748,10 @@ bpf_base_func_proto(enum bpf_func_id func_id) 
		return &bpf_cgrp_storage_get_proto;

	case BPF_FUNC_cgrp_storage_delete:

		return &bpf_cgrp_storage_delete_proto;

	case BPF_FUNC_get_current_cgroup_id:

		return &bpf_get_current_cgroup_id_proto;

	case BPF_FUNC_get_current_ancestor_cgroup_id:

		return &bpf_get_current_ancestor_cgroup_id_proto;

#endif

	default:

		break;

kernel/trace/bpf_trace.c

+0 −4
Original line number Diff line number Diff line
@@ -1453,10 +1453,6 @@ bpf_tracing_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) 
		       NULL : &bpf_probe_read_compat_str_proto;

#endif

#ifdef CONFIG_CGROUPS

	case BPF_FUNC_get_current_cgroup_id:

		return &bpf_get_current_cgroup_id_proto;

	case BPF_FUNC_get_current_ancestor_cgroup_id:

		return &bpf_get_current_ancestor_cgroup_id_proto;

	case BPF_FUNC_cgrp_storage_get:

		return &bpf_cgrp_storage_get_proto;

	case BPF_FUNC_cgrp_storage_delete:

net/core/filter.c

+0 −6
Original line number Diff line number Diff line
@@ -8165,12 +8165,6 @@ sk_msg_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) 
		return &bpf_sk_storage_delete_proto;

	case BPF_FUNC_get_netns_cookie:

		return &bpf_get_netns_cookie_sk_msg_proto;

#ifdef CONFIG_CGROUPS

	case BPF_FUNC_get_current_cgroup_id:

		return &bpf_get_current_cgroup_id_proto;

	case BPF_FUNC_get_current_ancestor_cgroup_id:

		return &bpf_get_current_ancestor_cgroup_id_proto;

#endif

#ifdef CONFIG_CGROUP_NET_CLASSID

	case BPF_FUNC_get_cgroup_classid:

		return &bpf_get_cgroup_classid_curr_proto;