On 31/07/2024 11:38, Alexis Lothoré (eBPF Foundation) wrote:

get_current_cgroup_id_user allows testing for bpf_get_current_cgroup_id() bpf API but is not integrated into test_progs, and so is not tested automatically in CI.

Convert it to the test_progs framework to allow running it automatically. The most notable differences with the old test are the following:

• the new test relies on autoattach instead of manually hooking/enabling the targeted tracepoint through perf_event, which reduces quite a lot the test code size
• sleep duration passed to nanosleep syscall has been reduced to its minimum to not impact overall CI duration (we only care about the syscall being properly triggered, not about the passed duration)

Signed-off-by: Alexis Lothoré (eBPF Foundation) alexis.lothore@bootlin.com

Nice work! Two small suggestions below..

---

The new test_progs part has been tested in a local qemu environment:

./test_progs -a cgroup_get_current_cgroup_id 47 cgroup_get_current_cgroup_id:OK Summary: 1/0 PASSED, 0 SKIPPED, 0 FAILED

---

tools/testing/selftests/bpf/.gitignore | 1 - tools/testing/selftests/bpf/Makefile | 3 +- tools/testing/selftests/bpf/get_cgroup_id_user.c | 151 --------------------- .../bpf/prog_tests/cgroup_get_current_cgroup_id.c | 58 ++++++++ 4 files changed, 59 insertions(+), 154 deletions(-)

diff --git a/tools/testing/selftests/bpf/.gitignore b/tools/testing/selftests/bpf/.gitignore index 4e4aae8aa7ec..108eb10626b9 100644 --- a/tools/testing/selftests/bpf/.gitignore +++ b/tools/testing/selftests/bpf/.gitignore @@ -20,7 +20,6 @@ test_sock urandom_read test_sockmap test_lirc_mode2_user -get_cgroup_id_user test_skb_cgroup_id_user test_cgroup_storage test_flow_dissector diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 1d7a62e7deff..8d8483f81009 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -68,7 +68,7 @@ endif # Order correspond to 'make run_tests' order TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test_progs \ test_dev_cgroup \

• test_sock test_sockmap get_cgroup_id_user \

• test_sock test_sockmap \ test_cgroup_storage \ test_tcpnotify_user test_sysctl \ test_progs-no_alu32

@@ -297,7 +297,6 @@ $(OUTPUT)/test_skb_cgroup_id_user: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(OUTPUT)/test_sock: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(OUTPUT)/test_sockmap: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(OUTPUT)/test_tcpnotify_user: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(TRACE_HELPERS) -$(OUTPUT)/get_cgroup_id_user: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(OUTPUT)/test_cgroup_storage: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(OUTPUT)/test_sock_fields: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(OUTPUT)/test_sysctl: $(CGROUP_HELPERS) $(TESTING_HELPERS) diff --git a/tools/testing/selftests/bpf/get_cgroup_id_user.c b/tools/testing/selftests/bpf/get_cgroup_id_user.c deleted file mode 100644 index aefd83ebdcd7..000000000000 --- a/tools/testing/selftests/bpf/get_cgroup_id_user.c +++ /dev/null @@ -1,151 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -// Copyright (c) 2018 Facebook

-#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <errno.h> -#include <fcntl.h> -#include <syscall.h> -#include <unistd.h> -#include <linux/perf_event.h> -#include <sys/ioctl.h> -#include <sys/time.h> -#include <sys/types.h> -#include <sys/stat.h>

-#include <linux/bpf.h> -#include <bpf/bpf.h> -#include <bpf/libbpf.h>

-#include "cgroup_helpers.h" -#include "testing_helpers.h"

-#define CHECK(condition, tag, format...) ({ \

• int __ret = !!(condition); \
• if (__ret) { \

• printf("%s:FAIL:%s ", __func__, tag);	\
  

• printf(format);				\
  

• } else { \

• printf("%s:PASS:%s\n", __func__, tag);	\
  

• } \
• __ret; \

-})

-static int bpf_find_map(const char *test, struct bpf_object *obj,

• 	const char *name)
  

-{

• struct bpf_map *map;
• map = bpf_object__find_map_by_name(obj, name);
• if (!map)

• return -1;
  

• return bpf_map__fd(map);

-}

-#define TEST_CGROUP "/test-bpf-get-cgroup-id/"

-int main(int argc, char **argv) -{

• const char *probe_name = "syscalls/sys_enter_nanosleep";
• const char *file = "get_cgroup_id_kern.bpf.o";
• int err, bytes, efd, prog_fd, pmu_fd;
• int cgroup_fd, cgidmap_fd, pidmap_fd;
• struct perf_event_attr attr = {};
• struct bpf_object *obj;
• __u64 kcgid = 0, ucgid;
• __u32 key = 0, pid;
• int exit_code = 1;
• char buf[256];
• const struct timespec req = {

• .tv_sec = 1,
  

• .tv_nsec = 0,
  

• };
• cgroup_fd = cgroup_setup_and_join(TEST_CGROUP);
• if (CHECK(cgroup_fd < 0, "cgroup_setup_and_join", "err %d errno %d\n", cgroup_fd, errno))

• return 1;
  

• /* Use libbpf 1.0 API mode */
• libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
• err = bpf_prog_test_load(file, BPF_PROG_TYPE_TRACEPOINT, &obj, &prog_fd);
• if (CHECK(err, "bpf_prog_test_load", "err %d errno %d\n", err, errno))

• goto cleanup_cgroup_env;
  

• cgidmap_fd = bpf_find_map(__func__, obj, "cg_ids");
• if (CHECK(cgidmap_fd < 0, "bpf_find_map", "err %d errno %d\n",

•   cgidmap_fd, errno))
  

• goto close_prog;
  

• pidmap_fd = bpf_find_map(__func__, obj, "pidmap");
• if (CHECK(pidmap_fd < 0, "bpf_find_map", "err %d errno %d\n",

•   pidmap_fd, errno))
  

• goto close_prog;
  

• pid = getpid();
• bpf_map_update_elem(pidmap_fd, &key, &pid, 0);
• if (access("/sys/kernel/tracing/trace", F_OK) == 0) {

• snprintf(buf, sizeof(buf),
  

• 	 "/sys/kernel/tracing/events/%s/id", probe_name);
  

• } else {

• snprintf(buf, sizeof(buf),
  

• 	 "/sys/kernel/debug/tracing/events/%s/id", probe_name);
  

• }
• efd = open(buf, O_RDONLY, 0);
• if (CHECK(efd < 0, "open", "err %d errno %d\n", efd, errno))

• goto close_prog;
  

• bytes = read(efd, buf, sizeof(buf));
• close(efd);
• if (CHECK(bytes <= 0 || bytes >= sizeof(buf), "read",

•   "bytes %d errno %d\n", bytes, errno))
  

• goto close_prog;
  

• attr.config = strtol(buf, NULL, 0);
• attr.type = PERF_TYPE_TRACEPOINT;
• attr.sample_type = PERF_SAMPLE_RAW;
• attr.sample_period = 1;
• attr.wakeup_events = 1;
• /* attach to this pid so the all bpf invocations will be in the

• * cgroup associated with this pid.
  

• */
  

• pmu_fd = syscall(__NR_perf_event_open, &attr, getpid(), -1, -1, 0);
• if (CHECK(pmu_fd < 0, "perf_event_open", "err %d errno %d\n", pmu_fd,

•   errno))
  

• goto close_prog;
  

• err = ioctl(pmu_fd, PERF_EVENT_IOC_ENABLE, 0);
• if (CHECK(err, "perf_event_ioc_enable", "err %d errno %d\n", err,

•   errno))
  

• goto close_pmu;
  

• err = ioctl(pmu_fd, PERF_EVENT_IOC_SET_BPF, prog_fd);
• if (CHECK(err, "perf_event_ioc_set_bpf", "err %d errno %d\n", err,

•   errno))
  

• goto close_pmu;
  

• /* trigger some syscalls */
• syscall(__NR_nanosleep, &req, NULL);
• err = bpf_map_lookup_elem(cgidmap_fd, &key, &kcgid);
• if (CHECK(err, "bpf_map_lookup_elem", "err %d errno %d\n", err, errno))

• goto close_pmu;
  

• ucgid = get_cgroup_id(TEST_CGROUP);
• if (CHECK(kcgid != ucgid, "compare_cgroup_id",

•   "kern cgid %llx user cgid %llx", kcgid, ucgid))
  

• goto close_pmu;
  

• exit_code = 0;
• printf("%s:PASS\n", argv[0]);

-close_pmu:

• close(pmu_fd);

-close_prog:

• bpf_object__close(obj);

-cleanup_cgroup_env:

• cleanup_cgroup_environment();
• return exit_code;

-} diff --git a/tools/testing/selftests/bpf/prog_tests/cgroup_get_current_cgroup_id.c b/tools/testing/selftests/bpf/prog_tests/cgroup_get_current_cgroup_id.c new file mode 100644 index 000000000000..dd8835a63a00 --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/cgroup_get_current_cgroup_id.c @@ -0,0 +1,58 @@ +// SPDX-License-Identifier: GPL-2.0

+#include <sys/stat.h> +#include <sys/sysmacros.h> +#include "test_progs.h" +#include "cgroup_helpers.h" +#include "get_cgroup_id_kern.skel.h"

+#define TEST_CGROUP "/test-bpf-get-cgroup-id/"

+void test_cgroup_get_current_cgroup_id(void) +{

• struct get_cgroup_id_kern *skel;
• const struct timespec req = {

• .tv_sec = 0,
  

• .tv_nsec = 1,
  

• };
• __u64 kcgid, ucgid;
• int cgroup_fd;
• int key = 0;
• int pid;
• cgroup_fd = cgroup_setup_and_join(TEST_CGROUP);
• if (!ASSERT_OK_FD(cgroup_fd, "cgroup switch"))

• return;
  

• skel = get_cgroup_id_kern__open_and_load();
• if (!ASSERT_OK_PTR(skel, "load program"))

• goto cleanup_cgroup;
  

• if (!ASSERT_OK(get_cgroup_id_kern__attach(skel), "attach bpf program"))

• goto cleanup_progs;
  

• pid = getpid();
• if (!ASSERT_OK(bpf_map__update_elem(skel->maps.pidmap, &key,

• 			    sizeof(key), &pid, sizeof(pid), 0),
  

•        "write pid"))
  

• goto cleanup_progs;
  

I think it would be worth using a global variable in the BPF program my_pid, and setting skel->bss->my_pid here as other more up-to-date tests do (example progs/test_usdt.c, prog_tests/usdt.c). No need for a separate map anymore.

• /* trigger the syscall on which is attached the tested prog */
• if (!ASSERT_OK(syscall(__NR_nanosleep, &req, NULL), "nanosleep"))

• goto cleanup_progs;
  

• if (!ASSERT_OK(bpf_map__lookup_elem(skel->maps.cg_ids, &key,

• 			    sizeof(key), &kcgid, sizeof(kcgid),
  

• 			    0),
  

•        "read bpf cgroup id"))
  

• goto cleanup_progs;
  

ditto here, cg_ids could be a global var cg_id that the bpf prog sets and we check here via skel->bss->cg_id.

• ucgid = get_cgroup_id(TEST_CGROUP);
• ASSERT_EQ(kcgid, ucgid, "compare cgroup ids");

+cleanup_progs:

• get_cgroup_id_kern__destroy(skel);

+cleanup_cgroup:

• cleanup_cgroup_environment();

+}

On 31/07/2024 11:38, Alexis Lothoré (eBPF Foundation) wrote:

test_skb_cgroup_id_user allows testing skb cgroup id retrieval at different levels, but is not integrated in test_progs, so it is not run automatically in CI. The test overlaps a bit with cgroup_skb_sk_lookup_kern, which is integrated in test_progs and test extensively skb cgroup helpers, but there is still one major difference between the two tests which justifies the conversion: cgroup_skb_sk_lookup_kern deals with a BPF_PROG_TYPE_CGROUP_SKB (attached on a cgroup), while test_skb_cgroup_id_user deals with a BPF_PROG_TYPE_SCHED_CLS (attached on a qdisc)

Convert test_skb_cgroup_id_user into test_progs framework in order to run it automatically in CI. The main differences with the original test are the following:

• rename the test to make it shorter and more straightforward regarding tested feature
• the wrapping shell script has been dropped since every setup step is now handled in the main C test file
• the test has been renamed for a shorter name and reflecting the tested API
• add dedicated assert log per level to ease test failure debugging

Signed-off-by: Alexis Lothoré (eBPF Foundation) alexis.lothore@bootlin.com

Looks great! A few things below...

---

The new test has been tested in a qemu environment:

./test_progs -a cgroup_ancestor 44 cgroup_ancestor:OK Summary: 1/0 PASSED, 0 SKIPPED, 0 FAILED

---

tools/testing/selftests/bpf/.gitignore | 1 - tools/testing/selftests/bpf/Makefile | 3 +- .../selftests/bpf/prog_tests/cgroup_ancestor.c | 159 ++++++++++++++++++ tools/testing/selftests/bpf/test_skb_cgroup_id.sh | 67 -------- .../selftests/bpf/test_skb_cgroup_id_user.c | 183 --------------------- 5 files changed, 160 insertions(+), 253 deletions(-)

diff --git a/tools/testing/selftests/bpf/.gitignore b/tools/testing/selftests/bpf/.gitignore index a45f11f81337..c46950d4ef53 100644 --- a/tools/testing/selftests/bpf/.gitignore +++ b/tools/testing/selftests/bpf/.gitignore @@ -20,7 +20,6 @@ test_sock urandom_read test_sockmap test_lirc_mode2_user -test_skb_cgroup_id_user test_flow_dissector flow_dissector_load test_tcpnotify_user diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 0ac0f9dbc2f8..057e6ba003f1 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -138,7 +138,7 @@ TEST_PROGS_EXTENDED := with_addr.sh \ test_xdp_vlan.sh test_bpftool.py # Compile but not part of 'make run_tests' -TEST_GEN_PROGS_EXTENDED = test_skb_cgroup_id_user \ +TEST_GEN_PROGS_EXTENDED = \ flow_dissector_load test_flow_dissector test_tcp_check_syncookie_user \ test_lirc_mode2_user xdping test_cpp runqslower bench bpf_testmod.ko \ xskxceiver xdp_redirect_multi xdp_synproxy veristat xdp_hw_metadata \ @@ -292,7 +292,6 @@ CAP_HELPERS := $(OUTPUT)/cap_helpers.o NETWORK_HELPERS := $(OUTPUT)/network_helpers.o $(OUTPUT)/test_dev_cgroup: $(CGROUP_HELPERS) $(TESTING_HELPERS) -$(OUTPUT)/test_skb_cgroup_id_user: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(OUTPUT)/test_sock: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(OUTPUT)/test_sockmap: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(OUTPUT)/test_tcpnotify_user: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(TRACE_HELPERS) diff --git a/tools/testing/selftests/bpf/prog_tests/cgroup_ancestor.c b/tools/testing/selftests/bpf/prog_tests/cgroup_ancestor.c new file mode 100644 index 000000000000..796aa3af75e8 --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/cgroup_ancestor.c @@ -0,0 +1,159 @@ +// SPDX-License-Identifier: GPL-2.0

+#include "test_progs.h" +#include "network_helpers.h" +#include "cgroup_helpers.h" +#include "cgroup_ancestor.skel.h"

+#define VETH_PREFIX "test_cgid_" +#define VETH_1 VETH_PREFIX "1" +#define VETH_2 VETH_PREFIX "2" +#define CGROUP_PATH "/skb_cgroup_test" +#define NUM_CGROUP_LEVELS 4 +#define WAIT_AUTO_IP_MAX_ATTEMPT 10 +#define DST_ADDR "ff02::1" +#define DST_PORT 1234 +#define MAX_ASSERT_NAME 32

+struct test_data {

• struct cgroup_ancestor *skel;
• struct bpf_tc_hook qdisc;
• struct bpf_tc_opts tc_attach;

+};

+static int send_datagram(void) +{

• unsigned char buf[] = "some random test data";
• struct sockaddr_in6 addr = { .sin6_family = AF_INET6,

• 		     .sin6_port = htons(DST_PORT),
  

• 		     .sin6_scope_id = if_nametoindex(VETH_1) };
  

• int sock, n;
• if (!ASSERT_EQ(inet_pton(AF_INET6, DST_ADDR, &addr.sin6_addr), 1,

•        "inet_pton"))
  

• return -1;
  

• sock = socket(AF_INET6, SOCK_DGRAM, 0);
• if (!ASSERT_OK_FD(sock, "create socket"))

• return sock;
  

• n = sendto(sock, buf, sizeof(buf), 0, (const struct sockaddr *)&addr,

•    sizeof(addr));
  

• if (!ASSERT_EQ(n, sizeof(buf), "send data"))

• return n;
  

• return 0;

+}

+static int wait_local_ip(void) +{

• char *ping_cmd = ping_command(AF_INET6);
• int i, err;
• for (i = 0; i < WAIT_AUTO_IP_MAX_ATTEMPT; i++) {

• err = SYS_NOFAIL("%s -c 1 -W 1 %s%%%s", ping_cmd, DST_ADDR,
  

• 		 VETH_1);
  

• if (!err)
  

• 	break;
  

• }

thinking about the risks of CI flakiness, would a small sleep between checks be worth doing here?

• return err;

+}

+static int setup_network(struct test_data *t) +{

• int ret;
• SYS(fail, "ip link add dev %s type veth peer name %s", VETH_1, VETH_2);
• SYS(fail, "ip link set %s up", VETH_1);
• SYS(fail, "ip link set %s up", VETH_2);
• ret = wait_local_ip();
• if (!ASSERT_EQ(ret, 0, "wait local ip"))

• goto fail;
  

• memset(&t->qdisc, 0, sizeof(t->qdisc));
• t->qdisc.sz = sizeof(t->qdisc);
• t->qdisc.attach_point = BPF_TC_EGRESS;
• t->qdisc.ifindex = if_nametoindex(VETH_1);
• if (!ASSERT_NEQ(t->qdisc.ifindex, 0, "if_nametoindex"))

• goto cleanup_interfaces;
  

• if (!ASSERT_OK(bpf_tc_hook_create(&t->qdisc), "qdisc add"))

• goto cleanup_interfaces;
  

• memset(&t->tc_attach, 0, sizeof(t->tc_attach));
• t->tc_attach.sz = sizeof(t->tc_attach);
• t->tc_attach.prog_fd = bpf_program__fd(t->skel->progs.log_cgroup_id);
• if (!ASSERT_OK(bpf_tc_attach(&t->qdisc, &t->tc_attach), "filter add"))

• goto cleanup_qdisc;
  

• return 0;

+cleanup_qdisc:

• bpf_tc_hook_destroy(&t->qdisc);

+cleanup_interfaces:

• SYS_NOFAIL("ip link del %s", VETH_1);

+fail:

• return 1;

+}

+static void cleanup_network(struct test_data *t) +{

• bpf_tc_detach(&t->qdisc, &t->tc_attach);
• bpf_tc_hook_destroy(&t->qdisc);
• /* Deleting first interface will also delete peer interface */
• SYS_NOFAIL("ip link del %s", VETH_1);

+}

+static void check_ancestors_ids(struct test_data *t) +{

• __u64 actual_ids[NUM_CGROUP_LEVELS], expected_ids[NUM_CGROUP_LEVELS];
• char assert_name[MAX_ASSERT_NAME];
• __u32 level;
• int err;
• 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 */
• for (level = 0; level < NUM_CGROUP_LEVELS; level++) {

• err = bpf_map__lookup_elem(t->skel->maps.cgroup_ids, &level,
  

• 			   sizeof(level), &actual_ids[level],
  

• 			   sizeof(__u64), 0);
  

could probably simplify this + the BPF prog using a global array of actual_ids[], then compare it to the expected values using skel->bss->actual_ids

• if (!ASSERT_OK(err, "read map"))
  

• 	continue;
  

• snprintf(assert_name, MAX_ASSERT_NAME,
  

• 	 "ancestor id at level %d", level);
  

• ASSERT_EQ(actual_ids[level], expected_ids[level], assert_name);
  

• }

+}

+void test_cgroup_ancestor(void) +{

• struct test_data t;
• int cgroup_fd;
• t.skel = cgroup_ancestor__open_and_load();
• if (!ASSERT_OK_PTR(t.skel, "open and load"))

• return;
  

• if (setup_network(&t))

• goto cleanup_progs;
  

• cgroup_fd = cgroup_setup_and_join(CGROUP_PATH);
• if (cgroup_fd < 0)

• goto cleanup_network;
  

• if (send_datagram())

• goto cleanup_cgroups;
  

• check_ancestors_ids(&t);

+cleanup_cgroups:

• cleanup_cgroup_environment();

+cleanup_network:

• cleanup_network(&t);

+cleanup_progs:

• cgroup_ancestor__destroy(t.skel);

+} diff --git a/tools/testing/selftests/bpf/test_skb_cgroup_id.sh b/tools/testing/selftests/bpf/test_skb_cgroup_id.sh deleted file mode 100755 index d7dad49175c2..000000000000 --- a/tools/testing/selftests/bpf/test_skb_cgroup_id.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 -# Copyright (c) 2018 Facebook

-set -eu

-wait_for_ip() -{

• local _i
• echo -n "Wait for testing link-local IP to become available "
• for _i in $(seq ${MAX_PING_TRIES}); do

• echo -n "."
  

• if $PING6 -c 1 -W 1 ff02::1%${TEST_IF} >/dev/null 2>&1; then
  

• 	echo " OK"
  

• 	return
  

• fi
  

• sleep 1
  

• done
• echo 1>&2 "ERROR: Timeout waiting for test IP to become available."
• exit 1

-}

-setup() -{

• # Create testing interfaces not to interfere with current environment.
• ip link add dev ${TEST_IF} type veth peer name ${TEST_IF_PEER}
• ip link set ${TEST_IF} up
• ip link set ${TEST_IF_PEER} up
• wait_for_ip
• tc qdisc add dev ${TEST_IF} clsact
• mkdir -p /sys/fs/bpf/${BPF_PROG_PIN}
• bpftool prog loadall ${BPF_PROG_OBJ} /sys/fs/bpf/${BPF_PROG_PIN} type tc
• tc filter add dev ${TEST_IF} egress bpf da object-pinned \

• /sys/fs/bpf/${BPF_PROG_PIN}/${BPF_PROG_NAME}
  

• BPF_PROG_ID=$(tc filter show dev ${TEST_IF} egress | \

• 	awk '/ id / {sub(/.* id /, "", $0); print($1)}')
  

-}

-cleanup() -{

• ip link del ${TEST_IF} 2>/dev/null || :
• ip link del ${TEST_IF_PEER} 2>/dev/null || :
• rm -rf /sys/fs/bpf/${BPF_PROG_PIN}

-}

-main() -{

• trap cleanup EXIT 2 3 6 15
• setup
• ${PROG} ${TEST_IF} ${BPF_PROG_ID}

-}

-DIR=$(dirname $0) -TEST_IF="test_cgid_1" -TEST_IF_PEER="test_cgid_2" -MAX_PING_TRIES=5 -BPF_PROG_PIN="cgroup_ancestor" -BPF_PROG_OBJ="${DIR}/${BPF_PROG_PIN}.bpf.o" -BPF_PROG_NAME="log_cgroup_id" -BPF_PROG_ID=0 -PROG="${DIR}/test_skb_cgroup_id_user" -type ping6 >/dev/null 2>&1 && PING6="ping6" || PING6="ping -6"

-main diff --git a/tools/testing/selftests/bpf/test_skb_cgroup_id_user.c b/tools/testing/selftests/bpf/test_skb_cgroup_id_user.c deleted file mode 100644 index ed518d075d1d..000000000000 --- a/tools/testing/selftests/bpf/test_skb_cgroup_id_user.c +++ /dev/null @@ -1,183 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -// Copyright (c) 2018 Facebook

-#include <stdlib.h> -#include <string.h> -#include <unistd.h>

-#include <arpa/inet.h> -#include <net/if.h> -#include <netinet/in.h> -#include <sys/socket.h> -#include <sys/types.h>

-#include <bpf/bpf.h> -#include <bpf/libbpf.h>

-#include "cgroup_helpers.h"

-#define CGROUP_PATH "/skb_cgroup_test" -#define NUM_CGROUP_LEVELS 4

-/* RFC 4291, Section 2.7.1 */ -#define LINKLOCAL_MULTICAST "ff02::1"

-static int mk_dst_addr(const char *ip, const char *iface,

•        struct sockaddr_in6 *dst)
  

-{

• memset(dst, 0, sizeof(*dst));
• dst->sin6_family = AF_INET6;
• dst->sin6_port = htons(1025);
• if (inet_pton(AF_INET6, ip, &dst->sin6_addr) != 1) {

• log_err("Invalid IPv6: %s", ip);
  

• return -1;
  

• }
• dst->sin6_scope_id = if_nametoindex(iface);
• if (!dst->sin6_scope_id) {

• log_err("Failed to get index of iface: %s", iface);
  

• return -1;
  

• }
• return 0;

-}

-static int send_packet(const char *iface) -{

• struct sockaddr_in6 dst;
• char msg[] = "msg";
• int err = 0;
• int fd = -1;
• if (mk_dst_addr(LINKLOCAL_MULTICAST, iface, &dst))

• goto err;
  

• fd = socket(AF_INET6, SOCK_DGRAM, 0);
• if (fd == -1) {

• log_err("Failed to create UDP socket");
  

• goto err;
  

• }
• if (sendto(fd, &msg, sizeof(msg), 0, (const struct sockaddr *)&dst,

•    sizeof(dst)) == -1) {
  

• log_err("Failed to send datagram");
  

• goto err;
  

• }
• goto out;

-err:

• err = -1;

-out:

• if (fd >= 0)

• close(fd);
  

• return err;

-}

-int get_map_fd_by_prog_id(int prog_id) -{

• struct bpf_prog_info info = {};
• __u32 info_len = sizeof(info);
• __u32 map_ids[1];
• int prog_fd = -1;
• int map_fd = -1;
• prog_fd = bpf_prog_get_fd_by_id(prog_id);
• if (prog_fd < 0) {

• log_err("Failed to get fd by prog id %d", prog_id);
  

• goto err;
  

• }
• info.nr_map_ids = 1;
• info.map_ids = (__u64) (unsigned long) map_ids;
• if (bpf_prog_get_info_by_fd(prog_fd, &info, &info_len)) {

• log_err("Failed to get info by prog fd %d", prog_fd);
  

• goto err;
  

• }
• if (!info.nr_map_ids) {

• log_err("No maps found for prog fd %d", prog_fd);
  

• goto err;
  

• }
• map_fd = bpf_map_get_fd_by_id(map_ids[0]);
• if (map_fd < 0)

• log_err("Failed to get fd by map id %d", map_ids[0]);
  

-err:

• if (prog_fd >= 0)

• close(prog_fd);
  

• return map_fd;

-}

-int check_ancestor_cgroup_ids(int prog_id) -{

• __u64 actual_ids[NUM_CGROUP_LEVELS], expected_ids[NUM_CGROUP_LEVELS];
• __u32 level;
• int err = 0;
• int map_fd;
• 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 */
• map_fd = get_map_fd_by_prog_id(prog_id);
• if (map_fd < 0)

• goto err;
  

• for (level = 0; level < NUM_CGROUP_LEVELS; ++level) {

• if (bpf_map_lookup_elem(map_fd, &level, &actual_ids[level])) {
  

• 	log_err("Failed to lookup key %d", level);
  

• 	goto err;
  

• }
  

• if (actual_ids[level] != expected_ids[level]) {
  

• 	log_err("%llx (actual) != %llx (expected), level: %u\n",
  

• 		actual_ids[level], expected_ids[level], level);
  

• 	goto err;
  

• }
  

• }
• goto out;

-err:

• err = -1;

-out:

• if (map_fd >= 0)

• close(map_fd);
  

• return err;

-}

-int main(int argc, char **argv) -{

• int cgfd = -1;
• int err = 0;
• if (argc < 3) {

• fprintf(stderr, "Usage: %s iface prog_id\n", argv[0]);
  

• exit(EXIT_FAILURE);
  

• }
• /* Use libbpf 1.0 API mode */
• libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
• cgfd = cgroup_setup_and_join(CGROUP_PATH);
• if (cgfd < 0)

• goto err;
  

• if (send_packet(argv[1]))

• goto err;
  

• if (check_ancestor_cgroup_ids(atoi(argv[2])))

• goto err;
  

• goto out;

-err:

• err = -1;

-out:

• close(cgfd);
• cleanup_cgroup_environment();
• printf("[%s]\n", err ? "FAIL" : "PASS");
• return err;

-}