summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Tammela <pctammela@gmail.com>2021-03-25 18:01:15 +0300
committerAndrii Nakryiko <andrii@kernel.org>2021-03-26 07:13:24 +0300
commit6032ebb54c60cae24329f6aba3ce0c1ca8ad6abe (patch)
treee4ad349834f0f3a96193e5e38b9e3e8f1809b068
parent002322402dafd846c424ffa9240a937f49b48c42 (diff)
downloadlinux-6032ebb54c60cae24329f6aba3ce0c1ca8ad6abe.tar.xz
libbpf: Fix bail out from 'ringbuf_process_ring()' on error
The current code bails out with negative and positive returns. If the callback returns a positive return code, 'ring_buffer__consume()' and 'ring_buffer__poll()' will return a spurious number of records consumed, but mostly important will continue the processing loop. This patch makes positive returns from the callback a no-op. Fixes: bf99c936f947 ("libbpf: Add BPF ring buffer support") Signed-off-by: Pedro Tammela <pctammela@mojatatu.com> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/bpf/20210325150115.138750-1-pctammela@mojatatu.com
-rw-r--r--tools/lib/bpf/ringbuf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/lib/bpf/ringbuf.c b/tools/lib/bpf/ringbuf.c
index 8caaafe7e312..e7a8d847161f 100644
--- a/tools/lib/bpf/ringbuf.c
+++ b/tools/lib/bpf/ringbuf.c
@@ -227,7 +227,7 @@ static int ringbuf_process_ring(struct ring* r)
if ((len & BPF_RINGBUF_DISCARD_BIT) == 0) {
sample = (void *)len_ptr + BPF_RINGBUF_HDR_SZ;
err = r->sample_cb(r->ctx, sample, len);
- if (err) {
+ if (err < 0) {
/* update consumer pos and bail out */
smp_store_release(r->consumer_pos,
cons_pos);