From patchwork Thu Nov 16 03:16:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuran Pereira X-Patchwork-Id: 13457579 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b="nORFT9hu" Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2015.outbound.protection.outlook.com [40.92.91.15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1BC8719E; Wed, 15 Nov 2023 19:17:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MZr6+hJ8Iu4/meg0HUIxb6pHWrlOgGv3uEyA9gXgoWwVfEm2h2MwxtvSUC1sEbL9Y+qHhuJWPstsTcSAs1+/MEHN7Y1WMRt8VO87tKQYtR6rA0NghDALTdc2jfjZv081SPOwkmrtUz0VJNwzGY48onEdTJ30NmT0HSz2MNcMs2yw+R7ov0fMFLrMb2AVB3c+8Re15TI7w6T+jyANFuKseIUgNMVKzsnHruhbE3Ql9zxz70Z0PmeAn5rjO+CZkGMnU6IrOfn/JUczOVol1XQ50mvIy6PNo/wq5BC2j/WgCm7V3n2ljVqcwAIT1NU1baeBozLek3wVOYifsEC5PQcTGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2kieiaA/pL+wMfRgL+l0MlG/OcfWJYSk6lI0ghA7o/E=; b=bWuTs1ykmLwXjpfK2M5HPWpUaXOn21A4MQbCYrOSZQ/0BTqrYbOtfsqI9fayDWB6pjORcpzWJoCRr2hCpzwtUv14Y6rydRGPml//ZmDCOtcn/HJZNNWeY5XvKHpwgZrU/EN34xRQ5y1sL5Qp0P/IQrL8rL7D1V2dNh9rkEp0s1NIcYCcN1QMcFmyEHrsibFv/HGTAxCn/Izuy6VgH4oPoHL5g0KmU58hl1RGRzP3UD0q/vp6DDGku9VWm8H+FCu9Dmm5ClLuPQJTf1qpUWAr9zmBinIUZ1+4rTwOTBFqZEHj5VI1WM/MK7ITwrli/Z+YHU5fEufes9Ob7Ow8ul47yA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2kieiaA/pL+wMfRgL+l0MlG/OcfWJYSk6lI0ghA7o/E=; b=nORFT9huSqx46XrwtVcICFYD37Q58BOS/0MGWlEveNbSUXspfJtjw3h0ooOrqSs+qVEptiW6PGXSwmQFTYwlP2aYCSwvEMnwiChHIXZYUWg4AaUBwAIKP71a+R1Zih7SI0ga9JGAresBv1mL8xX+WJNHzDVFBJCClgeRG/igv2dFGJceWqtPYiStLu5VhA2Lu0ZO2xMmNMUUcvOrMTH2YgRnkL1iA9VXLs+dNOb+bWcbdu4orQA3JPEAVCoDUFgkEVhK+N650tI3Rt7Pec/tibskZet3/d7rxsld9zYQqP1fDgoen3jgFkDxUzSOEmkb2zmqgVnn43ojnzlrFYqJ/w== Received: from GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:83::20) by AS2PR10MB7227.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:609::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.31; Thu, 16 Nov 2023 03:17:31 +0000 Received: from GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM ([fe80::6c45:bfdf:a384:5450]) by GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM ([fe80::6c45:bfdf:a384:5450%7]) with mapi id 15.20.7002.021; Thu, 16 Nov 2023 03:17:30 +0000 From: Yuran Pereira To: bpf@vger.kernel.org Cc: Yuran Pereira , andrii@kernel.org, mykolal@fb.com, ast@kernel.org, martin.lau@linux.dev, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com, haoluo@google.com, jolsa@kernel.org, shuah@kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org Subject: [PATCH bpf-next 1/4] selftests/bpf: Replaces the usage of CHECK calls for ASSERTs in bpf_tcp_ca Date: Thu, 16 Nov 2023 08:46:58 +0530 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: X-TMN: [DgREM1ts3urqaRvHw9L2q9uXLRFHqr4L] X-ClientProxiedBy: JN2P275CA0001.ZAFP275.PROD.OUTLOOK.COM (2603:1086:0:3::13) To GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:83::20) X-Microsoft-Original-Message-ID: <20231116031658.70661-1-yuran.pereira@hotmail.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR10MB6563:EE_|AS2PR10MB7227:EE_ X-MS-Office365-Filtering-Correlation-Id: 8e35c3da-0016-4631-e3f7-08dbe652913d X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NbMQRAfG6xVX8nh2tloRlSQvoqhbTiQb6I52PhXkktyg2rE6IcRa5ORCqt5JzpdzREOTTxJ4TqLAeqG9qJw0zLR9CwNwTYLOH5+PaUa1Ibx713lypey++AASurc6MHzTkiuS3+eYFjC1vORbLnnKQG9QFQRIc+JtAkP1w2VWoXcjD40ltlObT8J9f0qBJXqjwSdwEmi1mzG0HDk7ptpZQTUyNAD3TH32uF4BPiS3fPZJ7xO9de14YjOeQcpyBU+VUiktgsutL+IGuSEhQaM9pBDSuT+GseV26YJNrB066nbAvJ9btEH7A2mVxtq/lj4mDQtyIkV6DaVzPcLvGDLozuxkFoKhBo/vbRzeR6z0GycWMO9yec6b+ItrUYfM9Rk7OkM+l2LMwzQmgKnFOpv1YVEDuvw1cviPv12frkXvFfVj0KYcLVq6+a/UJsyfiZOlvsZGhHef/IVncfUO8/LacLwVVZ1LiKLQXbezR2YtvXK7N/mFHvGrm+yVH5/U1nU1j50hTfClUEuMfcT5Z+auVjlwRnkdv5Zr/TxzncS4QPVooBAw9JeB1Pqpd3gH8+/Mgz9A/nJF7CIohjHlt/6BzsYHIJF5mUNkTQg5bcOwT5U= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NJZDMNIBQrxmsRA9acRmDHWTGw4rvAjuyGk6TbCyxBVzl1cry2pxrA/RfIT4lPVj2RkNGWNxQ2WGUR9n4bx5jLETGQn71tae4bhujdPrlAhgxyOHldYF+PeHuamJnrrmsRZYrQ8wHt1G723cqSUje7QIsfyDuBIoKwQcDt+HwcQznki4UXG6tUgmc1swu1PyMX62qwWGc1I89N5wVtE+eRtCJZOgqlpAJEJzPoNKS8owqpa6ABQuC5vitzdZmzYRCraVnoaeQh70BwqWYwqm4In0lygXnXgk/79yGs/emvzfBZK7cjHtGxv9ZxHfape2QHpPPDOTJ1U6RQDJfDmXmlQ4O4/CwDN/lV3o3YxP46F9ua8VmX3+v1tzDnowCCuEsbMpcxNkDPl5VdQw6A4HJr0jE1pnc3QtDteaGeRUDyVR+/AHR89IVFo2AAFs1WmFFHVM/D6zeLhob7X5PlEv4PPUBiTQxhYKjbVbHMEIT8bKEusvzODNqAcgscjhVPdw1zAg7qUsujEoIKlgdRNifp6HA5ZcDpiiCFXGUAimM4UbprGzdYHR6ioS0GYhmkHCOwBIigKyzdrC88LRehWEO2lQRKs2kPSEZ25MfFo0J/MZQoZUgB0ZedZn9FrcwTJO8VSfyQL+nQ1M9heYytwfVWCfKeX0VIdVZ8O+EdWwY5NTywjia+Kyw0vj89cK16MMa8C1MZU+TAdPn9U9IK1+jq8qaEeGaEmJhU78qK3OOCe/K0SR6W9zfwUeSr5r6xuAmx0sl2Bbdt8xtQOToqzc0fPsBGfcGpICrLAJoYHN58p8yS1GN/d9MhPSl8L/CO3ThyHDPTzrCTi29ozqP4YWBmyfAoN3oFhvyX9RZPcFRd1AFYlmmIlVTdpxQ37IsgzWiADYVy1Z/72yM21m7HCBJHTRRBmfztWw6oJWuPwjSY44/1J1FzIYiQiEWnjGI2qB2o71NwsQ7feaQ1nOB80y07EWQYs6GqKcBK5bjzBr6bZcfKsz9MogjoLtx1lBET/RWe4Fx7sUNd+eGIO3AfQS4t0PzFgFFKRAIrzteQ6RM8tIH5hFoGXt6m8ZrfR/Z8ZEYQn2kDGiKNUCOM4JjXAp+SunYqIjIVwQ10ARy7ezJPD4yUcjWA2ZT0uC+5Reowu4iutkEGP5lS2JeG3VYoOA5i9FS3TSDGS2NeLZLcJH/LHM/+TItCLw0QKzlBMTJkkkKPLuJD4ruNKyZWLe9HsASwEOglwmlPOjOJP+bgSQ6Mk= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-6b909.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 8e35c3da-0016-4631-e3f7-08dbe652913d X-MS-Exchange-CrossTenant-AuthSource: GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2023 03:17:30.8500 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR10MB7227 bpf_tcp_ca uses the `CHECK` calls even though the use of ASSERT_ series of macros is preferred in the bpf selftests. This patch replaces all `CHECK` calls for equivalent `ASSERT_` macro calls. Signed-off-by: Yuran Pereira --- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 48 +++++++++---------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c b/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c index 4aabeaa525d4..9f5fb97ac0c5 100644 --- a/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +++ b/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c @@ -20,15 +20,14 @@ static const unsigned int total_bytes = 10 * 1024 * 1024; static int expected_stg = 0xeB9F; -static int stop, duration; +static int stop; static int settcpca(int fd, const char *tcp_ca) { int err; err = setsockopt(fd, IPPROTO_TCP, TCP_CONGESTION, tcp_ca, strlen(tcp_ca)); - if (CHECK(err == -1, "setsockopt(fd, TCP_CONGESTION)", "errno:%d\n", - errno)) + if (!ASSERT_NEQ(err, -1, "setsockopt")) return -1; return 0; @@ -65,8 +64,7 @@ static void *server(void *arg) bytes += nr_sent; } - CHECK(bytes != total_bytes, "send", "%zd != %u nr_sent:%zd errno:%d\n", - bytes, total_bytes, nr_sent, errno); + ASSERT_EQ(bytes, total_bytes, "send"); done: if (fd >= 0) @@ -92,10 +90,11 @@ static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map) WRITE_ONCE(stop, 0); lfd = socket(AF_INET6, SOCK_STREAM, 0); - if (CHECK(lfd == -1, "socket", "errno:%d\n", errno)) + if (!ASSERT_NEQ(lfd, -1, "socket")) return; + fd = socket(AF_INET6, SOCK_STREAM, 0); - if (CHECK(fd == -1, "socket", "errno:%d\n", errno)) { + if (!ASSERT_NEQ(fd, -1, "socket")) { close(lfd); return; } @@ -108,26 +107,27 @@ static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map) sa6.sin6_family = AF_INET6; sa6.sin6_addr = in6addr_loopback; err = bind(lfd, (struct sockaddr *)&sa6, addrlen); - if (CHECK(err == -1, "bind", "errno:%d\n", errno)) + if (!ASSERT_NEQ(err, -1, "bind")) goto done; + err = getsockname(lfd, (struct sockaddr *)&sa6, &addrlen); - if (CHECK(err == -1, "getsockname", "errno:%d\n", errno)) + if (!ASSERT_NEQ(err, -1, "getsockname")) goto done; + err = listen(lfd, 1); - if (CHECK(err == -1, "listen", "errno:%d\n", errno)) + if (!ASSERT_NEQ(err, -1, "listen")) goto done; if (sk_stg_map) { err = bpf_map_update_elem(bpf_map__fd(sk_stg_map), &fd, &expected_stg, BPF_NOEXIST); - if (CHECK(err, "bpf_map_update_elem(sk_stg_map)", - "err:%d errno:%d\n", err, errno)) + if (!ASSERT_OK(err, "bpf_map_update_elem(sk_stg_map)")) goto done; } /* connect to server */ err = connect(fd, (struct sockaddr *)&sa6, addrlen); - if (CHECK(err == -1, "connect", "errno:%d\n", errno)) + if (!ASSERT_NEQ(err, -1, "connect")) goto done; if (sk_stg_map) { @@ -135,14 +135,13 @@ static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map) err = bpf_map_lookup_elem(bpf_map__fd(sk_stg_map), &fd, &tmp_stg); - if (CHECK(!err || errno != ENOENT, - "bpf_map_lookup_elem(sk_stg_map)", - "err:%d errno:%d\n", err, errno)) + if (!ASSERT_NEQ(err, 0, "bpf_map_lookup_elem(sk_stg_map)") || + !ASSERT_EQ(errno, ENOENT, "bpf_map_lookup_elem(sk_stg_map)")) goto done; } err = pthread_create(&srv_thread, NULL, server, (void *)(long)lfd); - if (CHECK(err != 0, "pthread_create", "err:%d errno:%d\n", err, errno)) + if (!ASSERT_OK(err, "pthread_create")) goto done; /* recv total_bytes */ @@ -156,13 +155,12 @@ static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map) bytes += nr_recv; } - CHECK(bytes != total_bytes, "recv", "%zd != %u nr_recv:%zd errno:%d\n", - bytes, total_bytes, nr_recv, errno); + ASSERT_EQ(bytes, total_bytes, "recv"); WRITE_ONCE(stop, 1); pthread_join(srv_thread, &thread_ret); - CHECK(IS_ERR(thread_ret), "pthread_join", "thread_ret:%ld", - PTR_ERR(thread_ret)); + ASSERT_OK_PTR(thread_ret, "pthread_join"); + done: close(lfd); close(fd); @@ -174,7 +172,7 @@ static void test_cubic(void) struct bpf_link *link; cubic_skel = bpf_cubic__open_and_load(); - if (CHECK(!cubic_skel, "bpf_cubic__open_and_load", "failed\n")) + if (!ASSERT_OK_PTR(cubic_skel, "bpf_cubic__open_and_load")) return; link = bpf_map__attach_struct_ops(cubic_skel->maps.cubic); @@ -197,7 +195,7 @@ static void test_dctcp(void) struct bpf_link *link; dctcp_skel = bpf_dctcp__open_and_load(); - if (CHECK(!dctcp_skel, "bpf_dctcp__open_and_load", "failed\n")) + if (!ASSERT_OK_PTR(dctcp_skel, "bpf_dctcp__open_and_load")) return; link = bpf_map__attach_struct_ops(dctcp_skel->maps.dctcp); @@ -207,9 +205,7 @@ static void test_dctcp(void) } do_test("bpf_dctcp", dctcp_skel->maps.sk_stg_map); - CHECK(dctcp_skel->bss->stg_result != expected_stg, - "Unexpected stg_result", "stg_result (%x) != expected_stg (%x)\n", - dctcp_skel->bss->stg_result, expected_stg); + ASSERT_EQ(dctcp_skel->bss->stg_result, expected_stg, "stg_result"); bpf_link__destroy(link); bpf_dctcp__destroy(dctcp_skel); From patchwork Thu Nov 16 03:19:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuran Pereira X-Patchwork-Id: 13457580 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b="SkxewIy1" Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2042.outbound.protection.outlook.com [40.92.91.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EC2C199; Wed, 15 Nov 2023 19:19:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z9W+jeQbkHyVsB2lgGfYAdO+1fqcEGAqZep5Db8FdtcQDNS8qZYnxYFIo1SpcjT8xTuzB7FgVCtAbyoXdS7xqjQKdEcKDr7pLqkpGnafuq/6IWsTbca3NgeoFNXkqjq1kfzdXsl8Z+sx0DG2mnduCs6f84Lyi9zUScjMPqw28Mis8i2H/wKrAUt1qQaeMUsEWkt5TFsm/LwWHwhmQJTgDYvGsHeEHVBKv1OlWQo6Fy4UfByt9bCnDdV2oW8lFjyCCDtiuHYqPrYTfGJDseVCX3jv/FFijVdjfJUMEc/By7CSoVaTJwUC5iUYcIB/1q8tUQlk0RnfRTSRvInxemWYuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mpgZioiHFXVOmVOt3m5Jvrrc9VUKdE04J+X25ImEGOc=; b=QTlUvxyoMtl1yM2dm0mESKckDqxYuRKWKsDLMvPFgYf28zXeHoSMyRCYB2bUoutvkAtGWIPktV2FQU3CY8asqIRTlT4zuPIETwQv9KlqKh+QeQGL56ZkbtM3Mi65lAfy8c/8aea1Zzqw35ohkyT/nQk7XInMUvXE+AyKQr8zwtjkhtddZZv0WfjpfHOerIxkwvu966N37kJziA1i6N77kxe0lmwna/KPPI+8+vWJU8SKxuxRPNLrs3VFXBg+ZkZTvcNjc8LCiCE+3pQA3NoRsDYXwUTi2g1re9udwIQY2Ek7tSQNjBw3kIolW3JYlmCTaM2DKshItvwRwW/Nmhn0aw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mpgZioiHFXVOmVOt3m5Jvrrc9VUKdE04J+X25ImEGOc=; b=SkxewIy1rpxNIbm/zhZQOWzBhG1tL7wOcoS5ZVWhMEbvJ3ys+ytIStNR+ofeGxErMNew+ij8VOFXrK1jR3C0L0Vt7kzSGEaV+neWavLpZvlgJUROIms6cI3szKJ5X40I+tp3S78GX3nF7KAYZq3jKUhAyVbb/bd4i+PBl01R/Tpxb/hcFUelADSjVpWEfH6Q7LRmjaSCedvNWerP0pzdx6Mqr3aPzUsvL+/88bb3S6qIxvYeIVBS2gFJaMVcTRBW/vKnXIQ+dBGQZvi4oVcXWo8YOJ0VRgTlagL2VqOsks7aiVw2IJ8teNWiWDrp3kpk1z18sAVK2fB37uM27MiKHw== Received: from GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:83::20) by AS2PR10MB7227.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:609::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.31; Thu, 16 Nov 2023 03:19:25 +0000 Received: from GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM ([fe80::6c45:bfdf:a384:5450]) by GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM ([fe80::6c45:bfdf:a384:5450%7]) with mapi id 15.20.7002.021; Thu, 16 Nov 2023 03:19:25 +0000 From: Yuran Pereira To: bpf@vger.kernel.org Cc: Yuran Pereira , andrii@kernel.org, mykolal@fb.com, ast@kernel.org, martin.lau@linux.dev, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com, haoluo@google.com, jolsa@kernel.org, shuah@kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org Subject: [PATCH bpf-next 2/4] selftests/bpf: Replaces the usage of CHECK calls for ASSERTs in bind_perm Date: Thu, 16 Nov 2023 08:49:00 +0530 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: X-TMN: [QXnX9bdXqmjE9YvU8a0s2RgB13x7S5CL] X-ClientProxiedBy: JN3P275CA0013.ZAFP275.PROD.OUTLOOK.COM (2603:1086:0:70::18) To GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:83::20) X-Microsoft-Original-Message-ID: <20231116031900.70828-1-yuran.pereira@hotmail.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR10MB6563:EE_|AS2PR10MB7227:EE_ X-MS-Office365-Filtering-Correlation-Id: 13bd8b72-677d-417a-0370-08dbe652d59a X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GvWOd1ojObUSt+UMOWva8cW0SATQ+da7iAIlGKD9I/6f+rPCilT0hRoXyFrofjJVbnKoyfeB031dgC06+jJSDPMBS0xsPeFlvvcvOGaoupz8d4EEjzwEPBYDaED0R3x6FQl70hufJTFgXaTJgox2XgdTWAHGMCRl2NpKYBLb7ulM/dqOrRrC+XtDVheEbp6fjRgYpPewROJr5EAffoLm3oyPHpDq3gPGXqAvB8jPVzjxDNiOmK7mMRkki0GRaEUJPduPHaMLiCR6GSUt4+otgetnL5e79/WFrzCGxu8aR54jazy2ZHB4jDtLviYg8pidF4cJOnLXBBrVtZ5HcTjWUOIsC55LIK2V4YJJ5692JxDu2jnahuEGlBdTEyVFCanTob6SPpOYkShWtWszsGHc9bUf6qweA1j/SkOz9fYtQyHubTqGyTRmuojoepx8KgJmvlDHPkb7QDcUB5cGrxja507xUd2ETLfTvLdZZTUtAhFu1V8aE5NeCiYH1RqvjpDAIYa+NrczwcapCDRKJ89xpRis/Syqi71lArDi8mNudpNlQ0x4P16c2Ip3iymvAhQIAF94FkLeIwhgCQDMQXFKSeJI4ibk4rWYumTzT80FKXwl9SQb2SmO4qopxcsOaTuw X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EIzjeBLJY60kBntQMvhxCDq1HdrstkKA0KcPo1q7ec79hb9xZtVOnYlf6zJe71liaoxNNzqGGNoDZi5eJYvWVnEIlgdZkeH4uVeiKnXYE/KqtA10Y/bjtyC//ZRyTvFeUiqNh5H9PprGsV6hnFwel5ywuSrmRsA6Gwf1xnCFP4YHTs73lgtLvILBPlBxdjCPD11eaf9NPvZPRQ8imO4bhXw94IXy2zu2eThdhTBLeBZ1Fy2SdcHV85U1NgvfsGPQyi8B24MeM+TyDvcRrusutD+/VrOAvCyLww/F7LfpfooYI1hVt5Dp2V41PCoqfuqBUpZvHw9RaUFlQdJwG/5xJ8SiY1SPz5p9/d3gmimCMCOkQybxrtRzjGw8osDJMeXn0fveH1Jss2mZN6COog6PizfKWrSDzVbAGOWgcWJAFMHoPiaC/6ROS3DI3x4wN9X496uM21M/S9IQ2KKZ60ZNWJroypNrUKJUCEkN2WtM1QC4h+PM1QzKGVGbiXwYPYyyQEEAfAAls/E6y9bdFT60MfhAZEBC+AL0QCgv18x2iB74rJfvlo+ucUlPn5+IGP3jxM+GhdguggslGRqcYKqwEgp5h9P4SHS+AhySwHIPAhsmHAYyljfXWjevs4q87JPXYO2SOPcNaA1l/ovDcs/ro4S3rqtRso2XDjxlyxSzvy8L+GeneEzS6pgmNDk01l0qX3n9dgvFgPsAEI1fk1998Rpp6SZFWXm/ebIENJijRBpWFVHhoZ8M4Kp9POB9o/Nvg93j7o8KhEvmBcLoEFM8+jq/CkURCqJwnjRWa83s5QLDVY4GOUHLn0K3AP130x8gbzcysfK7DVfUVjH4u1ekeybKKoTQvxbJtFclcdARDwacxc+e8CnClbesZJuxIC6gAIlTGVG3VpNo7ZNcQ6/zVsHEUAElek7MreXNF/1LKd6xdHNWsBMuxNZ68iMZ4ArP/LB25Z6RInjPtGZsc+kqmu3WO8IMmw7UKZljO8r+bUD2vVmjbXVvBhHNYfvaA8WmbWypCNvmi6PifM9kkKoXUM6azlMemWf17v819DzbmPhgl5MFgJReOtrrBOqD0/OpQ1vcm27fOcea+lnfDm9c5lE6S3wbGt9FNIXCFba+LUOTxrii6jNinICvVqFT69nD2uPIEOOgIjSqsP9Okw17TwHlK6FttO9ICMjMWy8ALY/OESXwvCCEdNXCBy3AcziR9s2D7A9onctQmf4hqKs5xFU+/7PXUpDeSWWhxOi6hAQ= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-6b909.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 13bd8b72-677d-417a-0370-08dbe652d59a X-MS-Exchange-CrossTenant-AuthSource: GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2023 03:19:25.2110 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR10MB7227 bind_perm uses the `CHECK` calls even though the use of ASSERT_ series of macros is preferred in the bpf selftests. This patch replaces all `CHECK` calls for equivalent `ASSERT_` macro calls. Signed-off-by: Yuran Pereira --- tools/testing/selftests/bpf/prog_tests/bind_perm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/bind_perm.c b/tools/testing/selftests/bpf/prog_tests/bind_perm.c index a1766a298bb7..f7cd129cb82b 100644 --- a/tools/testing/selftests/bpf/prog_tests/bind_perm.c +++ b/tools/testing/selftests/bpf/prog_tests/bind_perm.c @@ -9,8 +9,6 @@ #include "cap_helpers.h" #include "bind_perm.skel.h" -static int duration; - static int create_netns(void) { if (!ASSERT_OK(unshare(CLONE_NEWNET), "create netns")) @@ -27,7 +25,7 @@ void try_bind(int family, int port, int expected_errno) int fd = -1; fd = socket(family, SOCK_STREAM, 0); - if (CHECK(fd < 0, "fd", "errno %d", errno)) + if (!ASSERT_GE(fd, 0, "socket")) goto close_socket; if (family == AF_INET) { @@ -60,7 +58,7 @@ void test_bind_perm(void) return; cgroup_fd = test__join_cgroup("/bind_perm"); - if (CHECK(cgroup_fd < 0, "cg-join", "errno %d", errno)) + if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup")) return; skel = bind_perm__open_and_load(); From patchwork Thu Nov 16 03:21:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuran Pereira X-Patchwork-Id: 13457581 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b="Oc6TJ9mk" Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2030.outbound.protection.outlook.com [40.92.91.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84B1919B; Wed, 15 Nov 2023 19:21:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WcN8N4isDOXAWOVLotyYauoI65uoaVcPQF1VcRWeC3qjBN3vLu5L/d/Jq138hVvkwmwQS0Zvav3AKo3ffLhw4O9tXIZ63toUz6JZlr++BoNVWt1Rgw8IVQaXtJilaMu8ZfcQKkcdGRCbXJX5LtG0KERZtL9dfgHZCUCNZWzbfJwODToLm/ls4NIQDeQ7xIZlil2ewOB07VbVRksemjVMvZdXachPe+EU/CYRRsCNJC8fFn3IbBfh6nnh8hTboRDRLhSS5TKz32Pai00HUGf7WRCS4Bt98E6IBInMdwUeGPb46g/KvQeUMuJ5kx4LXwzGjEH8EvQyU0lYxf7GkMZ/Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=piQaToojm3qbR2rRzMqggkfCTjcB4RS+/8/vAQe8Fwo=; b=T0B4MMCrwj0ySZbGx1JKXgtiMKTFrMgN/KlxU5Cc7sRiLXxSrpHVHfMMVxUoOPOJFi0TKow4ROzGs/D/TYpchaJ7E+/pW+kQhH25TSmI4sfxLtqotB4p0BHxhOmCcsXgDmjlC1ea9d6G1o6uqOEwdlj8WLUwoN0xgR+eGT1B0UY9u8EC49G/4Q0yEctojEnUvlfXZ0HPWY2oFiAqc58BLS+6lRCCgsWxqO1TlgF44+tSePHro3k0gJ6eorG1JXZTcCudNVHlvikRY3gpi/5J6mLbQPCnD2xZWnbYHa8nle2yJYjqGAQSSvxU2jMKbT/Ko/lTHgl+gx8Xjz3w70U3xA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=piQaToojm3qbR2rRzMqggkfCTjcB4RS+/8/vAQe8Fwo=; b=Oc6TJ9mkGmoXzeXxF6LiEgd+XJGZv0ygNtahs4lD+slfzwRjAHj4LDUnCIQygHmI5TExUro5aVpET35da6z29p2pq3Vf9NfTHUv1sk7LFe7JmZgrH/3V/Nlg83YQJFfQ1UtpujCfFCeY/ilcLlTEyY/FsQopTsMuIEFs8EfEJJ8ss6jkk2wv1LwHQmXXQ0Z1yXvhrUDcO5NtogewHCqmEzrH+BdBr4dfJweCdJ3e/WowOsXt2oOhbv27rekA/4Y+k38/QV6IvtqClExFHexpU7lOrvLF3VBSr3uO9m6vY58F5qBGvFldc2w1MRVq7YIe7EQi99JF+Zb1zi9PzRJZeg== Received: from GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:83::20) by AS2PR10MB7227.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:609::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.31; Thu, 16 Nov 2023 03:21:23 +0000 Received: from GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM ([fe80::6c45:bfdf:a384:5450]) by GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM ([fe80::6c45:bfdf:a384:5450%7]) with mapi id 15.20.7002.021; Thu, 16 Nov 2023 03:21:23 +0000 From: Yuran Pereira To: bpf@vger.kernel.org Cc: Yuran Pereira , andrii@kernel.org, mykolal@fb.com, ast@kernel.org, martin.lau@linux.dev, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com, haoluo@google.com, jolsa@kernel.org, shuah@kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org Subject: [PATCH bpf-next 3/4] selftests/bpf: Replaces the usage of CHECK calls for ASSERTs in bpf_obj_id Date: Thu, 16 Nov 2023 08:51:01 +0530 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: X-TMN: [1RDpw06Vk0Z6hyKP4KYXEY54JgP317kj] X-ClientProxiedBy: JNAP275CA0038.ZAFP275.PROD.OUTLOOK.COM (2603:1086:0:4e::9) To GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:83::20) X-Microsoft-Original-Message-ID: <20231116032101.70960-1-yuran.pereira@hotmail.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR10MB6563:EE_|AS2PR10MB7227:EE_ X-MS-Office365-Filtering-Correlation-Id: 92e0a206-9f5d-41b1-b204-08dbe6531bd7 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: og576KGpuGMVR9WQgKCXUq3pIrBH/IuqBFHcGSayL4ttyqFzZx2I7fhi1h5EpM8BtXwNuG5VfEuHmxLvm4LqYTP2++s+3hXS2T8LyRFR4xXeBqwKzGX5/2zrjy7AeRWghQNKEqXm1YJhAMBs58XDzbEMOiPNmYNATuoI/ZtR5tKROIsiJdaz/O00poxTwJGX0FXNbfW32VznYCpY3xjrsklBQ3TJMErC//VdAmTKWfXxVg31fal9HJsG6LF6l2CJPIcr2wf3iuybqi3hgUZkhAImkTrjCt6aIa0nJZLQA33SDdvpNkaBxyMM7U0ysFjI4Eis6b7GkBAoWnqaCJ26s8c/KLaE6zRKXdc3CstGm6erK9q/dBv4eK1dyLyKnFt7KHR6GYXeHgR5kIj+lWky3QLcK125RHJZkulRZpbmKaua+O/HkDw/AuYql8cg747/4QAcvx98u5FvTRsd/nEB0Z6wFRfwl0RVbT9RhTBMlMFfqI8rdlf5pI+KNzra0315U6Z9LcnVoQfo0zU34Ek2EMIQMMUXN4KxWHW2in21W2AGrWgW0SmAgQLbl2bN6rKxapNs41IwlVnFfqATpWQH+9rjatXi29tJcoNwfu9IEYTnPL/W5OaGiCZeIWuxepZM X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qozvUal+/uWW4aR1wdpukGrWOJUUiVoxFfc2AZiQe6fh7seTd5t6zcz4hdPJbUGF/2jc1jLtYcxgXVkUeARlHeNAWgIeXRluimTgAWsAj4/sJZafHFBJjmONmRmw40r4Jv95cKIdH6T8ngg78uhQXgM1aVpdhrAGolLsnXXOaQNuw6kCZLWLOiTcRDwFWe2Sa76vHSvrAkTI9Pzc1rF/IviMn/bk79BINUWjyTL3K0h0N2vvCMecc8CLjxhvgkIuVro97WY5xXJmFkvCQLNXsZP9rqq5GHNesXESx8Epjp2eYquT/ECNLgUiWw5O7HM5gAjsT2JavDV8lofZ8/g6r1nnI2ZnsvvHxn7G6tRWzKf8xMK0tPc85vhiaPCvNif7Rc8gIW/HGiTnnXY+2ibxBbl8katg1ifEvsZlE5xEVhSw3f2GIc2mCJonvtm0OOwXHRP6H89k0sUTWGfDDAfGmMNB2vpA/PJ8vAfjGwJ2tTuzWYpyz5va3UceHcFHaJ/EQnrHw7XWX9q61AQBbQyPGUpvtfCLY/G/j228Kv3LCW+6ZTfG5RbXBMJotYGVlGnqBbsFwkpHa2JX4MCSamxkZAYsKbb4xddvNLKS6lRPywwnMfWbLkl+gtLK3grRF66aUVwr/oDz3rchcIPCWwBh4dGH2TjvpGAO+PX5IF9UDGAfBrdWSTgwtNeUWwHWyUaklAPa1V+hehvI0bVNcHSAKlxf5DGutkGhPgvIrUUndtVsDYzbD6AuN0onX/3roQmVrzRhis7ST8fgfDPUXp/xZiR9MZxz76dddVoDX4cziurFaV7ENma2vH0K2ufau8rVOL8YVDIAL6kTHHdMa33DCdjg25ch8hYZaXlMzVXTC1PEorBPcJd9CKu6ovzLk6X/CMtnzJPFNnS6LAxITlaGDEsf7tU7dRhSakWcKSmd6yPGhdTHdNc278kgCMYFd+jmeuVhH72sLoxX75MRGEytB3r654zpPmu8ZFCeUVjfQA46yDB+ER+/WOFiSnNmvuB7KgXjL0GBYrRFdFGDXZzp9elhZDNjznwrejCBuENjL6ywYAKAwDlUDsw8CK9sS/5HS52CUzigev/7xl7GHsretjp3F2/7AfXFzvX/zdGseLN131TBhzbdtdgnN5bN7bbFuPluUCf6DzWRHUX5ld+r0DfAMzUv3H1W2hSgwSTQ+icwgQsvXc1GD7NxP2XARUPee/cKQFmAe3BH/Ume4RpbAxluPQ5MujcYC3CwNNOveRk= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-6b909.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 92e0a206-9f5d-41b1-b204-08dbe6531bd7 X-MS-Exchange-CrossTenant-AuthSource: GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2023 03:21:23.0159 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR10MB7227 bpf_obj_id uses the `CHECK` calls even though the use of ASSERT_ series of macros is preferred in the bpf selftests. This patch replaces all `CHECK` calls for equivalent `ASSERT_` macro calls. Signed-off-by: Yuran Pereira --- .../selftests/bpf/prog_tests/bpf_obj_id.c | 204 +++++++----------- 1 file changed, 73 insertions(+), 131 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_obj_id.c b/tools/testing/selftests/bpf/prog_tests/bpf_obj_id.c index 675b90b15280..986fb8429b22 100644 --- a/tools/testing/selftests/bpf/prog_tests/bpf_obj_id.c +++ b/tools/testing/selftests/bpf/prog_tests/bpf_obj_id.c @@ -25,7 +25,7 @@ void serial_test_bpf_obj_id(void) */ __u32 map_ids[nr_iters + 1]; char jited_insns[128], xlated_insns[128], zeros[128], tp_name[128]; - __u32 i, next_id, info_len, nr_id_found, duration = 0; + __u32 i, next_id, info_len, nr_id_found; struct timespec real_time_ts, boot_time_ts; int err = 0; __u64 array_value; @@ -33,16 +33,16 @@ void serial_test_bpf_obj_id(void) time_t now, load_time; err = bpf_prog_get_fd_by_id(0); - CHECK(err >= 0 || errno != ENOENT, - "get-fd-by-notexist-prog-id", "err %d errno %d\n", err, errno); + ASSERT_LT(err, 0, "bpf_prog_get_fd_by_id"); + ASSERT_EQ(errno, ENOENT, "bpf_prog_get_fd_by_id"); err = bpf_map_get_fd_by_id(0); - CHECK(err >= 0 || errno != ENOENT, - "get-fd-by-notexist-map-id", "err %d errno %d\n", err, errno); + ASSERT_LT(err, 0, "bpf_map_get_fd_by_id"); + ASSERT_EQ(errno, ENOENT, "bpf_map_get_fd_by_id"); err = bpf_link_get_fd_by_id(0); - CHECK(err >= 0 || errno != ENOENT, - "get-fd-by-notexist-link-id", "err %d errno %d\n", err, errno); + ASSERT_LT(err, 0, "bpf_map_get_fd_by_id"); + ASSERT_EQ(errno, ENOENT, "bpf_map_get_fd_by_id"); /* Check bpf_map_get_info_by_fd() */ bzero(zeros, sizeof(zeros)); @@ -53,25 +53,26 @@ void serial_test_bpf_obj_id(void) /* test_obj_id.o is a dumb prog. It should never fail * to load. */ - if (CHECK_FAIL(err)) + if (!ASSERT_OK(err, "bpf_prog_test_load")) continue; /* Insert a magic value to the map */ map_fds[i] = bpf_find_map(__func__, objs[i], "test_map_id"); - if (CHECK_FAIL(map_fds[i] < 0)) + if (!ASSERT_GE(map_fds[i], 0, "bpf_find_map")) goto done; + err = bpf_map_update_elem(map_fds[i], &array_key, &array_magic_value, 0); - if (CHECK_FAIL(err)) + if (!ASSERT_OK(err, "bpf_map_update_elem")) goto done; - prog = bpf_object__find_program_by_name(objs[i], - "test_obj_id"); - if (CHECK_FAIL(!prog)) + prog = bpf_object__find_program_by_name(objs[i], "test_obj_id"); + if (!ASSERT_OK_PTR(prog, "bpf_object__find_program_by_name")) goto done; + links[i] = bpf_program__attach(prog); err = libbpf_get_error(links[i]); - if (CHECK(err, "prog_attach", "prog #%d, err %d\n", i, err)) { + if (!ASSERT_OK(err, "bpf_program__attach")) { links[i] = NULL; goto done; } @@ -81,24 +82,14 @@ void serial_test_bpf_obj_id(void) bzero(&map_infos[i], info_len); err = bpf_map_get_info_by_fd(map_fds[i], &map_infos[i], &info_len); - if (CHECK(err || - map_infos[i].type != BPF_MAP_TYPE_ARRAY || - map_infos[i].key_size != sizeof(__u32) || - map_infos[i].value_size != sizeof(__u64) || - map_infos[i].max_entries != 1 || - map_infos[i].map_flags != 0 || - info_len != sizeof(struct bpf_map_info) || - strcmp((char *)map_infos[i].name, expected_map_name), - "get-map-info(fd)", - "err %d errno %d type %d(%d) info_len %u(%zu) key_size %u value_size %u max_entries %u map_flags %X name %s(%s)\n", - err, errno, - map_infos[i].type, BPF_MAP_TYPE_ARRAY, - info_len, sizeof(struct bpf_map_info), - map_infos[i].key_size, - map_infos[i].value_size, - map_infos[i].max_entries, - map_infos[i].map_flags, - map_infos[i].name, expected_map_name)) + if (!ASSERT_OK(err, "bpf_map_get_info_by_fd") || + !ASSERT_EQ(map_infos[i].type, BPF_MAP_TYPE_ARRAY, "map_type") || + !ASSERT_EQ(map_infos[i].key_size, sizeof(__u32), "key_size") || + !ASSERT_EQ(map_infos[i].value_size, sizeof(__u64), "value_size") || + !ASSERT_EQ(map_infos[i].max_entries, 1, "max_entries") || + !ASSERT_EQ(map_infos[i].map_flags, 0, "map_flags") || + !ASSERT_EQ(info_len, sizeof(struct bpf_map_info), "map_info_len") || + !ASSERT_STREQ((char *)map_infos[i].name, expected_map_name, "map_name")) goto done; /* Check getting prog info */ @@ -112,48 +103,34 @@ void serial_test_bpf_obj_id(void) prog_infos[i].xlated_prog_len = sizeof(xlated_insns); prog_infos[i].map_ids = ptr_to_u64(map_ids + i); prog_infos[i].nr_map_ids = 2; + err = clock_gettime(CLOCK_REALTIME, &real_time_ts); - if (CHECK_FAIL(err)) + if (!ASSERT_OK(err, "clock_gettime")) goto done; + err = clock_gettime(CLOCK_BOOTTIME, &boot_time_ts); - if (CHECK_FAIL(err)) + if (!ASSERT_OK(err, "clock_gettime")) goto done; + err = bpf_prog_get_info_by_fd(prog_fds[i], &prog_infos[i], &info_len); load_time = (real_time_ts.tv_sec - boot_time_ts.tv_sec) + (prog_infos[i].load_time / nsec_per_sec); - if (CHECK(err || - prog_infos[i].type != BPF_PROG_TYPE_RAW_TRACEPOINT || - info_len != sizeof(struct bpf_prog_info) || - (env.jit_enabled && !prog_infos[i].jited_prog_len) || - (env.jit_enabled && - !memcmp(jited_insns, zeros, sizeof(zeros))) || - !prog_infos[i].xlated_prog_len || - !memcmp(xlated_insns, zeros, sizeof(zeros)) || - load_time < now - 60 || load_time > now + 60 || - prog_infos[i].created_by_uid != my_uid || - prog_infos[i].nr_map_ids != 1 || - *(int *)(long)prog_infos[i].map_ids != map_infos[i].id || - strcmp((char *)prog_infos[i].name, expected_prog_name), - "get-prog-info(fd)", - "err %d errno %d i %d type %d(%d) info_len %u(%zu) " - "jit_enabled %d jited_prog_len %u xlated_prog_len %u " - "jited_prog %d xlated_prog %d load_time %lu(%lu) " - "uid %u(%u) nr_map_ids %u(%u) map_id %u(%u) " - "name %s(%s)\n", - err, errno, i, - prog_infos[i].type, BPF_PROG_TYPE_SOCKET_FILTER, - info_len, sizeof(struct bpf_prog_info), - env.jit_enabled, - prog_infos[i].jited_prog_len, - prog_infos[i].xlated_prog_len, - !!memcmp(jited_insns, zeros, sizeof(zeros)), - !!memcmp(xlated_insns, zeros, sizeof(zeros)), - load_time, now, - prog_infos[i].created_by_uid, my_uid, - prog_infos[i].nr_map_ids, 1, - *(int *)(long)prog_infos[i].map_ids, map_infos[i].id, - prog_infos[i].name, expected_prog_name)) + + if (!ASSERT_OK(err, "bpf_prog_get_info_by_fd") || + !ASSERT_EQ(prog_infos[i].type, BPF_PROG_TYPE_RAW_TRACEPOINT, "prog_type") || + !ASSERT_EQ(info_len, sizeof(struct bpf_prog_info), "prog_info_len") || + !ASSERT_FALSE((env.jit_enabled && !prog_infos[i].jited_prog_len), "jited_prog_len") || + !ASSERT_FALSE((env.jit_enabled && !memcmp(jited_insns, zeros, sizeof(zeros))), + "jited_insns") || + !ASSERT_NEQ(prog_infos[i].xlated_prog_len, 0, "xlated_prog_len") || + !ASSERT_NEQ(memcmp(xlated_insns, zeros, sizeof(zeros)), 0, "xlated_insns") || + !ASSERT_GE(load_time, (now - 60), "load_time") || + !ASSERT_LE(load_time, (now + 60), "load_time") || + !ASSERT_EQ(prog_infos[i].created_by_uid, my_uid, "created_by_uid") || + !ASSERT_EQ(prog_infos[i].nr_map_ids, 1, "nr_map_ids") || + !ASSERT_EQ(*(int *)(long)prog_infos[i].map_ids, map_infos[i].id, "map_ids") || + !ASSERT_STREQ((char *)prog_infos[i].name, expected_prog_name, "prog_name")) goto done; /* Check getting link info */ @@ -163,25 +140,12 @@ void serial_test_bpf_obj_id(void) link_infos[i].raw_tracepoint.tp_name_len = sizeof(tp_name); err = bpf_link_get_info_by_fd(bpf_link__fd(links[i]), &link_infos[i], &info_len); - if (CHECK(err || - link_infos[i].type != BPF_LINK_TYPE_RAW_TRACEPOINT || - link_infos[i].prog_id != prog_infos[i].id || - link_infos[i].raw_tracepoint.tp_name != ptr_to_u64(&tp_name) || - strcmp(u64_to_ptr(link_infos[i].raw_tracepoint.tp_name), - "sys_enter") || - info_len != sizeof(struct bpf_link_info), - "get-link-info(fd)", - "err %d errno %d info_len %u(%zu) type %d(%d) id %d " - "prog_id %d (%d) tp_name %s(%s)\n", - err, errno, - info_len, sizeof(struct bpf_link_info), - link_infos[i].type, BPF_LINK_TYPE_RAW_TRACEPOINT, - link_infos[i].id, - link_infos[i].prog_id, prog_infos[i].id, - (const char *)u64_to_ptr(link_infos[i].raw_tracepoint.tp_name), - "sys_enter")) + if (!ASSERT_OK(err, "bpf_link_get_info_by_fd") || + !ASSERT_EQ(link_infos[i].type, BPF_LINK_TYPE_RAW_TRACEPOINT, "link_type") || + !ASSERT_EQ(link_infos[i].prog_id, prog_infos[i].id, "prog_id") || + !ASSERT_EQ(link_infos[i].raw_tracepoint.tp_name, ptr_to_u64(&tp_name), "&tp_name") || + !ASSERT_STREQ(u64_to_ptr(link_infos[i].raw_tracepoint.tp_name), "sys_enter", "tp_name")) goto done; - } /* Check bpf_prog_get_next_id() */ @@ -190,7 +154,7 @@ void serial_test_bpf_obj_id(void) while (!bpf_prog_get_next_id(next_id, &next_id)) { struct bpf_prog_info prog_info = {}; __u32 saved_map_id; - int prog_fd; + int prog_fd, cmp_res; info_len = sizeof(prog_info); @@ -198,9 +162,7 @@ void serial_test_bpf_obj_id(void) if (prog_fd < 0 && errno == ENOENT) /* The bpf_prog is in the dead row */ continue; - if (CHECK(prog_fd < 0, "get-prog-fd(next_id)", - "prog_fd %d next_id %d errno %d\n", - prog_fd, next_id, errno)) + if (!ASSERT_GE(prog_fd, 0, "bpf_prog_get_fd_by_id")) break; for (i = 0; i < nr_iters; i++) @@ -218,9 +180,8 @@ void serial_test_bpf_obj_id(void) */ prog_info.nr_map_ids = 1; err = bpf_prog_get_info_by_fd(prog_fd, &prog_info, &info_len); - if (CHECK(!err || errno != EFAULT, - "get-prog-fd-bad-nr-map-ids", "err %d errno %d(%d)", - err, errno, EFAULT)) + if (!ASSERT_ERR(err, "bpf_prog_get_info_by_fd") || + !ASSERT_EQ(errno, EFAULT, "bpf_prog_get_info_by_fd")) break; bzero(&prog_info, sizeof(prog_info)); info_len = sizeof(prog_info); @@ -231,27 +192,22 @@ void serial_test_bpf_obj_id(void) err = bpf_prog_get_info_by_fd(prog_fd, &prog_info, &info_len); prog_infos[i].jited_prog_insns = 0; prog_infos[i].xlated_prog_insns = 0; - CHECK(err || info_len != sizeof(struct bpf_prog_info) || - memcmp(&prog_info, &prog_infos[i], info_len) || - *(int *)(long)prog_info.map_ids != saved_map_id, - "get-prog-info(next_id->fd)", - "err %d errno %d info_len %u(%zu) memcmp %d map_id %u(%u)\n", - err, errno, info_len, sizeof(struct bpf_prog_info), - memcmp(&prog_info, &prog_infos[i], info_len), - *(int *)(long)prog_info.map_ids, saved_map_id); + cmp_res = memcmp(&prog_info, &prog_infos[i], info_len); + + ASSERT_OK(err, "bpf_prog_get_info_by_fd"); + ASSERT_EQ(info_len, sizeof(struct bpf_prog_info), "prog_info_len"); + ASSERT_OK(cmp_res, "memcmp"); + ASSERT_EQ(*(int *)(long)prog_info.map_ids, saved_map_id, "map_id"); close(prog_fd); } - CHECK(nr_id_found != nr_iters, - "check total prog id found by get_next_id", - "nr_id_found %u(%u)\n", - nr_id_found, nr_iters); + ASSERT_EQ(nr_id_found, nr_iters, "prog_nr_id_found"); /* Check bpf_map_get_next_id() */ nr_id_found = 0; next_id = 0; while (!bpf_map_get_next_id(next_id, &next_id)) { struct bpf_map_info map_info = {}; - int map_fd; + int map_fd, cmp_res; info_len = sizeof(map_info); @@ -259,9 +215,7 @@ void serial_test_bpf_obj_id(void) if (map_fd < 0 && errno == ENOENT) /* The bpf_map is in the dead row */ continue; - if (CHECK(map_fd < 0, "get-map-fd(next_id)", - "map_fd %d next_id %u errno %d\n", - map_fd, next_id, errno)) + if (!ASSERT_GE(map_fd, 0, "bpf_map_get_fd_by_id")) break; for (i = 0; i < nr_iters; i++) @@ -274,25 +228,19 @@ void serial_test_bpf_obj_id(void) nr_id_found++; err = bpf_map_lookup_elem(map_fd, &array_key, &array_value); - if (CHECK_FAIL(err)) + if (!ASSERT_OK(err, "bpf_map_lookup_elem")) goto done; err = bpf_map_get_info_by_fd(map_fd, &map_info, &info_len); - CHECK(err || info_len != sizeof(struct bpf_map_info) || - memcmp(&map_info, &map_infos[i], info_len) || - array_value != array_magic_value, - "check get-map-info(next_id->fd)", - "err %d errno %d info_len %u(%zu) memcmp %d array_value %llu(%llu)\n", - err, errno, info_len, sizeof(struct bpf_map_info), - memcmp(&map_info, &map_infos[i], info_len), - array_value, array_magic_value); + cmp_res = memcmp(&map_info, &map_infos[i], info_len); + ASSERT_OK(err, "bpf_map_get_info_by_fd"); + ASSERT_EQ(info_len, sizeof(struct bpf_map_info), "info_len"); + ASSERT_OK(cmp_res, "memcmp"); + ASSERT_EQ(array_value, array_magic_value, "array_value"); close(map_fd); } - CHECK(nr_id_found != nr_iters, - "check total map id found by get_next_id", - "nr_id_found %u(%u)\n", - nr_id_found, nr_iters); + ASSERT_EQ(nr_id_found, nr_iters, "map_nr_id_found"); /* Check bpf_link_get_next_id() */ nr_id_found = 0; @@ -308,9 +256,7 @@ void serial_test_bpf_obj_id(void) if (link_fd < 0 && errno == ENOENT) /* The bpf_link is in the dead row */ continue; - if (CHECK(link_fd < 0, "get-link-fd(next_id)", - "link_fd %d next_id %u errno %d\n", - link_fd, next_id, errno)) + if (!ASSERT_GE(link_fd, 0, "bpf_link_get_fd_by_id")) break; for (i = 0; i < nr_iters; i++) @@ -325,17 +271,13 @@ void serial_test_bpf_obj_id(void) err = bpf_link_get_info_by_fd(link_fd, &link_info, &info_len); cmp_res = memcmp(&link_info, &link_infos[i], offsetof(struct bpf_link_info, raw_tracepoint)); - CHECK(err || info_len != sizeof(link_info) || cmp_res, - "check get-link-info(next_id->fd)", - "err %d errno %d info_len %u(%zu) memcmp %d\n", - err, errno, info_len, sizeof(struct bpf_link_info), - cmp_res); + ASSERT_OK(err, "bpf_link_get_info_by_fd"); + ASSERT_EQ(info_len, sizeof(link_info), "info_len"); + ASSERT_OK(cmp_res, "memcmp"); close(link_fd); } - CHECK(nr_id_found != nr_iters, - "check total link id found by get_next_id", - "nr_id_found %u(%u)\n", nr_id_found, nr_iters); + ASSERT_EQ(nr_id_found, nr_iters, "link_nr_id_found"); done: for (i = 0; i < nr_iters; i++) { From patchwork Thu Nov 16 03:22:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuran Pereira X-Patchwork-Id: 13457585 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b="Pd69ZkF5" Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2078.outbound.protection.outlook.com [40.92.59.78]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4E57199; Wed, 15 Nov 2023 19:23:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EwPrRS6O+siegdK2UwgZ7Xd7jYHivMKanZHUyEiUjwz1wNCtQQRF12EWLyy5AnwmjnbfsglSSeqG4nUyBwSJ/nXpygflqnPjPYLWDxZFi9GojVzmcheDPCzkrFbRN6qnsz/r7b1PqHwuVT+Gj+o4b+XkCzT2xNTJJ7MRL1sRnOgflY9V0VGPLwU2fozZMAeTPWPV5Fk//mLUsKybmvAAQv3CeC7ydSsOPwai3ME1xDvXX4EZYh6I6WMDXItczb6aGU1mc/LylKCskyVEBpOvj1vNqutMzm3hIsaoGz8ZzAkN2kqXEGRcB2yoRUVgZ/CJJGtlpVIAty5n6R+YKn7/bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SEV6FSvKBUg1qgQLg6TT1AC2iHwQLooeot5R9UOQzCQ=; b=CXp4t9LFA8qizmseF/6DYraK6lwG6H9kvZh6zYxU2L75XN12RNcVmsGxG7Cpgbp9CrNozyOKdDTezWMcaTVOh/UY6rWky/PffoKK3nw0fXWsohrl/7sdBrUFh+huxu5ED2PpOCmpT33O8ty5lk3Y/eCvcNX1dc/oAjsW9Z8TeNBKwLQW6EyhSQh9qtsytYJF+r4Ox6SCQQaihjx5zXsfomGvbzGB9EyKT+gYRKMZKJX27/Su6pYfna6N3YKMQratqvy2Xq+C51m1lMQvLWT1cNQWx/OVuR3+JJ9hFCInaJXaxaK+3vk3mu8tLG20MdKgjENboKR0HDHVDptUaOnXVg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SEV6FSvKBUg1qgQLg6TT1AC2iHwQLooeot5R9UOQzCQ=; b=Pd69ZkF58wbDXztHq/KKSSQMQRPk2wRNSa2/DVMJoXXJMTh0WR6CUaRps7gYbV4wAHvnQ8LqU6JaQvXEU6ccPsP2LjktWvdoCrVcDbXMtK0K82PVumOWMZ2Tan496ZdqO1XakmcfbteP00oa0uNY0Mi9SNeg8ZyRAoJeDlpnJjwzZR6CTDRfNmucgudMR62JJC6EStrWnyGWqMPRLAt0pKvxGcVFMrfYLwYxW0koAwF2CFxvJDi/LWfJu623MaWsqSHt9LL6MN1h0PGjr7AN7147FQPF8EwuzMwv/3/hB2cMspjtwqf1i1DWe/htFRSQavILp3+P0VVRK7l6yz+n4g== Received: from GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:83::20) by GVXPR10MB6006.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.31; Thu, 16 Nov 2023 03:23:06 +0000 Received: from GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM ([fe80::6c45:bfdf:a384:5450]) by GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM ([fe80::6c45:bfdf:a384:5450%7]) with mapi id 15.20.7002.021; Thu, 16 Nov 2023 03:23:06 +0000 From: Yuran Pereira To: bpf@vger.kernel.org Cc: Yuran Pereira , andrii@kernel.org, mykolal@fb.com, ast@kernel.org, martin.lau@linux.dev, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com, haoluo@google.com, jolsa@kernel.org, shuah@kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org Subject: [PATCH bpf-next 4/4] selftests/bpf: Replaces the usage of CHECK calls for ASSERTs in vmlinux Date: Thu, 16 Nov 2023 08:52:43 +0530 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: X-TMN: [iMtSmVnLqn/2ghnN2cAbiWv5/xBu1pCR] X-ClientProxiedBy: JNAP275CA0032.ZAFP275.PROD.OUTLOOK.COM (2603:1086:0:4d::9) To GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:83::20) X-Microsoft-Original-Message-ID: <20231116032243.71104-1-yuran.pereira@hotmail.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR10MB6563:EE_|GVXPR10MB6006:EE_ X-MS-Office365-Filtering-Correlation-Id: 777e759c-2e07-4ddd-0741-08dbe653596c X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dxEroqIItCupgcP7+UoT7Y8mfgqpx/aVbWB5m9OPjaX/+Tt2Ip+FQPKgZrX4to8Ex9oFoeftYwqkoJvwdmhQgEmmxHxZjigqB+KXzrGUzssm8DL3OcQzXKn6uy9+AsqIKuPy2DitQyJ20cbWmLFv/1ewWpkw2jsUN7Ki8QscHgrQ9aeiegNb4E3YHhHdK1aeOPw2EPLQ94+St8SBC582OSRS4juQoeEqqz0wwYjzdAOcrtwxBW7JxYr2dGtbspae6C88kWUZHwzChbrDihmxfUhjtlhpH0dnUy6INVFJIw1IrbqaZJ1+v8uzVJl04USE3k6ydiGfj/K+Y9BTfmnvNrPMo/Z5EPcBHxW38MbrmpaOnhPXbZhbZDUfV0A7WKpNJLDtIkrqSJetXBSEr29p0tXIl7Ds6a1BTaTUU+AanXbps1ujajoCNE5n2Lmio+VELjmkUgWuzLxIY27EXqC5/rCE0IPd1EkflT1VAQmr1veVjDxDKuhU2BqIMWYgsh/9i4iFBopB0YPnpzCo7due6IfivYBbmRrHMnpLVMn0Tlw7p7OfA1P0JDdLqPFRQVPxruK0czmrTgPwwjRVLBJ9LDGCkjdvoT9TeWXmgxtOc04= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NxeMUoE1m6pFTGnMmXhur84xft9QEpoRRTqawZh7guUqeK6ljwdT8NgGVk3+OEqvWiwoqMbfhn1DHElq2KOannlNSpbRa84f3Gh9SYhfhzR8rB7aGaQpi1zk3iTMHCrv1ctntl/m7iJjNlaMLvYGfXb33VjUO0Zx8RefgnVWdKThlR1lESZJPDBWm3mt55EJnzm6pEAJlCZNKfIpy0WP5CmjjkferJdQfmQ4Oo1g7P4MZWBA7vpFE7C68ALxPros8M2tPDX8BWgtGgWG7OJeWebxF1CMw897R03SiJAjuBMVlQVrwew/+r3iPE7KcPZHJqVUNsoFPasHSlQzW1ChWjnixm1Uti3kdcLe/QFvd/gFqa/K02EJxvnwkFIdffAtYREO/kJrL1lE/Ue6Qm+dcYvNFZqZ+NONvsJjN1Bs8Pd0RL4yWBoffq+rYjjcIyaWUZ2LpP9XosxgylVWxcYKKhv4BFKN1pfWpZbjg8f4IuHMQdUgbdCfHEtqsqwGWY1Opbo5xuB75hlyJN1ctkMi3fjgpcBrv5P/NY8/3e59NrRZQ1HGGwYwE1ZZ53l/4M9hBLd1w4HqlkXmuKkMDKf/ZDLri8lyeLKbdV4JLTKPoa7yUmBxy0orLQF+zWJ59HorXp6h9J/5LGnQtP5TrVkuFUPv9752te4UGwRmvGU9JuAv5DntQoKR60+Z7Mb/opuAuBFtLFj//IE2Otq/lTL3sC1YoeygvQ3+r0uXRNmHjQdxsumvIwTMiLTSz36e257L8I8sfVh68QUr8HCetrAYKw6gkcnKi/ozFTH1/FUPIGmarstq6Kp9w5m4VIyL+aEAv/epYN4knUVuddxwMhOZMZ/rdyQRGyMtbmah8o+UEolrAlDLDMF4wCQmdc8LSgf6VBYs4aVtPkurf01UyYHtR2EHvb11LeGiOAK+F65XZcNxV4V79SG/7dzeCXpz82nUO7ckhWcTDbqEN10szexLTQCHHpnXKYzQS+KVTCcMBlgiGOT4GSIilpOj3xF21DO9ajsGgQc/4c0IxRi03RIKfBp+GnW2xncFGNDQ+QQUaY60qMt913/vXNIcwscymakyNji41VOD6jwdZ6e3ZsB2doWuitnIH/TTkP1xNN+2P0+0ysBJCzs9PZaDQ//saONJKCeDmQ+URy3/dvyAwHAPjhVDhI+UmVRuT7IcxmvC0RhI9RikeSS94HCZCqL/mUu5/A7+b6zMrl9VJjjv1SD5DHswbydJfD+8RFdwK64IX5o= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-6b909.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 777e759c-2e07-4ddd-0741-08dbe653596c X-MS-Exchange-CrossTenant-AuthSource: GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2023 03:23:06.2889 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR10MB6006 vmlinux.c uses the `CHECK` calls even though the use of ASSERT_ series of macros is preferred in the bpf selftests. This patch replaces all `CHECK` calls for equivalent `ASSERT_` macro calls. Signed-off-by: Yuran Pereira --- tools/testing/selftests/bpf/prog_tests/vmlinux.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/vmlinux.c b/tools/testing/selftests/bpf/prog_tests/vmlinux.c index 72310cfc6474..6fb2217d940b 100644 --- a/tools/testing/selftests/bpf/prog_tests/vmlinux.c +++ b/tools/testing/selftests/bpf/prog_tests/vmlinux.c @@ -16,27 +16,27 @@ static void nsleep() void test_vmlinux(void) { - int duration = 0, err; + int err; struct test_vmlinux* skel; struct test_vmlinux__bss *bss; skel = test_vmlinux__open_and_load(); - if (CHECK(!skel, "skel_open", "failed to open skeleton\n")) + if (!ASSERT_OK_PTR(skel, "test_vmlinux__open_and_load")) return; bss = skel->bss; err = test_vmlinux__attach(skel); - if (CHECK(err, "skel_attach", "skeleton attach failed: %d\n", err)) + if (!ASSERT_OK(err, "test_vmlinux__attach")) goto cleanup; /* trigger everything */ nsleep(); - CHECK(!bss->tp_called, "tp", "not called\n"); - CHECK(!bss->raw_tp_called, "raw_tp", "not called\n"); - CHECK(!bss->tp_btf_called, "tp_btf", "not called\n"); - CHECK(!bss->kprobe_called, "kprobe", "not called\n"); - CHECK(!bss->fentry_called, "fentry", "not called\n"); + ASSERT_TRUE(bss->tp_called, "tp"); + ASSERT_TRUE(bss->raw_tp_called, "raw_tp"); + ASSERT_TRUE(bss->tp_btf_called, "tp_btf"); + ASSERT_TRUE(bss->kprobe_called, "kprobe"); + ASSERT_TRUE(bss->fentry_called, "fentry"); cleanup: test_vmlinux__destroy(skel);