cpp/liburing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync with upstream API

Browse Source 
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe
2019-01-16 08:41:05 -07:00
parent f16b83b293
commit b93edf5b9e
4 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/io_uring.h
View File

@@ -20,10 +20,7 @@ struct io_uring_sqe {
__u16 ioprio; /* ioprio for the request */ __u16 ioprio; /* ioprio for the request */
__s32 fd; /* file descriptor to do IO on */ __s32 fd; /* file descriptor to do IO on */
__u64 off; /* offset into file */ __u64 off; /* offset into file */
union { __u64 addr; /* pointer to buffer or iovecs */
void *addr; /* buffer or iovecs */
__u64 __pad;
};
__u32 len; /* buffer size or number of iovecs */ __u32 len; /* buffer size or number of iovecs */
union { union {
__kernel_rwf_t rw_flags; __kernel_rwf_t rw_flags;
@@ -136,20 +133,4 @@ struct io_uring_params {
#define IORING_REGISTER_FILES 2 #define IORING_REGISTER_FILES 2
#define IORING_UNREGISTER_FILES 3 #define IORING_UNREGISTER_FILES 3
struct io_uring_register_buffers {
union {
struct iovec *iovecs;
__u64 pad;
};
__u32 nr_iovecs;
};
struct io_uring_register_files {
union {
__s32 *fds;
__u64 pad;
};
__u32 nr_fds;
};
#endif #endif

5
src/syscall.c
View File

@@ -31,9 +31,10 @@
#error "Arch not supported yet" #error "Arch not supported yet"
#endif #endif
int io_uring_register(int fd, unsigned int opcode, void *arg) int io_uring_register(int fd, unsigned int opcode, void *arg,
unsigned int nr_args)
{ {
return syscall(__NR_sys_io_uring_register, fd, opcode, arg); return syscall(__NR_sys_io_uring_register, fd, opcode, arg, nr_args);
} }
int io_uring_setup(unsigned int entries, struct io_uring_params *p) int io_uring_setup(unsigned int entries, struct io_uring_params *p)

4
test/io_uring-cp.c
View File

@@ -73,7 +73,7 @@ static int queue_read(int fd, off_t size, off_t offset)
sqe->ioprio = 0; sqe->ioprio = 0;
sqe->fd = fd; sqe->fd = fd;
sqe->off = offset; sqe->off = offset;
sqe->addr = data->iov; sqe->addr = (unsigned long) data->iov;
sqe->buf_index = 0; sqe->buf_index = 0;
sqe->user_data = (unsigned long) data; sqe->user_data = (unsigned long) data;
iovecs[sqe_index(sqe)].iov_len = size; iovecs[sqe_index(sqe)].iov_len = size;
@@ -123,7 +123,7 @@ static void queue_write(int fd, struct io_uring_cqe *cqe)
sqe->ioprio = 0; sqe->ioprio = 0;
sqe->fd = fd; sqe->fd = fd;
sqe->off = data->offset; sqe->off = data->offset;
sqe->addr = data->iov; sqe->addr = (unsigned long) data->iov;
sqe->buf_index = 0; sqe->buf_index = 0;
sqe->user_data = 0; sqe->user_data = 0;
data->iov->iov_len = cqe->res; data->iov->iov_len = cqe->res;

2
test/io_uring-test.c
View File

@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
sqe->ioprio = 0; sqe->ioprio = 0;
sqe->fd = fd; sqe->fd = fd;
sqe->off = offset; sqe->off = offset;
sqe->addr = &iovecs[i]; sqe->addr = (unsigned long) &iovecs[i];
sqe->len = 1; sqe->len = 1;
sqe->buf_index = 0; sqe->buf_index = 0;
offset += iovecs[i].iov_len; offset += iovecs[i].iov_len;