From nobody Tue Nov 26 19:47:53 2024 Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 125612141C0; Wed, 16 Oct 2024 18:35:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.198 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729103752; cv=none; b=ZJHp50UPZAr6x/KQoSWmvkiA0Bgl5Lw4Vy+13I5amPK1xcVYdp7VzP14jGkQZqjg/Cnq6tfI0g+1J8fpm61z/Nkr8/rFGK1lQC03CidVq4HI46GtYX2yUG/ETlF7ePlW1AkiWoG5jiXi9hHiscf+mPvaNPkiiZ8uBI0ql7e72H4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729103752; c=relaxed/simple; bh=LrLl5cl+PwyhJWb4MiIJqUN+G/ds9NPx4pRxC0E6n8I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=b78W31CdXt/k8D4ltsV0wWPH9xAIn0B/cTI0zrwpnWReS+SpwAcHohTIJuVe38lqxumzOc5uhCbdZ+XFjJzljcHECAhTAVnkLtC41V3h0Kh0mcLfJQOEa8m9MS/i4Z+L6KLWUXsts4MmpM3gmTHjIHleyjq+Y7QnqTd2rh2ij9U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=p7qIGwz6; arc=none smtp.client-ip=217.70.183.198 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="p7qIGwz6" Received: by mail.gandi.net (Postfix) with ESMTPSA id 35B80C0004; Wed, 16 Oct 2024 18:35:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1729103748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QnwHg3SvLWapxZBFoQvj6AGcA1Tjaeknakx6IliT5xo=; b=p7qIGwz6p8qaysZKA785mZWq+rYBblh7JqDtKqrgJk/rl/5/hlXWwYDjKs7seTFJwNlTgX tyMLuV4BzSLT8pXroqMRxCpxdQ5oPYqRsZkJ2Wd4LpmiMNdqJA0smJTkR1VPjmeWDENhmY C2olR0jHzw3sykPUaWJfBDetwJRYbtgr24jtQbQfic+BkZ7Jc2flmFQs7mEhOkSZTTQH6z BRpODu/GatPysfpbH23hWta3JDoiXdC8k8OTL4Nhj6gj3gAsqBCDwi0SX03KlgjIX4SyrT 0W8nffDC9Ipyq4zX1fMHZmMqzck2a3VAnrMPYdPotJn4yPkvyTvQjiqusOptxA== From: =?utf-8?q?Alexis_Lothor=C3=A9_=28eBPF_Foundation=29?= Date: Wed, 16 Oct 2024 20:35:24 +0200 Subject: [PATCH bpf-next 3/6] selftests/bpf: get rid of global vars in btf_skc_cls_ingress Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20241016-syncookie-v1-3-3b7a0de12153@bootlin.com> References: <20241016-syncookie-v1-0-3b7a0de12153@bootlin.com> In-Reply-To: <20241016-syncookie-v1-0-3b7a0de12153@bootlin.com> To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer Cc: ebpf@linuxfoundation.org, Thomas Petazzoni , Lorenz Bauer , bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, =?utf-8?q?Alexis_Lothor=C3=A9_=28eBPF_Foundation=29?= X-Mailer: b4 0.14.2 X-GND-Sasl: alexis.lothore@bootlin.com There are a few global variables in btf_skc_cls_ingress.c, which are not really used by different tests. Get rid of those global variables, by performing the following updates: - make srv_sa6 local to the main runner function - make skel local to the main function, and propagate it through function arguments - get rid of duration by replacing CHECK macros with the ASSERT_XXX macros. While updating those assert macros: - do not return early on asserts performing some actual tests, let the other tests run as well (keep the early return for parts handling test setup) - instead of converting the CHECK on skel->bss->linum, just remove it, since there is already a call to print_err_line after the test to print the failing line in the bpf program Signed-off-by: Alexis Lothor=C3=A9 (eBPF Foundation) --- .../selftests/bpf/prog_tests/btf_skc_cls_ingress.c | 91 +++++++++---------= ---- 1 file changed, 35 insertions(+), 56 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c b= /tools/testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c index 8d1fa8806cdda088d264b44104f7c80726b025e2..a20d104f9909e5ba20ddc4c107b= 910956f042fc1 100644 --- a/tools/testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c +++ b/tools/testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c @@ -19,11 +19,7 @@ =20 #define TEST_NS "skc_cls_ingress" =20 -static struct test_btf_skc_cls_ingress *skel; -static struct sockaddr_in6 srv_sa6; -static __u32 duration; - -static struct netns_obj *prepare_netns(void) +static struct netns_obj *prepare_netns(struct test_btf_skc_cls_ingress *sk= el) { LIBBPF_OPTS(bpf_tc_hook, qdisc_lo, .attach_point =3D BPF_TC_INGRESS); LIBBPF_OPTS(bpf_tc_opts, tc_attach, @@ -34,9 +30,7 @@ static struct netns_obj *prepare_netns(void) if (!ASSERT_OK_PTR(ns, "create and join netns")) return ns; =20 - if (CHECK(system("ip link set dev lo up"), - "ip link set dev lo up", "failed\n")) - goto free_ns; + SYS(free_ns, "ip link set dev lo up"); =20 qdisc_lo.ifindex =3D if_nametoindex("lo"); if (!ASSERT_OK(bpf_tc_hook_create(&qdisc_lo), "qdisc add dev lo clsact")) @@ -61,7 +55,7 @@ static struct netns_obj *prepare_netns(void) return NULL; } =20 -static void reset_test(void) +static void reset_test(struct test_btf_skc_cls_ingress *skel) { memset(&skel->bss->srv_sa6, 0, sizeof(skel->bss->srv_sa6)); skel->bss->listen_tp_sport =3D 0; @@ -71,16 +65,17 @@ static void reset_test(void) skel->bss->linum =3D 0; } =20 -static void print_err_line(void) +static void print_err_line(struct test_btf_skc_cls_ingress *skel) { if (skel->bss->linum) printf("bpf prog error at line %u\n", skel->bss->linum); } =20 -static void run_test(bool gen_cookies) +static void run_test(struct test_btf_skc_cls_ingress *skel, bool gen_cooki= es) { const char *tcp_syncookies =3D gen_cookies ? "2" : "1"; int listen_fd =3D -1, cli_fd =3D -1, srv_fd =3D -1, err; + struct sockaddr_in6 srv_sa6; socklen_t addrlen =3D sizeof(srv_sa6); int srv_port; =20 @@ -88,58 +83,41 @@ static void run_test(bool gen_cookies) return; =20 listen_fd =3D start_server(AF_INET6, SOCK_STREAM, "::1", 0, 0); - if (CHECK_FAIL(listen_fd =3D=3D -1)) + if (!ASSERT_OK_FD(listen_fd, "start server")) return; =20 err =3D getsockname(listen_fd, (struct sockaddr *)&srv_sa6, &addrlen); - if (CHECK(err, "getsockname(listen_fd)", "err:%d errno:%d\n", err, - errno)) + if (!ASSERT_OK(err, "getsockname(listen_fd)")) goto done; memcpy(&skel->bss->srv_sa6, &srv_sa6, sizeof(srv_sa6)); srv_port =3D ntohs(srv_sa6.sin6_port); =20 cli_fd =3D connect_to_fd(listen_fd, 0); - if (CHECK_FAIL(cli_fd =3D=3D -1)) + if (!ASSERT_OK_FD(cli_fd, "connect client")) goto done; =20 srv_fd =3D accept(listen_fd, NULL, NULL); - if (CHECK_FAIL(srv_fd =3D=3D -1)) + if (!ASSERT_OK_FD(srv_fd, "accept connection")) goto done; =20 - if (CHECK(skel->bss->listen_tp_sport !=3D srv_port, - "Unexpected listen tp src port", - "listen_tp_sport:%u expected:%u\n", - skel->bss->listen_tp_sport, srv_port)) - goto done; + ASSERT_EQ(skel->bss->listen_tp_sport, srv_port, "listen tp src port"); =20 if (!gen_cookies) { - if (CHECK(skel->bss->req_sk_sport !=3D srv_port, - "Unexpected req_sk src port", - "req_sk_sport:%u expected:%u\n", - skel->bss->req_sk_sport, srv_port)) - goto done; - if (CHECK(skel->bss->gen_cookie || skel->bss->recv_cookie, - "Unexpected syncookie states", - "gen_cookie:%u recv_cookie:%u\n", - skel->bss->gen_cookie, skel->bss->recv_cookie)) - goto done; + ASSERT_EQ(skel->bss->req_sk_sport, srv_port, + "request socket source port with syncookies disabled"); + ASSERT_EQ(skel->bss->gen_cookie, 0, + "generated syncookie with syncookies disabled"); + ASSERT_EQ(skel->bss->recv_cookie, 0, + "received syncookie with syncookies disabled"); } else { - if (CHECK(skel->bss->req_sk_sport, - "Unexpected req_sk src port", - "req_sk_sport:%u expected:0\n", - skel->bss->req_sk_sport)) - goto done; - if (CHECK(!skel->bss->gen_cookie || - skel->bss->gen_cookie !=3D skel->bss->recv_cookie, - "Unexpected syncookie states", - "gen_cookie:%u recv_cookie:%u\n", - skel->bss->gen_cookie, skel->bss->recv_cookie)) - goto done; + ASSERT_EQ(skel->bss->req_sk_sport, 0, + "request socket source port with syncookies enabled"); + ASSERT_NEQ(skel->bss->gen_cookie, 0, + "syncookie properly generated"); + ASSERT_EQ(skel->bss->gen_cookie, skel->bss->recv_cookie, + "matching syncookies on client and server"); } =20 - CHECK(skel->bss->linum, "bpf prog detected error", "at line %u\n", - skel->bss->linum); - done: if (listen_fd !=3D -1) close(listen_fd); @@ -149,19 +127,19 @@ static void run_test(bool gen_cookies) close(srv_fd); } =20 -static void test_conn(void) +static void test_conn(struct test_btf_skc_cls_ingress *skel) { - run_test(false); + run_test(skel, false); } =20 -static void test_syncookie(void) +static void test_syncookie(struct test_btf_skc_cls_ingress *skel) { - run_test(true); + run_test(skel, true); } =20 struct test { const char *desc; - void (*run)(void); + void (*run)(struct test_btf_skc_cls_ingress *skel); }; =20 #define DEF_TEST(name) { #name, test_##name } @@ -172,25 +150,26 @@ static struct test tests[] =3D { =20 void test_btf_skc_cls_ingress(void) { + struct test_btf_skc_cls_ingress *skel; + struct netns_obj *ns; int i; =20 skel =3D test_btf_skc_cls_ingress__open_and_load(); - struct netns_obj *ns; - if (CHECK(!skel, "test_btf_skc_cls_ingress__open_and_load", "failed\n")) + if (!ASSERT_OK_PTR(skel, "test_btf_skc_cls_ingress__open_and_load")) return; =20 for (i =3D 0; i < ARRAY_SIZE(tests); i++) { if (!test__start_subtest(tests[i].desc)) continue; =20 - ns =3D prepare_netns(); + ns =3D prepare_netns(skel); if (!ns) break; =20 - tests[i].run(); + tests[i].run(skel); =20 - print_err_line(); - reset_test(); + print_err_line(skel); + reset_test(skel); netns_free(ns); } =20 --=20 2.46.2