syscall: task: implement thread_self

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 4.0)
 project(mango C ASM)
 
 if (NOT BUILD_TOOLS_DIR)
@@ -28,8 +28,6 @@ file(GLOB_RECURSE arch_sources_c arch/${kernel_arch}/*.c)
 file(GLOB_RECURSE arch_sources_asm arch/${kernel_arch}/*.S)
 file(GLOB_RECURSE arch_headers arch/${kernel_arch}/*.h)
 
-set_property(SOURCE ${arch_sources_asm} PROPERTY LANGUAGE C)
-
 add_executable(${kernel_exe_name}
 	${kernel_sources}
 	${kernel_headers}

arch/x86_64/config.cmake

@@ -1,4 +1,5 @@
 target_compile_options(${kernel_exe_name} PRIVATE
 	-z max-page-size=0x1000 -m64 -mcmodel=large -mno-red-zone -mno-mmx
 	-mno-sse -mno-sse2 -D_64BIT -DBYTE_ORDER=1234)
-target_link_libraries(${kernel_exe_name} "-z max-page-size=0x1000" "-T ${CMAKE_CURRENT_SOURCE_DIR}/arch/x86_64/layout.ld")
+target_link_libraries(${kernel_exe_name} "-static -z max-page-size=0x1000" "-T ${CMAKE_CURRENT_SOURCE_DIR}/arch/x86_64/layout.ld")
+

include/kernel/syscall.h

@@ -67,6 +67,7 @@ extern kern_status_t sys_task_config_set(
 	const void *ptr,
 	size_t len);
 
+extern kern_status_t sys_thread_self(kern_handle_t *out);
 extern kern_status_t sys_thread_start(kern_handle_t thread);
 extern kern_status_t sys_thread_exit(void);
 extern kern_status_t sys_thread_config_get(

libmango/CMakeLists.txt

@@ -1,7 +1,6 @@
 file(GLOB headers ${CMAKE_CURRENT_SOURCE_DIR}/include/mango/*.h)
 file(GLOB asm_sources
 	${CMAKE_CURRENT_SOURCE_DIR}/arch/${CMAKE_SYSTEM_PROCESSOR}/*.S)
-set_property(SOURCE ${asm_sources} PROPERTY LANGUAGE C)
 
 set(public_include_dirs
 	${CMAKE_CURRENT_SOURCE_DIR}/include

libmango/arch/x86_64/syscall.S

@@ -56,13 +56,14 @@
 .endm
 
 SYSCALL_GATE task_exit SYS_TASK_EXIT 1
-SYSCALL_GATE task_self SYS_TASK_SELF 0
+SYSCALL_GATE task_self SYS_TASK_SELF 1
 SYSCALL_GATE task_create SYS_TASK_CREATE 5
 SYSCALL_GATE task_create_thread SYS_TASK_CREATE_THREAD 6
 SYSCALL_GATE task_get_address_space SYS_TASK_GET_ADDRESS_SPACE 1
 SYSCALL_GATE task_config_get SYS_TASK_CONFIG_GET 4
 SYSCALL_GATE task_config_set SYS_TASK_CONFIG_SET 4
 
+SYSCALL_GATE thread_self SYS_THREAD_SELF 1
 SYSCALL_GATE thread_start SYS_THREAD_START 1
 SYSCALL_GATE thread_exit SYS_THREAD_EXIT 0
 SYSCALL_GATE thread_config_get SYS_THREAD_CONFIG_GET 4

libmango/include-user/mango/task.h

@@ -34,6 +34,7 @@ extern kern_status_t task_config_set(
 	const void *ptr,
 	size_t len);
 
+extern kern_status_t thread_self(kern_handle_t *out);
 extern kern_status_t thread_start(kern_handle_t thread);
 extern kern_status_t thread_exit(void);
 extern kern_status_t thread_config_get(

libmango/include/mango/syscall.h

@@ -1,52 +1,53 @@
 #ifndef MANGO_SYSCALL_H_
 #define MANGO_SYSCALL_H_
 
-#define SYS_KERN_LOG                    0x00u
+#define SYS_KERN_LOG                    1
-#define SYS_KERN_HANDLE_CLOSE           0x01u
+#define SYS_KERN_HANDLE_CLOSE           2
-#define SYS_KERN_HANDLE_DUPLICATE       0x02u
+#define SYS_KERN_HANDLE_DUPLICATE       3
-#define SYS_KERN_CONFIG_GET             0x03u
+#define SYS_KERN_CONFIG_GET             4
-#define SYS_KERN_CONFIG_SET             0x04u
+#define SYS_KERN_CONFIG_SET             5
-#define SYS_KERN_OBJECT_WAIT            0x05u
+#define SYS_KERN_OBJECT_WAIT            6
-#define SYS_KERN_OBJECT_WAIT_ASYNC      0x06u
+#define SYS_KERN_OBJECT_WAIT_ASYNC      7
-#define SYS_TASK_EXIT                   0x07u
+#define SYS_TASK_EXIT                   8
-#define SYS_TASK_SELF                   0x08u
+#define SYS_TASK_SELF                   9
-#define SYS_TASK_CREATE                 0x09u
+#define SYS_TASK_CREATE                 10
-#define SYS_TASK_CREATE_THREAD          0x0Au
+#define SYS_TASK_CREATE_THREAD          11
-#define SYS_TASK_GET_ADDRESS_SPACE      0x0Bu
+#define SYS_TASK_GET_ADDRESS_SPACE      12
-#define SYS_TASK_CONFIG_GET             0x2Au
+#define SYS_TASK_CONFIG_GET             13
-#define SYS_TASK_CONFIG_SET             0x2Bu
+#define SYS_TASK_CONFIG_SET             14
-#define SYS_THREAD_START                0x0Cu
+#define SYS_THREAD_SELF                 15
-#define SYS_THREAD_EXIT                 0x2Eu
+#define SYS_THREAD_START                16
-#define SYS_THREAD_CONFIG_GET           0x2Cu
+#define SYS_THREAD_EXIT                 17
-#define SYS_THREAD_CONFIG_SET           0x2Du
+#define SYS_THREAD_CONFIG_GET           18
-#define SYS_VM_OBJECT_CREATE            0x0Du
+#define SYS_THREAD_CONFIG_SET           19
-#define SYS_VM_OBJECT_READ              0x0Eu
+#define SYS_VM_OBJECT_CREATE            20
-#define SYS_VM_OBJECT_WRITE             0x0Fu
+#define SYS_VM_OBJECT_READ              21
-#define SYS_VM_OBJECT_COPY              0x10u
+#define SYS_VM_OBJECT_WRITE             22
-#define SYS_ADDRESS_SPACE_READ          0x11u
+#define SYS_VM_OBJECT_COPY              23
-#define SYS_ADDRESS_SPACE_WRITE         0x12u
+#define SYS_ADDRESS_SPACE_READ          24
-#define SYS_ADDRESS_SPACE_MAP           0x13u
+#define SYS_ADDRESS_SPACE_WRITE         25
-#define SYS_ADDRESS_SPACE_UNMAP         0x14u
+#define SYS_ADDRESS_SPACE_MAP           26
-#define SYS_ADDRESS_SPACE_RESERVE       0x15u
+#define SYS_ADDRESS_SPACE_UNMAP         27
-#define SYS_ADDRESS_SPACE_RELEASE       0x16u
+#define SYS_ADDRESS_SPACE_RESERVE       28
-#define SYS_MSG_SEND                    0x17u
+#define SYS_ADDRESS_SPACE_RELEASE       29
-#define SYS_MSG_RECV                    0x18u
+#define SYS_MSG_SEND                    30
-#define SYS_MSG_REPLY                   0x19u
+#define SYS_MSG_RECV                    31
-#define SYS_MSG_READ                    0x1Au
+#define SYS_MSG_REPLY                   32
-#define SYS_MSG_WRITE                   0x1Bu
+#define SYS_MSG_READ                    33
-#define SYS_CHANNEL_CREATE              0x1Cu
+#define SYS_MSG_WRITE                   34
-#define SYS_PORT_CREATE                 0x1Du
+#define SYS_CHANNEL_CREATE              35
-#define SYS_PORT_CONNECT                0x1Eu
+#define SYS_PORT_CREATE                 36
-#define SYS_PORT_DISCONNECT             0x1Fu
+#define SYS_PORT_CONNECT                37
-#define SYS_EQUEUE_CREATE               0x20u
+#define SYS_PORT_DISCONNECT             38
-#define SYS_EQUEUE_DEQUEUE              0x21u
+#define SYS_EQUEUE_CREATE               39
-#define SYS_VM_CONTROLLER_CREATE        0x22u
+#define SYS_EQUEUE_DEQUEUE              40
-#define SYS_VM_CONTROLLER_RECV          0x23u
+#define SYS_VM_CONTROLLER_CREATE        41
-#define SYS_VM_CONTROLLER_RECV_ASYNC    0x24u
+#define SYS_VM_CONTROLLER_RECV          42
-#define SYS_VM_CONTROLLER_CREATE_OBJECT 0x25u
+#define SYS_VM_CONTROLLER_RECV_ASYNC    43
-#define SYS_VM_CONTROLLER_DETACH_OBJECT 0x26u
+#define SYS_VM_CONTROLLER_CREATE_OBJECT 44
-#define SYS_VM_CONTROLLER_SUPPLY_PAGES  0x27u
+#define SYS_VM_CONTROLLER_DETACH_OBJECT 45
-#define SYS_FUTEX_WAIT                  0x28u
+#define SYS_VM_CONTROLLER_SUPPLY_PAGES  46
-#define SYS_FUTEX_WAKE                  0x29u
+#define SYS_FUTEX_WAIT                  47
+#define SYS_FUTEX_WAKE                  48
 
 #endif

sched/task.c

@@ -330,11 +330,11 @@ void task_exit(int status)
 	task_unlock(self);
 	handle_table_destroy(handles);
 
-	printk("thread %s[%u.%u] killed",
+	tracek("thread %s[%u.%u] killed",
 	       self->t_name,
 	       self->t_id,
 	       cur_thread->tr_id);
-	printk("task %s[%u] killed (%u, %u)",
+	tracek("task %s[%u] killed (%u, %u)",
 	       self->t_name,
 	       self->t_id,
 	       self->t_base.ob_refcount,

sched/thread.c

@@ -148,7 +148,7 @@ void thread_exit(void)
 	thread_lock_irqsave(self, &flags);
 	self->tr_state = THREAD_STOPPED;
 	object_assert_signal(&self->tr_base, THREAD_SIGNAL_STOPPED);
-	printk("thread %s[%u.%u] exited",
+	tracek("thread %s[%u.%u] exited",
 	       self->tr_parent->t_name,
 	       self->tr_parent->t_id,
 	       self->tr_id);
@@ -184,7 +184,7 @@ void thread_kill(struct thread *thread)
 	}
 
 	object_assert_signal(&thread->tr_base, THREAD_SIGNAL_STOPPED);
-	printk("thread %s[%u.%u] killed",
+	tracek("thread %s[%u.%u] killed",
 	       thread->tr_parent->t_name,
 	       thread->tr_parent->t_id,
 	       thread->tr_id);

syscall/dispatch.c

@@ -10,6 +10,7 @@ static const virt_addr_t syscall_table[] = {
 	SYSCALL_TABLE_ENTRY(TASK_CREATE, task_create),
 	SYSCALL_TABLE_ENTRY(TASK_CREATE_THREAD, task_create_thread),
 	SYSCALL_TABLE_ENTRY(TASK_GET_ADDRESS_SPACE, task_get_address_space),
+	SYSCALL_TABLE_ENTRY(THREAD_SELF, thread_self),
 	SYSCALL_TABLE_ENTRY(THREAD_START, thread_start),
 	SYSCALL_TABLE_ENTRY(THREAD_EXIT, thread_exit),
 	SYSCALL_TABLE_ENTRY(THREAD_CONFIG_GET, thread_config_get),

syscall/task.c

@@ -8,8 +8,10 @@
 
 extern kern_status_t sys_task_exit(int status)
 {
+#if defined(TRACE)
 	struct task *self = current_task();
 	printk("%s[%d]: task_exit(%d)", self->t_name, self->t_id, status);
+#endif
 	task_exit(status);
 	return KERN_FATAL_ERROR;
 }
@@ -260,6 +262,37 @@ kern_status_t sys_task_get_address_space(
 	return KERN_OK;
 }
 
+kern_status_t sys_thread_self(kern_handle_t *out)
+{
+	struct task *self = current_task();
+	if (!validate_access_w(self, out, sizeof *out)) {
+		return KERN_MEMORY_FAULT;
+	}
+
+	struct thread *self_thread = current_thread();
+
+	unsigned long flags;
+	task_lock_irqsave(self, &flags);
+
+	struct handle *handle_slot = NULL;
+	kern_handle_t handle;
+	kern_status_t status = handle_table_alloc_handle(
+		self->t_handles,
+		&handle_slot,
+		&handle);
+	task_unlock_irqrestore(self, flags);
+
+	if (status != KERN_OK) {
+		return status;
+	}
+
+	object_add_handle(&self_thread->tr_base);
+	handle_slot->h_object = &self_thread->tr_base;
+
+	*out = handle;
+	return KERN_OK;
+}
+
 kern_status_t sys_thread_start(kern_handle_t thread_handle)
 {
 	unsigned long flags;

vm/address-space.c

@@ -4,6 +4,8 @@
 #include <kernel/object.h>
 #include <kernel/panic.h>
 #include <kernel/printk.h>
+#include <kernel/sched.h>
+#include <kernel/task.h>
 #include <kernel/util.h>
 #include <kernel/vm-object.h>
 #include <mango/status.h>
@@ -1202,7 +1204,7 @@ bool address_space_validate_access(
 			return false;
 		}
 
-		i = area->vma_limit;
+		i = area->vma_limit + 1;
 	}
 
 	return true;
@@ -1297,7 +1299,14 @@ kern_status_t address_space_demand_map(
 		object_offset,
 		VMO_ALLOCATE_MISSING_PAGE,
 		NULL);
-	// tracek("vm: mapping %07llx -> %10llx", vm_page_get_paddr(pg), addr);
+#if 0
+	struct task *self = current_task();
+	printk("vm: %s[%d] mapping %07llx -> %10llx",
+	       self->t_name,
+	       self->t_id,
+	       vm_page_get_paddr(pg),
+	       addr);
+#endif
 
 	if (!pg) {
 		return KERN_FATAL_ERROR;

vm/vm-object.c

@@ -281,10 +281,12 @@ static struct vm_page *alloc_page(struct vm_object *vo, off_t offset)
 
 		void *page_buf = vm_page_get_vaddr(page);
 		memset(page_buf, 0x0, vm_page_get_size_bytes(page));
-		tracek("vm-object: [%s] alloc offset %zx -> page %zx",
+#if 0
+		printk("vm-object: [%s] alloc offset %zx -> page %zx",
 		       vo->vo_name,
 		       offset,
 		       vm_page_get_paddr(page));
+#endif
 		page->p_vmo_offset = offset;
 		vo->vo_pages.b_root = &page->p_bnode;
 		btree_insert_fixup(&vo->vo_pages, &page->p_bnode);
@@ -392,6 +394,7 @@ struct vm_page *vm_object_get_page(
 	enum vm_object_flags flags,
 	unsigned long *irq_flags)
 {
+	offset &= ~VM_PAGE_MASK;
 	if (!vo->vo_ctrl && (flags & VMO_ALLOCATE_MISSING_PAGE)) {
 		return alloc_page(vo, offset);
 	}