Recent changes (master)

[Jens Axboe <axboe@xxxxxxxxx>]

The following changes since commit a3e33e2fc06582e4170f90ae6e62d6225d52dc7c:

  Merge branch 'github-actions-i686' of https://github.com/vincentkfu/fio (2021-12-23 16:27:33 -0700)

are available in the Git repository at:

  git://git.kernel.dk/fio.git master

for you to fetch changes up to b5e99df6ec605b4dc6a3488203f32d5c5bfce8df:

  engines/io_uring: don't set CQSIZE clamp unconditionally (2022-01-09 19:34:27 -0700)

----------------------------------------------------------------
Jens Axboe (1):
      engines/io_uring: don't set CQSIZE clamp unconditionally

 engines/io_uring.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

---

Diff of recent changes:

diff --git a/engines/io_uring.c b/engines/io_uring.c
index 00ae3482..a2533c88 100644
--- a/engines/io_uring.c
+++ b/engines/io_uring.c
@@ -699,9 +699,15 @@ static int fio_ioring_queue_init(struct thread_data *td)
 	p.flags |= IORING_SETUP_CQSIZE;
 	p.cq_entries = depth;
 
+retry:
 	ret = syscall(__NR_io_uring_setup, depth, &p);
-	if (ret < 0)
+	if (ret < 0) {
+		if (errno == EINVAL && p.flags & IORING_SETUP_CQSIZE) {
+			p.flags &= ~IORING_SETUP_CQSIZE;
+			goto retry;
+		}
 		return ret;
+	}
 
 	ld->ring_fd = ret;