forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5
kernel/tools/testing/selftests/bpf/test_skb_cgroup_id_user.c
....@@ -120,7 +120,7 @@
120120 int err = 0;
121121 int map_fd;
122122
123
- expected_ids[0] = 0x100000001; /* root cgroup */
123
+ expected_ids[0] = get_cgroup_id("/.."); /* root cgroup */
124124 expected_ids[1] = get_cgroup_id("");
125125 expected_ids[2] = get_cgroup_id(CGROUP_PATH);
126126 expected_ids[3] = 0; /* non-existent cgroup */
....@@ -160,14 +160,8 @@
160160 exit(EXIT_FAILURE);
161161 }
162162
163
- if (setup_cgroup_environment())
164
- goto err;
165
-
166
- cgfd = create_and_get_cgroup(CGROUP_PATH);
167
- if (!cgfd)
168
- goto err;
169
-
170
- if (join_cgroup(CGROUP_PATH))
163
+ cgfd = cgroup_setup_and_join(CGROUP_PATH);
164
+ if (cgfd < 0)
171165 goto err;
172166
173167 if (send_packet(argv[1]))