Compare commits
38 Commits
ecfd20dba6
...
e5bb07874d
Author | SHA1 | Date | |
---|---|---|---|
e5bb07874d | |||
cf341dd82f | |||
5ab83343c6 | |||
b097932482 | |||
665d0e2284 | |||
935e1627af | |||
a9af1736b1 | |||
f44df78f01 | |||
5892ea6d99 | |||
93f0be760b | |||
2419efc513 | |||
7ad2428c1b | |||
05ca64e19a | |||
08ebc4fefe | |||
4831870f78 | |||
948d2af366 | |||
c7d5da540d | |||
4bb1930731 | |||
abaa66232b | |||
5e1153d2b8 | |||
5171e472a0 | |||
449869e81c | |||
d1c41c4fb1 | |||
8442fad197 | |||
a195439111 | |||
68d503186a | |||
41b2fd3b3a | |||
e912501c42 | |||
2fe25f160a | |||
adba7d8f7c | |||
30f86d8070 | |||
66e2db33b6 | |||
0da406e97e | |||
9fffc2def5 | |||
917203ef11 | |||
826be882a9 | |||
198935eb30 | |||
7c254e5e15 |
@ -33,38 +33,40 @@ void reap_thread()
|
|||||||
|
|
||||||
[[noreturn]] void init()
|
[[noreturn]] void init()
|
||||||
{
|
{
|
||||||
kinfoln("Starting Moon %s %s", MOON_VERSION, MOON_RELEASE);
|
{
|
||||||
|
kinfoln("Starting Moon %s %s", MOON_VERSION, MOON_RELEASE);
|
||||||
|
|
||||||
// Default hostname if nobody from userspace changes it
|
// Default hostname if nobody from userspace changes it
|
||||||
set_host_name("moon"_sv);
|
set_host_name("moon"_sv);
|
||||||
|
|
||||||
kinfoln("Current platform: %s", CPU::platform_string().chars());
|
kinfoln("Current platform: %s", CPU::platform_string().chars());
|
||||||
kinfoln("Current processor: %s", CPU::identify().value_or("(unknown)"_sv).chars());
|
kinfoln("Current processor: %s", CPU::identify().value_or("(unknown)"_sv).chars());
|
||||||
|
|
||||||
auto root = mark_critical(TmpFS::FileSystem::create(), "Failed to create initial ramfs");
|
auto root = mark_critical(TmpFS::FileSystem::create(), "Failed to create initial ramfs");
|
||||||
mark_critical(VFS::mount_root(root), "Failed to mount the initial ramfs as the root filesystem");
|
mark_critical(VFS::mount_root(root), "Failed to mount the initial ramfs as the root filesystem");
|
||||||
mark_critical(InitRD::populate_vfs(), "Failed to load files from the initial ramdisk");
|
mark_critical(InitRD::populate_vfs(), "Failed to load files from the initial ramdisk");
|
||||||
mark_critical(DeviceRegistry::init(), "Failed to register initial devices");
|
mark_critical(DeviceRegistry::init(), "Failed to register initial devices");
|
||||||
|
|
||||||
mark_critical(BinaryFormat::init(), "Failed to register initial binary formats");
|
mark_critical(BinaryFormat::init(), "Failed to register initial binary formats");
|
||||||
|
|
||||||
auto init =
|
auto init =
|
||||||
mark_critical(VFS::resolve_path("/bin/preinit", Credentials {}), "Can't find init in the initial ramfs!");
|
mark_critical(VFS::resolve_path("/bin/preinit", Credentials {}), "Can't find init in the initial ramfs!");
|
||||||
auto init_thread =
|
auto init_thread = mark_critical(Scheduler::new_userspace_thread(init, "/bin/preinit"),
|
||||||
mark_critical(Scheduler::new_userspace_thread(init, "/bin/preinit"), "Failed to create PID 1 process for init");
|
"Failed to create PID 1 process for init");
|
||||||
|
|
||||||
auto reap = mark_critical(Scheduler::new_kernel_thread(reap_thread, "[reap]"),
|
auto reap = mark_critical(Scheduler::new_kernel_thread(reap_thread, "[reap]"),
|
||||||
"Failed to create the process reaper kernel thread");
|
"Failed to create the process reaper kernel thread");
|
||||||
Scheduler::set_reap_thread(reap);
|
Scheduler::set_reap_thread(reap);
|
||||||
|
|
||||||
#ifdef ARCH_X86_64
|
#ifdef ARCH_X86_64
|
||||||
ATA::Controller::scan();
|
ATA::Controller::scan();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Disable console logging before transferring control to userspace.
|
// Disable console logging before transferring control to userspace.
|
||||||
setup_log(log_debug_enabled(), log_serial_enabled(), false);
|
setup_log(log_debug_enabled(), log_serial_enabled(), false);
|
||||||
|
|
||||||
init_thread->wake_up();
|
init_thread->wake_up();
|
||||||
|
}
|
||||||
|
|
||||||
kernel_exit();
|
kernel_exit();
|
||||||
}
|
}
|
||||||
|
@ -508,7 +508,7 @@ namespace MemoryManager
|
|||||||
{
|
{
|
||||||
TRY(result.try_append(*(char*)address));
|
TRY(result.try_append(*(char*)address));
|
||||||
address++;
|
address++;
|
||||||
if (address % ARCH_PAGE_SIZE)
|
if ((address % ARCH_PAGE_SIZE) == 0)
|
||||||
{
|
{
|
||||||
if (!validate_page_access(address, MMU::User)) return err(EFAULT);
|
if (!validate_page_access(address, MMU::User)) return err(EFAULT);
|
||||||
}
|
}
|
||||||
|
@ -143,9 +143,12 @@ Result<void> UnixSocket::connect(Registers* regs, int flags, struct sockaddr* ad
|
|||||||
m_blocked_thread = nullptr;
|
m_blocked_thread = nullptr;
|
||||||
if (current->interrupted)
|
if (current->interrupted)
|
||||||
{
|
{
|
||||||
if (current->will_invoke_signal_handler()) return err(EINTR);
|
if (current->will_ignore_pending_signal())
|
||||||
current->process_pending_signals(regs);
|
{
|
||||||
continue;
|
current->process_pending_signals(regs);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
return err(EINTR);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -182,9 +185,12 @@ Result<SharedPtr<OpenFileDescription>> UnixSocket::accept(Registers* regs, int f
|
|||||||
m_blocked_thread = nullptr;
|
m_blocked_thread = nullptr;
|
||||||
if (current->interrupted)
|
if (current->interrupted)
|
||||||
{
|
{
|
||||||
if (current->will_invoke_signal_handler()) return err(EINTR);
|
if (current->will_ignore_pending_signal())
|
||||||
current->process_pending_signals(regs);
|
{
|
||||||
continue;
|
current->process_pending_signals(regs);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
return err(EINTR);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -35,8 +35,12 @@ Result<u64> sys_read(Registers* regs, SyscallArgs args)
|
|||||||
if (current->interrupted)
|
if (current->interrupted)
|
||||||
{
|
{
|
||||||
kdbgln("signal: read interrupted by signal");
|
kdbgln("signal: read interrupted by signal");
|
||||||
if (current->will_invoke_signal_handler()) return err(EINTR);
|
if (current->will_ignore_pending_signal())
|
||||||
current->process_pending_signals(regs);
|
{
|
||||||
|
current->process_pending_signals(regs);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
return err(EINTR);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
#include "thread/Scheduler.h"
|
#include "thread/Scheduler.h"
|
||||||
#include <bits/poll.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];
|
struct pollfd* fds = (struct pollfd*)args[0];
|
||||||
nfds_t nfds = (nfds_t)args[1];
|
nfds_t nfds = (nfds_t)args[1];
|
||||||
@ -74,8 +74,6 @@ Result<u64> sys_poll(Registers* regs, SyscallArgs args)
|
|||||||
{
|
{
|
||||||
guard.deactivate();
|
guard.deactivate();
|
||||||
free_impl(kfds);
|
free_impl(kfds);
|
||||||
if (current->will_invoke_signal_handler()) return err(EINTR);
|
|
||||||
current->process_pending_signals(regs);
|
|
||||||
return err(EINTR);
|
return err(EINTR);
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
|
@ -27,9 +27,12 @@ Result<u64> sys_waitpid(Registers* regs, SyscallArgs args)
|
|||||||
if (current->interrupted)
|
if (current->interrupted)
|
||||||
{
|
{
|
||||||
kdbgln("signal: waitpid interrupted by signal");
|
kdbgln("signal: waitpid interrupted by signal");
|
||||||
if (current->will_invoke_signal_handler()) return err(EINTR);
|
if (current->will_ignore_pending_signal())
|
||||||
current->process_pending_signals(regs);
|
{
|
||||||
goto wait_for_child;
|
current->process_pending_signals(regs);
|
||||||
|
goto wait_for_child;
|
||||||
|
}
|
||||||
|
return err(EINTR);
|
||||||
}
|
}
|
||||||
|
|
||||||
check(thread->state == ThreadState::Exited);
|
check(thread->state == ThreadState::Exited);
|
||||||
@ -48,9 +51,12 @@ Result<u64> sys_waitpid(Registers* regs, SyscallArgs args)
|
|||||||
if (current->interrupted)
|
if (current->interrupted)
|
||||||
{
|
{
|
||||||
kdbgln("signal: waitpid interrupted by signal");
|
kdbgln("signal: waitpid interrupted by signal");
|
||||||
if (current->will_invoke_signal_handler()) return err(EINTR);
|
if (current->will_ignore_pending_signal())
|
||||||
current->process_pending_signals(regs);
|
{
|
||||||
goto wait_for_any_child;
|
current->process_pending_signals(regs);
|
||||||
|
goto wait_for_any_child;
|
||||||
|
}
|
||||||
|
return err(EINTR);
|
||||||
}
|
}
|
||||||
|
|
||||||
check(current->child_being_waited_for.value_or(-1) != -1);
|
check(current->child_being_waited_for.value_or(-1) != -1);
|
||||||
|
@ -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++)
|
for (int i = 0; i < NSIG; i++)
|
||||||
{
|
{
|
||||||
if (pending_signals & (1 << i))
|
if (pending_signals & (1 << i))
|
||||||
{
|
{
|
||||||
int signo = i + 1;
|
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;
|
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;
|
return false;
|
||||||
|
@ -159,7 +159,7 @@ struct Thread : public LinkedListNode<Thread>
|
|||||||
|
|
||||||
void process_pending_signals(Registers* current_regs);
|
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);
|
bool deliver_signal(int signo, Registers* current_regs);
|
||||||
void sigreturn(Registers* current_regs);
|
void sigreturn(Registers* current_regs);
|
||||||
|
@ -135,6 +135,8 @@ static ssize_t read_data_into_buffer(FILE* stream)
|
|||||||
stream->_buf.index = 0;
|
stream->_buf.index = 0;
|
||||||
ssize_t nread = read(stream->_fd, stream->_buf.buffer, stream->_buf.capacity);
|
ssize_t nread = read(stream->_fd, stream->_buf.buffer, stream->_buf.capacity);
|
||||||
if (nread >= 0) stream->_buf.size = nread;
|
if (nread >= 0) stream->_buf.size = nread;
|
||||||
|
else
|
||||||
|
stream->_buf.size = 0;
|
||||||
stream->_buf.status |= FileStatusFlags::LastRead;
|
stream->_buf.status |= FileStatusFlags::LastRead;
|
||||||
return nread;
|
return nread;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user