Re: [PATCH v4 4/4] selftests/bpf: Add tests for ring__consume_n and ring_buffer__consume_n

[Andrii Nakryiko]

On Sat, Apr 6, 2024 at 2:20 AM Andrea Righi <andrea.righi@canonicalcom> wrote:
>
> Add tests for new API ring__consume_n() and ring_buffer__consume_n().
>
> Signed-off-by: Andrea Righi <andrea.righi@xxxxxxxxxxxxx>
> ---
>  tools/testing/selftests/bpf/prog_tests/ringbuf.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/ringbuf.c b/tools/testing/selftests/bpf/prog_tests/ringbuf.c
> index 48c5695b7abf..33aba7684ab9 100644
> --- a/tools/testing/selftests/bpf/prog_tests/ringbuf.c
> +++ b/tools/testing/selftests/bpf/prog_tests/ringbuf.c
> @@ -304,10 +304,18 @@ static void ringbuf_subtest(void)
>         err = ring_buffer__consume(ringbuf);
>         CHECK(err < 0, "rb_consume", "failed: %d\b", err);
>
> +       /* try to consume up to one item */
> +       err = ring_buffer__consume_n(ringbuf, 1);
> +       CHECK(err < 0 || err > 1, "rb_consume_n", "failed: %d\b", err);
> +
>         /* also consume using ring__consume to make sure it works the same */
>         err = ring__consume(ring);
>         ASSERT_GE(err, 0, "ring_consume");
>
> +       /* try to consume up to one item */
> +       err = ring__consume_n(ring, 1);
> +       CHECK(err < 0 || err > 1, "ring_consume_n", "failed: %d\b", err);
> +

Did you actually run this test? There is ring_buffer__consume() and
ring__consume() calls right before your added calls, so consume_n will
return zero.

I dropped this broken patch. Please send a proper test as a follow up.

>         /* 3 rounds, 2 samples each */
>         cnt = atomic_xchg(&sample_cnt, 0);
>         CHECK(cnt != 6, "cnt", "exp %d samples, got %d\n", 6, cnt);
> --
> 2.43.0
>