Skip to content

Commit da99028

Browse files
teawaterAlexei Starovoitov
authored andcommitted
selftests/bpf: Use bpf_core_enum_value for stats in cgroup_iter_memcg
Replace hardcoded enum values with bpf_core_enum_value() calls in cgroup_iter_memcg test to improve portability across different kernel versions. The change adds runtime enum value resolution for: - node_stat_item: NR_ANON_MAPPED, NR_SHMEM, NR_FILE_PAGES, NR_FILE_MAPPED - vm_event_item: PGFAULT This ensures the BPF program can adapt to enum value changes between kernel versions. Reviewed-by: Emil Tsalapatis <emil@etsalapatis.com> Reviewed-by: JP Kobryn <jp.kobryn@linux.dev> Signed-off-by: Hui Zhu <zhuhui@kylinos.cn> Link: https://lore.kernel.org/r/ca6eb1a1a4fd7a17ffe995acf52c9a4ceb7bac13.1772505399.git.zhuhui@kylinos.cn Signed-off-by: Alexei Starovoitov <ast@kernel.org>
1 parent a8fce02 commit da99028

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

tools/testing/selftests/bpf/progs/cgroup_iter_memcg.c

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,18 @@ int cgroup_memcg_query(struct bpf_iter__cgroup *ctx)
2626

2727
bpf_mem_cgroup_flush_stats(memcg);
2828

29-
memcg_query.nr_anon_mapped = bpf_mem_cgroup_page_state(memcg, NR_ANON_MAPPED);
30-
memcg_query.nr_shmem = bpf_mem_cgroup_page_state(memcg, NR_SHMEM);
31-
memcg_query.nr_file_pages = bpf_mem_cgroup_page_state(memcg, NR_FILE_PAGES);
32-
memcg_query.nr_file_mapped = bpf_mem_cgroup_page_state(memcg, NR_FILE_MAPPED);
33-
memcg_query.pgfault = bpf_mem_cgroup_vm_events(memcg, PGFAULT);
29+
memcg_query.nr_anon_mapped = bpf_mem_cgroup_page_state(
30+
memcg,
31+
bpf_core_enum_value(enum node_stat_item, NR_ANON_MAPPED));
32+
memcg_query.nr_shmem = bpf_mem_cgroup_page_state(
33+
memcg, bpf_core_enum_value(enum node_stat_item, NR_SHMEM));
34+
memcg_query.nr_file_pages = bpf_mem_cgroup_page_state(
35+
memcg, bpf_core_enum_value(enum node_stat_item, NR_FILE_PAGES));
36+
memcg_query.nr_file_mapped = bpf_mem_cgroup_page_state(
37+
memcg,
38+
bpf_core_enum_value(enum node_stat_item, NR_FILE_MAPPED));
39+
memcg_query.pgfault = bpf_mem_cgroup_vm_events(
40+
memcg, bpf_core_enum_value(enum vm_event_item, PGFAULT));
3441

3542
bpf_put_mem_cgroup(memcg);
3643

0 commit comments

Comments
 (0)