cmake: add rule to run kernel with qemu monitor on stdio

arch/x86_64/QEMU.cmake

@@ -22,3 +22,12 @@ add_custom_target(debug-kernel
 			-o "gdb-remote localhost:1234"
 	USES_TERMINAL
 	DEPENDS ${kernel_name} bsp)
+
+add_custom_target(run-kernel-monitor
+	COMMAND
+		${QEMU}
+		-kernel $<TARGET_FILE:${kernel_name}>
+		-initrd ${sys_dir}/${bsp_name}
+		-m 1G -monitor stdio
+	USES_TERMINAL
+	DEPENDS ${kernel_name} bsp)

lib/liblaunch/elf.c

@@ -104,6 +104,7 @@ static enum launch_status parse_phdr(struct elf_image *image)
 	size_t r = 0;
 	image->e_total_size = 0;
 	image->e_data_size = 0;
+	off_t vaddr, vlimit;
 
 	for (size_t i = 0; i < image->e_hdr.e_phnum; i++) {
 		off_t offset
@@ -119,23 +120,24 @@ static enum launch_status parse_phdr(struct elf_image *image)
 			return LAUNCH_ERR_INVALID_EXECUTABLE;
 		}
 
+		vaddr = phdr.p_vaddr;
+		vlimit = phdr.p_vaddr + phdr.p_memsz;
+		if (vaddr & (PAGE_SIZE - 1)) {
+			vaddr &= ~(PAGE_SIZE - 1);
+		}
+
+		if (vlimit & (PAGE_SIZE - 1)) {
+			vlimit &= ~(PAGE_SIZE - 1);
+			vlimit += PAGE_SIZE;
+		}
+
 		switch (phdr.p_type) {
 		case PT_DYNAMIC:
 			image->e_dynamic = phdr;
 			break;
 		case PT_LOAD:
-			if (phdr.p_vaddr & (PAGE_SIZE - 1)) {
-				phdr.p_vaddr &= (PAGE_SIZE - 1);
-			}
 
-			if (phdr.p_memsz & (PAGE_SIZE - 1)) {
-				phdr.p_memsz &= (PAGE_SIZE - 1);
-				phdr.p_memsz += PAGE_SIZE;
-			}
-
-			image->e_total_size
-				= MAX(image->e_total_size,
-			              phdr.p_vaddr + phdr.p_memsz);
+			image->e_total_size = MAX(image->e_total_size, vlimit);
 			break;
 		case PT_INTERP: {
 			size_t r = 0;
@@ -153,9 +155,7 @@ static enum launch_status parse_phdr(struct elf_image *image)
 		}
 
 		if (phdr.p_flags & PF_W) {
-			image->e_data_size
-				= MAX(image->e_data_size,
-			              phdr.p_vaddr + phdr.p_memsz);
+			image->e_data_size = MAX(image->e_data_size, vlimit);
 		}
 	}
 
@@ -164,6 +164,10 @@ static enum launch_status parse_phdr(struct elf_image *image)
 
 static kern_status_t create_exec_regions(struct elf_image *image)
 {
+	kern_tracef(
+		"launch: executable region size=%zu %zx",
+		image->e_total_size,
+		image->e_total_size);
 	kern_status_t status = KERN_OK;
 	if (image->e_local_space != KERN_HANDLE_INVALID) {
 		status = vm_region_create(
@@ -240,6 +244,7 @@ static enum launch_status map_executable(struct elf_image *image)
 		if (phdr.p_flags & PF_W) {
 			vmo = image->e_data;
 			offset = data_offset;
+			size_t tmp = 0;
 
 			status = vm_object_copy(
 				image->e_data,
@@ -247,7 +252,11 @@ static enum launch_status map_executable(struct elf_image *image)
 				image->e_image,
 				phdr.p_offset,
 				phdr.p_filesz,
-				NULL);
+				&tmp);
+
+			if (tmp != phdr.p_filesz) {
+				return LAUNCH_ERR_IMAGE_DATA_LOAD_FAILED;
+			}
 		}
 
 		if (status != KERN_OK) {
@@ -383,6 +392,7 @@ static enum launch_status relocate(struct elf_image *image)
 
 	size_t nr_dyn = image->e_dynamic.p_filesz / sizeof *dyn;
 	for (size_t i = 0; i < nr_dyn; i++) {
+		kern_tracef("DYN:%zx", dyn[i].d_tag);
 		switch (dyn[i].d_tag) {
 		case DT_SYMTAB:
 			image->e_dynsym = dyn[i].d_un.d_ptr;

sys/bootstrap/main.c

@@ -87,13 +87,40 @@ int main(
 		.p_resolver_arg = &bsp,
 	};
 
+	kern_handle_t channel;
+	channel_create(0, 0, &channel);
+
 	launch_ctx_init(&launch);
 	launch.ctx_resolve_library = resolve_dependency;
 
 	enum launch_status status
 		= launch_ctx_execute(&launch, &params, LAUNCH_F_NONE, &result);
+	kern_logf("launch result: %d", status);
 
-	kern_tracef("launch result: %d", status);
+#if 1
+	char msg_buf[512];
+	struct iovec vec = {
+		.io_base = (virt_addr_t)msg_buf,
+		.io_len = sizeof msg_buf,
+	};
+	struct msg msg = {.msg_data = &vec, .msg_data_count = 1};
+
+	while (1) {
+		msgid_t id = 0;
+		kern_status_t kstatus = msg_recv(channel, 0, &id, &msg);
+		if (kstatus != KERN_OK) {
+			kern_logf("msg_recv failed %d", kstatus);
+			break;
+		}
+
+		kern_logf("received message %zx: %s", id, msg_buf);
+
+		size_t len = snprintf(msg_buf, sizeof msg_buf, "Goodbye!");
+		vec.io_len = len + 1;
+
+		msg_reply(channel, 0, id, &msg);
+	}
+#endif
 
 	return 102;
 }

sys/ld/main.c

@@ -1,5 +1,7 @@
 #include <mango/log.h>
+#include <mango/msg.h>
 #include <mango/types.h>
+#include <stdio.h>
 
 int main(
 	int argc,
@@ -9,5 +11,31 @@ int main(
 	uintptr_t bsp_base)
 {
 	kern_log("ld!");
+	kern_handle_t port;
+	kern_status_t status = port_create(&port);
+	if (status != KERN_OK) {
+		kern_logf("port creation failed %d", status);
+		return -1;
+	}
+
+#if 1
+	port_connect(port, 0, 0);
+
+	const char msg_buf[] = "Hello!";
+	struct iovec vec = IOVEC(msg_buf, 7);
+	struct msg msg = MSG(&vec, 1, NULL, 0);
+
+	char recv_buf[64];
+	struct iovec recv_vec = IOVEC(recv_buf, sizeof recv_buf);
+	struct msg recv_msg = MSG(&recv_vec, 1, NULL, 0);
+
+	kern_logf("sending message...");
+	status = msg_send(port, 0, &msg, &recv_msg);
+	kern_logf("msg_send: %d", status);
+
+	if (status == KERN_OK) {
+		kern_logf("reply: %s", recv_buf);
+	}
+#endif
 	return 0;
 }