From 6778948f9de86c3cfaf36725a7c87dcff9ba247f Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Mon, 11 Dec 2023 08:20:59 +0000
Subject: [PATCH] kernel_5.10 no rt
---
kernel/tools/testing/selftests/bpf/test_skb_cgroup_id_user.c | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/kernel/tools/testing/selftests/bpf/test_skb_cgroup_id_user.c b/kernel/tools/testing/selftests/bpf/test_skb_cgroup_id_user.c
index c121cc5..4a64306 100644
--- a/kernel/tools/testing/selftests/bpf/test_skb_cgroup_id_user.c
+++ b/kernel/tools/testing/selftests/bpf/test_skb_cgroup_id_user.c
@@ -120,7 +120,7 @@
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 */
@@ -160,14 +160,8 @@
exit(EXIT_FAILURE);
}
- if (setup_cgroup_environment())
- goto err;
-
- cgfd = create_and_get_cgroup(CGROUP_PATH);
- if (!cgfd)
- goto err;
-
- if (join_cgroup(CGROUP_PATH))
+ cgfd = cgroup_setup_and_join(CGROUP_PATH);
+ if (cgfd < 0)
goto err;
if (send_packet(argv[1]))
--
Gitblit v1.6.2