selftests/bpf: Don't hard-code root cgroup id
authorStanislav Fomichev <sdf@google.com>
Mon, 2 Dec 2019 20:01:43 +0000 (12:01 -0800)
committerAlexei Starovoitov <ast@kernel.org>
Thu, 5 Dec 2019 01:56:22 +0000 (17:56 -0800)
Commit 40430452fd5d ("kernfs: use 64bit inos if ino_t is 64bit") changed
the way cgroup ids are exposed to the userspace. Instead of assuming
fixed root id, let's query it.

Fixes: 40430452fd5d ("kernfs: use 64bit inos if ino_t is 64bit")
Signed-off-by: Stanislav Fomichev <sdf@google.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20191202200143.250793-1-sdf@google.com
tools/testing/selftests/bpf/test_skb_cgroup_id_user.c

index 9220747c069db6518b29cd0b3e106c6fafecbd01..356351c0ac28e81194ce6cecaa83769e79f0cb99 100644 (file)
@@ -120,7 +120,7 @@ int check_ancestor_cgroup_ids(int prog_id)
        int err = 0;
        int map_fd;
 
-       expected_ids[0] = 0x100000001;  /* root cgroup */
+       expected_ids[0] = get_cgroup_id("/.."); /* root cgroup */
        expected_ids[1] = get_cgroup_id("");
        expected_ids[2] = get_cgroup_id(CGROUP_PATH);
        expected_ids[3] = 0; /* non-existent cgroup */