Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33;
From:   Yuran Pereira <yuran.pereira@hotmail.com>
To:     bpf@vger.kernel.org
Cc:     Yuran Pereira <yuran.pereira@hotmail.com>, 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: <GV1PR10MB656384C49CCCC553BEA0BD70E8B0A@GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM>
In-Reply-To: <GV1PR10MB6563FCFF1C5DEBE84FEA985FE8B0A@GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM>
References: <GV1PR10MB6563FCFF1C5DEBE84FEA985FE8B0A@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_|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: =?us-ascii?Q?NxeMUoE1m6pFTGnMmXhur84xft9QEpoRRTqawZh7guUqeK6ljwdT8NgGVk3+?=
 =?us-ascii?Q?OEqvWiwoqMbfhn1DHElq2KOannlNSpbRa84f3Gh9SYhfhzR8rB7aGaQpi1zk?=
 =?us-ascii?Q?3iTMHCrv1ctntl/m7iJjNlaMLvYGfXb33VjUO0Zx8RefgnVWdKThlR1lESZJ?=
 =?us-ascii?Q?PDBWm3mt55EJnzm6pEAJlCZNKfIpy0WP5CmjjkferJdQfmQ4Oo1g7P4MZWBA?=
 =?us-ascii?Q?7vpFE7C68ALxPros8M2tPDX8BWgtGgWG7OJeWebxF1CMw897R03SiJAjuBMV?=
 =?us-ascii?Q?lQVrwew/+r3iPE7KcPZHJqVUNsoFPasHSlQzW1ChWjnixm1Uti3kdcLe/QFv?=
 =?us-ascii?Q?d/gFqa/K02EJxvnwkFIdffAtYREO/kJrL1lE/Ue6Qm+dcYvNFZqZ+NONvsJj?=
 =?us-ascii?Q?N1Bs8Pd0RL4yWBoffq+rYjjcIyaWUZ2LpP9XosxgylVWxcYKKhv4BFKN1pfW?=
 =?us-ascii?Q?pZbjg8f4IuHMQdUgbdCfHEtqsqwGWY1Opbo5xuB75hlyJN1ctkMi3fjgpcBr?=
 =?us-ascii?Q?v5P/NY8/3e59NrRZQ1HGGwYwE1ZZ53l/4M9hBLd1w4HqlkXmuKkMDKf/ZDLr?=
 =?us-ascii?Q?i8lyeLKbdV4JLTKPoa7yUmBxy0orLQF+zWJ59HorXp6h9J/5LGnQtP5TrVku?=
 =?us-ascii?Q?FUPv9752te4UGwRmvGU9JuAv5DntQoKR60+Z7Mb/opuAuBFtLFj//IE2Otq/?=
 =?us-ascii?Q?lTL3sC1YoeygvQ3+r0uXRNmHjQdxsumvIwTMiLTSz36e257L8I8sfVh68QUr?=
 =?us-ascii?Q?8HCetrAYKw6gkcnKi/ozFTH1/FUPIGmarstq6Kp9w5m4VIyL+aEAv/epYN4k?=
 =?us-ascii?Q?nUVuddxwMhOZMZ/rdyQRGyMtbmah8o+UEolrAlDLDMF4wCQmdc8LSgf6VBYs?=
 =?us-ascii?Q?4aVtPkurf01UyYHtR2EHvb11LeGiOAK+F65XZcNxV4V79SG/7dzeCXpz82nU?=
 =?us-ascii?Q?O7ckhWcTDbqEN10szexLTQCHHpnXKYzQS+KVTCcMBlgiGOT4GSIilpOj3xF2?=
 =?us-ascii?Q?1DO9ajsGgQc/4c0IxRi03RIKfBp+GnW2xncFGNDQ+QQUaY60qMt913/vXNIc?=
 =?us-ascii?Q?wscymakyNji41VOD6jwdZ6e3ZsB2doWuitnIH/TTkP1xNN+2P0+0ysBJCzs9?=
 =?us-ascii?Q?PZaDQ//saONJKCeDmQ+URy3/dvyAwHAPjhVDhI+UmVRuT7IcxmvC0RhI9Rik?=
 =?us-ascii?Q?eSS94HCZCqL/mUu5/A7+b6zMrl9VJjjv1SD5DHswbydJfD+8RFdwK64IX5o?=
 =?us-ascii?Q?=3D?=
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
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 lipwig.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 (lipwig.vger.email [0.0.0.0]); Wed, 15 Nov 2023 19:23:24 -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