From 28aef30f77e47a20903c326682b83f78a1104502 Mon Sep 17 00:00:00 2001 From: kamkow1 Date: Tue, 6 Jan 2026 23:32:11 +0100 Subject: [PATCH] Implement proc_map () and proc_unmap () syscalls --- include/m/syscall_defs.h | 4 ++++ init/init.c | 11 ++++++---- kernel/amd64/proc.c | 2 ++ kernel/proc/proc.c | 7 +++++- kernel/proc/proc.h | 1 + kernel/syscall/syscall.c | 35 ++++++++++++++++++++++++++++++ libmsl/amd64/syscall.c | 19 ++++++---------- libmsl/m/mem.h | 13 +++++++++++ libmsl/m/proc.c | 10 +++++++++ libmsl/m/proc.h | 6 ++++- libmsl/src.mk | 1 + libmsl/string/.gitignore | 1 + libmsl/string/src.mk | 3 +++ libmsl/string/string.c | 47 ++++++++++++++++++++++++++++++++++++++++ libmsl/string/string.h | 13 +++++++++++ 15 files changed, 155 insertions(+), 18 deletions(-) create mode 100644 libmsl/m/mem.h create mode 100644 libmsl/string/.gitignore create mode 100644 libmsl/string/src.mk create mode 100644 libmsl/string/string.c create mode 100644 libmsl/string/string.h diff --git a/include/m/syscall_defs.h b/include/m/syscall_defs.h index f47ac06..ee6949e 100644 --- a/include/m/syscall_defs.h +++ b/include/m/syscall_defs.h @@ -3,8 +3,12 @@ #define SYS_PROC_QUIT 1 #define SYS_PROC_TEST 2 +#define SYS_PROC_MAP 3 +#define SYS_PROC_UNMAP 4 #define SR_OK 0 #define SR_SYSCALL_NOT_FOUND 1 +#define SR_UNALIGNED 2 +#define SR_OOM_ERROR 3 #endif // _M_SYSCALL_DEFS_H diff --git a/init/init.c b/init/init.c index 9bbdca6..2eed183 100644 --- a/init/init.c +++ b/init/init.c @@ -1,9 +1,12 @@ #include +#include #include +#include void app_main (void) { - m_proc_test (); - m_proc_test (); - m_proc_test (); - m_proc_test (); + m_proc_map (M_PROC_MAP_BASE, 1, PM_PRESENT | PM_RW | PM_USER); + + memset ((void*)M_PROC_MAP_BASE, 0, M_PAGE_SIZE); + + m_proc_unmap (M_PROC_MAP_BASE, 1); } diff --git a/kernel/amd64/proc.c b/kernel/amd64/proc.c index bb84b0b..7b199df 100644 --- a/kernel/amd64/proc.c +++ b/kernel/amd64/proc.c @@ -70,6 +70,8 @@ void proc_cleanup (struct proc* proc) { struct proc_mapping* mapping = list_entry (mapping_link, struct proc_mapping, proc_mappings_link); + DEBUG ("mapping vaddr=%p, paddr=%p, size=%zu\n", mapping->vaddr, mapping->paddr, mapping->size); + pmm_free (mapping->paddr, mapping->size / PAGE_SIZE); list_remove (proc->mappings, mapping_link); free (mapping); diff --git a/kernel/proc/proc.c b/kernel/proc/proc.c index 0eaeedc..dce7d26 100644 --- a/kernel/proc/proc.c +++ b/kernel/proc/proc.c @@ -40,6 +40,9 @@ static bool proc_check_elf (uint8_t* elf) { bool proc_map (struct proc* proc, uintptr_t start_paddr, uintptr_t start_vaddr, size_t pages, uint32_t flags) { + DEBUG ("start_vaddr=%p, start_paddr=%p, pages=%zu, flags=%x\n", start_vaddr, start_paddr, pages, + flags); + struct proc_mapping* mapping = malloc (sizeof (*mapping)); if (mapping == NULL) @@ -49,7 +52,7 @@ bool proc_map (struct proc* proc, uintptr_t start_paddr, uintptr_t start_vaddr, mapping->vaddr = start_vaddr; mapping->size = pages * PAGE_SIZE; - flags &= ~MM_PD_LOCK; /* clear LOCK flag if present, because we lock manualy */ + flags &= ~(MM_PD_LOCK | MM_PD_RELOAD); /* clear LOCK flag if present, because we lock manualy */ spin_lock (&proc->pd.lock); @@ -71,6 +74,8 @@ bool proc_unmap (struct proc* proc, uintptr_t start_vaddr, size_t pages) { struct list_node_link *mapping_link, *mapping_link_tmp; bool used_tail_mapping = false; + DEBUG ("start_vaddr=%p, pages=%zu\n", start_vaddr, pages); + struct proc_mapping* tail_mapping = malloc (sizeof (*tail_mapping)); if (tail_mapping == NULL) return false; diff --git a/kernel/proc/proc.h b/kernel/proc/proc.h index 9f7e990..c9eec43 100644 --- a/kernel/proc/proc.h +++ b/kernel/proc/proc.h @@ -46,6 +46,7 @@ void proc_sched (void); void proc_kill (struct proc* proc); bool proc_map (struct proc* proc, uintptr_t start_paddr, uintptr_t start_vaddr, size_t pages, uint32_t flags); +bool proc_unmap (struct proc* proc, uintptr_t start_vaddr, size_t pages); struct elf_aux proc_load_segments (struct proc* proc, uint8_t* elf); void proc_init (void); diff --git a/kernel/syscall/syscall.c b/kernel/syscall/syscall.c index b73d278..20634fa 100644 --- a/kernel/syscall/syscall.c +++ b/kernel/syscall/syscall.c @@ -1,28 +1,63 @@ #include #include #include +#include #include #include +#include #include #define DEFINE_SYSCALL(name) \ int name (struct proc* proc, uintptr_t UNUSED a1, uintptr_t UNUSED a2, uintptr_t UNUSED a3, \ uintptr_t UNUSED a4, uintptr_t UNUSED a5, uintptr_t UNUSED a6) +/* int proc_quit (void) */ DEFINE_SYSCALL (sys_proc_quit) { proc_kill (proc); proc_sched (); return SR_OK; } +/* int proc_test (void) */ DEFINE_SYSCALL (sys_proc_test) { DEBUG ("test syscall message!\n"); return SR_OK; } +/* int proc_map (uintptr_t vaddr, size_t pages, uint32_t flags) */ +DEFINE_SYSCALL (sys_proc_map) { + uintptr_t vaddr = a1; + size_t pages = (size_t)a2; + uint32_t flags = (uint32_t)a3; + + if (vaddr % PAGE_SIZE != 0) + return -SR_UNALIGNED; + + uintptr_t paddr = pmm_alloc (pages); + if (paddr == PMM_ALLOC_ERR) + return -SR_OOM_ERROR; + + bool ok = proc_map (proc, paddr, vaddr, pages, flags); + return ok ? SR_OK : -SR_OOM_ERROR; +} + +/* int proc_unmap (uintptr_t vaddr, size_t pages) */ +DEFINE_SYSCALL (sys_proc_unmap) { + uintptr_t vaddr = a1; + size_t pages = (size_t)a2; + + if (vaddr % PAGE_SIZE != 0) + return -SR_UNALIGNED; + + bool ok = proc_unmap (proc, vaddr, pages); + return ok ? SR_OK : -SR_OOM_ERROR; +} + static syscall_handler_func_t handler_table[] = { [SYS_PROC_QUIT] = &sys_proc_quit, [SYS_PROC_TEST] = &sys_proc_test, + [SYS_PROC_MAP] = &sys_proc_map, + [SYS_PROC_UNMAP] = &sys_proc_unmap, }; syscall_handler_func_t syscall_find_handler (int syscall_num) { diff --git a/libmsl/amd64/syscall.c b/libmsl/amd64/syscall.c index d106a7b..a40309e 100644 --- a/libmsl/amd64/syscall.c +++ b/libmsl/amd64/syscall.c @@ -5,18 +5,13 @@ int msl_amd64_syscall (int syscall_num, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6) { uint64_t result; - __asm__ volatile ("movq %1, %%rax\n" - "movq %2, %%rdi\n" - "movq %3, %%rsi\n" - "movq %4, %%rdx\n" - "movq %5, %%r10\n" - "movq %6, %%r8\n" - "movq %7, %%r9\n" + __asm__ volatile ("movq %[a4], %%r10\n" + "movq %[a5], %%r8\n" + "movq %[a6], %%r9\n" "syscall\n" - "movq %%rax, %0\n" - : "=r"(result) - : "r"((uint64_t)syscall_num), "r"(a1), "r"(a2), "r"(a3), "r"(a4), "r"(a5), - "r"(a6) - : "memory", "cc", "rcx", "r11"); + : "=a"(result) + : "a"(syscall_num), "D"(a1), "S"(a2), + "d"(a3), [a4] "r"(a4), [a5] "r"(a5), [a6] "r"(a6) + : "r10", "r8", "r9", "r11", "rcx", "cc", "memory"); return (int)result; } diff --git a/libmsl/m/mem.h b/libmsl/m/mem.h new file mode 100644 index 0000000..252f25f --- /dev/null +++ b/libmsl/m/mem.h @@ -0,0 +1,13 @@ +#ifndef _LIBMSL_M_MEM_H +#define _LIBMSL_M_MEM_H + +#if defined(__x86_64__) +#define M_PROC_MAP_BASE 0x0000700000000000 +#define M_PAGE_SIZE 4096 +#endif + +#define PM_PRESENT (1 << 0) +#define PM_RW (1 << 1) +#define PM_USER (1 << 2) + +#endif // _LIBMSL_M_MEM_H diff --git a/libmsl/m/proc.c b/libmsl/m/proc.c index 544fa1f..e5c5398 100644 --- a/libmsl/m/proc.c +++ b/libmsl/m/proc.c @@ -1,6 +1,16 @@ #include #include +#include +#include int m_proc_quit (void) { return m_syscall (SYS_PROC_QUIT, 0, 0, 0, 0, 0, 0); } int m_proc_test (void) { return m_syscall (SYS_PROC_TEST, 0, 0, 0, 0, 0, 0); } + +int m_proc_map (uintptr_t vaddr, size_t pages, uint32_t flags) { + return m_syscall (SYS_PROC_MAP, vaddr, (uintptr_t)pages, (uintptr_t)flags, 0, 0, 0); +} + +int m_proc_unmap (uintptr_t vaddr, size_t pages) { + return m_syscall (SYS_PROC_UNMAP, vaddr, (uintptr_t)pages, 0, 0, 0, 0); +} diff --git a/libmsl/m/proc.h b/libmsl/m/proc.h index 1bb6667..e01c81b 100644 --- a/libmsl/m/proc.h +++ b/libmsl/m/proc.h @@ -1,8 +1,12 @@ #ifndef _LIBMSL_M_PROC_H #define _LIBMSL_M_PROC_H -int m_proc_quit (void); +#include +#include +int m_proc_quit (void); int m_proc_test (void); +int m_proc_map (uintptr_t vaddr, size_t pages, uint32_t flags); +int m_proc_unmap (uintptr_t vaddr, size_t pages); #endif // _LIBMSL_M_PROC_H diff --git a/libmsl/src.mk b/libmsl/src.mk index b61f45d..2d7c2af 100644 --- a/libmsl/src.mk +++ b/libmsl/src.mk @@ -1,3 +1,4 @@ include $(platform)/src.mk include init/src.mk include m/src.mk +include string/src.mk diff --git a/libmsl/string/.gitignore b/libmsl/string/.gitignore new file mode 100644 index 0000000..5761abc --- /dev/null +++ b/libmsl/string/.gitignore @@ -0,0 +1 @@ +*.o diff --git a/libmsl/string/src.mk b/libmsl/string/src.mk new file mode 100644 index 0000000..c3ea4f1 --- /dev/null +++ b/libmsl/string/src.mk @@ -0,0 +1,3 @@ +c += string/string.c + +o += string/string.o diff --git a/libmsl/string/string.c b/libmsl/string/string.c new file mode 100644 index 0000000..76ca357 --- /dev/null +++ b/libmsl/string/string.c @@ -0,0 +1,47 @@ +#include +#include +#include + +size_t memset (void* dst, uint8_t b, size_t n) { + uint8_t* dst1 = dst; + size_t i; + for (i = 0; i < n; i++) + dst1[i] = b; + return i; +} + +size_t memcpy (void* dst, const void* src, size_t n) { + uint8_t* dst1 = dst; + const uint8_t* src1 = src; + size_t i; + for (i = 0; i < n; i++) + dst1[i] = src1[i]; + return i; +} + +// SOURCE: https://stackoverflow.com/a/48967408 +void strncpy (char* dst, const char* src, size_t n) { + size_t i = 0; + while (i++ != n && (*dst++ = *src++)) + ; +} + +size_t strlen (const char* str) { + const char* s; + for (s = str; *s; ++s) + ; + return (s - str); +} + +int memcmp (const void* s1, const void* s2, size_t n) { + unsigned char* p = (unsigned char*)s1; + unsigned char* q = (unsigned char*)s2; + + while (n--) { + if (*p != *q) { + return (int)*p - (int)*q; + } + p++, q++; + } + return 0; +} diff --git a/libmsl/string/string.h b/libmsl/string/string.h new file mode 100644 index 0000000..f679a13 --- /dev/null +++ b/libmsl/string/string.h @@ -0,0 +1,13 @@ +#ifndef _LIBMSL_STRING_STRING_H +#define _LIBMSL_STRING_STRING_H + +#include +#include + +size_t memset (void* dst, uint8_t b, size_t n); +size_t memcpy (void* dst, const void* src, size_t n); +void strncpy (char* dst, const char* src, size_t n); +size_t strlen (const char* str); +int memcmp (const void* s1, const void* s2, size_t n); + +#endif // _LIBMSL_STRING_STRING_H