sysdeps/managarm: Implement signals

libc.makefile

@@ -231,9 +231,12 @@ libc_code_dirs += options/internal/generic \
 	options/internal/gcc-extra \
 	options/internal/x86_64
 	
-libc_code_dirs += sysdeps/managarm/crt-src sysdeps/managarm/generic
+libc_code_dirs += sysdeps/managarm/crt-src \
+	sysdeps/managarm/generic \
+	sysdeps/managarm/x86_64
 
 libc_s_sources := $(wildcard $(TREE_PATH)/options/internal/x86_64/*.S)
+libc_s_sources += $(wildcard $(TREE_PATH)/sysdeps/managarm/x86_64/*.S)
 
 libc_c_sources := $(wildcard $(TREE_PATH)/options/ansi/musl-generic-math/*.c)
 

options/internal/include/mlibc/sysdeps.hpp

@@ -79,6 +79,7 @@ int sys_mount(const char *source, const char *target,
 		const char *fstype, unsigned long flags, const void *data);
 int sys_sigprocmask(int how, const sigset_t *__restrict set, sigset_t *__restrict retrieve);
 int sys_sigaction(int, const struct sigaction *__restrict, struct sigaction *__restrict);
+int sys_kill(int, int);
 int sys_accept(int fd, int *newfd);
 int sys_bind(int fd, const struct sockaddr *addr_ptr, socklen_t addr_length);
 int sys_connect(int fd, const struct sockaddr *addr_ptr, socklen_t addr_length);

options/posix/generic/posix_signal.cpp

@@ -47,8 +47,9 @@ int sigaction(int signum, const struct sigaction *__restrict act, struct sigacti
 	return 0;
 }
 
-int kill(pid_t pid, int sig) {
-	__ensure(!"kill() not implemented");
-	__builtin_unreachable();
+int kill(pid_t pid, int number) {
+	if(mlibc::sys_kill(pid, number))
+		return -1;
+	return 0;
 }
 

options/posix/include/bits/posix/posix_signal.h

@@ -29,13 +29,13 @@ extern "C" {
 #define SIGXCPU 26
 #define SIGXFSZ 27
 
-#define SA_NOCLDSTOP 1
-#define SA_ONSTACK 2
-#define SA_RESETHAND 4
-#define SA_RESTART 8
-#define SA_SIGINFO 16
-#define SA_NOCLDWAIT 32
-#define SA_NODEFER 64
+#define SA_NOCLDSTOP (1 << 0)
+#define SA_ONSTACK (1 << 1)
+#define SA_RESETHAND (1 << 2)
+#define SA_RESTART (1 << 3)
+#define SA_SIGINFO (1 << 4)
+#define SA_NOCLDWAIT (1 << 5)
+#define SA_NODEFER (1 << 6)
 
 #define NSIG 65
 

sysdeps/managarm/generic/fork-exec.cpp

@@ -66,6 +66,16 @@ int sys_sleep(time_t *secs, long *nanos) {
 }
 
 int sys_fork(pid_t *child) {
+	int res;
+
+	sigset_t full_sigset;
+	res = sigfillset(&full_sigset);
+	__ensure(!res);
+
+	sigset_t former_sigset;
+	res = sigprocmask(SIG_SETMASK, &full_sigset, &former_sigset); 
+	__ensure(!res);
+
 	HelError error;
 	asm volatile ("syscall" : "=D"(error), "=S"(*child) : "0"(kHelCallSuper + 2)
 			: "rcx", "r11", "rbx", "memory");
@@ -73,6 +83,9 @@ int sys_fork(pid_t *child) {
 	
 	if(!*child)
 		clearCachedInfos();
+	
+	res = sigprocmask(SIG_SETMASK, &former_sigset, nullptr);
+	__ensure(!res);
 
 	return 0;
 }

sysdeps/managarm/generic/signals.cpp

@@ -1,21 +1,101 @@
 
-#include <signal.h>
-
 #include <bits/ensure.h>
+#include <signal.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
 
+#include <hel.h>
+#include <hel-syscalls.h>
 #include <frigg/debug.hpp>
+#include <mlibc/allocator.hpp>
+#include <frigg/string.hpp>
+#include <frigg/protobuf.hpp>
+#include <frigg/vector.hpp>
+#include <mlibc/cxx-support.hpp>
+#include <mlibc/posix-pipe.hpp>
+
+#include <posix.frigg_pb.hpp>
+
+extern "C" void __mlibc_signal_restore();
 
 namespace mlibc {
 
 int sys_sigprocmask(int how, const sigset_t *__restrict set, sigset_t *__restrict retrieve) {
-	frigg::infoLogger() << "mlibc: Broken sigprocmask() called!" << frigg::endLog;
+	uint64_t former;
+	if(set) {
+		HEL_CHECK(helSyscall2_1(kHelObserveSuperCall + 7, how, *set, &former));
+	}else{
+		HEL_CHECK(helSyscall2_1(kHelObserveSuperCall + 7, 0, 0, &former));
+	}
 	if(retrieve)
-		*retrieve = 0;
+		*retrieve = former;
 	return 0;
 }
 
-int sys_sigaction(int, const struct sigaction *__restrict, struct sigaction *__restrict) {
-	frigg::infoLogger() << "mlibc: Broken sigaction() called!" << frigg::endLog;
+int sys_sigaction(int number, const struct sigaction *__restrict action,
+		struct sigaction *__restrict saved_action) {
+	__ensure(action);
+
+	// TODO: Respect restorer. __ensure(!(action->sa_flags & SA_RESTORER));
+
+	HelAction actions[3];
+	globalQueue.trim();
+
+	managarm::posix::CntRequest<MemoryAllocator> req(getAllocator());
+	req.set_request_type(managarm::posix::CntReqType::SIG_ACTION);
+	req.set_flags(action->sa_flags);
+	req.set_sig_number(number);
+	req.set_sig_mask(action->sa_mask);
+	if(action->sa_flags & SA_SIGINFO) {
+		req.set_sig_handler(reinterpret_cast<uintptr_t>(action->sa_sigaction));
+	}else{
+		req.set_sig_handler(reinterpret_cast<uintptr_t>(action->sa_handler));
+	}
+	req.set_sig_restorer(reinterpret_cast<uintptr_t>(&__mlibc_signal_restore));
+
+	frigg::String<MemoryAllocator> ser(getAllocator());
+	req.SerializeToString(&ser);
+	actions[0].type = kHelActionOffer;
+	actions[0].flags = kHelItemAncillary;
+	actions[1].type = kHelActionSendFromBuffer;
+	actions[1].flags = kHelItemChain;
+	actions[1].buffer = ser.data();
+	actions[1].length = ser.size();
+	actions[2].type = kHelActionRecvInline;
+	actions[2].flags = 0;
+	HEL_CHECK(helSubmitAsync(kHelThisThread, actions, 3,
+			globalQueue.getQueue(), 0, 0));
+
+	auto element = globalQueue.dequeueSingle();
+	auto offer = parseSimple(element);
+	auto send_req = parseSimple(element);
+	auto recv_resp = parseInline(element);
+
+	HEL_CHECK(offer->error);
+	HEL_CHECK(send_req->error);
+	HEL_CHECK(recv_resp->error);
+
+	managarm::posix::SvrResponse<MemoryAllocator> resp(getAllocator());
+	resp.ParseFromArray(recv_resp->data, recv_resp->length);
+	__ensure(resp.error() == managarm::posix::Errors::SUCCESS);
+
+	if(saved_action) {
+		saved_action->sa_flags = resp.flags();
+		saved_action->sa_mask = resp.sig_mask();
+		if(resp.flags() & SA_SIGINFO) {
+			saved_action->sa_sigaction =
+					reinterpret_cast<void (*)(int, siginfo_t *, void *)>(resp.sig_handler());
+		}else{
+			saved_action->sa_handler = reinterpret_cast<void (*)(int)>(resp.sig_handler());
+		}
+		// TODO: saved_action->sa_restorer = resp.sig_restorer;
+	}
+	return 0;
+}
+
+int sys_kill(int pid, int number) {
+	HEL_CHECK(helSyscall2(kHelObserveSuperCall + 5, pid, number));
 	return 0;
 }
 

sysdeps/managarm/x86_64/signals.S

@@ -0,0 +1,8 @@
+
+.section .text
+.global __mlibc_signal_restore
+__mlibc_signal_restore:
+	mov $0x80000006, %rdi
+	syscall
+	ud2
+