mirror of
https://github.com/subhobhai943/SUB-OS.git
synced 2026-10-25 16:52:29 +00:00
SUB-OS had a syscall table and user GDT descriptors but nothing that could actually leave ring 0: lazybox and the shell run as kernel code, and syscall_handler() was never reachable from a user program. This adds the missing path end to end on x86_64. Address spaces (arch/x86_64/mm/vmspace.c) - The boot page tables identity-map the low 4 GB off PML4[0] and leave the rest empty, so userland is given its own PML4 slot (512 GiB) rather than holes punched in the kernel's 2 MB huge-page map. A process PML4 shares entry 0 with the kernel and privately owns entry 1. - Frames outside the identity map are refused rather than written through an unmapped pointer; lifting that needs a recursive map or a higher-half direct map, which is noted in the file. ELF loader (kernel/elf.c) - Validates ELF64/little-endian/ET_EXEC/machine, bounds-checks every program header against both the image and the user address range, and lays PT_LOAD segments into an address space. Frames arrive zeroed, so .bss is covered. Ring transition (arch/x86_64/cpu/usermode.asm) - user_enter() drops to ring 3 via iretq after scrubbing every GPR, and user_return() unwinds back to it when the process exits, so exec looks like a call that blocks until the program finishes. Syscalls - INT 0x80 installed at DPL 3 with the Linux x86_64 register convention. The process gets its own kernel stack for the trap, because TSS.rsp0 must not point at the stack user_enter() is standing on. - Every user pointer is range-checked before use. The process page tables are still live during a syscall, so without that check a program could pass a kernel address and have write(2) dump kernel text to the console. The new /sbin/init asserts both a wild pointer and a kernel pointer are rejected. - write(2) to stdout/stderr routes through the new console_write(), which reuses printk's routing so output reaches serial and the framebuffer console rather than only the VGA text buffer. Faults - A ring 3 exception now kills that process and reports CR2 instead of panicking the machine. Userland (userland/init/) - /sbin/init is a real freestanding static executable, linked at the user base and embedded in the kernel image by scripts/mkblob.py. It reports its pid, verifies .bss was zeroed and .data is writable, checks the two pointer rejections, and exits. aarch64 and armv8i keep building: the loader and exec path are portable, and those ports get honest vmspace stubs that fail cleanly rather than pretending to run a program with kernel privileges. Verified under QEMU: init loads at 0x80004000a0, reports pid 1, .bss zeroed, .data writable, both bad pointers rejected, and exits 0 back into the shell. Co-Authored-By: Claude Opus 5 <[email protected]> Claude-Session: https://claude.ai/code/session_0161Jh7uCEMLYEMNPsjC1LKf
162 lines
4.4 KiB
C
162 lines
4.4 KiB
C
#include <kernel/printk.h>
|
|
#include <drivers/tty.h>
|
|
#include <drivers/fbcon.h>
|
|
#include <drivers/serial.h>
|
|
#include <lib/printf.h>
|
|
#include <lib/string.h>
|
|
#include <kernel/sync.h>
|
|
|
|
#define DMESG_BUFFER_SIZE 65536 // 64 KB Ring Buffer
|
|
|
|
static char dmesg_buffer[DMESG_BUFFER_SIZE];
|
|
static size_t dmesg_head = 0;
|
|
static size_t dmesg_total = 0;
|
|
static spinlock_t printk_lock = SPINLOCK_INIT;
|
|
|
|
// Console redirection state. `sink_active` guards against a sink that calls
|
|
// printk itself, which would otherwise recurse until the stack ran out.
|
|
static printk_sink_fn_t sink_fn = NULL;
|
|
static void* sink_ctx = NULL;
|
|
static bool sink_active = false;
|
|
|
|
void printk_set_sink(printk_sink_fn_t fn, void* ctx) {
|
|
sink_fn = fn;
|
|
sink_ctx = ctx;
|
|
}
|
|
|
|
void printk_clear_sink(void) {
|
|
sink_fn = NULL;
|
|
sink_ctx = NULL;
|
|
}
|
|
|
|
bool printk_has_sink(void) {
|
|
return sink_fn != NULL;
|
|
}
|
|
|
|
void printk_init(void) {
|
|
memset(dmesg_buffer, 0, sizeof(dmesg_buffer));
|
|
dmesg_head = 0;
|
|
dmesg_total = 0;
|
|
}
|
|
|
|
static void dmesg_append(const char* str, size_t len) {
|
|
for (size_t i = 0; i < len; i++) {
|
|
dmesg_buffer[dmesg_head] = str[i];
|
|
dmesg_head = (dmesg_head + 1) % DMESG_BUFFER_SIZE;
|
|
if (dmesg_total < DMESG_BUFFER_SIZE) {
|
|
dmesg_total++;
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Put raw bytes on every console printk uses.
|
|
*
|
|
* Kept here rather than at the call sites because the routing is not obvious:
|
|
* once the display adapter is in graphics mode the VGA text buffer is no
|
|
* longer scanned out, so the framebuffer console has to take over, and the
|
|
* serial port is a separate sink that has to be fed either way. Userland
|
|
* writes to stdout/stderr land here so they behave exactly like kernel output.
|
|
*/
|
|
void console_write(const char* data, size_t len) {
|
|
if (!data || len == 0) return;
|
|
|
|
if (fbcon_is_active()) {
|
|
fbcon_write(data, len);
|
|
} else {
|
|
tty_write(data, len);
|
|
}
|
|
|
|
#if defined(__aarch64__) || defined(__arm__) || defined(__armv8i__)
|
|
extern void uart_pl011_putc(char c);
|
|
for (size_t i = 0; i < len; i++) {
|
|
uart_pl011_putc(data[i]);
|
|
}
|
|
#else
|
|
for (size_t i = 0; i < len; i++) {
|
|
serial_write_char(data[i]);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
int vprintk(const char* fmt, va_list args) {
|
|
char buffer[1024];
|
|
int len = vsnprintf(buffer, sizeof(buffer), fmt, args);
|
|
if (len <= 0) return 0;
|
|
|
|
spin_lock(&printk_lock);
|
|
|
|
// Skip loglevel prefix if present (e.g. "\0016")
|
|
const char* display_ptr = buffer;
|
|
if (buffer[0] == '\001' && buffer[1] >= '0' && buffer[1] <= '7') {
|
|
display_ptr += 2;
|
|
len -= 2;
|
|
}
|
|
|
|
// 1. Output to the active TTY console, or to the installed sink instead.
|
|
if (sink_fn && !sink_active) {
|
|
sink_active = true;
|
|
sink_fn(display_ptr, (size_t)len, sink_ctx);
|
|
sink_active = false;
|
|
} else if (!sink_fn) {
|
|
// The VGA text buffer stops being scanned out once the adapter is in
|
|
// graphics mode, so the framebuffer console takes over there.
|
|
if (fbcon_is_active()) {
|
|
fbcon_write(display_ptr, (size_t)len);
|
|
} else {
|
|
tty_write(display_ptr, (size_t)len);
|
|
}
|
|
}
|
|
|
|
// 2. Output to serial console (COM1 on x86, PL011 on ARM/AArch64)
|
|
#if defined(__aarch64__) || defined(__arm__) || defined(__armv8i__)
|
|
extern void uart_pl011_putc(char c);
|
|
for (int i = 0; i < len; i++) {
|
|
uart_pl011_putc(display_ptr[i]);
|
|
}
|
|
#else
|
|
for (int i = 0; i < len; i++) {
|
|
serial_write_char(display_ptr[i]);
|
|
}
|
|
#endif
|
|
|
|
// 3. Store in kernel dmesg ring buffer
|
|
dmesg_append(display_ptr, (size_t)len);
|
|
|
|
spin_unlock(&printk_lock);
|
|
return len;
|
|
}
|
|
|
|
int printk(const char* fmt, ...) {
|
|
va_list args;
|
|
va_start(args, fmt);
|
|
int ret = vprintk(fmt, args);
|
|
va_end(args);
|
|
return ret;
|
|
}
|
|
|
|
int kprintf(const char* fmt, ...) {
|
|
va_list args;
|
|
va_start(args, fmt);
|
|
int ret = vprintk(fmt, args);
|
|
va_end(args);
|
|
return ret;
|
|
}
|
|
|
|
void dmesg_dump(void) {
|
|
spin_lock(&printk_lock);
|
|
if (dmesg_total < DMESG_BUFFER_SIZE) {
|
|
tty_write(dmesg_buffer, dmesg_total);
|
|
} else {
|
|
// Output from head to end, then 0 to head
|
|
tty_write(dmesg_buffer + dmesg_head, DMESG_BUFFER_SIZE - dmesg_head);
|
|
tty_write(dmesg_buffer, dmesg_head);
|
|
}
|
|
spin_unlock(&printk_lock);
|
|
}
|
|
|
|
const char* dmesg_get_buffer(size_t* size_out) {
|
|
if (size_out) *size_out = dmesg_total;
|
|
return dmesg_buffer;
|
|
}
|