Commit 9621e60f authored by Daniel Borkmann's avatar Daniel Borkmann Committed by Alexei Starovoitov
Browse files

bpf: Move cgroup iterator helpers to bpf.h 



Move them into bpf.h given we also need them in core code.

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/r/20250730234733.530041-3-daniel@iogearbox.net


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

include/linux/bpf-cgroup.h

+0 −5
Original line number Diff line number Diff line
@@ -77,9 +77,6 @@ to_cgroup_bpf_attach_type(enum bpf_attach_type attach_type) 
extern struct static_key_false cgroup_bpf_enabled_key[MAX_CGROUP_BPF_ATTACH_TYPE];

#define cgroup_bpf_enabled(atype) static_branch_unlikely(&cgroup_bpf_enabled_key[atype])



#define for_each_cgroup_storage_type(stype) \

	for (stype = 0; stype < MAX_BPF_CGROUP_STORAGE_TYPE; stype++)



struct bpf_cgroup_storage_map;



struct bpf_storage_buffer {
@@ -510,8 +507,6 @@ static inline int bpf_percpu_cgroup_storage_update(struct bpf_map *map, 
#define BPF_CGROUP_RUN_PROG_SETSOCKOPT(sock, level, optname, optval, optlen, \

				       kernel_optval) ({ 0; })



#define for_each_cgroup_storage_type(stype) for (; false; )



#endif /* CONFIG_CGROUP_BPF */



#endif /* _BPF_CGROUP_H */

include/linux/bpf.h

+14 −8
Original line number Diff line number Diff line
@@ -208,6 +208,20 @@ enum btf_field_type { 
	BPF_RES_SPIN_LOCK = (1 << 12),

};



enum bpf_cgroup_storage_type {

	BPF_CGROUP_STORAGE_SHARED,

	BPF_CGROUP_STORAGE_PERCPU,

	__BPF_CGROUP_STORAGE_MAX

#define MAX_BPF_CGROUP_STORAGE_TYPE __BPF_CGROUP_STORAGE_MAX

};



#ifdef CONFIG_CGROUP_BPF

# define for_each_cgroup_storage_type(stype) \

	for (stype = 0; stype < MAX_BPF_CGROUP_STORAGE_TYPE; stype++)

#else

# define for_each_cgroup_storage_type(stype) for (; false; )

#endif /* CONFIG_CGROUP_BPF */



typedef void (*btf_dtor_kfunc_t)(void *);



struct btf_field_kptr {
@@ -1085,14 +1099,6 @@ struct bpf_prog_offload { 
	u32			jited_len;

};



enum bpf_cgroup_storage_type {

	BPF_CGROUP_STORAGE_SHARED,

	BPF_CGROUP_STORAGE_PERCPU,

	__BPF_CGROUP_STORAGE_MAX

};



#define MAX_BPF_CGROUP_STORAGE_TYPE __BPF_CGROUP_STORAGE_MAX



/* The longest tracepoint has 12 args.

 * See include/trace/bpf_probe.h

 */