Migrate filesystem clients to broker

.github/workflows/ci.yml

@@ -90,6 +90,7 @@ jobs:
       # is the PR this job starts covering it.
       AARCH64_CRATES: >-
         -p litebox
+        -p litebox_broker_core
         -p litebox_broker_userland
         -p litebox_common_linux
         -p litebox_egress_proxy
@@ -318,6 +319,9 @@ jobs:
           #   `std` access, since it owns hosted Linux broker resources such as
           #   sockets and the epoll reactor.
           #
+          # - `litebox_broker_platform_windows_userland` is allowed to have
+          #   `std` access, since it owns hosted Windows broker resources.
+          #
           # - `litebox_broker_userland` is allowed to have `std` access,
           #   since it is the hosted userland broker executable.
           #
@@ -328,16 +332,16 @@ jobs:
           #   not work with the current no_std checker.
           #
           # - `litebox_runner_linux_on_windows_userland` is allowed to have `std`
-          #   access since it needs to actually access the file-system, pull in
-          #   relevant files, and then actually trigger LiteBox itself.
+          #   access since it is a hosted executable that connects to the broker
+          #   and launches the LiteBox guest.
           #
           # - `litebox_runner_windows_on_linux_userland` is allowed to have `std`
           #   access since it needs to actually access the file-system, pull in
           #   relevant files, and then actually trigger LiteBox itself.
           #
           # - `litebox_runner_linux_userland` is allowed to have `std` access
-          #   since it needs to actually access the file-system, pull in
-          #   relevant files, and then actually trigger LiteBox itself.
+          #   since it is a hosted executable that connects to the broker and
+          #   launches the LiteBox guest.
           #
           # - `litebox_runner_windows_userland` is allowed to have `std` access
           #   since it needs to actually access the file-system, pull in
@@ -381,6 +385,7 @@ jobs:
             -not -path './Cargo.toml' \
             -not -path './litebox_broker_local_userland/Cargo.toml' \
             -not -path './litebox_broker_platform_linux_userland/Cargo.toml' \
+            -not -path './litebox_broker_platform_windows_userland/Cargo.toml' \
             -not -path './litebox_broker_transport_linux_userland/Cargo.toml' \
             -not -path './litebox_broker_transport_windows_userland/Cargo.toml' \
             -not -path './litebox_broker_userland/Cargo.toml' \

Cargo.toml

@@ -6,6 +6,7 @@ members = [
     "litebox_broker_local_userland",
     "litebox_broker_core",
     "litebox_broker_platform_linux_userland",
+    "litebox_broker_platform_windows_userland",
     "litebox_broker_protocol",
     "litebox_broker_host",
     "litebox_broker_transport",
@@ -47,6 +48,7 @@ default-members = [
     "litebox_broker_local_userland",
     "litebox_broker_core",
     "litebox_broker_platform_linux_userland",
+    "litebox_broker_platform_windows_userland",
     "litebox_broker_protocol",
     "litebox_broker_host",
     "litebox_broker_transport",

dev_bench/src/main.rs

@@ -450,9 +450,16 @@ fn run_rewritten_hello_static(ctx: BenchCtx<'_>) -> Result<()> {
         is_init,
         lock_tracing,
     } = ctx;
+    let tar_file = sh.current_dir().join("hello_static_rootfs.tar");
     if is_init {
         rewriter_hello_static(ctx.with_init(true))?;
         rewriter_hello_static(ctx.with_init(false))?;
+        sh.remove_path(&tar_file)?;
+        cmd!(
+            sh,
+            "tar --format=ustar -cf {tar_file} hello_static_rewritten"
+        )
+        .run()?;
         let features: &[&str] = if lock_tracing {
             &["--features", "lock_tracing"]
         } else {
@@ -463,11 +470,15 @@ fn run_rewritten_hello_static(ctx: BenchCtx<'_>) -> Result<()> {
             "cargo build -p litebox_runner_linux_userland --release {features...}"
         )
         .run()?;
+        cmd!(sh, "cargo build -p litebox_broker_userland --release").run()?;
     } else {
+        let broker = project_root.join("target/release/litebox-broker-userland");
+        let runner = project_root.join("target/release/litebox_runner_linux_userland");
         cmd!(
             sh,
-            "{project_root}/target/release/litebox_runner_linux_userland --unstable hello_static_rewritten"
-        ).run()?;
+            "{broker} --fs-initial-files {tar_file} --runner {runner} /hello_static_rewritten"
+        )
+        .run()?;
     }
     Ok(())
 }
@@ -586,9 +597,13 @@ fn run_rewritten_node(ctx: BenchCtx<'_>) -> Result<()> {
         rewriter_node(ctx.with_init(false))?;
 
         let tar_base_dir = sh.current_dir().join("node_tar_base");
+        sh.create_dir(&tar_base_dir)?;
         sh.write_file(tar_base_dir.join("hello_world.js"), HELLO_WORLD_JS)?;
+        std::fs::copy(
+            sh.current_dir().join("node_rewritten"),
+            tar_base_dir.join("node_rewritten"),
+        )?;
         let libs = find_dependencies(sh, "node")?;
-        sh.create_dir(&tar_base_dir)?;
         for lib in libs {
             let dest_path = tar_base_dir
                 .join(lib.strip_prefix("/").unwrap_or_else(|_| {
@@ -618,11 +633,14 @@ fn run_rewritten_node(ctx: BenchCtx<'_>) -> Result<()> {
             "cargo build -p litebox_runner_linux_userland {release...} {features...}"
         )
         .run()?;
+        cmd!(sh, "cargo build -p litebox_broker_userland {release...}").run()?;
     } else {
         let mode = if release_mode { "release" } else { "debug" };
+        let broker = project_root.join(format!("target/{mode}/litebox-broker-userland"));
+        let runner = project_root.join(format!("target/{mode}/litebox_runner_linux_userland"));
         cmd!(
             sh,
-            "{project_root}/target/{mode}/litebox_runner_linux_userland --unstable --env HOME=/ --initial-files {tar_file} node_rewritten hello_world.js"
+            "{broker} --fs-initial-files {tar_file} --runner {runner} --env HOME=/ /node_rewritten hello_world.js"
         ).run()?;
     }
     Ok(())

dev_bench/unixbench/README.md

@@ -7,11 +7,11 @@ Run [byte-unixbench](https://github.com/kdlucas/byte-unixbench) benchmarks nativ
 - The UnixBench source tree at `byte-unixbench-6.0.0/UnixBench/` (extracted from `v6.0.0.zip`).
 - `gcc`, `make`, `ldd`, `tar` on the host.
 - Pre-built LiteBox binaries (`litebox-broker-userland`,
-  `litebox_runner_linux_userland`, and `litebox_syscall_rewriter`).
+  `litebox_runner_linux_userland`, and `litebox_packager`).
 
 Build LiteBox (from workspace root):
 ```bash
-cargo build --release -p litebox_broker_userland -p litebox_runner_linux_userland -p litebox_syscall_rewriter
+cargo build --release -p litebox_broker_userland -p litebox_runner_linux_userland -p litebox_packager
 ```
 
 ## Quick Start
@@ -144,5 +144,4 @@ python run_unixbench.py --mode litebox --windows --prepared-dir ./prepared --run
 ```
 
 **Key differences from Linux mode:**
-- No `--rewrite-syscalls` needed — binaries are already pre-rewritten
 - No native baseline (Linux binaries can't run natively on Windows)

dev_bench/unixbench/run_unixbench.py

@@ -296,12 +296,11 @@ def prepare_litebox_rootfs(
 
     The packager discovers shared-library dependencies via ldd, rewrites all
     ELF files with the syscall rewriter, and produces a tar suitable for
-    ``--initial-files``.  The rewritten main binary is then extracted from
-    the tar so it can be passed to the runner as the program to execute.
+    broker ``--fs-initial-files``.
 
-    Returns (tar_path, rewritten_binary_path) or None on failure.
+    Returns (tar_path, guest_program_path) or None on failure.
     """
-    binary = pgms_dir / bench.binary
+    binary = (pgms_dir / bench.binary).resolve()
     if not binary.exists():
         print(f"  [SKIP] {bench.name}: binary not found at {binary}")
         return None
@@ -323,19 +322,17 @@ def prepare_litebox_rootfs(
         print(f"  Error: packager failed for {bench.name}: {stderr[:500]}")
         return None
 
-    # Extract the rewritten main binary from the tar
-    rewritten = work_dir / f"{bench.binary}.hooked"
-    try:
-        extract_rewritten_binary(tar_path, binary, rewritten)
-    except RuntimeError as e:
-        print(f"  Error: {e}")
-        return None
-
     # For execl: add the rewritten binary at /pgms/execl in the tar
     if bench.name == "execl":
+        rewritten = work_dir / f"{bench.binary}.hooked"
+        try:
+            extract_rewritten_binary(tar_path, binary, rewritten)
+        except RuntimeError as e:
+            print(f"  Error: {e}")
+            return None
         add_execl_to_tar(tar_path, rewritten)
 
-    return tar_path, rewritten
+    return tar_path, binary
 
 
 def _run_litebox_cmd(
@@ -433,11 +430,12 @@ def run_litebox(
     if prepared is None:
         return None
 
-    tar_path, rewritten = prepared
+    tar_path, guest_program = prepared
     broker_path = runner_path.with_name("litebox-broker-userland")
 
     cmd = [
         str(broker_path),
+        "--fs-initial-files", str(tar_path),
         "--runner", str(runner_path),
         "--env", "LD_LIBRARY_PATH=/lib64:/lib32:/lib",
         "--env", "HOME=/",
@@ -447,8 +445,7 @@ def run_litebox(
     if bench.name == "execl":
         cmd += ["--env", "UB_BINDIR=/pgms"]
 
-    cmd += ["--initial-files", str(tar_path)]
-    cmd += [str(rewritten)]
+    cmd += [str(guest_program)]
 
     return _run_litebox_cmd(bench, duration, cmd)
 
@@ -491,6 +488,7 @@ def run_litebox_windows(
     broker_path = runner_path.with_name("litebox-broker-userland.exe")
     cmd = [
         str(broker_path),
+        "--fs-initial-files", str(tar_path),
         "--runner", str(runner_path),
         "--env", "LD_LIBRARY_PATH=/lib64:/lib32:/lib",
         "--env", "HOME=/",
@@ -500,7 +498,6 @@ def run_litebox_windows(
     if bench.name == "execl":
         cmd += ["--env", "UB_BINDIR=/pgms"]
 
-    cmd += ["--initial-files", str(tar_path)]
     cmd += [tar_program_path]
 
     return _run_litebox_cmd(bench, duration, cmd)

dev_tests/src/ratchet.rs

@@ -34,21 +34,21 @@ fn ratchet_globals() -> Result<()> {
     ratchet(
         &[
             ("dev_bench/", 1),
-            ("litebox/", 7),
             ("litebox_broker_core/", 1),
             ("litebox_broker_transport_linux_userland/", 1),
             ("litebox_broker_userland/", 1),
+            ("litebox/", 7),
             ("litebox_platform/", 2),
             ("litebox_platform_linux_kernel/", 5),
             ("litebox_platform_linux_userland/", 5),
             ("litebox_platform_lvbs/", 21),
             ("litebox_platform_windows_userland/", 12),
             ("litebox_runner_lvbs/", 8),
             ("litebox_runner_snp/", 2),
-            ("litebox_runner_windows_userland/", 2),
             ("litebox_shim_linux/", 2),
             ("litebox_shim_optee/", 6),
             ("litebox_shim_windows/", 1),
+            ("litebox_runner_windows_userland/", 2),
         ],
         |file| {
             Ok(file