feat(sfs): Implemented Sovereign Filesystem (SFS)
- Implemented SFS Driver (core/fs/sfs.nim): - Mount logic (Sector 0 Superblock check). - List logic (Sector 1 Directory table). - Implemented Userland Formatter (nipbox.nim): - 'mkfs' command to write SFS1 Superblock. - Fixed 'virtio_block' logic: - Corrected Descriptor flags (VRING_DESC_F_WRITE for Read Buffers). - Fixed Async/Sync Conflict in 'libc_shim': - Added 'nexus_yield()' to block syscalls to prevent stack corruption before kernel processing. - Integrated SFS into Kernel startup.
This commit is contained in:
Markus Maiwald
parent
e367dd8380
commit
64380de4a7
|
|
@ -0,0 +1,103 @@
|
|||
# Markus Maiwald (Architect) | Voxis Forge (AI)
|
||||
# Rumpk Phase 11: The Sovereign Filesystem (SFS)
|
||||
# Simple Flat System (Contiguous, Directory-based, No Inodes)
|
||||
|
||||
# import ../ion # Removing to avoid cycle and ambiguity
|
||||
# import ../kernel # Removing to avoid cycle
|
||||
|
||||
proc kprintln(s: cstring) {.importc, cdecl.}
|
||||
proc kprint(s: cstring) {.importc, cdecl.}
|
||||
proc kprint_hex(n: uint64) {.importc, cdecl.}
|
||||
|
||||
# =========================================================
|
||||
# SFS Definitions
|
||||
# =========================================================
|
||||
|
||||
const SFS_MAGIC = 0x31534653'u32 # "SFS1" in Little Endian (S=53, F=46, S=53, 1=31 -> 31 53 46 53? No, S is lowest addr)
|
||||
# "SFS1" as string: bufs[0]=S, buf[1]=F...
|
||||
# u32 representation depends on Endianness.
|
||||
# On Little Endian (RISC-V):
|
||||
# 0x31534653 -> LSB is 0x53 (S). MSB is 0x31 (1).
|
||||
# So "SFS1" in memory.
|
||||
|
||||
type
|
||||
Superblock* = object
|
||||
magic*: uint32
|
||||
disk_size*: uint32 # in sectors? or bytes? Nipbox wrote u64 bytes. Let's use sectors for kernel simplicity?
|
||||
# Stack layout alignment might be issue. Let's read raw bytes.
|
||||
|
||||
DirEntry* = object
|
||||
filename*: array[32, char]
|
||||
start_sector*: uint32
|
||||
size_bytes*: uint32
|
||||
reserved*: array[24, byte] # Pad to 64 bytes? 32+4+4 = 40. 64-40=24.
|
||||
# 512 / 64 = 8 entries per sector.
|
||||
|
||||
# =========================================================
|
||||
# SFS State
|
||||
# =========================================================
|
||||
|
||||
var sfs_mounted: bool = false
|
||||
var io_buffer: array[512, byte] # Kernel IO Buffer for FS ops
|
||||
|
||||
# =========================================================
|
||||
# SFS Driver
|
||||
# =========================================================
|
||||
|
||||
# Import HAL block ops
|
||||
proc virtio_blk_read(sector: uint64, buf: pointer) {.importc, cdecl.}
|
||||
proc virtio_blk_write(sector: uint64, buf: pointer) {.importc, cdecl.}
|
||||
|
||||
proc sfs_mount*() =
|
||||
kprintln("[SFS] Mounting System...")
|
||||
|
||||
# 1. Read Sector 0 (Superblock)
|
||||
virtio_blk_read(0, addr io_buffer[0])
|
||||
|
||||
# 2. Check Magic
|
||||
# "SFS1" -> 0x53, 0x46, 0x53, 0x31
|
||||
if io_buffer[0] == 0x53 and io_buffer[1] == 0x46 and
|
||||
io_buffer[2] == 0x53 and io_buffer[3] == 0x31:
|
||||
kprintln("[SFS] Mount SUCCESS. Magic: SFS1")
|
||||
sfs_mounted = true
|
||||
else:
|
||||
kprint("[SFS] Mount FAILED. Invalid Magic. Found: ")
|
||||
kprint_hex(cast[uint64](io_buffer[0]))
|
||||
kprint(" ")
|
||||
kprint_hex(cast[uint64](io_buffer[1]))
|
||||
kprint(" ")
|
||||
kprint_hex(cast[uint64](io_buffer[2]))
|
||||
kprintln("")
|
||||
|
||||
proc sfs_list*() =
|
||||
if not sfs_mounted:
|
||||
kprintln("[SFS] Error: Not mounted.")
|
||||
return
|
||||
|
||||
# Read Sector 1 (Directory Table)
|
||||
virtio_blk_read(1, addr io_buffer[0])
|
||||
|
||||
kprintln("[SFS] Files:")
|
||||
# Parse Entries (assuming 64 bytes stride for now if nipbox holds it)
|
||||
# Actually nipbox `mkfs` just zeroed it.
|
||||
|
||||
var found = false
|
||||
var offset = 0
|
||||
while offset < 512:
|
||||
if io_buffer[offset] != 0:
|
||||
# Found entry
|
||||
var name: string = ""
|
||||
for i in 0..31:
|
||||
let c = char(io_buffer[offset+i])
|
||||
if c == '\0': break
|
||||
name.add(c)
|
||||
|
||||
kprint(" - ")
|
||||
kprintln(cstring(name))
|
||||
found = true
|
||||
|
||||
offset += 64
|
||||
|
||||
if not found:
|
||||
kprintln(" (Empty)")
|
||||
|
||||
|
|
@ -75,6 +75,7 @@ proc kprintln*(s: cstring) {.exportc, cdecl.} =
|
|||
kprint(s); kprint("\n")
|
||||
|
||||
import fs/tar
|
||||
import fs/sfs
|
||||
|
||||
# --- INITRD SYMBOLS ---
|
||||
var binary_initrd_tar_start {.importc: "_binary_initrd_tar_start".}: char
|
||||
|
|
@ -326,6 +327,9 @@ proc kmain() {.exportc, cdecl.} =
|
|||
# 1.1 VFS (InitRD)
|
||||
vfs_init(addr binary_initrd_tar_start, addr binary_initrd_tar_end)
|
||||
|
||||
# 1.2 VFS (SFS)
|
||||
sfs_mount()
|
||||
|
||||
# Wire VFS to SysTable (Hypercall Vector)
|
||||
let sys = cast[ptr SysTable](SYSTABLE_BASE)
|
||||
sys.fn_vfs_open = cast[pointer](ion_vfs_open)
|
||||
|
|
|
|||
|
|
@ -166,24 +166,33 @@ pub const VirtioBlkDriver = struct {
|
|||
const status: *u8 = @ptrCast(@alignCast(status_ptr));
|
||||
status.* = 0xFF; // Init with error
|
||||
|
||||
const VRING_DESC_F_NEXT: u16 = 1;
|
||||
const VRING_DESC_F_WRITE: u16 = 2;
|
||||
|
||||
// Setup Desc 1 (Header)
|
||||
q.desc[d1].addr = @intFromPtr(header);
|
||||
q.desc[d1].len = @sizeOf(VirtioBlkReq);
|
||||
q.desc[d1].flags = 1; // NEXT
|
||||
q.desc[d1].flags = VRING_DESC_F_NEXT;
|
||||
q.desc[d1].next = d2;
|
||||
|
||||
// Setup Desc 2 (Buffer)
|
||||
q.desc[d2].addr = @intFromPtr(buf);
|
||||
q.desc[d2].len = len;
|
||||
// If READ (IN), device writes to buffer -> VRING_DESC_F_WRITE (2)
|
||||
// If WRITE (OUT), device reads from buffer -> 0
|
||||
q.desc[d2].flags = if (type_ == VIRTIO_BLK_T_IN) @as(u16, 1 | 2) else @as(u16, 1); // NEXT | (WRITE?)
|
||||
|
||||
// If T_IN (0), Device Writes to Buffer (Needs WRITE flag)
|
||||
if (type_ == VIRTIO_BLK_T_IN) {
|
||||
q.desc[d2].flags = VRING_DESC_F_NEXT | VRING_DESC_F_WRITE;
|
||||
// uart.print("[VirtIO-Blk] Read Req (Flags=3)\n");
|
||||
} else {
|
||||
q.desc[d2].flags = VRING_DESC_F_NEXT;
|
||||
// uart.print("[VirtIO-Blk] Write Req (Flags=1)\n");
|
||||
}
|
||||
q.desc[d2].next = d3;
|
||||
|
||||
// Setup Desc 3 (Status)
|
||||
q.desc[d3].addr = @intFromPtr(status);
|
||||
q.desc[d3].len = 1;
|
||||
q.desc[d3].flags = 2; // WRITE (Device writes status)
|
||||
q.desc[d3].flags = VRING_DESC_F_WRITE; // Device writes status!
|
||||
q.desc[d3].next = 0;
|
||||
|
||||
asm volatile ("fence" ::: .{ .memory = true });
|
||||
|
|
|
|||
|
|
@ -201,11 +201,13 @@ const BlkArgs = ion.BlkArgs;
|
|||
export fn nexus_blk_read(sector: u64, buf: [*]u8, len: u64) void {
|
||||
var args = BlkArgs{ .sector = sector, .buf = @intFromPtr(buf), .len = len };
|
||||
_ = nexus_syscall(ion.CMD_BLK_READ, @intFromPtr(&args));
|
||||
nexus_yield(); // Block until Kernel processes it
|
||||
}
|
||||
|
||||
export fn nexus_blk_write(sector: u64, buf: [*]const u8, len: u64) void {
|
||||
var args = BlkArgs{ .sector = sector, .buf = @intFromPtr(buf), .len = len };
|
||||
_ = nexus_syscall(ion.CMD_BLK_WRITE, @intFromPtr(&args));
|
||||
nexus_yield(); // Block until Kernel processes it
|
||||
}
|
||||
|
||||
// Sovereign Yield: Return control to Kernel Scheduler
|
||||
|
|
|
|||
|
|
@ -81,9 +81,10 @@ proc print_raw(s: string) =
|
|||
if s.len > 0:
|
||||
discard write(1, unsafeAddr s[0], csize_t(s.len))
|
||||
|
||||
# Helper: Swap Bytes 16
|
||||
proc swap16(x: uint16): uint16 =
|
||||
return (x shl 8) or (x shr 8)
|
||||
# Forward declarations for functions used before their definition
|
||||
proc parseIntSimple(s: string): uint64
|
||||
proc toHexChar(b: byte): char
|
||||
proc do_mkfs()
|
||||
|
||||
# Calculate Checksum (Standard Internet Checksum)
|
||||
proc calc_checksum(buf: cptr, len: int): uint16 =
|
||||
|
|
@ -346,8 +347,44 @@ proc main() =
|
|||
elif cmd == "ls": do_ls()
|
||||
elif cmd == "exec": do_exec(arg)
|
||||
elif cmd == "dd": do_dd(arg)
|
||||
elif cmd == "mkfs": do_mkfs()
|
||||
elif cmd == "help": do_help()
|
||||
else: print("Unknown command: " & cmd)
|
||||
|
||||
proc do_mkfs() =
|
||||
print("[mkfs] Formatting disk as Sovereign Filesystem (SFS v1)...")
|
||||
|
||||
# 1. Superblock (Sector 0)
|
||||
var sb: array[512, byte]
|
||||
# Magic: S (0x53), F (0x46), S (0x53), 1 (0x31) -> Little Endian? String is byte order.
|
||||
sb[0] = 0x53
|
||||
sb[1] = 0x46
|
||||
sb[2] = 0x53
|
||||
sb[3] = 0x31
|
||||
# Disk Size (u64 at offset 4) - 32MB = 33554432 = 0x02000000
|
||||
# Little Endian
|
||||
sb[4] = 0x00
|
||||
sb[5] = 0x00
|
||||
sb[6] = 0x00
|
||||
sb[7] = 0x02
|
||||
sb[8] = 0x00
|
||||
sb[9] = 0x00
|
||||
sb[10] = 0x00
|
||||
sb[11] = 0x00
|
||||
|
||||
# Root Dir Sector (u64 at offset 12) -> 1
|
||||
sb[12] = 0x01
|
||||
|
||||
nexus_blk_write(0, addr sb[0], 512)
|
||||
print("[mkfs] Superblock written.")
|
||||
|
||||
# 2. Directory Table (Sector 1) - Zero it
|
||||
var zero: array[512, byte] # Implicitly zeroed? In Nim, yes if global/stack? Better be safe.
|
||||
for i in 0 ..< 512: zero[i] = 0
|
||||
nexus_blk_write(1, addr zero[0], 512)
|
||||
print("[mkfs] Directory Table initialized.")
|
||||
|
||||
print("[mkfs] Format Complete. The Ledger is structured.")
|
||||
|
||||
when isMainModule:
|
||||
main()
|
||||
|
|
|
|||
Loading…
Reference in New Issue