Recent changes (master)
The following changes since commit 3f43022d4021850905886e391ec68c02c99aec5a:
Merge branch 'genfio-tempfile' of https://github.com/scop/fio (2022-02-20 12:39:11 -0700)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to c377f4f85943e5b155b3daaab1ce5213077531d8:
io_uring: use syscall helpers for the hot path (2022-02-21 09:43:48 -0700)
----------------------------------------------------------------
Jens Axboe (3):
aarch64: add system call definitions
x86-64: add system call definitions
io_uring: use syscall helpers for the hot path
arch/arch-aarch64.h | 77 +++++++++++++++++++++++++++++++++++ arch/arch-x86_64.h | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++ engines/io_uring.c | 5 +++ t/io_uring.c | 5 +++ 4 files changed, 200 insertions(+)
---
Diff of recent changes:
arch/arch-aarch64.h +77 -0
@@ -44,4 +44,81 @@ static inline int arch_init(char *envp[]) return 0; } +#define __do_syscallN (...) ({ \ + __asm__ volatile ( \ + "svc 0" \ + : "=r"(x0) \ + : __VA_ARGS__ \ + : "memory", "cc"); \ + (long) x0; \ +}) + +#define __do_syscall0 (__n) ({ \ + register long x8 __asm__("x8") = __n; \ + register long x0 __asm__("x0"); \ + \ + __do_syscallN("r" (x8)); \ +}) + +#define __do_syscall1 (__n, __a) ({ \ + register long x8 __asm__("x8") = __n; \ + register __typeof__(__a) x0 __asm__("x0") = __a; \ + \ + __do_syscallN("r" (x8), "0" (x0)); \ +}) + +#define __do_syscall2 (__n, __a, __b) ({ \ + register long x8 __asm__("x8") = __n; \ + register __typeof__(__a) x0 __asm__("x0") = __a; \ + register __typeof__(__b) x1 __asm__("x1") = __b; \ + \ + __do_syscallN("r" (x8), "0" (x0), "r" (x1)); \ +}) + +#define __do_syscall3 (__n, __a, __b, __c) ({ \ + register long x8 __asm__("x8") = __n; \ + register __typeof__(__a) x0 __asm__("x0") = __a; \ + register __typeof__(__b) x1 __asm__("x1") = __b; \ + register __typeof__(__c) x2 __asm__("x2") = __c; \ + \ + __do_syscallN("r" (x8), "0" (x0), "r" (x1), "r" (x2)); \ +}) + +#define __do_syscall4 (__n, __a, __b, __c, __d) ({ \ + register long x8 __asm__("x8") = __n; \ + register __typeof__(__a) x0 __asm__("x0") = __a; \ + register __typeof__(__b) x1 __asm__("x1") = __b; \ + register __typeof__(__c) x2 __asm__("x2") = __c; \ + register __typeof__(__d) x3 __asm__("x3") = __d; \ + \ + __do_syscallN("r" (x8), "0" (x0), "r" (x1), "r" (x2), "r" (x3));\ +}) + +#define __do_syscall5 (__n, __a, __b, __c, __d, __e) ({ \ + register long x8 __asm__("x8") = __n; \ + register __typeof__(__a) x0 __asm__("x0") = __a; \ + register __typeof__(__b) x1 __asm__("x1") = __b; \ + register __typeof__(__c) x2 __asm__("x2") = __c; \ + register __typeof__(__d) x3 __asm__("x3") = __d; \ + register __typeof__(__e) x4 __asm__("x4") = __e; \ + \ + __do_syscallN("r" (x8), "0" (x0), "r" (x1), "r" (x2), "r" (x3), \ + "r"(x4)); \ +}) + +#define __do_syscall6 (__n, __a, __b, __c, __d, __e, __f) ({ \ + register long x8 __asm__("x8") = __n; \ + register __typeof__(__a) x0 __asm__("x0") = __a; \ + register __typeof__(__b) x1 __asm__("x1") = __b; \ + register __typeof__(__c) x2 __asm__("x2") = __c; \ + register __typeof__(__d) x3 __asm__("x3") = __d; \ + register __typeof__(__e) x4 __asm__("x4") = __e; \ + register __typeof__(__f) x5 __asm__("x5") = __f; \ + \ + __do_syscallN("r" (x8), "0" (x0), "r" (x1), "r" (x2), "r" (x3), \ + "r" (x4), "r"(x5)); \ +}) + +#define FIO_ARCH_HAS_SYSCALL +#endif
arch/arch-x86_64.h +113 -0
117 lines not on this page · raw message
engines/io_uring.c +5 -0
@@ -278,8 +278,13 @@ static struct fio_option options[] = {static int io_uring_enter (struct ioring_data *ld,unsigned int to_submit,unsigned int min_complete,unsigned int flags) { +#ifdef FIO_ARCH_HAS_SYSCALL +return __do_syscall6 (__NR_io_uring_enter, ld->ring_fd, to_submit, + min_complete, flags,NULL ,0 ); +#else return syscall (__NR_io_uring_enter, ld->ring_fd, to_submit, min_complete, flags,NULL ,0 ); +#endif }static int fio_ioring_prep (struct thread_data *td,struct io_u *io_u)
t/io_uring.c +5 -0
@@ -422,8 +422,13 @@ out:static int io_uring_enter (struct submitter *s,unsigned int to_submit,unsigned int min_complete,unsigned int flags) { +#ifdef FIO_ARCH_HAS_SYSCALL +return __do_syscall6 (__NR_io_uring_enter, s->ring_fd, to_submit, + min_complete, flags,NULL ,0 ); +#else return syscall (__NR_io_uring_enter, s->ring_fd, to_submit, min_complete, flags,NULL ,0 ); +#endif }#ifndef CONFIG_HAVE_GETTID