libbpf: Expose libbpf ringbufer epoll_fd
PATCH 1/1 libbpf: Expose libbpf ringbufer epoll_fd
This allows the user to do their own manual polling in more complicated setups.
--- tools/lib/bpf/libbpf.h | 1 + tools/lib/bpf/ringbuf.c | 6 ++++++ 2 files changed, 7 insertions(+)
tools/lib/bpf/libbpf.h +1 -0
@@ -536,6 +536,7 @@ LIBBPF_API int ring_buffer__add(struct ring_buffer *rb, int map_fd, ring_buffer_sample_fn sample_cb, void *ctx); LIBBPF_API int ring_buffer__poll(struct ring_buffer *rb, int timeout_ms); LIBBPF_API int ring_buffer__consume(struct ring_buffer *rb); +LIBBPF_API int ring_buffer__epoll_fd(struct ring_buffer *rb);/* Perf buffer APIs */ struct perf_buffer ;
tools/lib/bpf/ringbuf.c +6 -0
@@ -282,3 +282,9 @@ int ring_buffer__poll(struct ring_buffer *rb, int timeout_ms) }return cnt <0 ? -errno : res; } + +/* Get an fd that can be used to sleep until data is available in the ring(s) */ +int ring_buffer__epoll_fd (struct ring_buffer *rb) +{ +return rb->epoll_fd; +}
base-commit: b4fe9fec51ef48011f11c2da4099f0b530449c92
Signature · 1 line
2.29.2.576.ga3fc446d84-goog
Quoted 6 lines · Brendan Jackman
This allows the user to do their own manual polling in more complicated setups.
Signed-off-by Brendan Jackman <[email protected]>---
perf_buffer has it, so it's good for consistency. In practice, though, I'd expect anyone who needs more complicated polling to use ring buf's map FD directly on their instance of epoll. Doesn't that work for you?
Regardless, though, you need to add the API into libbpf.map file first.
Quoted 35 lines
tools/lib/bpf/libbpf.h | 1 + tools/lib/bpf/ringbuf.c | 6 ++++++ 2 files changed, 7 insertions(+)tools/lib/bpf/libbpf.h +1
-0@@ -536,6 +536,7 @@ LIBBPF_API int ring_buffer__add(struct ring_buffer *rb, int map_fd, ring_buffer_sample_fn sample_cb, void *ctx); LIBBPF_API int ring_buffer__poll(struct ring_buffer *rb, int timeout_ms); LIBBPF_API int ring_buffer__consume(struct ring_buffer *rb); +LIBBPF_API int ring_buffer__epoll_fd(struct ring_buffer *rb);/* Perf buffer APIs */ struct perf_buffer ;tools/lib/bpf/ringbuf.c +6
-0@@ -282,3 +282,9 @@ int ring_buffer__poll(struct ring_buffer *rb, int timeout_ms) }return cnt <0 ? -errno : res; } + +/* Get an fd that can be used to sleep until data is available in the ring(s) */ +int ring_buffer__epoll_fd (struct ring_buffer *rb) +{ +return rb->epoll_fd; +}base-commit:
b4fe9fec51ef48011f11c2da4099f0b530449c92--
2.29.2.576.ga3fc446d84-goog
Quoted 11 lines · Andrii Nakryiko
Quoted 6 lines · Brendan Jackman
This allows the user to do their own manual polling in more complicated setups.
Signed-off-by Brendan Jackman <[email protected]>---
perf_bufferhas it, so it's good for consistency. In practice, though, I'd expect anyone who needs more complicated polling to use ring buf's map FD directly on their instance of epoll. Doesn't that work for you?
Yep, thanks - on closer inspection I think that would be a better eventual solution. However this API provides a convenient migration path. I suspect it's a similar situation to what motivated perf_buffer__epoll_fd in commit dca5612f8eb9d.
Quoted 1 line
Regardless, though, you need to add the API into libbpf.map file first.
Ack, will send a v2. I guess this falls into Linus description of 'happy sending it in this upcoming week' for the 5.10 window so I'll put it in libbpf 0.3.0.
Quoted 35 lines
Quoted 35 lines
tools/lib/bpf/libbpf.h | 1 + tools/lib/bpf/ringbuf.c | 6 ++++++ 2 files changed, 7 insertions(+)tools/lib/bpf/libbpf.h +1
-0@@ -536,6 +536,7 @@ LIBBPF_API int ring_buffer__add(struct ring_buffer *rb, int map_fd, ring_buffer_sample_fn sample_cb, void *ctx); LIBBPF_API int ring_buffer__poll(struct ring_buffer *rb, int timeout_ms); LIBBPF_API int ring_buffer__consume(struct ring_buffer *rb); +LIBBPF_API int ring_buffer__epoll_fd(struct ring_buffer *rb);/* Perf buffer APIs */ struct perf_buffer ;tools/lib/bpf/ringbuf.c +6
-0@@ -282,3 +282,9 @@ int ring_buffer__poll(struct ring_buffer *rb, int timeout_ms) }return cnt <0 ? -errno : res; } + +/* Get an fd that can be used to sleep until data is available in the ring(s) */ +int ring_buffer__epoll_fd (struct ring_buffer *rb) +{ +return rb->epoll_fd; +}base-commit:
b4fe9fec51ef48011f11c2da4099f0b530449c92--
2.29.2.576.ga3fc446d84-goog