RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 06:57:42 +00:00
Code Issues Activity Actions

Kernel+LibPthread: Add support for usermode threads on x86_64

Browse source
This commit is contained in:
Gunnar Beutner 2021-07-01 11:15:00 +02:00 • committed by Andreas Kling
parent 93c741018e
commit 16b9a2d2e1
3 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Kernel/API/Syscall.h
View file

@ -352,10 +352,16 @@ struct SC_create_thread_params {
// a call to pthread_attr_getguardsize() specifying attr shall store in the guardsize // a call to pthread_attr_getguardsize() specifying attr shall store in the guardsize
// parameter the guard size specified by the previous pthread_attr_setguardsize() function call" // parameter the guard size specified by the previous pthread_attr_setguardsize() function call"
// ... ok, if you say so posix. Guess we get to lie to people about guard page size // ... ok, if you say so posix. Guess we get to lie to people about guard page size
unsigned int m_guard_page_size = 0; // Rounded up to PAGE_SIZE unsigned int guard_page_size = 0; // Rounded up to PAGE_SIZE
unsigned int m_reported_guard_page_size = 0; // The lie we tell callers unsigned int reported_guard_page_size = 0; // The lie we tell callers
unsigned int m_stack_size = 4 * MiB; // Default PTHREAD_STACK_MIN unsigned int stack_size = 4 * MiB; // Default PTHREAD_STACK_MIN
void* m_stack_location; // nullptr means any, o.w. process virtual address void* stack_location; // nullptr means any, o.w. process virtual address
# if ARCH(X86_64)
FlatPtr rdi;
FlatPtr rsi;
FlatPtr rcx;
FlatPtr rdx;
# endif
}; };
struct SC_realpath_params { struct SC_realpath_params {

8
Kernel/Syscalls/thread.cpp
View file

@ -70,6 +70,10 @@ KResultOr<FlatPtr> Process::sys$create_thread(void* (*entry)(void*), Userspace<c
regs.rip = (FlatPtr)entry; regs.rip = (FlatPtr)entry;
regs.rflags = 0x0202; regs.rflags = 0x0202;
regs.rsp = user_sp.value(); regs.rsp = user_sp.value();
regs.rdi = params.rdi;
regs.rsi = params.rsi;
regs.rdx = params.rdx;
regs.rcx = params.rcx;
#endif #endif
regs.cr3 = space().page_directory().cr3(); regs.cr3 = space().page_directory().cr3();
@ -81,11 +85,7 @@ KResultOr<FlatPtr> Process::sys$create_thread(void* (*entry)(void*), Userspace<c
ScopedSpinLock lock(g_scheduler_lock); ScopedSpinLock lock(g_scheduler_lock);
thread->set_priority(requested_thread_priority); thread->set_priority(requested_thread_priority);
#if ARCH(I386)
thread->set_state(Thread::State::Runnable); thread->set_state(Thread::State::Runnable);
#else
dbgln("FIXME: Not starting thread {} (because it'd crash)", *thread);
#endif
return thread->tid().value(); return thread->tid().value();
} }

7
Userland/Libraries/LibPthread/pthread.cpp
View file

@ -71,10 +71,17 @@ static int create_thread(pthread_t* thread, void* (*entry)(void*), void* argumen
while (((uintptr_t)stack - 16) % 16 != 0) while (((uintptr_t)stack - 16) % 16 != 0)
push_on_stack(nullptr); push_on_stack(nullptr);
#if ARCH(I386)
push_on_stack((void*)(uintptr_t)thread_params->stack_size); push_on_stack((void*)(uintptr_t)thread_params->stack_size);
push_on_stack(thread_params->stack_location); push_on_stack(thread_params->stack_location);
push_on_stack(argument); push_on_stack(argument);
push_on_stack((void*)entry); push_on_stack((void*)entry);
#else
thread_params->rdi = (FlatPtr)entry;
thread_params->rsi = (FlatPtr)argument;
thread_params->rdx = (FlatPtr)thread_params->stack_location;
thread_params->rcx = thread_params->stack_size;
#endif
VERIFY((uintptr_t)stack % 16 == 0); VERIFY((uintptr_t)stack % 16 == 0);
// Push a fake return address // Push a fake return address