Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
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 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: <GV1PR10MB6563BC7E775BD36D088AC37CE8B0A@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_|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: =?us-ascii?Q?EIzjeBLJY60kBntQMvhxCDq1HdrstkKA0KcPo1q7ec79hb9xZtVOnYlf6zJe?=
 =?us-ascii?Q?71liaoxNNzqGGNoDZi5eJYvWVnEIlgdZkeH4uVeiKnXYE/KqtA10Y/bjtyC/?=
 =?us-ascii?Q?/ZRyTvFeUiqNh5H9PprGsV6hnFwel5ywuSrmRsA6Gwf1xnCFP4YHTs73lgtL?=
 =?us-ascii?Q?vILBPlBxdjCPD11eaf9NPvZPRQ8imO4bhXw94IXy2zu2eThdhTBLeBZ1Fy2S?=
 =?us-ascii?Q?dcHV85U1NgvfsGPQyi8B24MeM+TyDvcRrusutD+/VrOAvCyLww/F7LfpfooY?=
 =?us-ascii?Q?I1hVt5Dp2V41PCoqfuqBUpZvHw9RaUFlQdJwG/5xJ8SiY1SPz5p9/d3gmimC?=
 =?us-ascii?Q?MCOkQybxrtRzjGw8osDJMeXn0fveH1Jss2mZN6COog6PizfKWrSDzVbAGOWg?=
 =?us-ascii?Q?cWJAFMHoPiaC/6ROS3DI3x4wN9X496uM21M/S9IQ2KKZ60ZNWJroypNrUKJU?=
 =?us-ascii?Q?CEkN2WtM1QC4h+PM1QzKGVGbiXwYPYyyQEEAfAAls/E6y9bdFT60MfhAZEBC?=
 =?us-ascii?Q?+AL0QCgv18x2iB74rJfvlo+ucUlPn5+IGP3jxM+GhdguggslGRqcYKqwEgp5?=
 =?us-ascii?Q?h9P4SHS+AhySwHIPAhsmHAYyljfXWjevs4q87JPXYO2SOPcNaA1l/ovDcs/r?=
 =?us-ascii?Q?o4S3rqtRso2XDjxlyxSzvy8L+GeneEzS6pgmNDk01l0qX3n9dgvFgPsAEI1f?=
 =?us-ascii?Q?k1998Rpp6SZFWXm/ebIENJijRBpWFVHhoZ8M4Kp9POB9o/Nvg93j7o8KhEvm?=
 =?us-ascii?Q?BcLoEFM8+jq/CkURCqJwnjRWa83s5QLDVY4GOUHLn0K3AP130x8gbzcysfK7?=
 =?us-ascii?Q?DVfUVjH4u1ekeybKKoTQvxbJtFclcdARDwacxc+e8CnClbesZJuxIC6gAIlT?=
 =?us-ascii?Q?GVG3VpNo7ZNcQ6/zVsHEUAElek7MreXNF/1LKd6xdHNWsBMuxNZ68iMZ4ArP?=
 =?us-ascii?Q?/LB25Z6RInjPtGZsc+kqmu3WO8IMmw7UKZljO8r+bUD2vVmjbXVvBhHNYfva?=
 =?us-ascii?Q?A8WmbWypCNvmi6PifM9kkKoXUM6azlMemWf17v819DzbmPhgl5MFgJReOtrr?=
 =?us-ascii?Q?BOqD0/OpQ1vcm27fOcea+lnfDm9c5lE6S3wbGt9FNIXCFba+LUOTxrii6jNi?=
 =?us-ascii?Q?nICvVqFT69nD2uPIEOOgIjSqsP9Okw17TwHlK6FttO9ICMjMWy8ALY/OESXw?=
 =?us-ascii?Q?vCCEdNXCBy3AcziR9s2D7A9onctQmf4hqKs5xFU+/7PXUpDeSWWhxOi6hAQ?=
 =?us-ascii?Q?=3D?=
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
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:19:56 -0800 (PST)

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