Skip to contentSkip to conversation

fio: Use fixed opcodes for pre-mapped buffers

PATCH In review Keith Busch 2 participants 2 messages Jan 14, 2020 io_uring

lore
Share & tools
lore

Keith Busch

author
#0 lore raw

PATCH 1/1 fio: Use fixed opcodes for pre-mapped buffers

Use the correct opcode when for reads and writes using the fixedbuf option, otherwise EINVAL errors will be returned to these requests.

Fixes b10b1e70a ("io_uring: add option for non-vectored read/write commands")
Signed-off-by Keith Busch <[email protected]>
---
 engines/io_uring.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
engines/io_uring.c +7 -1
index 4f6a9678..329f2f07 100644
@@ -84,6 +84,11 @@ static const int ddir_to_op[2][2] = {
 	{ IORING_OP_WRITEV, IORING_OP_WRITE }
 };
 
+static const int fixed_ddir_to_op[2] = {
+	IORING_OP_READ_FIXED,
+	IORING_OP_WRITE_FIXED
+};
+
 static int fio_ioring_sqpoll_cb(void *data, unsigned long long *val)
 {
 	struct ioring_options *o = data;

@@ -189,12 +194,13 @@ static int fio_ioring_prep(struct thread_data *td, struct io_u *io_u)
 	}
 
 	if (io_u->ddir == DDIR_READ || io_u->ddir == DDIR_WRITE) {
-		sqe->opcode = ddir_to_op[io_u->ddir][!!o->nonvectored];
 		if (o->fixedbufs) {
+			sqe->opcode = fixed_ddir_to_op[io_u->ddir];
 			sqe->addr = (unsigned long) io_u->xfer_buf;
 			sqe->len = io_u->xfer_buflen;
 			sqe->buf_index = io_u->index;
 		} else {
+			sqe->opcode = ddir_to_op[io_u->ddir][!!o->nonvectored];
 			if (o->nonvectored) {
 				sqe->addr = (unsigned long)
 						ld->iovecs[io_u->index].iov_base;
Signature · 1 line
2.24.1
maintainer
#1 lore raw
Quoted 2 lines · Keith Busch

Use the correct opcode when for reads and writes using the fixedbuf option, otherwise EINVAL errors will be returned to these requests.

Oops, thanks for fixing!

Signature · 1 line
Jens Axboe