On Fri, Aug 12, 2022 at 10:28 AM David Vernet <void@xxxxxxxxxxxxx> wrote: > > On Thu, Aug 11, 2022 at 04:39:57PM -0700, Andrii Nakryiko wrote: > > [...] > > > > diff --git a/kernel/bpf/ringbuf.c b/kernel/bpf/ringbuf.c > > > index fc589fc8eb7c..a10558e79ec8 100644 > > > --- a/kernel/bpf/ringbuf.c > > > +++ b/kernel/bpf/ringbuf.c > > > @@ -639,7 +639,9 @@ static int __bpf_user_ringbuf_poll(struct bpf_ringbuf *rb, void **sample, > > > if (!atomic_try_cmpxchg(&rb->busy, &busy, 1)) > > > return -EBUSY; > > > [...] > > > +void ring_buffer_user__submit(struct ring_buffer_user *rb, void *sample) > > > +{ > > > + __ring_buffer_user__commit(rb); > > > +} > > > > this made me think that it's probably best to add kernel support for > > busy bit anyways (just like for existing ringbuf), so that we can > > eventually turn this into multi-producer on user-space side (all we > > need is a lock, really). So let's anticipate that on kernel side from > > the very beginning > > Hmm, yeah, fair enough. We have the extra space in the sample header to OR the > busy bit, and we already have a 2-stage reserve -> commit workflow, so we might > as well. I'll go ahead and add this, and then hopefully someday we can just add > a lock, as you mentioned. Right. We can probably also just document that reserve() step is the only one that needs serialization among multiple producers (and currently is required to taken care of by user app), while commit (submit/discard) operation is thread-safe and needs no synchronization. The only reason we don't add it to libbpf right now is because we are unsure about taking explicit dependency on pthread library. But I also just found [0], so I don't know, maybe we should use that? I wonder if it's supported by musl and other less full-featured libc implementations, though. [0] https://www.gnu.org/software/libc/manual/html_node/ISO-C-Mutexes.html > > > > +/* Reserve a pointer to a sample in the user ring buffer. This function is *not* > > > + * thread safe, and the ring-buffer supports only a single producer. > > > + */ > > > +void *ring_buffer_user__reserve(struct ring_buffer_user *rb, uint32_t size) > > > +{ > > > + uint32_t *hdr; > > > + /* 64-bit to avoid overflow in case of extreme application behavior */ > > > + size_t avail_size, total_size, max_size; > > > > size_t is not guaranteed to be 64-bit, neither is long [...] > > > +/* Poll for available space in the ringbuffer, and reserve a record when it > > > + * becomes available. > > > + */ > > > +void *ring_buffer_user__poll(struct ring_buffer_user *rb, uint32_t size, > > > + int timeout_ms) > > > +{ > > > + int cnt; > > > + > > > + cnt = epoll_wait(rb->epoll_fd, &rb->event, 1, timeout_ms); > > > + if (cnt < 0) > > > + return NULL; > > > + > > > + return ring_buffer_user__reserve(rb, size); > > > > it's not clear how just doing epoll_wait() guarantees that we have >= > > size of space available?.. Seems like some tests are missing? > > Right now, the kernel only kicks the polling writer once it's drained all > of the samples from the ring buffer. So at this point, if there's not > enough size in the buffer, there would be nothing we could do regardless. > This seemed like reasonable, simple behavior for the initial > implementation. I can make it a bit more intelligent if you'd like, and > return EPOLLRWNORM as soon as there is any space in the buffer, and have > libbpf potentially make multiple calls to epoll_wait() until enough space > has become available. So this "drain all samples" notion is not great: you can end drain prematurely and thus not really drain all the data in ringbuf. With multiple producers there could also be always more data coming in in parallel. Plus, when in the future we'll have BPF program associated with such ringbuf on the kernel side, we won't have a notion of draining queue, we'll be just submitting record and letting kernel handle it eventually. So I think yeah, you'd have to send notification when at least one sample gets consumed. The problem is that it's going to be a performance hit, potentially, if you are going to do this notification for each consumed sample. BPF ringbuf gets somewhat around that by using heuristic to avoid notification if we see that consumer is still behind kernel when kernel submits a new sample. I don't know if we can do anything clever here for waiting for some space to be available... Any thoughts? As for making libbpf loop until enough space is available... I guess that would be the only reasonable implementation, right? I wonder if calling it "user_ring_buffer__reserve_blocking()" would be a better name than just "poll", though?