Removing arch_prctl from syscall and creating architecture specific musl calls

deps/musl/default.nix

@@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
     cp ${./patches/includeos_syscalls.h} $sourceRoot/src/internal/includeos_syscalls.h
     cp ${./patches/syscall.h} $sourceRoot/src/internal/syscall.h
 
+    rm $sourceRoot/src/thread/x86_64/__set_thread_area.s
+    cp ${./patches/__set_thread_area.c} $sourceRoot/src/thread/x86_64/__set_thread_area.c
+
     rm $sourceRoot/arch/x86_64/syscall_arch.h
     rm $sourceRoot/arch/i386/syscall_arch.h
   '';

deps/musl/patches/__set_thread_area.c

@@ -0,0 +1,8 @@
+#include "syscall.h"
+
+#define ARCH_SET_FS 0x1002
+
+int __set_thread_area(void *p)
+{
+    return __syscall(SYS_arch_prctl, ARCH_SET_FS, p);
+}

src/arch/aarch64/CMakeLists.txt

@@ -7,6 +7,7 @@ set(ARCH_OBJECTS
 #  profile_intr.asm
 #  apic_asm.asm
   arch_start.asm
+  arch_musl.cpp
   exceptions.asm
 #  interrupts.asm
 #  fiber.asm
@@ -15,7 +16,6 @@ set(ARCH_SOURCES
   paging.cpp
   cpu.cpp
   timer.cpp
-  syscall_entry.cpp
 )
 enable_language(ASM)
 

src/arch/aarch64/arch_musl.cpp

@@ -0,0 +1,27 @@
+#include <os>
+#include <errno.h>
+#include <musl/common.hpp>
+#include "cpu.hpp"
+
+extern "C"
+long sys_set_thread_area(struct user_desc *u_info)
+{
+  set_tpidr(u_info); // This probably still does not work
+  return 0;
+}
+
+extern "C"
+long syscall_SYS_set_thread_area(struct user_desc *u_desc) {
+    return strace(sys_set_thread_area, "set_thread_area", u_desc);
+}
+
+extern "C"
+long sys_arch_prctl(int code, uintptr_t ptr) {
+    os::panic("This should not happen!");
+    return -ENOSYS;
+}
+
+extern "C"
+long syscall_SYS_arch_prctl(int code, uintptr_t ptr) {
+    return strace(sys_arch_prctl, "arch_prctl", code, ptr);
+}

src/arch/i686/CMakeLists.txt

@@ -6,6 +6,7 @@ set(ARCH_OBJECTS
   profile_intr.asm
   apic_asm.asm
   arch_start.asm
+  arch_musl.cpp
   exceptions.asm
   interrupts.asm
   fiber.asm

src/arch/i686/arch_musl.cpp

@@ -0,0 +1,26 @@
+#include <os>
+#include <errno.h>
+#include <musl/common.hpp>
+
+extern "C"
+long sys_set_thread_area(struct user_desc *u_info) {
+    os::panic("This should not happen!");
+    return -ENOSYS;
+}
+
+extern "C"
+long syscall_SYS_set_thread_area(struct user_desc *u_info)
+{
+    return strace(sys_set_thread_area, "set_thread_area", u_info);
+}
+
+extern "C"
+long sys_arch_prctl(int code, uintptr_t ptr) {
+    os::panic("This should not happen!");
+    return -ENOSYS;
+}
+
+extern "C"
+long syscall_SYS_arch_prctl(int code, uintptr_t ptr) {
+    return strace(sys_arch_prctl, "arch_prctl", code, ptr);
+}

src/arch/x86_64/CMakeLists.txt

@@ -5,6 +5,7 @@ set(ARCH_OBJECTS
   apic_asm.asm
   apic_longmode.asm
   arch_start.asm
+  arch_musl.cpp
   exceptions.asm
   interrupts.asm
   fiber_asm.asm

src/arch/x86_64/arch_musl.cpp

@@ -0,0 +1,45 @@
+#include <os>
+#include <errno.h>
+#include <likely>
+#include <musl/common.hpp>
+#include <arch/x86/cpu.hpp>
+
+extern "C"
+long sys_set_thread_area(struct user_desc *u_info)
+{
+    return -ENOSYS;
+}
+
+extern "C"
+long syscall_SYS_set_thread_area(struct user_desc *u_desc) {
+    return strace(sys_set_thread_area, "set_thread_area", u_desc);
+}
+
+#define ARCH_SET_GS 0x1001
+#define ARCH_SET_FS 0x1002
+#define ARCH_GET_FS 0x1003
+#define ARCH_GET_GS 0x1004
+
+extern "C"
+long sys_arch_prctl(int code, uintptr_t ptr) {
+  switch(code){
+  case ARCH_SET_GS:
+    if (UNLIKELY(!ptr)) return -EINVAL;
+    x86::CPU::set_gs((void*)ptr);
+    break;
+  case ARCH_SET_FS:
+    if (UNLIKELY(!ptr)) return -EINVAL;
+    x86::CPU::set_fs((void*)ptr);
+    break;
+  case ARCH_GET_GS:
+    os::panic("<arch_prctl> GET_GS called!\n");
+  case ARCH_GET_FS:
+    os::panic("<arch_prctl> GET_FS called!\n");
+  }
+  return 0;
+}
+
+extern "C"
+long syscall_SYS_arch_prctl(int code, uintptr_t ptr) {
+  return strace(sys_arch_prctl, "arch_prctl", code, ptr);
+}

src/arch/x86_64/syscall_entry.cpp

@@ -14,63 +14,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <arch/x86/cpu.hpp>
 #include <os.hpp>
-#include <likely>
 #include <kprint>
-#include <errno.h>
-
-#define ARCH_SET_GS 0x1001
-#define ARCH_SET_FS 0x1002
-#define ARCH_GET_FS 0x1003
-#define ARCH_GET_GS 0x1004
-
-#ifdef __x86_64__
-static long sys_prctl(int code, uintptr_t ptr)
-{
-  switch(code){
-  case ARCH_SET_GS:
-    //kprintf("<arch_prctl> set_gs to %#lx\n", ptr);
-    if (UNLIKELY(!ptr)) return -EINVAL;
-    x86::CPU::set_gs((void*)ptr);
-    break;
-  case ARCH_SET_FS:
-    //kprintf("<arch_prctl> set_fs to %#lx\n", ptr);
-    if (UNLIKELY(!ptr)) return -EINVAL;
-    x86::CPU::set_fs((void*)ptr);
-    break;
-  case ARCH_GET_GS:
-    os::panic("<arch_prctl> GET_GS called!\n");
-  case ARCH_GET_FS:
-    os::panic("<arch_prctl> GET_FS called!\n");
-  }
-  return -EINVAL;
-}
-#endif
 
 extern "C"
 uintptr_t syscall_entry(uint64_t n, uint64_t a1, uint64_t a2, uint64_t a3,
                    uint64_t a4, uint64_t a5)
 {
-  switch(n) {
-  case 158: // arch_prctl
-    sys_prctl(a1, a2);
-    break;
-  default:
-    kprintf("<syscall entry> no %lu (a1=%#lx a2=%#lx a3=%#lx a4=%#lx a5=%#lx) \n",
+  kprintf("<syscall entry> no %lu (a1=%#lx a2=%#lx a3=%#lx a4=%#lx a5=%#lx) \n",
             n, a1, a2, a3, a4, a5);
-  }
   return 0;
 }
 
-extern "C"
-long syscall_SYS_set_thread_area(struct user_desc *u_info)
-{
-  if (UNLIKELY(!u_info)) return -EINVAL;
-#ifdef __x86_64__
-  x86::CPU::set_fs(u_info);
-#else
-  x86::CPU::set_gs(u_info);
-#endif
-  return 0;
-}

src/musl/access.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 
 #include <fs/vfs.hpp>
 

src/musl/brk.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <string.h>
 #include <os.hpp>
 #include <errno.h>

src/musl/chmod.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 
 static long sys_chmod(const char* /*path*/, mode_t /*mode*/) {

src/musl/chown.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <unistd.h>
 
 static long sys_chown(const char* /*path*/, uid_t /*owner*/, gid_t /*group*/)

src/musl/clock_gettime.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 
 static long sys_clock_gettime(clockid_t clk_id, struct timespec* tp)
 {

src/musl/close.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <posix/fd_map.hpp>
 
 static long sys_close(int fd)

src/musl/cwd.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <unistd.h>
 
 #include <fs/vfs.hpp>

src/musl/dup3.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/types.h>
 #include <unistd.h>
 

src/musl/execve.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/types.h>
 #include <unistd.h>
 

src/musl/exit.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <arch.hpp>
 #include <string>
 #include <os>

src/musl/faccessat.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 #include <fcntl.h>
 

src/musl/faccessat2.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 #include <fcntl.h>
 

src/musl/fchdir.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <unistd.h>
 
 static long sys_fchdir(int /*fd*/)

src/musl/fchmod.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 
 static long sys_fchmod(int /*fd*/, mode_t /*mode*/) {

src/musl/fchmodat.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 #include <fcntl.h>
 

src/musl/fchmodat2.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 #include <fcntl.h>
 

src/musl/fchown.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <unistd.h>
 
 static long sys_fchown(int /*fd*/, uid_t /*owner*/, gid_t /*group*/)

src/musl/fcntl.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <posix/fd_map.hpp>
 
 static long sys_fcntl(int fd, int cmd, va_list va)

src/musl/fstat.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 
 #include <posix/fd_map.hpp>

src/musl/fstatat.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 #include <limits.h>
 #include <posix/fd_map.hpp>

src/musl/fsync.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <unistd.h>
 
 static long sys_fsync(int /*fd*/)

src/musl/ftruncate.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <unistd.h>
 #include <sys/types.h>
 

src/musl/getdents.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <dirent.h>
 #include <posix/fd_map.hpp>
 

src/musl/geteuid.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <unistd.h>
 #include <sys/types.h>
 

src/musl/getgid.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/types.h>
 
 static long sys_getgid()

src/musl/getpid.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 
 int sys_getpid() {
   return 1;

src/musl/getrandom.cpp

@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <kernel/rng.hpp>
 
 // TODO: flags are ignored.