2021-12-01 00:52:32

by Paul E. McKenney

Subject: [PATCH] testing/bpf: Update test names for xchg and cmpxchg

The test_cmpxchg() and test_xchg() functions say "test_run add".
Therefore, make them say "test_run cmpxchg" and "test_run xchg",
respectively.

Cc: Shuah Khan <[email protected]>
Cc: Alexei Starovoitov <[email protected]>
Cc: Daniel Borkmann <[email protected]>
Cc: Andrii Nakryiko <[email protected]>
Cc: Martin KaFai Lau <[email protected]>
Cc: Song Liu <[email protected]>
Cc: Yonghong Song <[email protected]>
Cc: John Fastabend <[email protected]>
Cc: KP Singh <[email protected]>
Cc: <[email protected]>
Cc: <[email protected]>
Cc: <[email protected]>
Cc: <[email protected]>
Signed-off-by: Paul E. McKenney <[email protected]>

diff --git a/tools/testing/selftests/bpf/prog_tests/atomics.c b/tools/testing/selftests/bpf/prog_tests/atomics.c
index 0f9525293881b..86b7d5d84eec4 100644
--- a/tools/testing/selftests/bpf/prog_tests/atomics.c
+++ b/tools/testing/selftests/bpf/prog_tests/atomics.c
@@ -167,7 +167,7 @@ static void test_cmpxchg(struct atomics_lskel *skel)
prog_fd = skel->progs.cmpxchg.prog_fd;
err = bpf_prog_test_run(prog_fd, 1, NULL, 0,
NULL, NULL, &retval, &duration);
- if (CHECK(err || retval, "test_run add",
+ if (CHECK(err || retval, "test_run cmpxchg",
"err %d errno %d retval %d duration %d\n", err, errno, retval, duration))
goto cleanup;

@@ -196,7 +196,7 @@ static void test_xchg(struct atomics_lskel *skel)
prog_fd = skel->progs.xchg.prog_fd;
err = bpf_prog_test_run(prog_fd, 1, NULL, 0,
NULL, NULL, &retval, &duration);
- if (CHECK(err || retval, "test_run add",
+ if (CHECK(err || retval, "test_run xchg",
"err %d errno %d retval %d duration %d\n", err, errno, retval, duration))
goto cleanup;

2021-12-02 20:14:07

by Andrii Nakryiko

Subject: Re: [PATCH] testing/bpf: Update test names for xchg and cmpxchg

On Tue, Nov 30, 2021 at 4:50 PM Paul E. McKenney <[email protected]> wrote:
>
> The test_cmpxchg() and test_xchg() functions say "test_run add".
> Therefore, make them say "test_run cmpxchg" and "test_run xchg",
> respectively.
>
> Cc: Shuah Khan <[email protected]>
> Cc: Alexei Starovoitov <[email protected]>
> Cc: Daniel Borkmann <[email protected]>
> Cc: Andrii Nakryiko <[email protected]>
> Cc: Martin KaFai Lau <[email protected]>
> Cc: Song Liu <[email protected]>
> Cc: Yonghong Song <[email protected]>
> Cc: John Fastabend <[email protected]>
> Cc: KP Singh <[email protected]>
> Cc: <[email protected]>
> Cc: <[email protected]>
> Cc: <[email protected]>
> Cc: <[email protected]>
> Signed-off-by: Paul E. McKenney <[email protected]>
>

fixed up "testing/bpf" to more commonly used "selftests/bpf" and
pushed to bpf-next, thanks.


> diff --git a/tools/testing/selftests/bpf/prog_tests/atomics.c b/tools/testing/selftests/bpf/prog_tests/atomics.c
> index 0f9525293881b..86b7d5d84eec4 100644
> --- a/tools/testing/selftests/bpf/prog_tests/atomics.c
> +++ b/tools/testing/selftests/bpf/prog_tests/atomics.c
> @@ -167,7 +167,7 @@ static void test_cmpxchg(struct atomics_lskel *skel)
> prog_fd = skel->progs.cmpxchg.prog_fd;
> err = bpf_prog_test_run(prog_fd, 1, NULL, 0,
> NULL, NULL, &retval, &duration);
> - if (CHECK(err || retval, "test_run add",
> + if (CHECK(err || retval, "test_run cmpxchg",
> "err %d errno %d retval %d duration %d\n", err, errno, retval, duration))
> goto cleanup;
>
> @@ -196,7 +196,7 @@ static void test_xchg(struct atomics_lskel *skel)
> prog_fd = skel->progs.xchg.prog_fd;
> err = bpf_prog_test_run(prog_fd, 1, NULL, 0,
> NULL, NULL, &retval, &duration);
> - if (CHECK(err || retval, "test_run add",
> + if (CHECK(err || retval, "test_run xchg",
> "err %d errno %d retval %d duration %d\n", err, errno, retval, duration))
> goto cleanup;
>