use the rust-toolchain

Signed-off-by: Andy-Python-Programmer <[email protected]>

Author: Andy-Python-Programmer

.gitignore

@@ -22,3 +22,5 @@ base-files/doom1.wad
 # Wayland test client and server executables: (todo: remove these)
 base-files/client
 base-files/server
+
+userland/.cargo/config.toml

.vscode/settings.json

@@ -4,9 +4,9 @@
         "./userland/Cargo.toml"
     ],
     "rust-analyzer.checkOnSave.allTargets": false,
-    "rust-analyzer.checkOnSave.extraArgs": [
-        "-Zbuild-std=core,alloc"
-    ],
+    // "rust-analyzer.checkOnSave.extraArgs": [
+    //     "-Zbuild-std=core,alloc"
+    // ],
     "editor.formatOnSave": true,
     "files.associations": {
         "stdio.h": "c",

aero.py

@@ -71,6 +71,54 @@
 """
 
 
+def log_info(msg):
+    """
+    Logs a message with info log level.
+    """
+    print(f"\033[1m\033[92minfo\033[0m: {msg}")
+
+
+def download_userland_host_rust():
+    out_file = os.path.join(BUNDLED_DIR, "host-rust-prebuilt.tar.gz")
+
+    # we have already cloned the toolchain
+    if os.path.exists(out_file):
+        return
+
+    log_info("downloading prebuilt userland host rust toolchain")
+
+    cmd = r"""
+    wget --load-cookies /tmp/cookies.txt "https://docs.google.com/uc?export=download&confirm=$(wget --quiet --save-cookies /tmp/cookies.txt --keep-session-cookies --no-check-certificate "https://docs.google.com/uc?export=download&id=FILE_HASH" -O- | sed -rn 's/.*confirm=([0-9A-Za-z_]+).*/\1\n/p')&id=FILE_HASH" -O OUTPUT_FILE && rm -rf /tmp/cookies.txt
+    """.replace("FILE_HASH", "1TTC9qa1z-KdLaQkhgMCYxLE5nuKg4gcx").replace("OUTPUT_FILE", out_file)
+
+    subprocess.run(cmd, shell=True)
+
+    log_info("extracting prebuilt userland host rust toolchain")
+
+    # the toolchain is compressed, so we need to extract it
+    file = tarfile.open(out_file)
+    file.extractall(os.path.join(BUNDLED_DIR, "host-rust-prebuilt"))
+    file.close()
+
+
+def get_userland_tool():
+    toolchain = os.path.join(SYSROOT_DIR, "tools")
+
+    if os.path.exists(toolchain):
+        return toolchain
+
+    return os.path.join(BUNDLED_DIR, "host-rust-prebuilt/aero")
+
+
+def get_userland_package():
+    toolchain = os.path.join(SYSROOT_DIR, "packages")
+
+    if os.path.exists(toolchain):
+        return toolchain
+
+    return os.path.join(BUNDLED_DIR, "host-rust-prebuilt/aero")
+
+
 def remove_prefix(string: str, prefix: str):
     if string.startswith(prefix):
         return string[len(prefix):]
@@ -180,6 +228,9 @@ def download_bundled():
         run_command(['git', 'clone', '--branch', 'v3.0-branch-binary',
                     '--depth', '1', LIMINE_URL, limine_path])
 
+    if not os.path.exists(SYSROOT_DIR):
+        download_userland_host_rust()
+
 
 def extract_artifacts(stdout):
     result = []
@@ -195,13 +246,13 @@ def extract_artifacts(stdout):
     return result
 
 
-def build_cargo_workspace(cwd, command, args):
-    code, _, _ = run_command(['cargo', command, *args], cwd=cwd)
+def build_cargo_workspace(cwd, command, args, cargo="cargo"):
+    code, _, _ = run_command([cargo, command, *args], cwd=cwd)
 
     if code != 0:
         return None
 
-    _, stdout, _ = run_command(['cargo', command, *args, '--message-format=json'],
+    _, stdout, _ = run_command([cargo, command, *args, '--message-format=json'],
                                stdout=subprocess.PIPE,
                                stderr=subprocess.DEVNULL,
                                cwd=cwd)
@@ -292,8 +343,31 @@ def build_userland_sysroot(args):
 
 
 def build_userland(args):
+    HOST_CARGO = "host-cargo/bin/cargo"
+    HOST_RUST = "host-rust/bin/rustc"
+    HOST_GCC = "host-gcc/bin/x86_64-aero-gcc"
+    HOST_BINUTILS = "host-binutils/x86_64-aero/bin"
+    PACKAGE_MLIBC = "mlibc"
+
+    tool_dir = get_userland_tool()
+    pkg_dir = get_userland_package()
+
+    def get_cargo(): return os.path.join('..', tool_dir, HOST_CARGO)
+    def get_rustc(): return os.path.join('..', tool_dir, HOST_RUST)
+    def get_gcc(): return os.path.join('..', tool_dir, HOST_GCC)
+    def get_binutils(): return os.path.join("..", tool_dir, HOST_BINUTILS)
+    def get_mlibc(): return os.path.join("..", pkg_dir, PACKAGE_MLIBC)
+
     command = 'build'
-    cmd_args = []
+    cmd_args = ["--target", "x86_64-unknown-aero-system",
+
+                # cargo config
+                "--config", f"build.rustc = '{get_rustc()}'",
+                "--config", "build.target = 'x86_64-unknown-aero-system'",
+                "--config", f"build.rustflags = ['-C', 'link-args=-no-pie -B {get_binutils()} --sysroot {get_mlibc()}', '-lc']",
+                "--config", f"target.x86_64-unknown-aero-system.linker = '{get_gcc()}'",
+
+                "-Z", "unstable-options"]
 
     if not args.debug:
         cmd_args += ['--release']
@@ -302,9 +376,9 @@ def build_userland(args):
         command = 'check'
 
     if args.test:
-        return build_cargo_workspace('userland', 'build', ['--package', 'utest', *cmd_args])
+        return build_cargo_workspace('userland', 'build', ['--package', 'utest', *cmd_args], get_cargo())
     else:
-        return build_cargo_workspace('userland', command, cmd_args)
+        return build_cargo_workspace('userland', command, cmd_args, get_cargo())
 
     # TODO: Userland check
     # elif args.check:
@@ -378,6 +452,15 @@ def cp(src, dest):
             os.makedirs(os.path.dirname(dest_file), exist_ok=True)
             shutil.copy(file, dest_file)
 
+    # dynamic linker (ld.so)
+    mlibc = os.path.join(get_userland_package(), "mlibc")
+    # gcc libraries required for rust programs
+    gcc = os.path.join(get_userland_package(), "gcc")
+
+    if "host-rust-prebuilt" in str(mlibc):
+        cp(mlibc, initramfs_root)
+        cp(gcc, initramfs_root)
+
     cp(BASE_FILES_DIR, initramfs_root)
 
     for file in user_bins:

patches/mlibc/mlibc.patch

@@ -1,4 +1,4 @@
-From 989da4c4aa01ce3ad7a52986f0492a6b565add28 Mon Sep 17 00:00:00 2001
+From 7483398f8048d7b25eae2015a6d67fc1feb061e6 Mon Sep 17 00:00:00 2001
 From: Andy-Python-Programmer <[email protected]>
 Date: Thu, 10 Feb 2022 19:12:25 +1100
 Subject: [PATCH] yes
@@ -7,12 +7,12 @@ Signed-off-by: Andy-Python-Programmer <[email protected]>
 ---
  .gitignore                          |  3 +
  options/rtdl/generic/linker.cpp     |  2 +-
- sysdeps/aero/generic/aero.cpp       | 12 +++-
+ sysdeps/aero/generic/aero.cpp       | 26 ++++++--
  sysdeps/aero/generic/filesystem.cpp | 97 ++++++++++++++++++++++++++---
  sysdeps/aero/generic/signals.cpp    |  8 ++-
  sysdeps/aero/generic/sockets.cpp    | 59 ++++++++++++++++++
- sysdeps/aero/include/aero/syscall.h | 11 ++++
- 7 files changed, 179 insertions(+), 13 deletions(-)
+ sysdeps/aero/include/aero/syscall.h | 12 ++++
+ 7 files changed, 191 insertions(+), 16 deletions(-)
 
 diff --git a/.gitignore b/.gitignore
 index dbb35e8b..20c8d4c3 100644
@@ -39,10 +39,34 @@ index 53264175..38ba8c9f 100644
 
  #if defined(__x86_64__)
 diff --git a/sysdeps/aero/generic/aero.cpp b/sysdeps/aero/generic/aero.cpp
-index 7de909f5..4281beb9 100644
+index 7de909f5..c8d076a5 100644
 --- a/sysdeps/aero/generic/aero.cpp
 +++ b/sysdeps/aero/generic/aero.cpp
-@@ -173,7 +173,15 @@ int sys_getcwd(char *buffer, size_t size) {
+@@ -131,12 +131,20 @@ void sys_exit(int status) {
+ pid_t sys_getpid() {
+     auto result = syscall(SYS_GETPID);
+ 
+-    // SAFETY: getpid does not return any errors (ie. the call is always
+-    // successful).
+-    __ensure(result >= 0);
++    __ensure(result >= 0); // getpid() cannot fail.
+     return result;
+ }
+ 
++int sys_kill(int pid, int sig) {
++    auto result = syscall(SYS_KILL, pid, sig);
++
++    if (result < 0) {
++        return -result;
++    }
++
++    return 0;
++}
++
+ pid_t sys_getpgid(pid_t pid, pid_t *pgid) {
+     mlibc::infoLogger() << "sys_getpgid() is unimplemented" << frg::endlog;
+     *pgid = 0;
+@@ -173,7 +181,15 @@ int sys_getcwd(char *buffer, size_t size) {
      return 0;
  }
 
@@ -59,7 +83,7 @@ index 7de909f5..4281beb9 100644
 
  int sys_gethostname(char *buffer, size_t bufsize) {
      auto result = syscall(SYS_GETHOSTNAME, buffer, bufsize);
-@@ -286,7 +294,7 @@ int sys_execve(const char *path, char *const argv[], char *const envp[]) {
+@@ -286,7 +302,7 @@ int sys_execve(const char *path, char *const argv[], char *const envp[]) {
      __builtin_unreachable();
  }
 
@@ -292,10 +316,10 @@ index e69de29b..b6b18fe7 100644
 +}
 +} // namespace mlibc
 diff --git a/sysdeps/aero/include/aero/syscall.h b/sysdeps/aero/include/aero/syscall.h
-index 07b1b51b..6487cd85 100644
+index 07b1b51b..b6763b63 100644
 --- a/sysdeps/aero/include/aero/syscall.h
 +++ b/sysdeps/aero/include/aero/syscall.h
-@@ -49,6 +49,17 @@
+@@ -49,6 +49,18 @@
  #define SYS_DUP 42
  #define SYS_FCNTL 43
  #define SYS_DUP2 44
@@ -310,6 +334,7 @@ index 07b1b51b..6487cd85 100644
 +#define SYS_EPOLL_PWAIT 53
 +#define SYS_EPOLL_CTL 54
 +#define SYS_EVENT_FD 55
++#define SYS_KILL 56
 
  // Invalid syscall used to trigger a log error in the kernel (as a hint)
  // so, that we can implement the syscall in the kernel.

src/aero_kernel/src/arch/x86_64/interrupts/exceptions.rs

@@ -168,8 +168,6 @@ pub(super) fn page_fault(stack: &mut InterruptErrorStack) {
 
             let task = scheduler::get_scheduler().current_task();
             task.signal(aero_syscall::signal::SIGSEGV);
-
-            return;
         } else if !signal {
         } else {
             return;

src/aero_kernel/src/arch/x86_64/syscall.rs

@@ -5,6 +5,7 @@ use crate::arch::gdt::GdtEntryType;
 use crate::mem::paging::VirtAddr;
 use crate::userland::scheduler;
 use crate::utils::io;
+use crate::utils::sync::IrqGuard;
 
 use super::interrupts::InterruptErrorStack;
 
@@ -21,6 +22,8 @@ const ARCH_GET_GS: usize = 0x1004;
 fn arch_prctl(command: usize, address: usize) -> Result<usize, AeroSyscallError> {
     match command {
         ARCH_SET_FS => unsafe {
+            let _guard = IrqGuard::new();
+
             scheduler::get_scheduler()
                 .current_task()
                 .arch_task_mut()
@@ -36,6 +39,8 @@ fn arch_prctl(command: usize, address: usize) -> Result<usize, AeroSyscallError>
             .as_u64() as usize),
 
         ARCH_SET_GS => unsafe {
+            let _guard = IrqGuard::new();
+
             scheduler::get_scheduler()
                 .current_task()
                 .arch_task_mut()

src/aero_kernel/src/arch/x86_64/task.rs

@@ -443,16 +443,12 @@ pub fn arch_task_spinup(from: &mut ArchTask, to: &ArchTask) {
         super::gdt::get_task_state_segement().rsp[0] = kstackp;
         io::wrmsr(io::IA32_SYSENTER_ESP, kstackp);
 
-        task_spinup(&mut from.context, to.context.as_ref());
-
-        // make a restore point for the current FS base.
-        from.fs_base = VirtAddr::new(io::rdmsr(io::IA32_FS_BASE));
         // switch to the new FS base.
         io::wrmsr(io::IA32_FS_BASE, to.fs_base.as_u64());
 
-        // make a restore point for the current GS base.
-        from.gs_base = VirtAddr::new(io::rdmsr(io::IA32_KERNEL_GSBASE));
         // update the swap GS target to point to the new GS base.
         io::wrmsr(io::IA32_KERNEL_GSBASE, to.gs_base.as_u64());
+
+        task_spinup(&mut from.context, to.context.as_ref());
     }
 }

src/aero_kernel/src/syscall/fs.rs

@@ -228,7 +228,17 @@ pub fn ioctl(fd: usize, command: usize, argument: usize) -> Result<usize, AeroSy
         .get_handle(fd)
         .ok_or(AeroSyscallError::EBADFD)?;
 
-    Ok(handle.inode().ioctl(command, argument)?)
+    match command {
+        // Sets the close-on-exec file descriptor flag. This is equivalent
+        // to `fcntl(fd, F_SETFD, FD_CLOEXEC)`
+        FIOCLEX => {
+            handle.fd_flags.lock().insert(FdFlags::CLOEXEC);
+            return Ok(0x00);
+        }
+
+        // Handle file specific ioctl:
+        _ => Ok(handle.inode().ioctl(command, argument)?),
+    }
 }
 
 #[syscall]

src/aero_kernel/src/syscall/mod.rs

@@ -181,6 +181,7 @@ pub fn generic_do_syscall(
         SYS_SIGACTION => process::sigaction(b, c, d, e),
         SYS_SIGPROCMASK => process::sigprocmask(b, c, d),
         SYS_CLONE => process::clone(b, c),
+        SYS_KILL => process::kill(b, c),
 
         SYS_READ => fs::read(b, c, d),
         SYS_OPEN => fs::open(b, c, d, e),

src/aero_kernel/src/syscall/process.rs

@@ -29,6 +29,7 @@ use crate::fs::Path;
 use crate::mem::paging::VirtAddr;
 use crate::userland::scheduler;
 use crate::userland::signals::SignalEntry;
+use crate::userland::task::TaskId;
 use crate::utils::sync::IrqGuard;
 
 static HOSTNAME: Once<Mutex<String>> = Once::new();
@@ -98,6 +99,21 @@ pub fn clone(entry: usize, stack: usize) -> Result<usize, AeroSyscallError> {
     Ok(cloned.pid().as_usize())
 }
 
+#[syscall]
+pub fn kill(pid: usize, signal: usize) -> Result<usize, AeroSyscallError> {
+    // If pid is positive, then signal is sent to the process with that pid.
+    if pid > 0 {
+        let task = scheduler::get_scheduler()
+            .find_task(TaskId::new(pid))
+            .ok_or(AeroSyscallError::ESRCH)?;
+
+        task.signal(signal);
+        Ok(0)
+    } else {
+        unimplemented!()
+    }
+}
+
 #[syscall]
 pub fn exec(
     path: &Path,