Start work on ext2 filesystem prober

Author: chronium

.cargo/config.toml

@@ -0,0 +1,6 @@
+[unstable]
+build-std = ["core", "compiler_builtins", "alloc"]
+build-std-features = ["compiler-builtins-mem"]
+
+[build]
+target = "kernel/arch/x86_64/x86_64.json"

.editorconfig

@@ -0,0 +1,12 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = false
+insert_final_newline = false

.gitignore

@@ -0,0 +1,8 @@
+/target
+Cargo.lock
+loopback_dev
+/isotmp
+build/kernel.elf
+build/os.img
+build/kernel.sym
+virtio-net.pcap

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "extern/limine"]
+	path = extern/limine
+	url = https://github.com/limine-bootloader/limine.git
+	branch = v2.0-branch

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "rust-analyzer.cargo.target": "kernel/arch/x86_64/x86_64.json",
+    "rust-analyzer.checkOnSave.allTargets": false
+}

Cargo.toml

@@ -0,0 +1,27 @@
+[workspace]
+members = [
+  "environment",
+  "kernel",
+  "utils",
+  "log_filter",
+  "extensions/api",
+  "extensions/virtio",
+  "extensions/virtio_net",
+  "extensions/virtio_blk",
+]
+
+[profile.release]
+opt-level = 3
+codegen-units = 1
+lto = true
+debug = 1
+debug-assertions = false
+overflow-checks = false
+
+[profile.dev]
+opt-level = 0
+codegen-units = 1
+lto = true
+debug = 1
+debug-assertions = false
+overflow-checks = false

Justfile

@@ -0,0 +1,76 @@
+target := "x86_64"
+mem := "512M"
+
+img := "os.img"
+drive := "if=none,id=dsk0,format=raw,file=build/" + img
+# drive := "id=dsk0,format=raw,file=build/" + img
+
+virtio-net := "virtio-net,netdev=net0,disable-legacy=on,disable-modern=off"
+dev := "user,id=net0"
+pcap := "filter-dump,id=filter0,netdev=net0,file=virtio-net.pcap"
+
+virtio-blk := "virtio-blk-pci,drive=dsk0,disable-legacy=on,disable-modern=off"
+
+# + " -device " + virtio-net
+
+# qemu-args := " -serial stdio" + " -m " + mem + " -drive " + drive + " -no-reboot -d cpu_reset -s" + " -netdev " + dev + " -object " + pcap + " -device " + virtio-blk
+#  
+qemu-args := " -serial stdio" + " -m " + mem + " -drive " + drive + " -no-reboot -d cpu_reset -s" + " -device " + virtio-net + " -netdev " + dev + " -object " + pcap + " -device " + virtio-blk
+
+limine := "extern/limine/build/bin"
+
+clean:
+    cargo clean
+    rm -f build/*
+    sudo umount -R isotmp/ | cat
+    sudo rm -rf isotmp/
+    rm -f loopback_dev
+    echo "Clean is complete"
+
+build release:
+    #!/usr/bin/env bash
+    set -e
+    if { [ release != "debug" ] && [ release != "release" ] ;} then \
+        echo Unknown build mode \"{{release}}\";\
+        exit 1; \
+    fi;
+
+    cargo build {{ if release == "debug" { "" } else { "--release" } }} --target kernel/arch/x86_64/x86_64.json
+    cp target/{{target}}/{{release}}/kernel build/kernel.elf
+
+    nm build/kernel.elf | rustfilt | awk '{ $2=""; print $0 }' > build/kernel.sym
+    python3 ./embed-symbol-table.py build/kernel.sym build/kernel.elf
+
+image name:
+    #!/usr/bin/env sh
+    set -e
+    path="build/{{name}}"
+
+    dd if=/dev/zero of=$path bs=1M count=64
+    parted -s $path mklabel gpt
+    parted -s $path mkpart primary 2048s 100%
+    sudo losetup -Pf --show $path >loopback_dev
+    mkdir -p isotmp
+    sudo partprobe $(cat loopback_dev)
+    sudo mkfs.ext2 $(cat loopback_dev)p1
+    sudo mount $(cat loopback_dev)p1 isotmp/
+    sudo cp -Rf build/kernel.elf isotmp/
+    sudo cp -Rf root/* isotmp/
+    sudo cp -Rf {{limine}}/limine.sys isotmp/
+    sync
+    sudo umount isotmp/
+    sudo losetup -d $(cat loopback_dev)
+    ./{{limine}}/limine-install $path
+    echo "HDD is complete"
+
+limine:
+    #!/usr/bin/env bash
+    pushd ./extern/limine
+    make
+    popd
+
+run release="debug": (build release) (image img)
+    qemu-system-{{target}} -cpu Haswell {{qemu-args}}
+
+kvm release="debug": (build release) (image img)
+    sudo qemu-system-{{target}} -enable-kvm -cpu host {{qemu-args}}

build/.gitkeep

@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+import argparse
+import sys
+import struct
+
+START_MAKER = b"__SYMBOL_TABLE_START__"
+END_MAKER = b"__SYMBOL_TABLE_END__"
+SYMBOL_TABLE_MAGIC = 0xbeefbeef
+SYMBOL_MAX_LEN = 55
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("symbols_file")
+    parser.add_argument("executable")
+    args = parser.parse_args()
+
+    # Locate the symbol table in the executable.
+    image = open(args.executable, "rb").read()
+    offset = image.find(START_MAKER)
+    offset_end = image.find(END_MAKER)
+    if offset < 0 or offset_end < 0:
+        sys.exit("embed-symbol-table.py: failed to locate the symbol table")
+    if image.find(START_MAKER, offset + 1) >= 0:
+        print(hex(offset), hex(image.find(START_MAKER, offset + 1)))
+        sys.exit(
+            "embed-symbol-table.py: found multiple empty symbol tables (perhaps because "
+            + "START_MAKER is not sufficiently long to be unique?)")
+
+    # Parse the nm output and extract symbol names and theier addresses.
+    symbols = {}
+    for line in open(args.symbols_file).read().strip().split("\n"):
+        cols = line.split(" ", 1)
+        try:
+            addr = int(cols[0], 16)
+        except ValueError:
+            continue
+        name = cols[1]
+        symbols[addr] = name
+
+    symbols = sorted(symbols.items(), key=lambda s: s[0])
+
+    # Build a symbol table.
+    symbol_table = struct.pack("<IIQ", SYMBOL_TABLE_MAGIC, len(symbols), 0)
+    for addr, name in symbols:
+        if len(name) <= SYMBOL_MAX_LEN:
+            truncated_name = name[:55]
+        else:
+            prefix_len = SYMBOL_MAX_LEN // 2
+            suffix_len = SYMBOL_MAX_LEN - len("...") - prefix_len
+            truncated_name = name[:prefix_len] + "..." + name[-suffix_len:]
+            assert len(truncated_name) == SYMBOL_MAX_LEN
+        symbol_table += struct.pack("<Q56s", addr,
+                                    bytes(truncated_name, "ascii"))
+
+    max_size = offset_end - offset
+    if len(symbol_table) > max_size:
+        sys.exit(
+            f"embed-symbol-table.py: Too many symbols; please expand the symbol table area (max_size={max_size / 1024}KiB, created={len(symbol_table) / 1024}KiB)"
+        )
+
+    # Embed the symbol table.
+    image = image[:offset] + symbol_table + image[offset + len(symbol_table):]
+    open(args.executable, "wb").write(image)
+
+
+if __name__ == "__main__":
+    main()

embed-symbol-table.py

@@ -0,0 +1,25 @@
+[package]
+name = "environment"
+description = "A runtime environment for the kernel"
+version = "0.0.1"
+authors = ["chronium <[email protected]>"]
+edition = "2021"
+
+[lib]
+name = "environment"
+path = "lib.rs"
+
+[dependencies]
+log = "0.4.14"
+x86 = "0.43.0"
+vte = "0.10.1"
+spin = "0.9.2"
+cfg-if = "1.0.0"
+bitflags = "1.3.2"
+atomic_refcell = "0.1.8"
+
+buddy_system_allocator = { version = "0.8.0", features = ["const_fn"] }
+arrayvec = { version = "0.7.2", default-features = false }
+
+utils = { path = "../utils", features = ["no_std"] }
+log_filter = { path = "../log_filter" }