selftests/bpf: Remove kmem subtest from cgroup_iter_memcg

When cgroup.memory=nokmem is set in the kernel command line, kmem
accounting is disabled. This causes the test_kmem subtest in
cgroup_iter_memcg to fail because it expects non-zero kmem values.

Remove the kmem subtest altogether since the remaining subtests
(shmem, file, pgfault) already provide sufficient coverage for
the cgroup iter memcg functionality.

Reviewed-by: JP Kobryn <jp.kobryn@linux.dev>
Signed-off-by: Hui Zhu <zhuhui@kylinos.cn>
Link: https://lore.kernel.org/r/35fa32a019361ec26265c8a789ee31e448d4dbda.1772505399.git.zhuhui@kylinos.cn
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/tools/testing/selftests/bpf/cgroup_iter_memcg.h b/tools/testing/selftests/bpf/cgroup_iter_memcg.h
index 3f59b127943baa4b0fe611422493e0820b3c42cd..ff20ec537164a35a90e5d1696084b47dcc1fb91f 100644 (file)
--- a/tools/testing/selftests/bpf/cgroup_iter_memcg.h
+++ b/tools/testing/selftests/bpf/cgroup_iter_memcg.h
@@ -9,8 +9,6 @@ struct memcg_query {
        unsigned long nr_shmem;
        unsigned long nr_file_pages;
        unsigned long nr_file_mapped;
-       /* some memcg_stat_item */
-       unsigned long memcg_kmem;
        /* some vm_event_item */
        unsigned long pgfault;
 };

diff --git a/tools/testing/selftests/bpf/prog_tests/cgroup_iter_memcg.c b/tools/testing/selftests/bpf/prog_tests/cgroup_iter_memcg.c
index a5afd16705f05221a6772895752c4f1f39859ad6..88fc3e83d2b78d4d8a0e60dc9a85651e996416d1 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/cgroup_iter_memcg.c
+++ b/tools/testing/selftests/bpf/prog_tests/cgroup_iter_memcg.c
@@ -126,32 +126,6 @@ cleanup:
        shm_unlink("/tmp_shmem");
 }
 
-#define NR_PIPES 64
-static void test_kmem(struct bpf_link *link, struct memcg_query *memcg_query)
-{
-       int fds[NR_PIPES][2], i;
-
-       /*
-        * Increase kmem value by creating pipes which will allocate some
-        * kernel buffers.
-        */
-       for (i = 0; i < NR_PIPES; i++) {
-               if (!ASSERT_OK(pipe(fds[i]), "pipe"))
-                       goto cleanup;
-       }
-
-       if (!ASSERT_OK(read_stats(link), "read stats"))
-               goto cleanup;
-
-       ASSERT_GT(memcg_query->memcg_kmem, 0, "kmem value");
-
-cleanup:
-       for (i = i - 1; i >= 0; i--) {
-               close(fds[i][0]);
-               close(fds[i][1]);
-       }
-}
-
 static void test_pgfault(struct bpf_link *link, struct memcg_query *memcg_query)
 {
        void *map;
@@ -209,8 +183,6 @@ void test_cgroup_iter_memcg(void)
                test_shmem(link, &skel->data_query->memcg_query);
        if (test__start_subtest("cgroup_iter_memcg__file"))
                test_file(link, &skel->data_query->memcg_query);
-       if (test__start_subtest("cgroup_iter_memcg__kmem"))
-               test_kmem(link, &skel->data_query->memcg_query);
        if (test__start_subtest("cgroup_iter_memcg__pgfault"))
                test_pgfault(link, &skel->data_query->memcg_query);
 

diff --git a/tools/testing/selftests/bpf/progs/cgroup_iter_memcg.c b/tools/testing/selftests/bpf/progs/cgroup_iter_memcg.c
index 59fb70a3cc502e0f21a5196614ca00a67cd3b135..12f79a44133e99598b71e57d6e2b540f3a0687b6 100644 (file)
--- a/tools/testing/selftests/bpf/progs/cgroup_iter_memcg.c
+++ b/tools/testing/selftests/bpf/progs/cgroup_iter_memcg.c
@@ -30,7 +30,6 @@ int cgroup_memcg_query(struct bpf_iter__cgroup *ctx)
        memcg_query.nr_shmem = bpf_mem_cgroup_page_state(memcg, NR_SHMEM);
        memcg_query.nr_file_pages = bpf_mem_cgroup_page_state(memcg, NR_FILE_PAGES);
        memcg_query.nr_file_mapped = bpf_mem_cgroup_page_state(memcg, NR_FILE_MAPPED);
-       memcg_query.memcg_kmem = bpf_mem_cgroup_page_state(memcg, MEMCG_KMEM);
        memcg_query.pgfault = bpf_mem_cgroup_vm_events(memcg, PGFAULT);
 
        bpf_put_mem_cgroup(memcg);