[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <3531360b-c933-4c5f-a84c-17edf0592519@linux.dev>
Date: Tue, 24 Oct 2023 21:14:13 -0700
From: Yonghong Song <yonghong.song@...ux.dev>
To: Yuran Pereira <yuran.pereira@...mail.com>
Cc: shuah@...nel.org, ast@...nel.org, daniel@...earbox.net,
andrii@...nel.org, martin.lau@...ux.dev, song@...nel.org,
john.fastabend@...il.com, kpsingh@...nel.org, sdf@...gle.com,
haoluo@...gle.com, jolsa@...nel.org, mykolal@...com,
brauner@...nel.org, iii@...ux.ibm.com, kuifeng@...a.com,
bpf@...r.kernel.org, linux-kselftest@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH bpf-next] selftests/bpf: Convert CHECK macros to ASSERT_*
macros in bpf_iter
On 10/24/23 3:43 PM, Yuran Pereira wrote:
> As it was pointed out by Yonghong Song [1], in the bpf selftests the use
> of the ASSERT_* series of macros is preferred over the CHECK macro.
> This patch replaces all CHECK calls in bpf_iter with the appropriate
> ASSERT_* macros.
>
> [1] https://lore.kernel.org/lkml/0a142924-633c-44e6-9a92-2dc019656bf2@linux.dev
>
> Suggested-by: Yonghong Song <yonghong.song@...ux.dev>
> Signed-off-by: Yuran Pereira <yuran.pereira@...mail.com>
> ---
> .../selftests/bpf/prog_tests/bpf_iter.c | 80 +++++++++----------
> 1 file changed, 39 insertions(+), 41 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
> index 1f02168103dd..526ac4e741ee 100644
> --- a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
> +++ b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
> @@ -64,7 +64,7 @@ static void do_dummy_read_opts(struct bpf_program *prog, struct bpf_iter_attach_
> /* not check contents, but ensure read() ends without error */
> while ((len = read(iter_fd, buf, sizeof(buf))) > 0)
> ;
> - CHECK(len < 0, "read", "read failed: %s\n", strerror(errno));
> + ASSERT_GE(len, 0, "read");
>
> close(iter_fd);
After converting CHECK to ASSERT_*, 'static int duration' is not needed any more. Otherwise,
you will hit the following compilation error with latest clang:
/home/yhs/work/bpf-next/tools/testing/selftests/bpf/prog_tests/bpf_iter.c:37:12: error: unused variable 'duration' [-Werror,-Wunused-variable]
37 | static int duration;
| ^~~~~~~~
1 error generated.
Please remove 'static int duration'.
>
> [...]
Powered by blists - more mailing lists