Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
From:   Yuran Pereira <yuran.pereira@hotmail.com>
To:     bpf@vger.kernel.org
Cc:     Yuran Pereira <yuran.pereira@hotmail.com>, andrii@kernel.org,
        ast@kernel.org, haoluo@google.com, john.fastabend@gmail.com,
        jolsa@kernel.org, kpsingh@kernel.org,
        linux-kernel-mentees@lists.linuxfoundation.org,
        linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
        martin.lau@linux.dev, mykolal@fb.com, sdf@google.com,
        shuah@kernel.org, song@kernel.org, yonghong.song@linux.dev
Subject: [PATCH bpf-next v3 4/4] selftests/bpf: Replaces the usage of CHECK calls for ASSERTs in vmlinux
Date:   Tue, 21 Nov 2023 05:40:41 +0530
Message-ID: <GV1PR10MB6563ED1023A2A3AEF30BDA5DE8BBA@GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM>
In-Reply-To: <GV1PR10MB6563BEFEA4269E1DDBC264B1E8BBA@GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM>
References: <GV1PR10MB6563BEFEA4269E1DDBC264B1E8BBA@GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: GV1PR10MB6563:EE_|AS2PR10MB7477:EE_
X-MS-Office365-Filtering-Correlation-Id: 11f2328b-f843-4611-eaa8-08dbea267542
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: NS24g2DnoxWFNSyLkhbSLja6G/JSLLwPte3nr4QkxhTNFrebQHHKs0xYgeDhGID/rrZHBgwNDtD7uYjK6oNyPcZE+rWa6H8GpvZ00R/66uGxTzM4VlHwFZJQxH6ejSlL+A1gFGKVPTeKT7+9BiUEhuwj1Thx1oIgBG3+EZA+jPopFiW0KtOkhUEfQ9ibT+I1klRd5NfCz0Yvud3D2VYtdFUe77/GJd/xxCdccTci06NMTzU+bommktvIw4Vo/1yGe0a41CxsiSlEl+vP1A5jPAhfS1d9XAOli3kjeO+vheOOXlnipziyq1rWmCNIiSLdRLzxX06yarli05PWKChgkUEbmZK9tSjHVT55nvwcPi0L/H3Pou5ifzxy08fUHchCx2ofMWGWCn7wRs1K3gZyrtQhUEP7tTLan9dR+0SyHSz0r7VSQDq+w0uh5ZmCkowpuhvL287C8Z7beHbtygkopZI91JPJOCzqAtwjZhaXdf1E3h6jL/wNlxRXbGDGV6pN3x3fYBYSaNaCmfxlu6NctfWtC7ifxvXQPCg1rhuen/KkBr7mM8cKQtRqgOc51AkriVEVMgOrFhtJfEo33sexxITSEAuXAlc4aXt7QpmayTM=
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4DSfMlgQE6YPc5gos16W5U5qyhWbsqwmGS1US9fvbAfPP+zMh5y5e2LwIY+n?=
 =?us-ascii?Q?maP30he6DVDsQSbUDWzfx0kwSrIlXT++KvkzBmxd9wa9e0ua8ONIvhFf6g3u?=
 =?us-ascii?Q?oMgb74gwDUZ5ehI3ADSMmMaa2jz4PiBb/XhPhbtdvcxcJL7/aEi7qOPJCOUi?=
 =?us-ascii?Q?o3xyph9Dwp/HRxqc5mm2yPufqlETTxxz0i5xOoJ5b4eA22L6qcxrJCnBngUQ?=
 =?us-ascii?Q?a5/RikylXM5yCWuz2Jw8SDCYiN57cMudJYYgcy+OzbBYzX6oJ5AlU7pzVfuo?=
 =?us-ascii?Q?YE3Tlay1nOBFgkOf0h9MRqQVjegI0Ewf3HcUPG9KleJcC8e0e3hk25kiy/8M?=
 =?us-ascii?Q?Yy+VqiiS4J8lM4Cs2SmJRKXr46Sr6g9WL+YDX6ASo25FqrIgCLgl+Hjiuo4T?=
 =?us-ascii?Q?S4T0A7c1zEU5p822lYQ/sUGUwU3OctX5wEhUeFjtDrM3nIUyn/MJQpSowxo/?=
 =?us-ascii?Q?gnqgpcoIKyDg5bBrerLSkd55GePBAIiIQkA0/nFBL5y5obQVlzOUWtapIy+i?=
 =?us-ascii?Q?YkpKhy2wq7LMlQrjJLd8UzP9gAhFSGSduAgWGEbPAoTCsNyXtOTULPl57CNo?=
 =?us-ascii?Q?OZcUA17IRyKBk3RKfIdGoTYtoueQzwoDM+xgj0a/Q5YXs55bqKu3onm/zmxd?=
 =?us-ascii?Q?LKRgPYte6X1wYK4g/ZoZ5ztFzLD/WkjyPRZhQuDUGiuLZ08dURc8yDcRUIbc?=
 =?us-ascii?Q?z86YsIk7V5tsUk41nLskTe3eed+1lBCj4KGULxnddoCo2QORFyQpgVtwyviL?=
 =?us-ascii?Q?7Waxv1fbgbDuS+gwN11aI6P410iJsXzmG51krvXNEbdZupPpcu4KpKSbj4/B?=
 =?us-ascii?Q?ZqkGFX17xt/wRkcLqor4+3CMUhul2aWQ0N9qZfBGvmu9LL9I/OTHBn+lT3EL?=
 =?us-ascii?Q?xCYHqWKo1qh6H5HOn8ediPlmBTPjE1OezSbW0kL+Id/NktJzrE6+lXNgb9Gi?=
 =?us-ascii?Q?qLiu1ps61pRaRwiTBnNOpDoxNTil4ITc845OeX706JCDZs+3lHe1mFxpeOK3?=
 =?us-ascii?Q?v0RqmdIz6+Zh/WVP3b9jsEPgdUfjlZyhBH7fFsBwJ2Uf5N3SC6dbxX56CGka?=
 =?us-ascii?Q?yb7Q5dU7TgDCPJRn3iR3DU7bibdmjXfpoyVf0KBUJajXxlm3LkCHACwQuDy5?=
 =?us-ascii?Q?vHCKQE0cx//ALCwqHKERcOa2IS5QHTE9Y5hDZxIydKOHpKy3HEhwfZn5YIOO?=
 =?us-ascii?Q?nbO6i9pnsFulEDh5tZ9v7uOz2ATGJ33JKdkPJ5Q2ogbV9rDxQGWO03SHIVc?=
 =?us-ascii?Q?=3D?=
X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-6b909.templateTenant
X-MS-Exchange-CrossTenant-Network-Message-Id: 11f2328b-f843-4611-eaa8-08dbea267542
X-MS-Exchange-CrossTenant-AuthSource: GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Nov 2023 00:11:50.3329
 (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: AS2PR10MB7477
X-Spam-Status: No, score=0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,FORGED_HOTMAIL_RCVD2,FREEMAIL_FORGED_FROMDOMAIN,
	FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 20 Nov 2023 16:12:08 -0800 (PST)

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 <yuran.pereira@hotmail.com>
---
 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);
-- 
2.25.1