mini-liburing updates
cover mini-liburing updates
Update mini-liburing with NO_SQARRAY and io_uring_queue_init_params() support. Sending these separately to get rid of dependencies, but they're also nice to have while writing selftests.
Pavel Begunkov (2):
selftests/io_uring: add io_uring_queue_init_params selftests/io_uring: support NO_SQARRAY in miniliburing
tools/include/io_uring/mini_liburing.h | 59 +++++++++++++++++++------- 1 file changed, 44 insertions(+), 15 deletions(-)
Signature · 1 line
2.52.0
PATCH 1/2 selftests/io_uring: add io_uring_queue_init_params
Add a ring init variant taking struct io_uring_params, which mimicks liburing API.
--- tools/include/io_uring/mini_liburing.h | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
tools/include/io_uring/mini_liburing.h +17 -8
@@ -126,21 +126,18 @@ static inline int io_uring_enter(int fd, unsigned int to_submit, flags, sig, _NSIG / 8); } -static inline int io_uring_queue_init (unsigned int entries, -struct io_uring *ring, -unsigned int flags) +static inline int io_uring_queue_init_params (unsigned int entries, +struct io_uring *ring, +struct io_uring_params *p) { -struct io_uring_params p;int fd, ret;memset (ring,0 ,sizeof (*ring)); -memset (&p,0 ,sizeof (p)); - p.flags = flags; - fd =io_uring_setup (entries, &p); + fd =io_uring_setup (entries, p);if (fd <0 )return fd; - ret =io_uring_mmap (fd, &p, &ring->sq, &ring->cq); + ret =io_uring_mmap (fd, p, &ring->sq, &ring->cq);if (!ret) ring->ring_fd = fd;else
@@ -148,6 +145,18 @@ static inline int io_uring_queue_init(unsigned int entries,return ret; } +static inline int io_uring_queue_init (unsigned int entries, +struct io_uring *ring, +unsigned int flags) +{ +struct io_uring_params p; + +memset (&p,0 ,sizeof (p)); + p.flags = flags; + +return io_uring_queue_init_params (entries, ring, &p); +} +/* Get a sqe */ static inline struct io_uring_sqe *io_uring_get_sqe (struct io_uring *ring) {
Signature · 1 line
2.52.0
PATCH 2/2 selftests/io_uring: support NO_SQARRAY in miniliburing
In reply to Pavel BegunkovAdd support for IORING_SETUP_NO_SQARRAY in miniliburing.
--- tools/include/io_uring/mini_liburing.h | 34 ++++++++++++++++++++------ 1 file changed, 27 insertions(+), 7 deletions(-)
tools/include/io_uring/mini_liburing.h +27 -7
@@ -6,6 +6,7 @@#include <stdio.h> #include <string.h> #include <unistd.h> +#include <sys/uio.h> struct io_sq_ring {unsigned int *head;
@@ -55,6 +56,7 @@ struct io_uring {struct io_uring_sq sq;struct io_uring_cq cq;int ring_fd; +unsigned flags; };#if defined(__x86_64) || defined(__i386__)
@@ -72,7 +74,14 @@ static inline int io_uring_mmap(int fd, struct io_uring_params *p,void *ptr;int ret; - sq->ring_sz = p->sq_off.array + p->sq_entries *sizeof (unsigned int ); +if (p->flags &IORING_SETUP_NO_SQARRAY ) { + sq->ring_sz = p->cq_off.cqes; + sq->ring_sz += p->cq_entries *sizeof (struct io_uring_cqe ); + }else { + sq->ring_sz = p->sq_off.array; + sq->ring_sz += p->sq_entries *sizeof (unsigned int ); + } + ptr =mmap (0 , sq->ring_sz,PROT_READ |PROT_WRITE ,MAP_SHARED |MAP_POPULATE , fd,IORING_OFF_SQ_RING );if (ptr ==MAP_FAILED )
@@ -83,7 +92,8 @@ static inline int io_uring_mmap(int fd, struct io_uring_params *p, sq->kring_entries = ptr + p->sq_off.ring_entries; sq->kflags = ptr + p->sq_off.flags; sq->kdropped = ptr + p->sq_off.dropped; - sq->array = ptr + p->sq_off.array; +if (!(p->flags &IORING_SETUP_NO_SQARRAY )) + sq->array = ptr + p->sq_off.array; size = p->sq_entries *sizeof (struct io_uring_sqe ); sq->sqes = mmap(0, size, PROT_READ | PROT_WRITE,
@@ -138,10 +148,12 @@ static inline int io_uring_queue_init_params(unsigned int entries,if (fd <0 )return fd; ret =io_uring_mmap (fd, p, &ring->sq, &ring->cq); -if (!ret) +if (!ret) { ring->ring_fd = fd; -else + ring->flags = p->flags; + }else {close (fd); + }return ret; }
@@ -208,10 +220,18 @@ static inline int io_uring_submit(struct io_uring *ring) ktail = *sq->ktail; to_submit = sq->sqe_tail - sq->sqe_head; -for (submitted =0 ; submitted < to_submit; submitted++) { -read_barrier (); - sq->array[ktail++ & mask] = sq->sqe_head++ & mask; + +if (!(ring->flags &IORING_SETUP_NO_SQARRAY )) { +for (submitted =0 ; submitted < to_submit; submitted++) { +read_barrier (); + sq->array[ktail++ & mask] = sq->sqe_head++ & mask; + } + }else { + ktail += to_submit; + sq->sqe_head += to_submit; + submitted = to_submit; } +if (!submitted)return 0 ;
Signature · 1 line
2.52.0
Quoted 9 lines · Pavel Begunkov
Update mini-liburing with
NO_SQARRAYandio_uring_queue_init_params()support. Sending these separately to get rid of dependencies, but they're also nice to have while writing selftests.Pavel Begunkov (2):
selftests/io_uring: addio_uring_queue_init_paramsselftests/io_uring: supportNO_SQARRAYin miniliburing[...]
Applied, thanks!
[1/2] selftests/io_uring: add io_uring_queue_init_params
commit: 73061dbeca783aaf311e1af9610f8cba1c1176cd
[2/2] selftests/io_uring: support NO_SQARRAY in miniliburing
commit: 145e0074392587606aa5df353d0e761f0b8357d5Best regards,
Signature · 1 line
Jens Axboe