mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-27 20:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

signals: more general changes

Browse Source
This commit is contained in:
Matheus
2024-05-17 18:48:57 -03:00
parent 7b0cc4c51b
commit 1b63e9b436
13 changed files with 135 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/arch/x86-64/context.asm
+1
View File
@@ -1,6 +1,7 @@
section .text
global arch_context_switch
arch_context_switch:
xor rsi, rsi ; is syscall? (no)
extern sched_userspacecheck
call sched_userspacecheck ; compiled with no_caller_saved_registers
kernel-src/arch/x86-64/syscall.asm
+5 -1
View File
@@ -226,7 +226,11 @@ arch_syscall_entry:
mov rdi, rsp
add rdi, 8 ; context pointer is after r9 argument
extern sched_userspacecheck
xor rsi, rsi
inc rsi ; is syscall? (yes)
; errno already in rdx
mov rcx, rax ; return value
extern sched_userspacecheck ; context, return, errno
call sched_userspacecheck ; compiled with __attribute__((no_caller_saved_registers))
; restore context
kernel-src/include/kernel/signal.h
+1 -1
View File
@@ -152,6 +152,6 @@ void signal_changemask(struct thread_t *thread, int how, sigset_t *new, sigset_t
void signal_signalproc(struct proc_t *proc, int signal);
void signal_signalthread(struct thread_t *thread, int signal, bool urgent);
void signal_pending(struct thread_t *, sigset_t *sigset);
void signal_check(struct thread_t *thread, context_t *context);
void signal_check(struct thread_t *thread, context_t *context, bool syscall, uint64_t syscallret, uint64_t syscallerrno);
#endif
kernel-src/include/x86-64/arch/signal.h
+1
View File
@@ -5,6 +5,7 @@
#define ARCH_SIGNAL_STACK_GROWS_DOWNWARDS 1
#define ARCH_SIGNAL_REDZONE_SIZE 128
#define ARCH_SIGNAL_SYSCALL_INSTRUCTION_SIZE 2
#define ARCH_SIGNAL_GETFROMRETURN(x)
kernel-src/sys/interrupt.c
+2 -2
View File
@@ -95,7 +95,7 @@ static void dopending(context_t *ctx) {
}
}
__attribute__((no_caller_saved_registers)) void sched_userspacecheck(context_t *context);
__attribute__((no_caller_saved_registers)) void sched_userspacecheck(context_t *context, bool syscall, uint64_t syscallret, uint64_t syscallerrno);
void interrupt_isr(int vec, context_t *ctx) {
isr_t *isr = &_cpu()->isr[vec];
@@ -116,7 +116,7 @@ void interrupt_isr(int vec, context_t *ctx) {
isr->eoi(isr);
if (ARCH_CONTEXT_ISUSER(ctx))
sched_userspacecheck(ctx);
sched_userspacecheck(ctx, false, 0, 0);
_cpu()->intstatus = ARCH_CONTEXT_INTSTATUS(ctx);
}
kernel-src/sys/jobctl.c
+34
View File
@@ -288,5 +288,39 @@ void jobctl_procremove(proc_t *proc) {
// proc can be null if the signal is being sent to the calling processes own process group
// since that is only passed from a userland thread, we can assume _cpu()->thread->proc is not null
int jobctl_signal(proc_t *proc, int signal) {
int error = 0;
bool intstatus = interrupt_set(false);
proc_t *leader;
proc_t *tmpproc = _cpu()->thread->proc;
if (proc == NULL) {
spinlock_acquire(&tmpproc->jobctllock);
leader = tmpproc->pgrp.leader ? tmpproc->pgrp.leader : tmpproc;
} else {
spinlock_acquire(&proc->jobctllock);
if (proc->pgrp.leader) {
error = ESRCH;
spinlock_release(&proc->jobctllock);
goto leave;
}
leader = proc;
spinlock_release(&proc->jobctllock);
}
spinlock_acquire(&leader->pgrp.lock);
proc_t *iterator = leader;
while (iterator) {
signal_signalproc(iterator, signal);
iterator = iterator->pgrp.nextmember;
}
spinlock_release(&leader->pgrp.lock);
leave:
if (proc == NULL) {
spinlock_release(&tmpproc->jobctllock);
}
interrupt_set(intstatus);
return error;
}
kernel-src/sys/scheduler.c
+7 -5
View File
@@ -290,11 +290,11 @@ void sched_procexit() {
MUTEX_ACQUIRE(&sched_initproc->mutex, false);
bool haszombie = false;
int belowzombiecount = 0;
while (lastchild && lastchild->sibling) {
if (lastchild->state == SCHED_PROC_STATE_ZOMBIE)
haszombie = true;
++belowzombiecount;
lastchild->parent = sched_initproc;
lastchild = lastchild->sibling;
@@ -308,8 +308,10 @@ void sched_procexit() {
MUTEX_RELEASE(&sched_initproc->mutex);
MUTEX_RELEASE(&proc->mutex);
signal_signalproc(proc->parent, SIGCHLD);
semaphore_signal(&proc->parent->waitsem);
if (haszombie)
// TODO sigaction flag for this
for (int i = 0; i < belowzombiecount; ++i)
semaphore_signal(&sched_initproc->waitsem);
}
@@ -363,7 +365,7 @@ __attribute__((noreturn)) void sched_threadexit() {
}
// called right before going back to userspace in places like the syscall handler or arch_context_switch
__attribute__((no_caller_saved_registers)) void sched_userspacecheck(context_t *context) {
__attribute__((no_caller_saved_registers)) void sched_userspacecheck(context_t *context, bool syscall, uint64_t syscallerrno, uint64_t syscallret) {
thread_t *thread = _cpu()->thread;
if (thread == NULL || ARCH_CONTEXT_ISUSER(context) == false)
return;
@@ -373,7 +375,7 @@ __attribute__((no_caller_saved_registers)) void sched_userspacecheck(context_t *
sched_threadexit();
}
signal_check(thread, context);
signal_check(thread, context, syscall, syscallret, syscallerrno);
}
void sched_stopotherthreads() {
kernel-src/sys/signal.c
+65 -43
View File
@@ -2,6 +2,46 @@
#include <arch/signal.h>
#include <logging.h>
#define ACTION_TERM 0
#define ACTION_IGN 1
#define ACTION_CORE 2
#define ACTION_STOP 3
#define ACTION_CONT 4
static int defaultactions[NSIG] = {
[SIGABRT] = ACTION_CORE,
[SIGALRM] = ACTION_TERM,
[SIGBUS] = ACTION_CORE,
[SIGCHLD] = ACTION_IGN,
[SIGCONT] = ACTION_CONT,
[SIGFPE] = ACTION_CORE,
[SIGHUP] = ACTION_TERM,
[SIGILL] = ACTION_CORE,
[SIGINT] = ACTION_TERM,
[SIGIO] = ACTION_TERM,
[SIGKILL] = ACTION_TERM,
[SIGPIPE] = ACTION_TERM,
[SIGPOLL] = ACTION_TERM,
[SIGPROF] = ACTION_TERM,
[SIGPWR] = ACTION_TERM,
[SIGQUIT] = ACTION_CORE,
[SIGSEGV] = ACTION_CORE,
[SIGSTOP] = ACTION_STOP,
[SIGTSTP] = ACTION_STOP,
[SIGSYS] = ACTION_CORE,
[SIGTERM] = ACTION_TERM,
[SIGTRAP] = ACTION_CORE,
[SIGTTIN] = ACTION_STOP,
[SIGTTOU] = ACTION_STOP,
[SIGURG] = ACTION_IGN,
[SIGUSR1] = ACTION_TERM,
[SIGUSR2] = ACTION_TERM,
[SIGVTALRM] = ACTION_TERM,
[SIGXCPU] = ACTION_CORE,
[SIGXFSZ] = ACTION_CORE,
[SIGWINCH] = ACTION_IGN
};
#define PROCESS_ENTER(proc) \
bool procintstatus = interrupt_set(false); \
spinlock_acquire(&proc->signals.lock);
@@ -99,20 +139,30 @@ void signal_pending(struct thread_t *thread, sigset_t *sigset) {
}
void signal_signalthread(struct thread_t *thread, int signal, bool urgent) {
PROCESS_ENTER(thread->proc);
THREAD_ENTER(thread);
sigset_t *sigset = urgent ? &thread->signals.urgent : &thread->signals.pending;
SIGNAL_SETON(sigset, signal);
if (signal == SIGKILL || signal == SIGSTOP || urgent || SIGNAL_GET(&thread->signals.mask, signal) == 0)
void *address = thread->proc->signals.actions[signal].address;
bool notignored = address != SIG_IGN && ((address == SIG_DFL && defaultactions[signal] != ACTION_IGN) || address != SIG_DFL);
if (signal == SIGKILL || signal == SIGSTOP || urgent || (SIGNAL_GET(&thread->signals.mask, signal) == 0 && notignored)) {
sched_wakeup(thread, SCHED_WAKEUP_REASON_INTERRUPTED);
}
THREAD_LEAVE(thread);
PROCESS_LEAVE(thread->proc);
}
void signal_signalproc(struct proc_t *proc, int signal) {
// first, check if any threads have the signal unmasked, and set as pending for the first one
MUTEX_ACQUIRE(&proc->mutex, false);
PROCESS_ENTER(proc);
void *address = proc->signals.actions[signal].address;
bool notignored = address != SIG_IGN && ((address == SIG_DFL && defaultactions[signal] != ACTION_IGN) || address != SIG_DFL);
for (int i = 0; i < proc->threadtablesize; ++i) {
if (proc->threads[i] == NULL || (proc->threads[i]->flags & SCHED_THREAD_FLAGS_DEAD))
continue;
@@ -124,8 +174,10 @@ void signal_signalproc(struct proc_t *proc, int signal) {
// TODO this
} else if (SIGNAL_GET(&proc->threads[i]->signals.mask, signal) == 0 || signal == SIGKILL || signal == SIGSTOP) {
SIGNAL_SETON(&proc->threads[i]->signals.pending, signal);
// TODO ipi if running isn't self
sched_wakeup(proc->threads[i], SCHED_WAKEUP_REASON_INTERRUPTED);
if (notignored) {
sched_wakeup(proc->threads[i], SCHED_WAKEUP_REASON_INTERRUPTED);
// TODO ipi if running isn't self
}
THREAD_LEAVE(proc->threads[i]);
PROCESS_LEAVE(proc);
MUTEX_RELEASE(&proc->mutex);
@@ -143,47 +195,8 @@ void signal_signalproc(struct proc_t *proc, int signal) {
PROCESS_LEAVE(proc);
}
#define ACTION_TERM 0
#define ACTION_IGN 1
#define ACTION_CORE 2
#define ACTION_STOP 3
#define ACTION_CONT 4
static int defaultactions[NSIG] = {
[SIGABRT] = ACTION_CORE,
[SIGALRM] = ACTION_TERM,
[SIGBUS] = ACTION_CORE,
[SIGCHLD] = ACTION_IGN,
[SIGCONT] = ACTION_CONT,
[SIGFPE] = ACTION_CORE,
[SIGHUP] = ACTION_TERM,
[SIGILL] = ACTION_CORE,
[SIGINT] = ACTION_TERM,
[SIGIO] = ACTION_TERM,
[SIGKILL] = ACTION_TERM,
[SIGPIPE] = ACTION_TERM,
[SIGPOLL] = ACTION_TERM,
[SIGPROF] = ACTION_TERM,
[SIGPWR] = ACTION_TERM,
[SIGQUIT] = ACTION_CORE,
[SIGSEGV] = ACTION_CORE,
[SIGSTOP] = ACTION_STOP,
[SIGTSTP] = ACTION_STOP,
[SIGSYS] = ACTION_CORE,
[SIGTERM] = ACTION_TERM,
[SIGTRAP] = ACTION_CORE,
[SIGTTIN] = ACTION_STOP,
[SIGTTOU] = ACTION_STOP,
[SIGURG] = ACTION_IGN,
[SIGUSR1] = ACTION_TERM,
[SIGUSR2] = ACTION_TERM,
[SIGVTALRM] = ACTION_TERM,
[SIGXCPU] = ACTION_CORE,
[SIGXFSZ] = ACTION_CORE,
[SIGWINCH] = ACTION_IGN
};
void signal_check(struct thread_t *thread, context_t *context) {
void signal_check(struct thread_t *thread, context_t *context, bool syscall, uint64_t syscallret, uint64_t syscallerrno) {
proc_t *proc = thread->proc;
PROCESS_ENTER(proc);
@@ -246,6 +259,8 @@ void signal_check(struct thread_t *thread, context_t *context) {
case ACTION_CORE:
case ACTION_TERM:
proc->status = signal;
THREAD_LEAVE(thread);
PROCESS_LEAVE(proc);
interrupt_set(true);
sched_threadexit();
default:
@@ -268,6 +283,13 @@ void signal_check(struct thread_t *thread, context_t *context) {
#error unsupported
#endif
// configure context for sigreturn() when a system call
if (syscall) {
CTX_ERRNO(context) = syscallerrno;
CTX_RET(context) = syscallret;
// TODO restartable system call stuff goes here
}
// configure stack frame
sigframe_t *sigframe = stack;
sigframe->restorer = action->restorer;
kernel-src/sys/syscalls/execve.c
+3
View File
@@ -127,6 +127,9 @@ syscallret_t syscall_execve(context_t *context, char *upath, char *uargv[], char
fd_close(fd);
}
memset(&_cpu()->thread->signals.stack, 0, sizeof(stack_t));
memset(&proc->signals.actions[0], 0, sizeof(sigaction_t) * NSIG);
error:
free(path);
if (argv)
kernel-src/sys/syscalls/fork.c
+6
View File
@@ -54,6 +54,12 @@ syscallret_t syscall_fork(context_t *ctx) {
CTX_ERRNO(&nthread->context) = 0;
jobctl_addproc(proc, nproc);
memcpy(&nthread->signals.mask, &_cpu()->thread->signals.mask, sizeof(sigset_t));
memcpy(&nthread->signals.pending, &_cpu()->thread->signals.pending, sizeof(sigset_t));
memcpy(&nthread->signals.stack, &_cpu()->thread->signals.stack, sizeof(stack_t));
memcpy(&nproc->signals.pending, &proc->signals.pending, sizeof(sigset_t));
memcpy(&nproc->signals.actions, &proc->signals.actions[0], sizeof(sigaction_t) * NSIG);
ret.ret = nproc->pid;
sched_queue(nthread);
kernel-src/sys/syscalls/kill.c
+2 -1
View File
@@ -1,6 +1,7 @@
#include <kernel/syscalls.h>
#include <arch/cpu.h>
#include <logging.h>
#include <kernel/jobctl.h>
syscallret_t syscall_kill(context_t *context, int pid, int signal) {
syscallret_t ret = {
@@ -23,7 +24,7 @@ syscallret_t syscall_kill(context_t *context, int pid, int signal) {
return ret;
}
proc_t *target = sched_getprocfrompid(pid);
proc_t *target = sched_getprocfrompid(effectivepid);
if (target == NULL && pid != 0) {
ret.errno = ESRCH;
return ret;
kernel-src/sys/syscalls/poll.c
+2 -1
View File
@@ -37,7 +37,7 @@ syscallret_t syscall_poll(context_t *, pollfd_t *fds, size_t nfds, int timeoutms
goto cleanup;
}
polldesc_t desc;
polldesc_t desc = {0};
// when nfds is 0, poll is used as a sleep.
// therefore, initialize the desc size to one descriptor in that case.
ret.errno = poll_initdesc(&desc, nfds == 0 ? 1 : nfds);
@@ -72,6 +72,7 @@ syscallret_t syscall_poll(context_t *, pollfd_t *fds, size_t nfds, int timeoutms
if (eventcount == 0 && timeoutms != 0) {
ret.errno = poll_dowait(&desc, (timeoutms == -1 ? 0 : timeoutms) * 1000);
if (ret.errno == 0 && desc.event) {
int fd = ((uintptr_t)desc.event - (uintptr_t)desc.data) / sizeof(polldata_t);
fdsbuff[fd].revents = desc.data[fd].revents;
kernel-src/sys/syscalls/waitpid.c
+6
View File
@@ -25,6 +25,12 @@ syscallret_t syscall_waitpid(context_t *context, pid_t pid, int *status, int opt
proc_t *iterator = proc->child;
proc_t *desired = NULL;
if (iterator == NULL) {
ret.errno = ECHILD;
MUTEX_RELEASE(&proc->mutex);
return ret;
}
for (;;) {
if (iterator == NULL) {
if (pid > 0 && desired == NULL) {