From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E70BC00A8F for ; Tue, 24 Oct 2023 03:34:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232070AbjJXDeg (ORCPT ); Mon, 23 Oct 2023 23:34:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47590 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232011AbjJXDef (ORCPT ); Mon, 23 Oct 2023 23:34:35 -0400 X-Greylist: delayed 358 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Mon, 23 Oct 2023 20:34:32 PDT Received: from out-191.mta1.migadu.com (out-191.mta1.migadu.com [IPv6:2001:41d0:203:375::bf]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5145B7 for ; Mon, 23 Oct 2023 20:34:32 -0700 (PDT) Message-ID: <0a142924-633c-44e6-9a92-2dc019656bf2@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1698118109; 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=fvextBqAqP7MtW5YqhYrMlGtzS9D2lHRuhU2o1fRKMM=; b=xeCU9FUK0o+eESj+4RG20o15X/2aPBvnjwYW+dJh5lq5NhFZeiZX/B7EXUX9tX6e2MYDlz 2Wr1jQb2OwypvCulURHq/N3Oq+tozXh+mZQE7LRtbsZZLiQeGCf4fwqXuNpHaZyit9rnqg +HNw9g5QsgDx1bFyL27fkN1BU2isqhA= Date: Mon, 23 Oct 2023 20:28:21 -0700 MIME-Version: 1.0 Subject: Re: [PATCH] selftests: bpf: add malloc failures checks in bpf_iter Content-Language: en-GB To: Yuran Pereira , shuah@kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, song@kernel.org, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com, haoluo@google.com, jolsa@kernel.org, mykolal@fb.com, brauner@kernel.org, iii@linux.ibm.com, kuifeng@meta.com, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org References: X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Yonghong Song In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org On 10/23/23 7:59 PM, Yuran Pereira wrote: > Since some malloc calls in bpf_iter may at times fail, > this patch adds the appropriate fail checks, and ensures that > any previously allocated resource is appropriately destroyed > before returning the function. > > Signed-off-by: Yuran Pereira > --- > tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c > index 1f02168103dd..6d47ea9211a4 100644 > --- a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c > +++ b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c > @@ -878,6 +878,11 @@ static void test_bpf_percpu_hash_map(void) > > skel->rodata->num_cpus = bpf_num_possible_cpus(); > val = malloc(8 * bpf_num_possible_cpus()); > + if (CHECK(!val, "malloc", "memory allocation failed: %s", > + strerror(errno))) { > + bpf_iter_bpf_percpu_hash_map__destroy(skel); > + return; > + } Could you use !ASSERT_OK_PTR(...) instead of CHECK? bpf selftest prefers to use ASSERT_* series of macros instead of CHECK. In the above example, printing out strerror is not required, see some other examples in the same folder. Also bpf_iter.c has some other usages of CHECK macro. Since you are touching this file, could you convert all CHECK macros to ASSERT_* macros? Basically you need two patches: patch 1: convert existing CHECK macros to ASSERT_* macros in bpf_iter.c. this should not check any functionality except error messages. patch 2: your patch with ASSERT_* macros. You can use the following as your subject line: [PATCH bpf-next] selftests/bpf: Add malloc failure checks in bpf_iter > > err = bpf_iter_bpf_percpu_hash_map__load(skel); > if (!ASSERT_OK_PTR(skel, "bpf_iter_bpf_percpu_hash_map__load")) > @@ -1057,6 +1062,11 @@ static void test_bpf_percpu_array_map(void) > > skel->rodata->num_cpus = bpf_num_possible_cpus(); > val = malloc(8 * bpf_num_possible_cpus()); > + if (CHECK(!val, "malloc", "memory allocation failed: %s", > + strerror(errno))) { > + bpf_iter_bpf_percpu_hash_map__destroy(skel); > + return; > + } > > err = bpf_iter_bpf_percpu_array_map__load(skel); > if (!ASSERT_OK_PTR(skel, "bpf_iter_bpf_percpu_array_map__load"))