Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Nov 21, 2021

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit beda9d8d9e9148ff34eaa0eeb0cde19a36f47494:

t/io_uring: add -R option for random/sequential IO (2021-11-19 10:44:15 -0700)

are available in the Git repository at:

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

for you to fetch changes up to 9f51d89c683d70cd8ab23ba09ec6e628a548af5a:

Sync io_uring header with the kernel (2021-11-20 07:31:20 -0700)

----------------------------------------------------------------
Jens Axboe (2):
io_uring: clamp CQ size to SQ size
Sync io_uring header with the kernel

 engines/io_uring.c  |   7 ++
 os/linux/io_uring.h | 186 ++++++++++++++++++++++++++++++++++++++++++----------
 t/io_uring.c        |   7 ++
 3 files changed, 167 insertions(+), 33 deletions(-)

---

Diff of recent changes:

engines/io_uring.c +7 -0
index 8b8f35f1..00ae3482 100644
@@ -692,6 +692,13 @@ static int fio_ioring_queue_init(struct thread_data *td)
 		}
 	}
 
+	/*
+	 * Clamp CQ ring size at our SQ ring size, we don't need more entries
+	 * than that.
+	 */
+	p.flags |= IORING_SETUP_CQSIZE;
+	p.cq_entries = depth;
+
 	ret = syscall(__NR_io_uring_setup, depth, &p);
 	if (ret < 0)
 		return ret;
os/linux/io_uring.h +153 -33

262 lines not on this page · raw message

t/io_uring.c +7 -0
index b79822d7..7bf215c7 100644
@@ -384,6 +384,13 @@ static int io_uring_register_files(struct submitter *s)
 
 static int io_uring_setup(unsigned entries, struct io_uring_params *p)
 {
+	/*
+	 * Clamp CQ ring size at our SQ ring size, we don't need more entries
+	 * than that.
+	 */
+	p->flags |= IORING_SETUP_CQSIZE;
+	p->cq_entries = entries;
+
 	return syscall(__NR_io_uring_setup, entries, p);
 }