apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

kernel: Interrupt syscalls before exiting because of a signal

Browse Source 
Closes #40.
This commit is contained in:
apio 2023-08-08 10:41:46 +02:00
parent 198935eb30
commit 826be882a9
Signed by: apio
GPG Key ID: B8A7D06E42258954
6 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kernel/src/net/UnixSocket.cpp
View File

@ -143,9 +143,12 @@ Result<void> UnixSocket::connect(Registers* regs, int flags, struct sockaddr* ad
m_blocked_thread = nullptr;
if (current->interrupted)
{
if (current->will_invoke_signal_handler()) return err(EINTR);
current->process_pending_signals(regs);
continue;
if (current->will_ignore_pending_signal())
{
current->process_pending_signals(regs);
continue;
}
return err(EINTR);
}
break;
}
@ -182,9 +185,12 @@ Result<SharedPtr<OpenFileDescription>> UnixSocket::accept(Registers* regs, int f
m_blocked_thread = nullptr;
if (current->interrupted)
{
if (current->will_invoke_signal_handler()) return err(EINTR);
current->process_pending_signals(regs);
continue;
if (current->will_ignore_pending_signal())
{
current->process_pending_signals(regs);
continue;
}
return err(EINTR);
}
}

8
kernel/src/sys/file.cpp
View File

@ -35,8 +35,12 @@ Result<u64> sys_read(Registers* regs, SyscallArgs args)
if (current->interrupted)
{
kdbgln("signal: read interrupted by signal");
if (current->will_invoke_signal_handler()) return err(EINTR);
current->process_pending_signals(regs);
if (current->will_ignore_pending_signal())
{
current->process_pending_signals(regs);
continue;
}
return err(EINTR);
}
}

4
kernel/src/sys/poll.cpp
View File

@ -5,7 +5,7 @@
#include "thread/Scheduler.h"
#include <bits/poll.h>
Result<u64> sys_poll(Registers* regs, SyscallArgs args)
Result<u64> sys_poll(Registers*, SyscallArgs args)
{
struct pollfd* fds = (struct pollfd*)args[0];
nfds_t nfds = (nfds_t)args[1];
@ -58,8 +58,6 @@ Result<u64> sys_poll(Registers* regs, SyscallArgs args)
{
guard.deactivate();
free_impl(kfds);
if (current->will_invoke_signal_handler()) return err(EINTR);
current->process_pending_signals(regs);
return err(EINTR);
}
continue;

18
kernel/src/sys/waitpid.cpp
View File

@ -27,9 +27,12 @@ Result<u64> sys_waitpid(Registers* regs, SyscallArgs args)
if (current->interrupted)
{
kdbgln("signal: waitpid interrupted by signal");
if (current->will_invoke_signal_handler()) return err(EINTR);
current->process_pending_signals(regs);
goto wait_for_child;
if (current->will_ignore_pending_signal())
{
current->process_pending_signals(regs);
goto wait_for_child;
}
return err(EINTR);
}
check(thread->state == ThreadState::Exited);
@ -48,9 +51,12 @@ Result<u64> sys_waitpid(Registers* regs, SyscallArgs args)
if (current->interrupted)
{
kdbgln("signal: waitpid interrupted by signal");
if (current->will_invoke_signal_handler()) return err(EINTR);
current->process_pending_signals(regs);
goto wait_for_any_child;
if (current->will_ignore_pending_signal())
{
current->process_pending_signals(regs);
goto wait_for_any_child;
}
return err(EINTR);
}
check(current->child_being_waited_for.value_or(-1) != -1);

11
kernel/src/thread/Thread.cpp
View File

@ -186,18 +186,19 @@ void Thread::process_pending_signals(Registers* current_regs)
}
}
bool Thread::will_invoke_signal_handler()
bool Thread::will_ignore_pending_signal()
{
for (int i = 0; i < NSIG; i++)
{
if (pending_signals & (1 << i))
{
int signo = i + 1;
if (signo != SIGKILL && signo != SIGSTOP && signal_mask & (1 << i)) continue;
auto handler = signal_handlers[i];
if (handler.sa_handler == SIG_IGN || handler.sa_handler == SIG_DFL) return false;
if (signo == SIGKILL || signo == SIGSTOP) return false;
return true;
if (signal_mask & (1 << i)) continue;
auto handler = signal_handlers[i];
if (handler.sa_handler == SIG_IGN) return true;
if (handler.sa_handler == SIG_DFL && default_actions[i] == DefaultSignalAction::Ignore) return true;
return false;
}
}
return false;

2
kernel/src/thread/Thread.h
View File

@ -159,7 +159,7 @@ struct Thread : public LinkedListNode<Thread>
void process_pending_signals(Registers* current_regs);
bool will_invoke_signal_handler();
bool will_ignore_pending_signal();
bool deliver_signal(int signo, Registers* current_regs);
void sigreturn(Registers* current_regs);