diff options
| author |   Andrii Nakryiko <andrii@kernel.org> | 2020-11-30 14:33:35 -0800 |
|---|---|---|
| committer |   Alexei Starovoitov <ast@kernel.org> | 2020-12-01 20:21:45 -0800 |
| commit | f6a8250ea1e42ad1f4f3bab01c851ec5fd48f0e7 (patch) | |
| tree | 8ac1c6128617881180417463ec9ac139bf4a80c8 /tools/testing/selftests/bpf/prog_tests/ringbuf_multi.c | |
| parent | xdp: Handle MEM_TYPE_XSK_BUFF_POOL correctly in xdp_return_buff() (diff) | |
| download | linux-dev-f6a8250ea1e42ad1f4f3bab01c851ec5fd48f0e7.tar.xz linux-dev-f6a8250ea1e42ad1f4f3bab01c851ec5fd48f0e7.zip | |
libbpf: Fix ring_buffer__poll() to return number of consumed samples
Fix ring_buffer__poll() to return the number of non-discarded records
consumed, just like its documentation states. It's also consistent with
ring_buffer__consume() return. Fix up selftests with wrong expected results.
Fixes: bf99c936f947 ("libbpf: Add BPF ring buffer support")
Fixes: cb1c9ddd5525 ("selftests/bpf: Add BPF ringbuf selftests")
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20201130223336.904192-1-andrii@kernel.org
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/ringbuf_multi.c')
| -rw-r--r-- | tools/testing/selftests/bpf/prog_tests/ringbuf_multi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/ringbuf_multi.c b/tools/testing/selftests/bpf/prog_tests/ringbuf_multi.c index 78e450609803..d37161e59bb2 100644 --- a/tools/testing/selftests/bpf/prog_tests/ringbuf_multi.c +++ b/tools/testing/selftests/bpf/prog_tests/ringbuf_multi.c @@ -81,7 +81,7 @@ void test_ringbuf_multi(void) /* poll for samples, should get 2 ringbufs back */ err = ring_buffer__poll(ringbuf, -1); - if (CHECK(err != 4, "poll_res", "expected 4 records, got %d\n", err)) + if (CHECK(err != 2, "poll_res", "expected 2 records, got %d\n", err)) goto cleanup; /* expect extra polling to return nothing */ |