summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/arch/generic/syscall.h4
-rw-r--r--src/arch/x86/syscall.h57
-rw-r--r--src/syscall.h155
3 files changed, 63 insertions, 153 deletions
diff --git a/src/arch/generic/syscall.h b/src/arch/generic/syscall.h
index 7136290..6b10fe3 100644
--- a/src/arch/generic/syscall.h
+++ b/src/arch/generic/syscall.h
@@ -1,5 +1,9 @@
/* SPDX-License-Identifier: MIT */
+#ifndef __INTERNAL__LIBURING_SYSCALL_H
+ #error "This file should be included from src/syscall.h (liburing)"
+#endif
+
#ifndef LIBURING_ARCH_GENERIC_SYSCALL_H
#define LIBURING_ARCH_GENERIC_SYSCALL_H
diff --git a/src/arch/x86/syscall.h b/src/arch/x86/syscall.h
index 2fb3552..2d5642c 100644
--- a/src/arch/x86/syscall.h
+++ b/src/arch/x86/syscall.h
@@ -1,12 +1,12 @@
/* SPDX-License-Identifier: MIT */
+#ifndef __INTERNAL__LIBURING_SYSCALL_H
+ #error "This file should be included from src/syscall.h (liburing)"
+#endif
+
#ifndef LIBURING_ARCH_X86_SYSCALL_H
#define LIBURING_ARCH_X86_SYSCALL_H
-#ifndef LIBURING_SYSCALL_H
-# error "This file should be included from src/syscall.h (liburing)"
-#endif
-
#if defined(__x86_64__)
/**
* Note for syscall registers usage (x86-64):
@@ -29,8 +29,8 @@
* %r11 == %rflags and %rcx == %rip.
*/
-static inline void *__arch_impl_mmap(void *addr, size_t length, int prot,
- int flags, int fd, off_t offset)
+static inline void *uring_mmap(void *addr, size_t length, int prot, int flags,
+ int fd, off_t offset)
{
void *rax;
register int r10 __asm__("r10") = flags;
@@ -52,7 +52,7 @@ static inline void *__arch_impl_mmap(void *addr, size_t length, int prot,
return rax;
}
-static inline int __arch_impl_munmap(void *addr, size_t length)
+static inline int uring_munmap(void *addr, size_t length)
{
long rax;
@@ -67,7 +67,7 @@ static inline int __arch_impl_munmap(void *addr, size_t length)
return (int) rax;
}
-static inline int __arch_impl_madvise(void *addr, size_t length, int advice)
+static inline int uring_madvise(void *addr, size_t length, int advice)
{
long rax;
@@ -83,7 +83,7 @@ static inline int __arch_impl_madvise(void *addr, size_t length, int advice)
return (int) rax;
}
-static inline int __arch_impl_getrlimit(int resource, struct rlimit *rlim)
+static inline int uring_getrlimit(int resource, struct rlimit *rlim)
{
long rax;
@@ -98,7 +98,7 @@ static inline int __arch_impl_getrlimit(int resource, struct rlimit *rlim)
return (int) rax;
}
-static inline int __arch_impl_setrlimit(int resource, const struct rlimit *rlim)
+static inline int uring_setrlimit(int resource, const struct rlimit *rlim)
{
long rax;
@@ -113,7 +113,7 @@ static inline int __arch_impl_setrlimit(int resource, const struct rlimit *rlim)
return (int) rax;
}
-static inline int __arch_impl_close(int fd)
+static inline int uring_close(int fd)
{
long rax;
@@ -127,9 +127,9 @@ static inline int __arch_impl_close(int fd)
return (int) rax;
}
-static inline int __arch_impl_io_uring_register(int fd, unsigned opcode,
- const void *arg,
- unsigned nr_args)
+static inline int ____sys_io_uring_register(int fd, unsigned opcode,
+ const void *arg,
+ unsigned nr_args)
{
long rax;
register unsigned r10 __asm__("r10") = nr_args;
@@ -147,8 +147,8 @@ static inline int __arch_impl_io_uring_register(int fd, unsigned opcode,
return (int) rax;
}
-static inline int __arch_impl_io_uring_setup(unsigned entries,
- struct io_uring_params *p)
+static inline int ____sys_io_uring_setup(unsigned entries,
+ struct io_uring_params *p)
{
long rax;
@@ -163,10 +163,9 @@ static inline int __arch_impl_io_uring_setup(unsigned entries,
return (int) rax;
}
-static inline int __arch_impl_io_uring_enter(int fd, unsigned to_submit,
- unsigned min_complete,
- unsigned flags, sigset_t *sig,
- int sz)
+static inline int ____sys_io_uring_enter2(int fd, unsigned to_submit,
+ unsigned min_complete, unsigned flags,
+ sigset_t *sig, int sz)
{
long rax;
register unsigned r10 __asm__("r10") = flags;
@@ -188,12 +187,26 @@ static inline int __arch_impl_io_uring_enter(int fd, unsigned to_submit,
return (int) rax;
}
+static inline int ____sys_io_uring_enter(int fd, unsigned to_submit,
+ unsigned min_complete, unsigned flags,
+ sigset_t *sig)
+{
+ return ____sys_io_uring_enter2(fd, to_submit, min_complete, flags, sig,
+ _NSIG / 8);
+}
+
#else /* #if defined(__x86_64__) */
/*
- * TODO: Add x86 (32-bit) support here.
+ * For x86 (32-bit), fallback to libc wrapper.
+ * We can't use CONFIG_NOLIBC for x86 (32-bit) at the moment.
+ *
+ * TODO: Add x86 (32-bit) nolibc support.
*/
-#error "x86 (32-bit) is currently not supported for nolibc builds"
+#ifdef CONFIG_NOLIBC
+ #error "x86 (32-bit) is currently not supported for nolibc builds"
+#endif
+#include "../generic/syscall.h"
#endif /* #if defined(__x86_64__) */
diff --git a/src/syscall.h b/src/syscall.h
index 4b336f1..beb357e 100644
--- a/src/syscall.h
+++ b/src/syscall.h
@@ -55,27 +55,6 @@
*/
struct io_uring_params;
-
-#ifdef CONFIG_NOLIBC
-# if defined(__x86_64__) || defined(__i386__)
-# include "arch/x86/syscall.h"
-# else
-# error "This arch doesn't support building liburing without libc"
-# endif
-#endif
-
-
-/*
- * System calls
- */
-int __sys_io_uring_setup(unsigned entries, struct io_uring_params *p);
-int __sys_io_uring_enter(int fd, unsigned to_submit, unsigned min_complete,
- unsigned flags, sigset_t *sig);
-int __sys_io_uring_enter2(int fd, unsigned to_submit, unsigned min_complete,
- unsigned flags, sigset_t *sig, int sz);
-int __sys_io_uring_register(int fd, unsigned int opcode, const void *arg,
- unsigned int nr_args);
-
static inline void *ERR_PTR(intptr_t n)
{
return (void *) n;
@@ -91,118 +70,32 @@ static inline bool IS_ERR(const void *ptr)
return uring_unlikely((uintptr_t) ptr >= (uintptr_t) -4095UL);
}
-static inline int ____sys_io_uring_register(int fd, unsigned opcode,
- const void *arg, unsigned nr_args)
-{
-#ifdef CONFIG_NOLIBC
- return __arch_impl_io_uring_register(fd, opcode, arg, nr_args);
-#else
- int ret;
- ret = syscall(__NR_io_uring_register, fd, opcode, arg, nr_args);
- return (ret < 0) ? -errno : ret;
-#endif
-}
-
-static inline int ____sys_io_uring_setup(unsigned entries,
- struct io_uring_params *p)
-{
-#ifdef CONFIG_NOLIBC
- return __arch_impl_io_uring_setup(entries, p);
+#define __INTERNAL__LIBURING_SYSCALL_H
+#if defined(__x86_64__) || defined(__i386__)
+ #include "arch/x86/syscall.h"
#else
- int ret;
- ret = syscall(__NR_io_uring_setup, entries, p);
- return (ret < 0) ? -errno : ret;
+ /*
+ * We don't have native syscall wrappers
+ * for this arch. Must use libc!
+ */
+ #ifdef CONFIG_NOLIBC
+ #error "This arch doesn't support building liburing without libc"
+ #endif
+ /* libc syscall wrappers. */
+ #include "arch/generic/syscall.h"
#endif
-}
-
-static inline int ____sys_io_uring_enter2(int fd, unsigned to_submit,
- unsigned min_complete, unsigned flags,
- sigset_t *sig, int sz)
-{
-#ifdef CONFIG_NOLIBC
- return __arch_impl_io_uring_enter(fd, to_submit, min_complete, flags,
- sig, sz);
-#else
- int ret;
- ret = syscall(__NR_io_uring_enter, fd, to_submit, min_complete, flags,
- sig, sz);
- return (ret < 0) ? -errno : ret;
-#endif
-}
-
-static inline int ____sys_io_uring_enter(int fd, unsigned to_submit,
- unsigned min_complete, unsigned flags,
- sigset_t *sig)
-{
- return ____sys_io_uring_enter2(fd, to_submit, min_complete, flags, sig,
- _NSIG / 8);
-}
-
-static inline void *uring_mmap(void *addr, size_t length, int prot, int flags,
- int fd, off_t offset)
-{
-#ifdef CONFIG_NOLIBC
- return __arch_impl_mmap(addr, length, prot, flags, fd, offset);
-#else
- void *ret;
- ret = mmap(addr, length, prot, flags, fd, offset);
- return (ret == MAP_FAILED) ? ERR_PTR(-errno) : ret;
-#endif
-}
+#undef __INTERNAL__LIBURING_SYSCALL_H
-static inline int uring_munmap(void *addr, size_t length)
-{
-#ifdef CONFIG_NOLIBC
- return __arch_impl_munmap(addr, length);
-#else
- int ret;
- ret = munmap(addr, length);
- return (ret < 0) ? -errno : ret;
-#endif
-}
-
-static inline int uring_madvise(void *addr, size_t length, int advice)
-{
-#ifdef CONFIG_NOLIBC
- return __arch_impl_madvise(addr, length, advice);
-#else
- int ret;
- ret = madvise(addr, length, advice);
- return (ret < 0) ? -errno : ret;
-#endif
-}
-
-static inline int uring_getrlimit(int resource, struct rlimit *rlim)
-{
-#ifdef CONFIG_NOLIBC
- return __arch_impl_getrlimit(resource, rlim);
-#else
- int ret;
- ret = getrlimit(resource, rlim);
- return (ret < 0) ? -errno : ret;
-#endif
-}
-
-static inline int uring_setrlimit(int resource, const struct rlimit *rlim)
-{
-#ifdef CONFIG_NOLIBC
- return __arch_impl_setrlimit(resource, rlim);
-#else
- int ret;
- ret = setrlimit(resource, rlim);
- return (ret < 0) ? -errno : ret;
-#endif
-}
-
-static inline int uring_close(int fd)
-{
-#ifdef CONFIG_NOLIBC
- return __arch_impl_close(fd);
-#else
- int ret;
- ret = close(fd);
- return (ret < 0) ? -errno : ret;
-#endif
-}
+/*
+ * For backward compatibility.
+ * (these __sys* functions always use libc, see syscall.c)
+ */
+int __sys_io_uring_setup(unsigned entries, struct io_uring_params *p);
+int __sys_io_uring_enter(int fd, unsigned to_submit, unsigned min_complete,
+ unsigned flags, sigset_t *sig);
+int __sys_io_uring_enter2(int fd, unsigned to_submit, unsigned min_complete,
+ unsigned flags, sigset_t *sig, int sz);
+int __sys_io_uring_register(int fd, unsigned int opcode, const void *arg,
+ unsigned int nr_args);
#endif