Forker process

.github/workflows/ci.yml

@@ -106,7 +106,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --all-features
+          args: --all-features -- --test-threads=1
 
   doc:
     name: Documentation

README.md

@@ -264,7 +264,7 @@ kernel configuration with the `CONFIG_` entries in the `check_conf.sh` script.
 
 ### Container launch sequence
 
-**TODO**: <br/><img src="images/container-startup.png" class="inline" width=600/>
+<br/><img src="images/container-startup.png" class="inline" width=600/>
 
 ### Manifest Format
 

examples/console/manifest.yaml

@@ -5,10 +5,8 @@ console: true
 uid: 1000
 gid: 1000
 io:
-  stdout:
-    log:
-      level: DEBUG
-      tag: console
+  stdout: pipe
+  stderr: pipe
 mounts:
   /dev:
     type: dev

examples/cpueater/manifest.yaml

@@ -24,7 +24,5 @@ mounts:
     type: bind
     host: /system
 io:
-  stdout:
-    log:
-      level: DEBUG
-      tag: cpueater
+  stdout: pipe
+  stderr: pipe

examples/cpueater/src/main.rs

@@ -1,7 +1,7 @@
 use std::env::var;
 
 fn main() {
-    let version = var("VERSION").expect("Failed to read VERSION");
+    let version = var("NORTHSTAR_VERSION").expect("Failed to read NORTHSTAR_VERSION");
     let threads = var("THREADS")
         .expect("Failed to read THREADS")
         .parse::<i32>()

examples/crashing/manifest.yaml

@@ -5,6 +5,9 @@ uid: 1000
 gid: 1000
 env:
   RUST_BACKTRACE: 1
+io:
+  stdout: pipe
+  stderr: discard
 mounts:
   /dev:
     type: dev
@@ -19,8 +22,3 @@ mounts:
   /system:
     type: bind
     host: /system
-io:
-  stdout:
-    log:
-      level: DEBUG
-      tag: crashing

examples/hello-ferris/manifest.yaml

@@ -37,7 +37,5 @@ mounts:
     dir: /
     options: noexec,nodev,nosuid
 io:
-  stdout:
-    log:
-      level: DEBUG
-      tag: ferris
+  stdout: pipe
+  stderr: pipe

examples/hello-resource/manifest.yaml

@@ -23,7 +23,5 @@ mounts:
     type: bind
     host: /system
 io:
-  stdout:
-    log:
-      level: DEBUG
-      tag: hello
+  stdout: pipe
+  stderr: pipe

examples/hello-world/manifest.yaml

@@ -6,10 +6,8 @@ gid: 1000
 env:
   HELLO: northstar
 io:
-  stdout:
-    log:
-      level: DEBUG
-      tag: hello
+  stdout: pipe
+  stderr: pipe
 mounts:
   /dev:
     type: dev

examples/hello-world/src/main.rs

@@ -1,13 +1,9 @@
 fn main() {
-    let hello = std::env::var("HELLO").unwrap_or_else(|_| "unknown".into());
-    let version = std::env::var("VERSION").unwrap_or_else(|_| "unknown".into());
+    let hello = std::env::var("NORTHSTAR_CONTAINER").unwrap_or_else(|_| "unknown".into());
 
-    println!("Hello again {} from version {}!", hello, version);
+    println!("Hello again {}!", hello);
     for i in 0..u64::MAX {
-        println!(
-            "...and hello again #{} {} from version {}...",
-            i, hello, version
-        );
+        println!("...and hello again #{} {} ...", i, hello);
         std::thread::sleep(std::time::Duration::from_secs(1));
     }
 }

examples/inspect/manifest.yaml

@@ -1,17 +1,11 @@
-name: inspect 
+name: inspect
 version: 0.0.1
 init: /inspect
 uid: 1000
 gid: 1000
 io:
-  stdout:
-    log:
-      level: DEBUG
-      tag: inspect
-  stderr:
-    log:
-      level: WARN
-      tag: inspect
+  stdout: pipe
+  stderr: discard
 mounts:
   /dev:
     type: dev

examples/memeater/manifest.yaml

@@ -23,7 +23,5 @@ mounts:
     type: bind
     host: /system
 io:
-  stdout:
-    log:
-      level: DEBUG
-      tag: memeater
+  stdout: pipe
+  stderr: pipe

examples/persistence/manifest.yaml

@@ -20,7 +20,5 @@ mounts:
     type: bind
     host: /system
 io:
-  stdout:
-    log:
-      level: DEBUG
-      tag: persistence
+  stdout: pipe
+  stderr: pipe

examples/seccomp/manifest.yaml

@@ -18,10 +18,8 @@ mounts:
     type: bind
     host: /system
 io:
-  stdout:
-    log:
-      level: DEBUG
-      tag: seccomp
+  stdout: pipe
+  stderr: pipe
 seccomp:
   profile:
-    default
+    default

images/container-startup.puml

@@ -1,33 +1,69 @@
 @startuml container_startup
 
+create Client
+activate Client
+
+create Runtime
 activate Runtime
-Runtime -> Runtime: Check and Mount container
+
+create Forker
+Runtime -> Forker: Fork
+activate Forker
+
+Client -> Runtime: Connect: Hello
+Client <- Runtime: ConnectAck
+Client -> Runtime: Start container
+Runtime -> Runtime: Check and mount container(s)
+Runtime -> Runtime: Open PTY
+
+Runtime -> Forker: Create container
+
 create Trampoline
-Runtime -> Trampoline: Fork
+Forker -> Trampoline: Fork
 activate Trampoline
+Trampoline -> Trampoline: Create PID namespace
+
 create Init
 Trampoline -> Init: Fork
 activate Init
-Trampoline -> Runtime: Init PID
+Init -> Init: Mount, Chroot, UID / GID,\ndrop privileges, file descriptors
+
+Trampoline -> Forker: Forked init with PID
 destroy Trampoline
-Runtime -> Runtime: Wait for Trampoline exit (waitpid)
-Init -> Init: Wait for run signal (Condition::wait)
+
+Forker -> Forker: reap Trampoline
+
+Forker -> Runtime: Created init with PID
+
 Runtime -> Runtime: Configure cgroups
-Runtime -> Init: Signal run (Condition::notify)
-Runtime -> Runtime: Wait for execve (Condition::wait)
-Init -> Init: Mount, Chroot, UID / GID,\ndrop privileges, file descriptors
+Runtime -> Runtime: Configure debug
+Runtime -> Runtime: Configure PTY forward
+
+Runtime -> Forker: Exec container
+Forker -> Init: Exec Container
 create Container
 Init -> Container: Fork
 activate Container
+Forker <- Init: Exec
+Runtime <- Forker: Exec
+Client <- Runtime: Started
+Client <- Runtime: Notification: Started
+
 Init -> Init: Wait for container to exit (waitpid)
+Container -> Container: Setup PTY
 Container -> Container: Set seccomp filter
 Container -> : Execve(..)
-Runtime -> Runtime: Condition pipe closed: Container is started
-note left: Condition pipe is CLOEXEC
-Container -> Init: Exit
+...
+Container -> Init: SIGCHLD
 destroy Container
-Init -> Runtime: Exit
-Runtime -> Runtime: Read exit status from pipe or waitpid on pid of init
+
+Init -> Init: waitpid: Exit status of container
+Init -> Forker: Container exit status
 destroy Init
 
+Forker -> Runtime: Container exit status
+Runtime -> Runtime: Stop PTY thread
+Runtime -> Runtime: Destroy cgroups
+Client <- Runtime: Notification: Exit
+
 @enduml

main/Cargo.toml

@@ -16,7 +16,7 @@ clap = { version = "3.1.0", features = ["derive"] }
 log = "0.4.14"
 nix = "0.23.0"
 northstar = { path = "../northstar", features = ["runtime"] }
-tokio = { version = "1.17.0", features = ["rt", "macros", "signal"] }
+tokio = { version = "1.17.0", features = ["rt-multi-thread", "macros", "signal"] }
 toml = "0.5.8"
 
 [target.'cfg(not(target_os = "android"))'.dependencies]