Merge branch 'user' into dev

15 files changed, 245 insertions, 12 deletions

diff --git a/sys/include/arch/amd64/cpu.h b/sys/include/arch/amd64/cpu.h
index e2ed851..ee9bad7 100644
--- a/sys/include/arch/amd64/cpu.h
+++ b/sys/include/arch/amd64/cpu.h
@@ -110,6 +110,46 @@ amd64_read_gs_base(void)
     return rdmsr(IA32_KERNEL_GS_BASE);
 }
 
+static inline uint64_t
+amd64_read_cr0(void)
+{
+    uint64_t cr0;
+    __ASMV("mov %%cr0, %0" : "=r" (cr0) :: "memory");
+    return cr0;
+}
+
+static inline void
+amd64_write_cr0(uint64_t val)
+{
+    __ASMV("mov %0, %%cr0" :: "r" (val) : "memory");
+}
+
+static inline uint64_t
+amd64_read_cr4(void)
+{
+    uint64_t cr4;
+    __ASMV("mov %%cr4, %0" : "=r" (cr4) :: "memory");
+    return cr4;
+}
+
+static inline void
+amd64_write_cr4(uint64_t val)
+{
+    __ASMV("mov %0, %%cr4" :: "r" (val) : "memory");
+}
+
+static inline void
+amd64_fxsave(void *area)
+{
+    __ASMV("fxsave (%0)" :: "r" (area) : "memory");
+}
+
+static inline void
+amd64_fxrstor(void *area)
+{
+    __ASMV("fxrstor (%0)" :: "r" (area) : "memory");
+}
+
 struct cpu_info *amd64_this_cpu(void);
 
 #endif  /* !_AMD64_CPU_H_ */
diff --git a/sys/include/arch/amd64/frame.h b/sys/include/arch/amd64/frame.h
index a2e1a05..298a836 100644
--- a/sys/include/arch/amd64/frame.h
+++ b/sys/include/arch/amd64/frame.h
@@ -67,5 +67,12 @@ struct trapframe {
     (FRAME)->rsp        = SP;       \
     (FRAME)->ss         = 0x10;     \
 
+#define init_frame_user(FRAME, IP, SP)      \
+    (FRAME)->rip = IP;                      \
+    (FRAME)->cs = 0x18 | 3;                 \
+    (FRAME)->rflags = 0x202;                \
+    (FRAME)->rsp = SP;                      \
+    (FRAME)->ss = 0x20 | 3;                 \
+
 #endif      /* !defined(__ASSEMBLER__) */
 #endif  /* !_AMD64_FRAME_H_ */
diff --git a/sys/include/arch/amd64/pcb.h b/sys/include/arch/amd64/pcb.h
new file mode 100644
index 0000000..0e0aab8
--- /dev/null
+++ b/sys/include/arch/amd64/pcb.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Hyra nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _AMD64_PCB_H_
+#define _AMD64_PCB_H_
+
+#include <sys/types.h>
+
+struct pcb {
+    uint8_t *fpu_state;
+};
+
+#endif  /* !_AMD64_PCB_H_ */
diff --git a/sys/include/arch/amd64/trap.h b/sys/include/arch/amd64/trap.h
index 1019999..c75fa28 100644
--- a/sys/include/arch/amd64/trap.h
+++ b/sys/include/arch/amd64/trap.h
@@ -47,6 +47,7 @@
 #define TRAP_PROTFLT        9       /* General protection */
 #define TRAP_PAGEFLT        10      /* Page fault */
 #define TRAP_NMI            11      /* Non-maskable interrupt */
+#define TRAP_SS             12      /* Stack-segment fault */
 
 /* Trap is coming from user mode */
 #define TRAP_USER           0x100
@@ -65,6 +66,7 @@ void segnp(void *sf);
 void general_prot(void *sf);
 void page_fault(void *sf);
 void nmi(void *sf);
+void ss_fault(void *sf);
 void trap_handler(struct trapframe *tf);
 #else
 .macro handle_trap
diff --git a/sys/include/sys/filedesc.h b/sys/include/sys/filedesc.h
new file mode 100644
index 0000000..ef74fb1
--- /dev/null
+++ b/sys/include/sys/filedesc.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Hyra nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _SYS_FILEDESC_H_
+#define _SYS_FILEDESC_H_
+
+#include <sys/vnode.h>
+#include <sys/spinlock.h>
+#include <sys/types.h>
+
+struct proc;
+
+struct filedesc {
+    int fdno;
+    off_t offset;
+    bool is_dir;
+    struct vnode *vnode;
+    struct spinlock lock;
+};
+
+#if defined(_KERNEL)
+struct filedesc *fd_alloc(struct proc *td);
+struct filedesc *fd_from_fdnum(const struct proc *td, int fdno);
+void fd_close_fdnum(struct proc *td, int fdno);
+#endif
+
+#endif
diff --git a/sys/include/sys/loader.h b/sys/include/sys/loader.h
index c1aa426..74a325c 100644
--- a/sys/include/sys/loader.h
+++ b/sys/include/sys/loader.h
@@ -33,17 +33,22 @@
 #include <sys/types.h>
 #include <vm/pmap.h>
 
-#define AT_NULL   0
-#define AT_IGNORE 1
-#define AT_EXECFD 2
-#define AT_PHDR   3
-#define AT_PHENT  4
-#define AT_PHNUM  5
-#define AT_PAGESZ 6
-#define AT_BASE   7
-#define AT_FLAGS  8
-#define AT_ENTRY  9
-#define AT_SECURE 10
+/* DANGER!: DO NOT CHANGE THESE DEFINES */
+#define AT_NULL 0
+#define AT_ENTRY 1
+#define AT_PHDR 2
+#define AT_PHENT 3
+#define AT_PHNUM 4
+#define AT_EXECPATH 5
+#define AT_SECURE 6
+#define AT_RANDOM 7
+#define AT_EXECFN 8
+
+#define STACK_PUSH(ptr, val) *(--ptr) = val
+#define AUXVAL(ptr, tag, val) __extension__ ({  \
+    STACK_PUSH(ptr, val);                       \
+    STACK_PUSH(ptr, tag);                       \
+});
 
 /* Auxiliary Vector */
 struct auxval {
diff --git a/sys/include/sys/machdep.h b/sys/include/sys/machdep.h
index 713b7db..0c06374 100644
--- a/sys/include/sys/machdep.h
+++ b/sys/include/sys/machdep.h
@@ -32,11 +32,15 @@
 
 #include <sys/types.h>
 #include <sys/cdefs.h>
+#include <sys/proc.h>
 
 #if defined(_KERNEL)
 
 #define MAXCPUS 32
 
+int processor_init_pcb(struct proc *proc);
+int processor_free_pcb(struct proc *proc);
+void processor_switch_to(struct proc *old_td, struct proc *new_td);
 void processor_init(void);
 void processor_halt(void);
 void intr_mask(void);
diff --git a/sys/include/sys/mount.h b/sys/include/sys/mount.h
index 3ac7ec7..209fa3e 100644
--- a/sys/include/sys/mount.h
+++ b/sys/include/sys/mount.h
@@ -33,6 +33,7 @@
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/vnode.h>
+#include <sys/cdefs.h>
 
 #define FS_NAME_MAX 16 /* Max length of FS type name including nul */
 
@@ -54,9 +55,15 @@ struct fs_info {
     char name[FS_NAME_MAX];     /* Filesystem type name */
     struct vfsops *vfsops;      /* Filesystem operations */
     struct mount *mp_root;
+    uint16_t caps;
 };
 
 /*
+ * Filesystem capabilities
+ */
+#define FSCAP_FULLPATH __BIT(0) /* Requires full path per lookup */
+
+/*
  * Mount flags
  */
 #define MNT_RDONLY  0x00000001
diff --git a/sys/include/sys/proc.h b/sys/include/sys/proc.h
index f45e4c6..c6046d7 100644
--- a/sys/include/sys/proc.h
+++ b/sys/include/sys/proc.h
@@ -32,8 +32,13 @@
 
 #include <sys/types.h>
 #include <sys/queue.h>
+#include <sys/filedesc.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
+#include <machine/pcb.h>
+#include <vm/vm.h>
+
+#define PROC_MAX_FDS 256
 
 /*
  * A task running on the CPU e.g., a process or
@@ -43,6 +48,11 @@ struct proc {
     pid_t pid;
     struct cpu_info *cpu;
     struct trapframe *tf;
+    struct pcb pcb;
+    struct vas addrsp;
+    uintptr_t stack_base;
+    uint8_t is_user;
+    struct filedesc *fds[PROC_MAX_FDS];
     TAILQ_ENTRY(proc) link;
 };
 
diff --git a/sys/include/sys/sched.h b/sys/include/sys/sched.h
index d803df0..1fa947e 100644
--- a/sys/include/sys/sched.h
+++ b/sys/include/sys/sched.h
@@ -37,7 +37,9 @@
 #include <machine/cpu.h>
 #include <machine/frame.h>
 
+struct proc *this_td(void);
 void sched_init(void);
+void sched_exit(void);
 void sched_context_switch(struct trapframe *tf);
 
 __noreturn
diff --git a/sys/include/sys/syscall.h b/sys/include/sys/syscall.h
new file mode 100644
index 0000000..66dc5f3
--- /dev/null
+++ b/sys/include/sys/syscall.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Hyra nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _SYS_SYSCALL_H_
+#define _SYS_SYSCALL_H_
+
+#include <sys/types.h>
+#if defined(_KERNEL)
+#include <machine/frame.h>
+#endif
+
+/* Do not reorder */
+enum {
+    SYS_exit = 1,
+    __MAX_SYSCALLS
+};
+
+struct syscall_args {
+    uint64_t code;
+    uint64_t arg0, arg1, arg2, arg3, arg4;
+    uint64_t ip;
+    uint64_t sp;
+};
+
+#if defined(_KERNEL)
+extern uint64_t(*g_syscall_table[__MAX_SYSCALLS])(struct syscall_args *args);
+void __syscall(struct trapframe *tf);
+#endif
+
+#endif
diff --git a/sys/include/sys/vfs.h b/sys/include/sys/vfs.h
index a684c3f..c1bef53 100644
--- a/sys/include/sys/vfs.h
+++ b/sys/include/sys/vfs.h
@@ -42,7 +42,7 @@ void vfs_init(void);
 struct fs_info *vfs_byname(const char *name);
 int vfs_vget(struct vnode *parent, const char *name, struct vnode **vp);
 
-struct vnode *vfs_path_to_node(const char *path);
+int vfs_path_to_node(const char *path, struct vnode **vp);
 char *vfs_get_fname_at(const char *path, size_t idx);
 int vfs_rootname(const char *path, char **new_path);
 bool vfs_is_valid_path(const char *path);
diff --git a/sys/include/sys/vnode.h b/sys/include/sys/vnode.h
index f584356..545e38f 100644
--- a/sys/include/sys/vnode.h
+++ b/sys/include/sys/vnode.h
@@ -47,6 +47,7 @@ struct vnode {
     struct mount *mp;   /* Ptr to vfs vnode is in */
     struct vops *vops;
     struct vnode *parent;
+    struct fs_info *fs; /* Filesystem this vnode belongs to, can be NULL */
     void *data;         /* Filesystem specific data */
 };
 
diff --git a/sys/include/vm/pmap.h b/sys/include/vm/pmap.h
index ebabd32..3380199 100644
--- a/sys/include/vm/pmap.h
+++ b/sys/include/vm/pmap.h
@@ -90,6 +90,12 @@ struct vas pmap_read_vas(void);
 int pmap_map(struct vm_ctx *, struct vas, vaddr_t, paddr_t, vm_prot_t);
 
 /*
+ * Get rid of a virtual address space and free
+ * resources.
+ */
+int pmap_free_vas(struct vm_ctx *, struct vas);
+
+/*
  * Unmap a page.
  */
 int pmap_unmap(struct vm_ctx *, struct vas, vaddr_t);
diff --git a/sys/include/vm/vm.h b/sys/include/vm/vm.h
index 2a24d76..48e1b8f 100644
--- a/sys/include/vm/vm.h
+++ b/sys/include/vm/vm.h
@@ -61,5 +61,6 @@ vm_get_page_size(void)
 
 void vm_init(void);
 struct vm_ctx *vm_get_ctx(void);
+struct vas vm_get_kvas(void);
 
 #endif      /* !_VM_H_ */