Signed-off-by: Jens Axboe <axboe@kernel.dk>
sqe->buf_index = 0;
if (io_u->ddir == DDIR_READ || io_u->ddir == DDIR_WRITE) {
sqe->buf_index = 0;
if (io_u->ddir == DDIR_READ || io_u->ddir == DDIR_WRITE) {
- if (io_u->ddir == DDIR_READ)
- sqe->opcode = IORING_OP_READV;
- else
- sqe->opcode = IORING_OP_WRITEV;
-
- sqe->flags |= IOSQE_FIXED_BUFFER;
+ if (io_u->ddir == DDIR_READ)
+ sqe->opcode = IORING_OP_READ_FIXED;
+ else
+ sqe->opcode = IORING_OP_WRITE_FIXED;
sqe->addr = io_u->xfer_buf;
sqe->len = io_u->xfer_buflen;
sqe->buf_index = io_u->index;
} else {
sqe->addr = io_u->xfer_buf;
sqe->len = io_u->xfer_buflen;
sqe->buf_index = io_u->index;
} else {
+ if (io_u->ddir == DDIR_READ)
+ sqe->opcode = IORING_OP_READV;
+ else
+ sqe->opcode = IORING_OP_WRITEV;
sqe->addr = &ld->iovecs[io_u->index];
sqe->len = 1;
}
sqe->off = io_u->offset;
sqe->addr = &ld->iovecs[io_u->index];
sqe->len = 1;
}
sqe->off = io_u->offset;
- } else if (ddir_sync(io_u->ddir))
+ } else if (ddir_sync(io_u->ddir)) {
+ sqe->fsync_flags = 0;
+ if (io_u->ddir == DDIR_DATASYNC)
+ sqe->fsync_flags |= IORING_FSYNC_DATASYNC;
sqe->opcode = IORING_OP_FSYNC;
sqe->opcode = IORING_OP_FSYNC;
- sqe->data = (unsigned long) io_u;
+ sqe->user_data = (unsigned long) io_u;
index = (event + ld->cq_ring_off) & ld->cq_ring_mask;
cqe = &ld->cq_ring.cqes[index];
index = (event + ld->cq_ring_off) & ld->cq_ring_mask;
cqe = &ld->cq_ring.cqes[index];
- io_u = (struct io_u *) cqe->data;
+ io_u = (struct io_u *) cqe->user_data;
if (cqe->res != io_u->xfer_buflen) {
if (cqe->res > io_u->xfer_buflen)
if (cqe->res != io_u->xfer_buflen) {
if (cqe->res > io_u->xfer_buflen)
*/
struct io_uring_sqe {
__u8 opcode; /* type of operation for this sqe */
*/
struct io_uring_sqe {
__u8 opcode; /* type of operation for this sqe */
- __u8 flags; /* IOSQE_ flags below */
+ __u8 flags; /* IOSQE_ flags */
__u16 ioprio; /* ioprio for the request */
__s32 fd; /* file descriptor to do IO on */
__u64 off; /* offset into file */
__u16 ioprio; /* ioprio for the request */
__s32 fd; /* file descriptor to do IO on */
__u64 off; /* offset into file */
__u32 len; /* buffer size or number of iovecs */
union {
__kernel_rwf_t rw_flags;
__u32 len; /* buffer size or number of iovecs */
union {
__kernel_rwf_t rw_flags;
};
__u16 buf_index; /* index into fixed buffers, if used */
};
__u16 buf_index; /* index into fixed buffers, if used */
- __u16 __pad2[3];
- __u64 data; /* data to be passed back at completion time */
+ __u16 __pad2;
+ __u32 __pad3;
+ __u64 user_data; /* data to be passed back at completion time */
-#define IOSQE_FIXED_BUFFER (1 << 0) /* use fixed buffer */
-#define IOSQE_FIXED_FILE (1 << 1) /* use fixed fileset */
+#define IOSQE_FIXED_FILE (1 << 0) /* use fixed fileset */
/*
* io_uring_setup() flags
/*
* io_uring_setup() flags
#define IORING_OP_READV 1
#define IORING_OP_WRITEV 2
#define IORING_OP_FSYNC 3
#define IORING_OP_READV 1
#define IORING_OP_WRITEV 2
#define IORING_OP_FSYNC 3
-#define IORING_OP_FDSYNC 4
+#define IORING_OP_READ_FIXED 4
+#define IORING_OP_WRITE_FIXED 5
+
+/*
+ * sqe->fsync_flags
+ */
+#define IORING_FSYNC_DATASYNC (1 << 0)
/*
* IO completion data structure (Completion Queue Entry)
*/
struct io_uring_cqe {
/*
* IO completion data structure (Completion Queue Entry)
*/
struct io_uring_cqe {
- __u64 data; /* sqe->data submission passed back */
+ __u64 user_data; /* sqe->data submission passed back */
__s32 res; /* result code for this event */
__u32 flags;
};
__s32 res; /* result code for this event */
__u32 flags;
};
+/*
+ * sq_ring->flags
+ */
#define IORING_SQ_NEED_WAKEUP (1 << 0) /* needs io_uring_enter wakeup */
struct io_cqring_offsets {
#define IORING_SQ_NEED_WAKEUP (1 << 0) /* needs io_uring_enter wakeup */
struct io_cqring_offsets {
struct io_uring_register_buffers {
struct iovec *iovecs;
struct io_uring_register_buffers {
struct iovec *iovecs;
};
struct io_uring_register_files {
};
struct io_uring_register_files {
- int *fds;
- unsigned nr_fds;
+ __s32 *fds;
+ __u32 nr_fds;
struct file {
unsigned long max_blocks;
unsigned pending_ios;
struct file {
unsigned long max_blocks;
unsigned pending_ios;
+ int real_fd;
+ int fixed_fd;
unsigned long cachehit, cachemiss;
volatile int finish;
unsigned long cachehit, cachemiss;
volatile int finish;
struct file files[MAX_FDS];
unsigned nr_files;
unsigned cur_file;
struct file files[MAX_FDS];
unsigned nr_files;
unsigned cur_file;
static int io_uring_register_files(struct submitter *s)
{
struct io_uring_register_files reg;
static int io_uring_register_files(struct submitter *s)
{
struct io_uring_register_files reg;
- reg.fds = calloc(s->nr_files, sizeof(int));
- for (i = 0; i < s->nr_files; i++)
- reg.fds[i] = s->files[i].fd;
+ s->fds = calloc(s->nr_files, sizeof(__s32));
+ for (i = 0; i < s->nr_files; i++) {
+ s->fds[i] = s->files[i].real_fd;
+ s->files[i].fixed_fd = i;
+ }
+ reg.fds = s->fds;
reg.nr_fds = s->nr_files;
reg.nr_fds = s->nr_files;
- ret = syscall(__NR_sys_io_uring_register, s->ring_fd,
+ return syscall(__NR_sys_io_uring_register, s->ring_fd,
IORING_REGISTER_FILES, ®);
IORING_REGISTER_FILES, ®);
- free(reg.fds);
- return ret;
}
static int io_uring_setup(unsigned entries, struct io_uring_params *p)
}
static int io_uring_setup(unsigned entries, struct io_uring_params *p)
offset = (r % (f->max_blocks - 1)) * BS;
sqe->flags = IOSQE_FIXED_FILE;
offset = (r % (f->max_blocks - 1)) * BS;
sqe->flags = IOSQE_FIXED_FILE;
- sqe->opcode = IORING_OP_READV;
+ sqe->opcode = IORING_OP_READ_FIXED;
sqe->addr = s->iovecs[index].iov_base;
sqe->len = BS;
sqe->buf_index = index;
sqe->addr = s->iovecs[index].iov_base;
sqe->len = BS;
sqe->buf_index = index;
- sqe->flags |= IOSQE_FIXED_BUFFER;
+ sqe->opcode = IORING_OP_READV;
sqe->addr = &s->iovecs[index];
sqe->len = 1;
sqe->buf_index = 0;
}
sqe->ioprio = 0;
sqe->addr = &s->iovecs[index];
sqe->len = 1;
sqe->buf_index = 0;
}
sqe->ioprio = 0;
- sqe->data = (unsigned long) f;
+ sqe->user_data = (unsigned long) f;
}
static int prep_more_ios(struct submitter *s, int max_ios)
}
static int prep_more_ios(struct submitter *s, int max_ios)
- if (fstat(f->fd, &st) < 0)
+ if (fstat(f->real_fd, &st) < 0)
return -1;
if (S_ISBLK(st.st_mode)) {
unsigned long long bytes;
return -1;
if (S_ISBLK(st.st_mode)) {
unsigned long long bytes;
- if (ioctl(f->fd, BLKGETSIZE64, &bytes) != 0)
+ if (ioctl(f->real_fd, BLKGETSIZE64, &bytes) != 0)
return -1;
f->max_blocks = bytes / BS;
return -1;
f->max_blocks = bytes / BS;
if (head == *ring->tail)
break;
cqe = &ring->cqes[head & cq_ring_mask];
if (head == *ring->tail)
break;
cqe = &ring->cqes[head & cq_ring_mask];
- f = (struct file *) cqe->data;
+ f = (struct file *) cqe->user_data;
f->pending_ios--;
if (cqe->res != BS) {
printf("io: unexpected ret=%d\n", cqe->res);
f->pending_ios--;
if (cqe->res != BS) {
printf("io: unexpected ret=%d\n", cqe->res);
perror("open");
return 1;
}
perror("open");
return 1;
}
if (get_file_size(f)) {
printf("failed getting size of device/file\n");
return 1;
if (get_file_size(f)) {
printf("failed getting size of device/file\n");
return 1;