dburkart · dburkart · May 5, 2026 · May 5, 2026 · May 5, 2026
diff --git a/.github/workflows/smoke-soak.yml b/.github/workflows/smoke-soak.yml
@@ -106,7 +106,7 @@ jobs:
         with:
           # The fork/exec surface PR #206 introduced and epic #501 is
           # actively de-risking, plus the reproducer harness itself — a
-          # change to `scripts/repro-fork.sh`, `userspace/repro_fork/`,
+          # change to `scripts/repro-fork.sh`, `tests/userspace/repro_fork/`,
           # or the `repro-fork` xtask subcommand could silently
           # invalidate the soak, so it must trigger too.
           # Deliberately does NOT include this workflow file — a
@@ -120,7 +120,7 @@ jobs:
               - 'kernel/src/process/**'
               - 'xtask/src/main.rs'
               - 'scripts/repro-fork.sh'
-              - 'userspace/repro_fork/**'
+              - 'tests/userspace/repro_fork/**'
 
       - name: Decide
         id: decide

diff --git a/Cargo.toml b/Cargo.toml
@@ -16,16 +16,16 @@ members = [
     # dispatches to its `bench-page-cache` binary.
     "bench/page-cache",
     "xtask",
-    "userspace/hello",
-    "userspace/init",
-    "userspace/pjdfstest_runner",
-    "userspace/repro_fork",
-    "userspace/shell_pipeline",
-    "userspace/vibix_abi",
-    "userspace/vibix_libc",
-    "userspace/vibix_libc_defs",
-    "userspace/ld_vibix",
-    "userspace/hello_dyn",
+    "base/init",
+    "base/vibix_abi",
+    "base/vibix_libc",
+    "base/vibix_libc_defs",
+    "base/ld_vibix",
+    "tests/userspace/hello",
+    "tests/userspace/hello_dyn",
+    "tests/userspace/pjdfstest_runner",
+    "tests/userspace/repro_fork",
+    "tests/userspace/shell_pipeline",
 ]
 # tests/pjdfstest is a vendored copy of saidsay-so/pjdfstest (2-clause BSD). It
 # is intentionally kept outside the workspace until #581 wires it into xtask —
@@ -38,7 +38,7 @@ members = [
 # `host-fuzz` feature; pulling it into the workspace would force the host
 # feature surface on the kernel-target build graph. `cargo xtask fuzz ext2`
 # drives it directly.
-exclude = ["tests/pjdfstest", "kernel/fuzz", "userspace/std_hello"]
+exclude = ["tests/pjdfstest", "kernel/fuzz", "tests/userspace/std_hello"]
 resolver = "2"
 
 [workspace.package]

diff --git a/userspace/init/Cargo.toml → base/init/Cargo.toml b/userspace/init/Cargo.toml → base/init/Cargo.toml
diff --git a/userspace/init/link.ld → base/init/link.ld b/userspace/init/link.ld → base/init/link.ld
diff --git a/userspace/init/src/main.rs → base/init/src/main.rs b/userspace/init/src/main.rs → base/init/src/main.rs
diff --git a/userspace/ld_vibix/Cargo.toml → base/ld_vibix/Cargo.toml b/userspace/ld_vibix/Cargo.toml → base/ld_vibix/Cargo.toml
diff --git a/userspace/ld_vibix/link.ld → base/ld_vibix/link.ld b/userspace/ld_vibix/link.ld → base/ld_vibix/link.ld
diff --git a/userspace/ld_vibix/src/elf.rs → base/ld_vibix/src/elf.rs b/userspace/ld_vibix/src/elf.rs → base/ld_vibix/src/elf.rs
diff --git a/userspace/ld_vibix/src/main.rs → base/ld_vibix/src/main.rs b/userspace/ld_vibix/src/main.rs → base/ld_vibix/src/main.rs
diff --git a/userspace/ld_vibix/src/reloc.rs → base/ld_vibix/src/reloc.rs b/userspace/ld_vibix/src/reloc.rs → base/ld_vibix/src/reloc.rs
diff --git a/userspace/ld_vibix/src/serial.rs → base/ld_vibix/src/serial.rs b/userspace/ld_vibix/src/serial.rs → base/ld_vibix/src/serial.rs
diff --git a/userspace/lib/ld-musl-x86_64.so.1 → base/lib/ld-musl-x86_64.so.1 b/userspace/lib/ld-musl-x86_64.so.1 → base/lib/ld-musl-x86_64.so.1
diff --git a/userspace/vibix_abi/Cargo.toml → base/vibix_abi/Cargo.toml b/userspace/vibix_abi/Cargo.toml → base/vibix_abi/Cargo.toml
diff --git a/userspace/vibix_abi/src/alloc.rs → base/vibix_abi/src/alloc.rs b/userspace/vibix_abi/src/alloc.rs → base/vibix_abi/src/alloc.rs
diff --git a/userspace/vibix_abi/src/errno.rs → base/vibix_abi/src/errno.rs b/userspace/vibix_abi/src/errno.rs → base/vibix_abi/src/errno.rs
diff --git a/userspace/vibix_abi/src/fs.rs → base/vibix_abi/src/fs.rs b/userspace/vibix_abi/src/fs.rs → base/vibix_abi/src/fs.rs
diff --git a/userspace/vibix_abi/src/futex.rs → base/vibix_abi/src/futex.rs b/userspace/vibix_abi/src/futex.rs → base/vibix_abi/src/futex.rs
diff --git a/userspace/vibix_abi/src/lib.rs → base/vibix_abi/src/lib.rs b/userspace/vibix_abi/src/lib.rs → base/vibix_abi/src/lib.rs
diff --git a/userspace/vibix_abi/src/process.rs → base/vibix_abi/src/process.rs b/userspace/vibix_abi/src/process.rs → base/vibix_abi/src/process.rs
diff --git a/userspace/vibix_abi/src/stdio.rs → base/vibix_abi/src/stdio.rs b/userspace/vibix_abi/src/stdio.rs → base/vibix_abi/src/stdio.rs
diff --git a/userspace/vibix_abi/src/syscall.rs → base/vibix_abi/src/syscall.rs b/userspace/vibix_abi/src/syscall.rs → base/vibix_abi/src/syscall.rs
diff --git a/userspace/vibix_abi/src/thread.rs → base/vibix_abi/src/thread.rs b/userspace/vibix_abi/src/thread.rs → base/vibix_abi/src/thread.rs
diff --git a/userspace/vibix_libc/Cargo.toml → base/vibix_libc/Cargo.toml b/userspace/vibix_libc/Cargo.toml → base/vibix_libc/Cargo.toml
diff --git a/userspace/vibix_libc/src/errno.rs → base/vibix_libc/src/errno.rs b/userspace/vibix_libc/src/errno.rs → base/vibix_libc/src/errno.rs
diff --git a/userspace/vibix_libc/src/fcntl.rs → base/vibix_libc/src/fcntl.rs b/userspace/vibix_libc/src/fcntl.rs → base/vibix_libc/src/fcntl.rs
diff --git a/userspace/vibix_libc/src/helpers.rs → base/vibix_libc/src/helpers.rs b/userspace/vibix_libc/src/helpers.rs → base/vibix_libc/src/helpers.rs
diff --git a/userspace/vibix_libc/src/lib.rs → base/vibix_libc/src/lib.rs b/userspace/vibix_libc/src/lib.rs → base/vibix_libc/src/lib.rs
diff --git a/userspace/vibix_libc/src/stat.rs → base/vibix_libc/src/stat.rs b/userspace/vibix_libc/src/stat.rs → base/vibix_libc/src/stat.rs
diff --git a/userspace/vibix_libc/src/unistd.rs → base/vibix_libc/src/unistd.rs b/userspace/vibix_libc/src/unistd.rs → base/vibix_libc/src/unistd.rs
diff --git a/userspace/vibix_libc_defs/Cargo.toml → base/vibix_libc_defs/Cargo.toml b/userspace/vibix_libc_defs/Cargo.toml → base/vibix_libc_defs/Cargo.toml
diff --git a/userspace/vibix_libc_defs/src/lib.rs → base/vibix_libc_defs/src/lib.rs b/userspace/vibix_libc_defs/src/lib.rs → base/vibix_libc_defs/src/lib.rs
diff --git a/docs/RFC/0009-std-on-vibix.md b/docs/RFC/0009-std-on-vibix.md
@@ -251,7 +251,7 @@ Key choices:
 #### vibix_abi crate structure
 
 ```
-userspace/vibix_abi/
+base/vibix_abi/
 ├── Cargo.toml          # #![no_std], no deps
 └── src/
     ├── lib.rs          # pub mod syscall, alloc, thread, ...
@@ -268,7 +268,7 @@ userspace/vibix_abi/
 #### vibix_libc crate structure
 
 ```
-userspace/vibix_libc/
+base/vibix_libc/
 ├── Cargo.toml          # cdylib + staticlib, depends on vibix_abi
 ├── cbindgen.toml       # generates libc-compatible C headers
 └── src/
@@ -599,7 +599,7 @@ Porting it to vibix would give immediate ecosystem compatibility.
 musl introduces 100K lines of C that must be audited, cross-compiled,
 and maintained. The Rust-based approach (`vibix_libc`) is smaller,
 memory-safe, and can share syscall stubs with `vibix_abi`. The
-`ld-musl-x86_64.so.1` already present in `userspace/lib/` was
+`ld-musl-x86_64.so.1` already present in `base/lib/` was
 shipped for PT_INTERP testing (#762), not as a long-term libc
 strategy.
 

diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml
@@ -79,7 +79,7 @@ hermit-abi = { version = "0.5.0", features = [
 ], public = true }
 
 [target.'cfg(target_os = "vibix")'.dependencies]
-vibix_abi = { path = "../../userspace/vibix_abi", features = [
+vibix_abi = { path = "../../base/vibix_abi", features = [
     'rustc-dep-of-std',
 ] }
 

diff --git a/tests/fixtures/ext2_image.sha256 b/tests/fixtures/ext2_image.sha256
@@ -1 +1 @@
-8322bed0e51dc05695bb4c097a0901091603f97a5af0f56fba0fda05d550b15f
+5328494b6702cb3a791125b47f950881c29f76d7a680dd19f38fdfccdf0929d3
diff --git a/userspace/hello/Cargo.toml → tests/userspace/hello/Cargo.toml b/userspace/hello/Cargo.toml → tests/userspace/hello/Cargo.toml
diff --git a/userspace/hello/link.ld → tests/userspace/hello/link.ld b/userspace/hello/link.ld → tests/userspace/hello/link.ld
diff --git a/userspace/hello/src/main.rs → tests/userspace/hello/src/main.rs b/userspace/hello/src/main.rs → tests/userspace/hello/src/main.rs
diff --git a/userspace/hello_dyn/Cargo.toml → tests/userspace/hello_dyn/Cargo.toml b/userspace/hello_dyn/Cargo.toml → tests/userspace/hello_dyn/Cargo.toml
@@ -11,4 +11,4 @@ name = "userspace_hello_dyn"
 path = "src/main.rs"
 
 [dependencies]
-vibix_libc = { path = "../vibix_libc" }
+vibix_libc = { path = "../../../base/vibix_libc" }
diff --git a/userspace/hello_dyn/link.ld → tests/userspace/hello_dyn/link.ld b/userspace/hello_dyn/link.ld → tests/userspace/hello_dyn/link.ld
diff --git a/userspace/hello_dyn/src/main.rs → tests/userspace/hello_dyn/src/main.rs b/userspace/hello_dyn/src/main.rs → tests/userspace/hello_dyn/src/main.rs
diff --git a/userspace/pjdfstest_runner/Cargo.toml → tests/userspace/pjdfstest_runner/Cargo.toml b/userspace/pjdfstest_runner/Cargo.toml → tests/userspace/pjdfstest_runner/Cargo.toml
diff --git a/userspace/pjdfstest_runner/link.ld → tests/userspace/pjdfstest_runner/link.ld b/userspace/pjdfstest_runner/link.ld → tests/userspace/pjdfstest_runner/link.ld
diff --git a/userspace/pjdfstest_runner/src/main.rs → tests/userspace/pjdfstest_runner/src/main.rs b/userspace/pjdfstest_runner/src/main.rs → tests/userspace/pjdfstest_runner/src/main.rs
diff --git a/userspace/repro_fork/Cargo.toml → tests/userspace/repro_fork/Cargo.toml b/userspace/repro_fork/Cargo.toml → tests/userspace/repro_fork/Cargo.toml
diff --git a/userspace/repro_fork/link.ld → tests/userspace/repro_fork/link.ld b/userspace/repro_fork/link.ld → tests/userspace/repro_fork/link.ld
diff --git a/userspace/repro_fork/src/main.rs → tests/userspace/repro_fork/src/main.rs b/userspace/repro_fork/src/main.rs → tests/userspace/repro_fork/src/main.rs
diff --git a/userspace/shell_pipeline/Cargo.toml → tests/userspace/shell_pipeline/Cargo.toml b/userspace/shell_pipeline/Cargo.toml → tests/userspace/shell_pipeline/Cargo.toml
diff --git a/userspace/shell_pipeline/link.ld → tests/userspace/shell_pipeline/link.ld b/userspace/shell_pipeline/link.ld → tests/userspace/shell_pipeline/link.ld
diff --git a/userspace/shell_pipeline/src/main.rs → tests/userspace/shell_pipeline/src/main.rs b/userspace/shell_pipeline/src/main.rs → tests/userspace/shell_pipeline/src/main.rs
diff --git a/userspace/std_hello/Cargo.toml → tests/userspace/std_hello/Cargo.toml b/userspace/std_hello/Cargo.toml → tests/userspace/std_hello/Cargo.toml
diff --git a/userspace/std_hello/src/main.rs → tests/userspace/std_hello/src/main.rs b/userspace/std_hello/src/main.rs → tests/userspace/std_hello/src/main.rs
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
@@ -577,13 +577,13 @@ fn build_userspace_binary(package: &str, link_ld: &str) -> R<PathBuf> {
 }
 
 fn build_userspace_init() -> R<PathBuf> {
-    build_userspace_binary("userspace_init", "userspace/init/link.ld")
+    build_userspace_binary("userspace_init", "base/init/link.ld")
 }
 
 /// Build the hello binary — the exec() target for the fork+exec+wait test.
 /// Links at 0x400000 (lower half) just like init so load_user_elf accepts it.
 fn build_userspace_hello() -> R<PathBuf> {
-    build_userspace_binary("userspace_hello", "userspace/hello/link.ld")
+    build_userspace_binary("userspace_hello", "tests/userspace/hello/link.ld")
 }
 
 /// Build the fork-loop reproducer harness (issue #506).
@@ -592,20 +592,20 @@ fn build_userspace_hello() -> R<PathBuf> {
 /// this binary runs a tight fork+exec+wait loop as PID 1 to amplify the
 /// ~50 %-rate flake bisected to PR #206 into a deterministic repro.
 fn build_userspace_repro_fork() -> R<PathBuf> {
-    build_userspace_binary("userspace_repro_fork", "userspace/repro_fork/link.ld")
+    build_userspace_binary("userspace_repro_fork", "tests/userspace/repro_fork/link.ld")
 }
 
 /// Build the shell-pipeline integration binary (issue #462).
 ///
 /// Shipped as `userspace_init.elf` when `cargo xtask shell-pipeline` is
 /// used — the binary internally simulates `echo foo | cat | wc -c`
 /// using pipe2/fork/dup2/close/wait4 and prints `SHELL_PIPELINE_OK: 4`
-/// on success. See `userspace/shell_pipeline/src/main.rs` for the
+/// on success. See `tests/userspace/shell_pipeline/src/main.rs` for the
 /// rationale on why all three pipeline stages live in one binary.
 fn build_userspace_shell_pipeline() -> R<PathBuf> {
     build_userspace_binary(
         "userspace_shell_pipeline",
-        "userspace/shell_pipeline/link.ld",
+        "tests/userspace/shell_pipeline/link.ld",
     )
 }
 
@@ -614,7 +614,7 @@ fn build_userspace_shell_pipeline() -> R<PathBuf> {
 /// `cargo xtask pjdfstest`. Same link layout as `userspace_init` so
 /// the kernel's ELF loader doesn't need any new code paths.
 pub(crate) fn build_pjdfstest_runner() -> R<PathBuf> {
-    build_userspace_binary("pjdfstest_runner", "userspace/pjdfstest_runner/link.ld")
+    build_userspace_binary("pjdfstest_runner", "tests/userspace/pjdfstest_runner/link.ld")
 }
 
 /// Build the vibix dynamic linker (`ld-vibix.so`).
@@ -624,7 +624,7 @@ pub(crate) fn build_pjdfstest_runner() -> R<PathBuf> {
 /// Uses `-C relocation-model=pic` and `-C link-arg=-shared` to get
 /// position-independent code in a shared-object container.
 fn build_ld_vibix() -> R<PathBuf> {
-    let link_ld = "userspace/ld_vibix/link.ld";
+    let link_ld = "base/ld_vibix/link.ld";
     let rustflags = [
         &format!("-C link-arg=-T{link_ld}"),
         "-C relocation-model=pic",
@@ -713,7 +713,7 @@ fn build_libc_so() -> R<PathBuf> {
 /// The kernel loads ld-vibix.so and transfers control to it, which then
 /// processes relocations and jumps to this binary's entry point.
 fn build_userspace_hello_dyn() -> R<PathBuf> {
-    let link_ld = "userspace/hello_dyn/link.ld";
+    let link_ld = "tests/userspace/hello_dyn/link.ld";
     let rustflags = [
         &format!("-C link-arg=-T{link_ld}"),
         "-C relocation-model=pic",
@@ -751,7 +751,7 @@ fn build_userspace_hello_dyn() -> R<PathBuf> {
 fn build_userspace_std_hello() -> R<PathBuf> {
     let ws = workspace_root();
     let target_spec = ws.join(VIBIX_USERSPACE_TARGET);
-    let manifest = ws.join("userspace/std_hello/Cargo.toml");
+    let manifest = ws.join("tests/userspace/std_hello/Cargo.toml");
     let library_root = ws.join("library");
 
     let target_dir = ws.join("target");
@@ -1283,7 +1283,7 @@ fn ensure_initrd() -> R<PathBuf> {
                                                       // DIRS headers + 4 file headers + (3 small + LDSO_BLOCKS) data blocks + 2 end blocks.
     const EXPECTED_SIZE: u64 = (DIRS.len() as u64 + 4 + 3 + LDSO_BLOCKS + 2) * 512;
 
-    let ldso_src = workspace_root().join("userspace/lib/ld-musl-x86_64.so.1");
+    let ldso_src = workspace_root().join("base/lib/ld-musl-x86_64.so.1");
 
     // Size + magic aren't sufficient — changing MOTD_PAYLOAD to another
     // equal-or-shorter string would leave the old payload on disk (same
@@ -1551,7 +1551,7 @@ fn make_iso_inner(
     fs::copy(userspace_hello, iso_root.join("boot/userspace_hello.elf"))?;
     fs::copy(&initrd, iso_root.join("boot/rootfs.tar"))?;
     fs::copy(
-        workspace_root().join("userspace/lib/ld-musl-x86_64.so.1"),
+        workspace_root().join("base/lib/ld-musl-x86_64.so.1"),
         iso_root.join("boot/ld-musl-x86_64.so.1"),
     )?;
     // #764: stub dynamic-linker fixture for the dynlinker_stub integration test.
@@ -2275,7 +2275,7 @@ fn repro_fork_build(opts: &BuildOpts) -> R<PathBuf> {
 /// heartbeat-aware watchdog.  Issue #506 / epic #501.
 ///
 /// Replaces `/boot/userspace_init.elf` in the ISO with the
-/// `userspace_repro_fork` binary (see `userspace/repro_fork/`).  That
+/// `userspace_repro_fork` binary (see `tests/userspace/repro_fork/`).  That
 /// binary runs `CYCLES` fork+exec+wait iterations, emitting
 /// `repro: cycle K alive` every 50 cycles and `repro: fork loop
 /// complete` on success.  The loop in this function follows those
@@ -3687,6 +3687,7 @@ repro: starting fork loop cycles=500 hb=50
     fn repro_fork_default_cycles_is_500() {
         let source = std::fs::read_to_string(
             workspace_root()
+                .join("tests")
                 .join("userspace")
                 .join("repro_fork")
                 .join("src")
@@ -3701,7 +3702,7 @@ repro: starting fork loop cycles=500 hb=50
         // timing budget / this test."
         assert!(
             source.contains("None => 500,"),
-            "userspace/repro_fork/src/main.rs must keep the default CYCLES=500; \
+            "tests/userspace/repro_fork/src/main.rs must keep the default CYCLES=500; \
              if you genuinely need to change this, also update \
              .github/workflows/smoke-soak.yml timing budgets and issue #531's context"
         );
@@ -3720,6 +3721,7 @@ repro: starting fork loop cycles=500 hb=50
     fn repro_fork_syscall_blocks_clobber_all_sysv_caller_saved() {
         let source = std::fs::read_to_string(
             workspace_root()
+                .join("tests")
                 .join("userspace")
                 .join("repro_fork")
                 .join("src")
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		8322bed0e51dc05695bb4c097a0901091603f97a5af0f56fba0fda05d550b15f
		5328494b6702cb3a791125b47f950881c29f76d7a680dd19f38fdfccdf0929d3