mirror of
https://github.com/netdata/libbpf.git
synced 2026-11-06 18:00:15 +08:00
libbpf: Fix ring buffer consumer loop on 32-bit position wrap
ringbuf_process_ring() walks the records between the consumer and the
producer with an ordering comparison:
while (cons_pos < prod_pos) {
cons_pos and prod_pos mirror the kernel's ring positions and are
unsigned long here too, so on 32-bit they wrap at 2^32 bytes of traffic.
When producer_pos has wrapped and consumer_pos has not, prod_pos is the
smaller of the two, the loop body never runs and no record is consumed.
Since consumer_pos only advances inside that loop, it never wraps either
and the consumer stops delivering samples for good, with no error
returned to the caller: ring_buffer__poll() keeps reporting zero
records while the kernel side fills up and starts dropping.
Compare the distance instead. The consumer never runs ahead of the
producer, so prod_pos - cons_pos is the amount of unconsumed data and
stays correct across the wrap.
64-bit hosts are unaffected in practice: the counters would need 16 EiB
to wrap. This is the userspace counterpart of the kernel-side walk fixed
in "bpf: Fix pending_pos walk on 32-bit ring position wrap"; a 32-bit
consumer hits whichever of the two comes first.
Signed-off-by: Israel Téllez García <i.tellez@btesa.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20260814124843.22041-5-i.tellez@btesa.com
This commit is contained in:
1 parent
7832f8e857
commit
a68c588fa8
1 file changed
+1
-1
+1
-1
@@ -244,7 +244,7 @@ static int64_t ringbuf_process_ring(struct ring *r, size_t n)
|
||||
do {
|
||||
got_new_data = false;
|
||||
prod_pos = smp_load_acquire(r->producer_pos);
|
||||
while (cons_pos < prod_pos) {
|
||||
while (prod_pos - cons_pos > 0) {
|
||||
len_ptr = r->data + (cons_pos & r->mask);
|
||||
len = smp_load_acquire(len_ptr);
|
||||
|
||||
|
||||
Reference in new issue
Block a user