(cherry picked from commit 5fa10aa313f16e2afedefc58806d1c0a40ed08df) --- .../cargo-lock-vendor-fix.patch | 53 ------------------- .../cloud-hypervisor/default.nix | 15 +++--- 2 files changed, 7 insertions(+), 61 deletions(-) delete mode 100644 pkgs/applications/virtualization/cloud-hypervisor/cargo-lock-vendor-fix.patch diff --git a/pkgs/applications/virtualization/cloud-hypervisor/cargo-lock-vendor-fix.patch b/pkgs/applications/virtualization/cloud-hypervisor/cargo-lock-vendor-fix.patch deleted file mode 100644 index 7a7378faa58..00000000000 --- a/pkgs/applications/virtualization/cloud-hypervisor/cargo-lock-vendor-fix.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index e566ed25..a661a963 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -689,7 +689,7 @@ dependencies = [ - "serde", - "serde_derive", - "serde_json", -- "vfio-bindings 0.2.0 (git+https://github.com/rust-vmm/vfio-bindings)", -+ "vfio-bindings", - "vfio-ioctls", - "vm-allocator", - "vm-device", -@@ -1346,17 +1346,12 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] - name = "vfio-bindings" - version = "0.2.0" --source = "git+https://github.com/rust-vmm/vfio-bindings#f08cbcbf4041c981441d9c036c49ebad50..." -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4a21f546f2bda37f5a8cfb138c87f95b8e34d2d78d6a7a92ba3785f4e08604a7" - dependencies = [ - "vmm-sys-util", - ] - --[[package]] --name = "vfio-bindings" --version = "0.2.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4a21f546f2bda37f5a8cfb138c87f95b8e34d2d78d6a7a92ba3785f4e08604a7" -- - [[package]] - name = "vfio-ioctls" - version = "0.1.0" -@@ -1366,7 +1361,7 @@ dependencies = [ - "kvm-bindings", - "kvm-ioctls", - "log 0.4.8", -- "vfio-bindings 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vfio-bindings", - "vm-memory", - "vmm-sys-util", - ] -diff --git a/pci/Cargo.toml b/pci/Cargo.toml -index 9c6955c7..4ecf8e6b 100644 ---- a/pci/Cargo.toml -+++ b/pci/Cargo.toml -@@ -23,5 +23,5 @@ vm-memory = "0.2.1" - vm-migration = { path = "../vm-migration" } - - [dependencies.vfio-bindings] --git = "https://github.com/rust-vmm/vfio-bindings" -+version = "0.2.0" - features = ["fam-wrappers"] diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 59c97c4a8de..4abd9fe1ab9 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -1,28 +1,27 @@ -{ lib, fetchFromGitHub, rustPlatform, pkgconfig, openssl }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, dtc, openssl }: rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "0.8.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "h2aWWjycTm84TS89/vhqnAvwOqeeSDtvvCt+Is6I0eI="; + sha256 = "0pnfg6dzpz8v40cwg3dmlj52x8pblavv7mkczar814dwbk01y7vr"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoPatches = [ ./cargo-lock-vendor-fix.patch ]; - cargoSha256 = "fOIB+qVDqAAgQPW3bK2NfST24GzYJeRXgaMFXyNPcPQ="; + cargoSha256 = "0dbjds40znly11i0ssfv66w82ynxp00ixw1349m5ln9i9ms94sr4"; meta = with lib; { homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor"; description = "Open source Virtual Machine Monitor (VMM) that runs on top of KVM"; changelog = "https://github.com/cloud-hypervisor/cloud-hypervisor/releases/tag/v${version}"; license = with licenses; [ asl20 bsd3 ]; - maintainers = with maintainers; [ offline ]; - platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ offline qyliss ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; }; } -- 2.30.0

This patch (backported from Linux 5.5) fixes hotplugging with cloud-hypervisor. See https://github.com/cloud-hypervisor/cloud-hypervisor/blob/8b7aafad16ee8a23d7.... --- pkgs/os-specific/linux/kernel/patches.nix | 9 +++++++++ pkgs/os-specific/linux/spectrum/linux/vm.nix | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 8ce1ac2b587..a802a0a24d7 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -92,4 +92,13 @@ name = "mac_nvme_t2"; patch = ./mac-nvme-t2.patch; }; + + # https://github.com/cloud-hypervisor/cloud-hypervisor/blob/8b7aafad16ee8a23d7... + evged = { + name = "evged"; + patch = fetchpatch { + url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch?id=..."; + sha256 = "0hzl3s2fmsvz54hq478lqi14dwry8a5g2b2awsssxf0r2ga15jk5"; + }; + }; } diff --git a/pkgs/os-specific/linux/spectrum/linux/vm.nix b/pkgs/os-specific/linux/spectrum/linux/vm.nix index 9c9ba78b691..f456053dc99 100644 --- a/pkgs/os-specific/linux/spectrum/linux/vm.nix +++ b/pkgs/os-specific/linux/spectrum/linux/vm.nix @@ -1,8 +1,11 @@ -{ lib, linux }: +{ lib, linux, kernelPatches }: with lib.kernel; linux.override { + # Fix hotplugging with cloud-hypervisor. + kernelPatches = linux.kernelPatches ++ [ kernelPatches.evged ]; + structuredExtraConfig = { VIRTIO_PCI = yes; VIRTIO_BLK = yes; -- 2.30.0

This will be important for host-based networking in Spectrum. --- ...upport-setting-guest-MAC-from-tap-fd.patch | 294 ++++++++++++++++++ .../linux/chromium-os/crosvm/default.nix | 1 + 2 files changed, 295 insertions(+) create mode 100644 pkgs/os-specific/linux/chromium-os/crosvm/0001-crosvm-support-setting-guest-MAC-from-tap-fd.patch diff --git a/pkgs/os-specific/linux/chromium-os/crosvm/0001-crosvm-support-setting-guest-MAC-from-tap-fd.patch b/pkgs/os-specific/linux/chromium-os/crosvm/0001-crosvm-support-setting-guest-MAC-from-tap-fd.patch new file mode 100644 index 00000000000..df0f16ee23a --- /dev/null +++ b/pkgs/os-specific/linux/chromium-os/crosvm/0001-crosvm-support-setting-guest-MAC-from-tap-fd.patch @@ -0,0 +1,294 @@ +From 2db1db4e42e87f05e414384a0c09be340e81d94d Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Sun, 27 Sep 2020 15:34:02 +0000 +Subject: [PATCH] crosvm: support setting guest MAC from tap-fd + +This adds a mac= option to crosvm's --tap-fd option. The virtio-net +driver in the guest will read the desired MAC from virtio +configuration space. + +See the documentation for VIRTIO_NET_F_MAC in the Virtio spec[1]. + +[1]: https://docs.oasis-open.org/virtio/virtio/v1.1/virtio-v1.1.html + +Thanks-to: Puck Meerburg + +--- + devices/src/virtio/net.rs | 31 ++++++++++++++++--- + src/crosvm.rs | 8 +++-- + src/linux.rs | 20 +++++++----- + src/main.rs | 64 ++++++++++++++++++++++++++++++--------- + 4 files changed, 96 insertions(+), 27 deletions(-) + +diff --git a/devices/src/virtio/net.rs b/devices/src/virtio/net.rs +index 44a39abd..fe71371f 100644 +--- a/devices/src/virtio/net.rs ++++ b/devices/src/virtio/net.rs +@@ -22,7 +22,9 @@ use virtio_sys::virtio_net::{ + }; + use virtio_sys::{vhost, virtio_net}; + +-use super::{DescriptorError, Interrupt, Queue, Reader, VirtioDevice, Writer, TYPE_NET}; ++use super::{ ++ copy_config, DescriptorError, Interrupt, Queue, Reader, VirtioDevice, Writer, TYPE_NET, ++}; + + const QUEUE_SIZE: u16 = 256; + const NUM_QUEUES: usize = 3; +@@ -373,7 +375,13 @@ where + } + } + ++#[derive(Default)] ++pub struct NetOptions { ++ pub guest_mac: Option, ++} ++ + pub struct Net { ++ config: Vec<u8>, + workers_kill_evt: Option<EventFd>, + kill_evt: EventFd, + worker_thread: Option>, +@@ -392,6 +400,7 @@ where + ip_addr: Ipv4Addr, + netmask: Ipv4Addr, + mac_addr: MacAddress, ++ options: NetOptions, + ) -> Result { + let tap: T = T::new(true).map_err(NetError::TapOpen)?; + tap.set_ip_addr(ip_addr).map_err(NetError::TapSetIp)?; +@@ -401,18 +410,18 @@ where + + tap.enable().map_err(NetError::TapEnable)?; + +- Net::from(tap) ++ Net::with_tap(tap, options) + } + + /// Creates a new virtio network device from a tap device that has already been + /// configured. +- pub fn from(tap: T) -> Result { ++ pub fn with_tap(tap: T, options: NetOptions) -> Result { + // This would also validate a tap created by Self::new(), but that's a good thing as it + // would ensure that any changes in the creation procedure are matched in the validation. + // Plus we still need to set the offload and vnet_hdr_size values. + validate_and_configure_tap(&tap)?; + +- let avail_features = 1 << virtio_net::VIRTIO_NET_F_GUEST_CSUM ++ let mut avail_features = 1 << virtio_net::VIRTIO_NET_F_GUEST_CSUM + | 1 << virtio_net::VIRTIO_NET_F_CSUM + | 1 << virtio_net::VIRTIO_NET_F_CTRL_VQ + | 1 << virtio_net::VIRTIO_NET_F_CTRL_GUEST_OFFLOADS +@@ -422,8 +431,18 @@ where + | 1 << virtio_net::VIRTIO_NET_F_HOST_UFO + | 1 << vhost::VIRTIO_F_VERSION_1; + ++ if options.guest_mac.is_some() { ++ avail_features |= 1 << virtio_net::VIRTIO_NET_F_MAC; ++ } ++ ++ let config = options ++ .guest_mac ++ .map(|mac| mac.octets().to_vec()) ++ .unwrap_or_default(); ++ + let kill_evt = EventFd::new().map_err(NetError::CreateKillEventFd)?; + Ok(Net { ++ config, + workers_kill_evt: Some(kill_evt.try_clone().map_err(NetError::CloneKillEventFd)?), + kill_evt, + worker_thread: None, +@@ -545,6 +564,10 @@ where + } + } + ++ fn read_config(&self, offset: u64, data: &mut [u8]) { ++ copy_config(data, 0, self.config.as_slice(), offset); ++ } ++ + fn activate( + &mut self, + mem: GuestMemory, +diff --git a/src/crosvm.rs b/src/crosvm.rs +index 81344c32..e69f2dfc 100644 +--- a/src/crosvm.rs ++++ b/src/crosvm.rs +@@ -157,6 +157,10 @@ impl Default for SharedDir { + } + } + ++pub struct TapFdOptions { ++ pub mac: Option, ++} ++ + /// Aggregate of all configurable options for a running VM. + pub struct Config { + pub vcpu_count: Option<u32>, +@@ -177,7 +181,7 @@ pub struct Config { + pub netmask: Optionnet::Ipv4Addr, + pub mac_address: Option, + pub vhost_net: bool, +- pub tap_fd: Vec<RawFd>, ++ pub tap_fd: BTreeMap, + pub cid: Option<u64>, + pub wayland_socket_paths: BTreeMap, + pub wayland_dmabuf: bool, +@@ -224,7 +228,7 @@ impl Default for Config { + netmask: None, + mac_address: None, + vhost_net: false, +- tap_fd: Vec::new(), ++ tap_fd: BTreeMap::new(), + cid: None, + #[cfg(feature = "gpu")] + gpu_parameters: None, +diff --git a/src/linux.rs b/src/linux.rs +index 3370c1e1..f7f78ad2 100644 +--- a/src/linux.rs ++++ b/src/linux.rs +@@ -60,7 +60,9 @@ use vm_control::{ + VmMemoryRequest, VmMemoryResponse, VmRunMode, + }; + +-use crate::{Config, DiskOption, Executable, SharedDir, SharedDirKind, TouchDeviceOption}; ++use crate::{ ++ Config, DiskOption, Executable, SharedDir, SharedDirKind, TapFdOptions, TouchDeviceOption, ++}; + use arch::{self, LinuxArch, RunnableLinuxVm, VirtioDeviceStub, VmComponents, VmImage}; + + #[cfg(any(target_arch = "arm", target_arch = "aarch64"))] +@@ -586,14 +588,18 @@ fn create_balloon_device(cfg: &Config, socket: BalloonControlResponseSocket) -> + }) + } + +-fn create_tap_net_device(cfg: &Config, tap_fd: RawFd) -> DeviceResult { ++fn create_tap_net_device(cfg: &Config, tap_fd: RawFd, options: &TapFdOptions) -> DeviceResult { + // Safe because we ensure that we get a unique handle to the fd. + let tap = unsafe { + Tap::from_raw_fd(validate_raw_fd(tap_fd).map_err(Error::ValidateRawFd)?) + .map_err(Error::CreateTapDevice)? + }; + +- let dev = virtio::Net::from(tap).map_err(Error::NetDeviceNew)?; ++ let net_opts = virtio::NetOptions { ++ guest_mac: options.mac, ++ }; ++ ++ let dev = virtio::Net::with_tap(tap, net_opts).map_err(Error::NetDeviceNew)?; + + Ok(VirtioDeviceStub { + dev: Box::new(dev), +@@ -614,8 +620,8 @@ fn create_net_device( + .map_err(Error::VhostNetDeviceNew)?; + Box::new(dev) as Box<dyn VirtioDevice> + } else { +- let dev = +- virtio::Net::<Tap>::new(host_ip, netmask, mac_address).map_err(Error::NetDeviceNew)?; ++ let dev = virtio::Net::<Tap>::new(host_ip, netmask, mac_address, Default::default()) ++ .map_err(Error::NetDeviceNew)?; + Box::new(dev) as Box<dyn VirtioDevice> + }; + +@@ -1006,8 +1012,8 @@ fn create_virtio_devices( + devs.push(create_balloon_device(cfg, balloon_device_socket)?); + + // We checked above that if the IP is defined, then the netmask is, too. +- for tap_fd in &cfg.tap_fd { +- devs.push(create_tap_net_device(cfg, *tap_fd)?); ++ for (tap_fd, options) in &cfg.tap_fd { ++ devs.push(create_tap_net_device(cfg, *tap_fd, options)?); + } + + if let (Some(host_ip), Some(netmask), Some(mac_address)) = +diff --git a/src/main.rs b/src/main.rs +index 3afca8e0..053af465 100644 +--- a/src/main.rs ++++ b/src/main.rs +@@ -21,7 +21,8 @@ use arch::Pstore; + use audio_streams::StreamEffect; + use crosvm::{ + argument::{self, print_help, set_arguments, Argument}, +- linux, BindMount, Config, DiskOption, Executable, GidMap, SharedDir, TouchDeviceOption, ++ linux, BindMount, Config, DiskOption, Executable, GidMap, SharedDir, TapFdOptions, ++ TouchDeviceOption, + }; + #[cfg(feature = "gpu")] + use devices::virtio::gpu::{GpuMode, GpuParameters}; +@@ -1041,17 +1042,52 @@ fn set_argument(cfg: &mut Config, name: &str, value: Option<&str>) -> argument:: + } + "vhost-net" => cfg.vhost_net = true, + "tap-fd" => { +- cfg.tap_fd.push( +- value +- .unwrap() +- .parse() +- .map_err(|_| argument::Error::InvalidValue { +- value: value.unwrap().to_owned(), +- expected: String::from( +- "this value for `tap-fd` must be an unsigned integer", +- ), +- })?, +- ); ++ let mut components = value.unwrap().split(','); ++ ++ let fd: RawFd = components ++ .next() ++ .and_then(|x| x.parse().ok()) ++ .ok_or_else(|| argument::Error::InvalidValue { ++ value: value.unwrap().to_owned(), ++ expected: String::from("this value for `tap-fd` must be an unsigned integer"), ++ })?; ++ ++ let mut mac = None; ++ for c in components { ++ let mut kv = c.splitn(2, '='); ++ let (kind, value) = match (kv.next(), kv.next()) { ++ (Some(kind), Some(value)) => (kind, value), ++ _ => { ++ return Err(argument::Error::InvalidValue { ++ value: c.to_owned(), ++ expected: String::from("option must be of the form `kind=value`"), ++ }) ++ } ++ }; ++ match kind { ++ "mac" => { ++ mac = Some(value.parse().map_err(|_| argument::Error::InvalidValue { ++ value: value.to_owned(), ++ expected: String::from( ++ "`mac` needs to be in the form \"XX:XX:XX:XX:XX:XX\"", ++ ), ++ })?) ++ } ++ _ => { ++ return Err(argument::Error::InvalidValue { ++ value: kind.to_owned(), ++ expected: String::from("unrecognized option"), ++ }) ++ } ++ } ++ } ++ if cfg.tap_fd.contains_key(&fd) { ++ return Err(argument::Error::TooManyArguments(format!( ++ "TAP FD already used: '{}'", ++ name ++ ))); ++ } ++ cfg.tap_fd.insert(fd, TapFdOptions { mac }); + } + #[cfg(feature = "gpu")] + "gpu" => { +@@ -1295,8 +1331,8 @@ writeback=BOOL - Indicates whether the VM can use writeback caching (default: fa + Argument::value("plugin-gid-map-file", "PATH", "Path to the file listing supplemental GIDs that should be mapped in plugin jail. Can be given more than once."), + Argument::flag("vhost-net", "Use vhost for networking."), + Argument::value("tap-fd", +- "fd", +- "File descriptor for configured tap device. A different virtual network card will be added each time this argument is given."), ++ "FD[,mac=MAC]", ++ "File descriptor for configured tap device. A different virtual network card will be added each time this argument is given. MAC is the MAC address that will be set in the guest."), + #[cfg(feature = "gpu")] + Argument::flag_or_value("gpu", + "[width=INT,height=INT]", +-- +2.27.0 + diff --git a/pkgs/os-specific/linux/chromium-os/crosvm/default.nix b/pkgs/os-specific/linux/chromium-os/crosvm/default.nix index d64dc316772..d54c050d308 100644 --- a/pkgs/os-specific/linux/chromium-os/crosvm/default.nix +++ b/pkgs/os-specific/linux/chromium-os/crosvm/default.nix @@ -39,6 +39,7 @@ in patches = [ ./default-seccomp-policy-dir.diff + ./0001-crosvm-support-setting-guest-MAC-from-tap-fd.patch ]; cargoSha256 = "0wzqn2n4vyv3bk39079yg1zbnriagi5xns928bzdqmq9djdcj21i"; -- 2.30.0

This allows specifying s6-rc services (which can have dependencies, and be taken up and down) in the same way that s6 services (which are merely supervised) are declared. This removes the spectrumcmd mechanism to clean up the boot process -- it could be reintroduced as an s6-rc service if required. --- .../linux/spectrum/rootfs/default.nix | 43 +++++++++++++++---- .../linux/spectrum/rootfs/generic.nix | 15 ++++--- .../linux/spectrum/rootfs/rc-services.nix | 26 +++++++++++ .../linux/spectrum/rootfs/stage1.nix | 22 +++------- 4 files changed, 77 insertions(+), 29 deletions(-) create mode 100644 pkgs/os-specific/linux/spectrum/rootfs/rc-services.nix diff --git a/pkgs/os-specific/linux/spectrum/rootfs/default.nix b/pkgs/os-specific/linux/spectrum/rootfs/default.nix index 6f46ad8054b..70ddac4c545 100644 --- a/pkgs/os-specific/linux/spectrum/rootfs/default.nix +++ b/pkgs/os-specific/linux/spectrum/rootfs/default.nix @@ -35,17 +35,44 @@ makeRootfs { ${busybox}/bin/getty -i -n -l ${login} 38400 ttyS0 ''; - run = '' - if { chown user /dev/wl0 } + rcServices.ok-all = { + type = writeText "ok-all-type" '' + bundle + ''; + contents = writeText "ok-all-contents" '' + wayfire + ''; + }; - s6-applyuidgid -u 1000 -g 1000 - export XDG_RUNTIME_DIR /run/user/1000 + rcServices.wayfire = { + type = writeText "wayfire-type" '' + longrun + ''; + run = writeScript "wayfire-run" '' + #! ${execline}/bin/execlineb -S0 - export PATH ${lib.makeBinPath path} + s6-applyuidgid -u 1000 -g 1000 - ${sommelier}/bin/sommelier - wayfire -c ${wayfireConfig} - ''; + export HOME / + export PATH ${lib.makeBinPath path} + export XDG_RUNTIME_DIR /run/user/1000 + + ${sommelier}/bin/sommelier + wayfire -c ${wayfireConfig} + ''; + dependencies = writeText "wayfire-dependencies" '' + wl0 + ''; + }; + + rcServices.wl0 = { + type = writeText "wl0-type" '' + oneshot + ''; + up = writeText "wl0-run" '' + chown user /dev/wl0 + ''; + }; fonts = [ source-code-pro ]; } diff --git a/pkgs/os-specific/linux/spectrum/rootfs/generic.nix b/pkgs/os-specific/linux/spectrum/rootfs/generic.nix index 81fb80a614f..4122abf80c6 100644 --- a/pkgs/os-specific/linux/spectrum/rootfs/generic.nix +++ b/pkgs/os-specific/linux/spectrum/rootfs/generic.nix @@ -1,14 +1,14 @@ { runCommandNoCC, writeScript, writeReferencesToFile, makeFontsConf, lib -, dash, execline, s6, s6-portable-utils, s6-linux-utils, s6-linux-init, busybox +, dash, execline, s6, s6-rc, s6-portable-utils, s6-linux-utils, s6-linux-init, busybox , mesa, squashfs-tools-ng }: -{ services, run, fonts ? [], path ? [] }: +{ services, rcServices ? {}, fonts ? [], path ? [] }: let - makeStage1 = import ./stage1.nix { + stage1 = import ./stage1.nix { inherit writeScript lib - execline s6 s6-portable-utils s6-linux-utils s6-linux-init busybox mesa + execline s6 s6-rc s6-portable-utils s6-linux-utils s6-linux-init busybox mesa path; }; @@ -16,6 +16,10 @@ let inherit runCommandNoCC writeScript lib execline; }; + makeRcServicesDir = import ./rc-services.nix { + inherit runCommandNoCC lib s6-rc; + }; + fontsConf = makeFontsConf { fontDirectories = fonts; }; squashfs = runCommandNoCC "root-squashfs" {} '' @@ -34,7 +38,7 @@ let mkdir bin sbin dev proc run sys tmp ln -s ${dash}/bin/dash bin/sh - ln -s ${makeStage1 { inherit run; }} sbin/init + ln -s ${stage1} sbin/init cp -r ${./etc} etc chmod u+w etc @@ -43,6 +47,7 @@ let touch etc/login.defs cp -r ${makeServicesDir { inherit services; }} etc/service + cp -r ${makeRcServicesDir { services = rcServices; }} etc/s6-rc ''; in rootfs diff --git a/pkgs/os-specific/linux/spectrum/rootfs/rc-services.nix b/pkgs/os-specific/linux/spectrum/rootfs/rc-services.nix new file mode 100644 index 00000000000..4c942189c5e --- /dev/null +++ b/pkgs/os-specific/linux/spectrum/rootfs/rc-services.nix @@ -0,0 +1,26 @@ +{ runCommandNoCC, lib, s6-rc }: + +{ services ? [] }: + +let + inherit (lib) concatStrings escapeShellArg mapAttrsToList optionalString; + + source = runCommandNoCC "s6-services-source" {} '' + mkdir $out + ${concatStrings (mapAttrsToList (name: attrs: '' + mkdir $out/${name} + ${concatStrings (mapAttrsToList (key: value: '' + cp ${value} $out/${name}/${key} + '') attrs)} + '') services)} + ''; + + s6RcCompile = { fdhuser ? null }: source: + runCommandNoCC "s6-rc-compile" {} '' + ${s6-rc}/bin/s6-rc-compile \ + ${optionalString (fdhuser != null) "-h ${escapeShellArg fdhuser}"} \ + $out ${source} + ''; +in + +s6RcCompile {} source diff --git a/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix b/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix index 6caf9ff93b8..13de2d09876 100644 --- a/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix +++ b/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix @@ -1,13 +1,11 @@ { writeScript, lib -, execline, s6, s6-portable-utils, s6-linux-utils, s6-linux-init, busybox, mesa +, execline, s6, s6-rc, s6-portable-utils, s6-linux-utils, s6-linux-init, busybox, mesa , path ? [] }: -{ run ? "true" }: - let path' = path ++ [ - s6 s6-portable-utils s6-linux-utils s6-linux-init busybox execline + s6 s6-rc s6-portable-utils s6-linux-utils s6-linux-init busybox execline ]; in @@ -16,8 +14,6 @@ writeScript "init-stage1" '' export PATH ${lib.makeBinPath path'} ${s6}/bin/s6-setsid -qb -- - importas -i spectrumcmd spectrumcmd - umask 022 if { s6-mount -t tmpfs -o mode=0755 tmpfs /run } if { s6-hiercopy /etc/service /run/service } @@ -25,6 +21,9 @@ writeScript "init-stage1" '' background { s6-setsid -- + + if { s6-rc-init -c /etc/s6-rc /run/service } + if { s6-mkdir -p /run/user/0 /dev/pts /dev/shm } if { install -o user -g user -d /run/user/1000 } if { s6-mount -t devpts -o gid=4,mode=620 none /dev/pts } @@ -33,16 +32,7 @@ writeScript "init-stage1" '' if { s6-mount -t sysfs none /sys } if { s6-ln -s ${mesa.drivers} /run/opengl-driver } - export HOME / - export XDG_RUNTIME_DIR /run/user/0 - foreground { - ifelse { test -n $spectrumcmd } - { pipeline { heredoc 0 $spectrumcmd base64 -d } /bin/sh } - ${run} - } - importas -i ? ? - if { s6-echo STATUS: $? } - s6-svscanctl -6 /run/service + s6-rc change ok-all } unexport ! -- 2.30.0

This doesn't actually include dbus, just sets up its user, group and configuration files. We'll need dbus for connman or NetworkManager. --- pkgs/os-specific/linux/spectrum/rootfs/etc/group | 1 + pkgs/os-specific/linux/spectrum/rootfs/etc/passwd | 1 + pkgs/os-specific/linux/spectrum/rootfs/generic.nix | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/spectrum/rootfs/etc/group b/pkgs/os-specific/linux/spectrum/rootfs/etc/group index e1f50c66958..df4940a5516 100644 --- a/pkgs/os-specific/linux/spectrum/rootfs/etc/group +++ b/pkgs/os-specific/linux/spectrum/rootfs/etc/group @@ -1,2 +1,3 @@ root:x:0:root +messagebus:x:4:messagebus user:x:1000:user diff --git a/pkgs/os-specific/linux/spectrum/rootfs/etc/passwd b/pkgs/os-specific/linux/spectrum/rootfs/etc/passwd index 467ffc9e42c..c76fb8f2a99 100644 --- a/pkgs/os-specific/linux/spectrum/rootfs/etc/passwd +++ b/pkgs/os-specific/linux/spectrum/rootfs/etc/passwd @@ -1,2 +1,3 @@ root:x:0:0:System administrator:/:/bin/sh +messagebus:x:1:1:D-Bus system message bus daemon user:/run/dbus:/bin/sh user:x:1000:1000:User:/:/bin/sh diff --git a/pkgs/os-specific/linux/spectrum/rootfs/generic.nix b/pkgs/os-specific/linux/spectrum/rootfs/generic.nix index ac628de13a3..ae4dd6579f5 100644 --- a/pkgs/os-specific/linux/spectrum/rootfs/generic.nix +++ b/pkgs/os-specific/linux/spectrum/rootfs/generic.nix @@ -1,6 +1,6 @@ { runCommandNoCC, writeScript, writeReferencesToFile, makeFontsConf, lib , dash, execline, s6, s6-rc, s6-portable-utils, s6-linux-utils, s6-linux-init, busybox -, mesa, squashfs-tools-ng +, mesa, squashfs-tools-ng, makeDBusConf }: { services, rcServices ? {}, fonts ? [], path ? [] }: @@ -42,6 +42,10 @@ let ln -s ${stage1} sbin/init cp -r ${./etc} etc chmod u+w etc + ln -s ${makeDBusConf { + suidHelper = "/run/dbus-daemon-launch-helper"; + serviceDirectories = []; + }} etc/dbus-1 mkdir etc/fonts ln -s ${fontsConf} etc/fonts/fonts.conf -- 2.30.0

This removes the default rootfs, and creates a VM called "comp" that runs all the Wayfire stuff the default rootfs did previously. This is in a new namespace called sys-vms, which I have a very vague intention of being a place to put VMs that run system services like a Wayland compositor or hardware drivers. I don't think this will be the final structure, but it's _a_ structure that supports more than one VM, so it's an improvement over what we had before. --- pkgs/os-specific/linux/spectrum/default.nix | 4 +- .../linux/spectrum/rootfs/default.nix | 78 ----------------- .../linux/spectrum/spectrum-vm/default.nix | 6 +- .../linux/spectrum/vm/comp/default.nix | 86 +++++++++++++++++++ .../os-specific/linux/spectrum/vm/default.nix | 5 ++ 5 files changed, 96 insertions(+), 83 deletions(-) delete mode 100644 pkgs/os-specific/linux/spectrum/rootfs/default.nix create mode 100644 pkgs/os-specific/linux/spectrum/vm/comp/default.nix create mode 100644 pkgs/os-specific/linux/spectrum/vm/default.nix diff --git a/pkgs/os-specific/linux/spectrum/default.nix b/pkgs/os-specific/linux/spectrum/default.nix index ea86dc25c2b..f8a9813d16a 100644 --- a/pkgs/os-specific/linux/spectrum/default.nix +++ b/pkgs/os-specific/linux/spectrum/default.nix @@ -4,13 +4,13 @@ let self = with self; { callPackage = newScope self; + sys-vms = callPackage ./vm { }; + spectrum-vm = callPackage ./spectrum-vm { linux = linux_vm; }; linux_vm = callPackage ./linux/vm.nix { linux = linux_cros; }; makeRootfs = callPackage ./rootfs/generic.nix { }; - - rootfs = callPackage ./rootfs { }; }; in self diff --git a/pkgs/os-specific/linux/spectrum/rootfs/default.nix b/pkgs/os-specific/linux/spectrum/rootfs/default.nix deleted file mode 100644 index 70ddac4c545..00000000000 --- a/pkgs/os-specific/linux/spectrum/rootfs/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ writeScript, writeText, lib, makeRootfs -, busybox, execline, s6, sommelier, source-code-pro, wayfire, zsh -, gcc, emacs26-nox, westonLite -}: - -let - path = [ - zsh emacs26-nox gcc wayfire sommelier westonLite busybox s6 execline - ]; - - login = writeScript "login" '' - #! ${execline}/bin/execlineb -s0 - unexport ! - ${busybox}/bin/login -p -f root $@ - ''; - - # This can't be /etc/wayfire/defaults.ini because autostart entries - # from that file aren't applied. - wayfireConfig = writeText "wayfire-config" '' - [core] - xwayland = false - - [input] - xkb_layout = us - xkb_variant = dvorak - - [autostart] - terminal = weston-terminal --shell $(command -v zsh) - ''; -in - -makeRootfs { - services.getty.run = writeScript "getty-run" '' - #! ${execline}/bin/execlineb -P - ${busybox}/bin/getty -i -n -l ${login} 38400 ttyS0 - ''; - - rcServices.ok-all = { - type = writeText "ok-all-type" '' - bundle - ''; - contents = writeText "ok-all-contents" '' - wayfire - ''; - }; - - rcServices.wayfire = { - type = writeText "wayfire-type" '' - longrun - ''; - run = writeScript "wayfire-run" '' - #! ${execline}/bin/execlineb -S0 - - s6-applyuidgid -u 1000 -g 1000 - - export HOME / - export PATH ${lib.makeBinPath path} - export XDG_RUNTIME_DIR /run/user/1000 - - ${sommelier}/bin/sommelier - wayfire -c ${wayfireConfig} - ''; - dependencies = writeText "wayfire-dependencies" '' - wl0 - ''; - }; - - rcServices.wl0 = { - type = writeText "wl0-type" '' - oneshot - ''; - up = writeText "wl0-run" '' - chown user /dev/wl0 - ''; - }; - - fonts = [ source-code-pro ]; -} diff --git a/pkgs/os-specific/linux/spectrum/spectrum-vm/default.nix b/pkgs/os-specific/linux/spectrum/spectrum-vm/default.nix index 56f1eadea99..c56d2537c63 100644 --- a/pkgs/os-specific/linux/spectrum/spectrum-vm/default.nix +++ b/pkgs/os-specific/linux/spectrum/spectrum-vm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, utillinux, crosvm, linux, rootfs }: +{ stdenv, lib, makeWrapper, utillinux, crosvm, linux, sys-vms }: stdenv.mkDerivation { name = "spectrum-vm"; @@ -18,8 +18,8 @@ stdenv.mkDerivation { getopt = "${lib.getBin utillinux}/bin/getopt"; crosvm = "${lib.getBin crosvm}/bin/crosvm"; - kernel = "${linux}/bzImage"; - rootfs = rootfs.squashfs; + kernel = "${sys-vms.comp.linux}/bzImage"; + rootfs = sys-vms.comp.rootfs.squashfs; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/os-specific/linux/spectrum/vm/comp/default.nix b/pkgs/os-specific/linux/spectrum/vm/comp/default.nix new file mode 100644 index 00000000000..988fad5fba6 --- /dev/null +++ b/pkgs/os-specific/linux/spectrum/vm/comp/default.nix @@ -0,0 +1,86 @@ +{ lib, makeRootfs, runCommand, writeScript, writeText +, busybox, emacs26-nox, execline, gcc, linux_vm, s6, sommelier, source-code-pro +, wayfire, westonLite, zsh +}: + +runCommand "vm-comp" rec { + linux = linux_vm; + + path = [ + busybox emacs26-nox execline gcc s6 sommelier wayfire westonLite zsh + ]; + + login = writeScript "login" '' + #! ${execline}/bin/execlineb -s0 + unexport ! + ${busybox}/bin/login -p -f root $@ + ''; + + # This can't be /etc/wayfire/defaults.ini because autostart entries + # from that file aren't applied. + wayfireConfig = writeText "wayfire-config" '' + [core] + xwayland = false + + [input] + xkb_layout = us + xkb_variant = dvorak + + [autostart] + terminal = weston-terminal --shell $(command -v zsh) + ''; + + rootfs = makeRootfs { + services.getty.run = writeScript "getty-run" '' + #! ${execline}/bin/execlineb -P + ${busybox}/bin/getty -i -n -l ${login} 38400 ttyS0 + ''; + + rcServices.ok-all = { + type = writeText "ok-all-type" '' + bundle + ''; + contents = writeText "ok-all-contents" '' + wayfire + ''; + }; + + rcServices.wayfire = { + type = writeText "wayfire-type" '' + longrun + ''; + run = writeScript "wayfire-run" '' + #! ${execline}/bin/execlineb -S0 + + s6-applyuidgid -u 1000 -g 1000 + + export HOME / + export PATH ${lib.makeBinPath path} + export XDG_RUNTIME_DIR /run/user/1000 + + ${sommelier}/bin/sommelier + wayfire -c ${wayfireConfig} + ''; + dependencies = writeText "wayfire-dependencies" '' + wl0 + ''; + }; + + rcServices.wl0 = { + type = writeText "wl0-type" '' + oneshot + ''; + up = writeText "wl0-run" '' + chown user /dev/wl0 + ''; + }; + + fonts = [ source-code-pro ]; + }; + + inherit (rootfs) squashfs; +} '' + mkdir $out + ln -s $linux/bzImage $out/kernel + ln -s $squashfs $out/squashfs +'' diff --git a/pkgs/os-specific/linux/spectrum/vm/default.nix b/pkgs/os-specific/linux/spectrum/vm/default.nix new file mode 100644 index 00000000000..582a0c2e9c3 --- /dev/null +++ b/pkgs/os-specific/linux/spectrum/vm/default.nix @@ -0,0 +1,5 @@ +{ callPackage }: + +{ + comp = callPackage ./comp { }; +} -- 2.30.0

This is a VM that acts as a router. It handles talking to network hardware, and other VMs can be connected to it by attaching virtual ethernet devices. It expects to get a physical ethernet device passed through to it using VFIO. Wi-Fi should work too, but would need to be configured so I've stuck with Ethernet for now. We use ConnMan[1] to configure physical network interfaces, and it automatically takes care of DHCP and stuff for us. I chose ConnMan over NetworkManager because it was easier to get set up. Virtual ethernet devices are identified by a specific OUI in their MAC address. The NIC part of the MAC address is used to encode the last three octets of the IPv4 address this VM should assign to the interface. This way, the host can tell this VM what the address of each virtual interface is without having to resort to a secondary communication channel. The first octet will always be 100, as the intention is to use the IPv4 shared address space (aka the CGNAT space) for inter-VM networks to match the behaviour of Chromium OS[2]. Every networking client will be connected to a router VM with a /31, where the low address is for the router, and the high address is for the client. This way the host's job is as simple as possible -- it just has to connect two TAPs together, without worrying about any routing rules or anything -- that can all happen in the VM. This does mean that the router has to have a virtio-net device for every client, though. We may run into scaling limitations with this approach, in which case we might have to revisit how this works on the host. [1]: https://git.kernel.org/pub/scm/network/connman/connman.git/about/ [2]: https://chromium.googlesource.com/chromiumos/platform2/+/39e48f668a937d26663... --- .../os-specific/linux/spectrum/vm/default.nix | 2 + .../linux/spectrum/vm/net/default.nix | 165 ++++++++++++++++++ 2 files changed, 167 insertions(+) create mode 100644 pkgs/os-specific/linux/spectrum/vm/net/default.nix diff --git a/pkgs/os-specific/linux/spectrum/vm/default.nix b/pkgs/os-specific/linux/spectrum/vm/default.nix index 582a0c2e9c3..c4ff729cb8a 100644 --- a/pkgs/os-specific/linux/spectrum/vm/default.nix +++ b/pkgs/os-specific/linux/spectrum/vm/default.nix @@ -2,4 +2,6 @@ { comp = callPackage ./comp { }; + + net = callPackage ./net { }; } diff --git a/pkgs/os-specific/linux/spectrum/vm/net/default.nix b/pkgs/os-specific/linux/spectrum/vm/net/default.nix new file mode 100644 index 00000000000..079311c80e6 --- /dev/null +++ b/pkgs/os-specific/linux/spectrum/vm/net/default.nix @@ -0,0 +1,165 @@ +{ lib, makeRootfs, runCommand, writeScript, writeText +, busybox, connman, dbus, execline, iptables, iproute, jq, linux_vm, mdevd +}: + +runCommand "vm-net" rec { + linux = linux_vm.override { + structuredExtraConfig = with lib.kernel; { + E1000E = yes; + PACKET = yes; + + IP_NF_NAT = yes; + IP_NF_IPTABLES = yes; + IP_NF_TARGET_MASQUERADE = yes; + NF_CONNTRACK = yes; + }; + }; + + login = writeScript "login" '' + #! ${execline}/bin/execlineb -s0 + unexport ! + ${busybox}/bin/login -p -f root $@ + ''; + + rootfs = makeRootfs { + rcServices.ok-all = { + type = writeText "ok-all-type" '' + bundle + ''; + contents = writeText "ok-all-contents" '' + mdevd-coldplug + ''; + }; + + rcServices.mdevd = { + type = writeText "mdevd-type" '' + longrun + ''; + run = writeScript "mdevd-run" '' + #! ${execline}/bin/execlineb -P + ${mdevd}/bin/mdevd -D3 -f ${writeText "mdevd.conf" '' + $INTERFACE=.* 0:0 660 ! @${writeScript "interface" '' + #! ${execline}/bin/execlineb -S0 + + multisubstitute { + importas -i DEVPATH DEVPATH + importas -i INTERFACE INTERFACE + } + + ifte + + { + # This interface is connected to another VM. + + # Our IP is encoded in the NIC-specific portion of the + # interface's MAC address. + backtick -i LOCAL_IP { + pipeline { ip -j link show $INTERFACE } + pipeline { jq -r ".[0].address | split(\":\") | .[3:6] | \"0x\" + .[]" } + xargs printf "100.%d.%d.%d" + } + importas -iu LOCAL_IP LOCAL_IP + + if { ip address add ''${LOCAL_IP}/31 dev $INTERFACE } + ip link set $INTERFACE up + } + + { + if { test $INTERFACE != lo } + # This is a physical connection to a network device. + if { iptables -t nat -A POSTROUTING -o $INTERFACE -j MASQUERADE } + s6-rc -u change connman + } + + grep -iq ^0A:B3:EC: /sys/class/net/''${INTERFACE}/address + ''} + ''} + ''; + notification-fd = writeText "mdevd-notification-fd" '' + 3 + ''; + dependencies = writeText "mdevd-dependencies" '' + sysctl + ''; + }; + + rcServices.mdevd-coldplug = { + type = writeText "mdevd-coldplug-type" '' + oneshot + ''; + up = writeText "mdevd-run" '' + ${mdevd}/bin/mdevd-coldplug + ''; + dependencies = writeText "mdevd-coldplug-dependencies" '' + mdevd + ''; + }; + + rcServices.dbus = { + type = writeText "dbus-daemon" '' + longrun + ''; + run = writeScript "dbus-daemon-run" '' + #! ${execline}/bin/execlineb -S0 + foreground { mkdir /run/dbus } + # Busybox cp doesn't have -n to avoid copying to paths that + # already exist, but we can abuse -u for the same effect, + # since every file in the store is from Jan 1 1970. + foreground { cp -u ${dbus}/libexec/dbus-daemon-launch-helper /run } + foreground { chgrp messagebus /run/dbus-daemon-launch-helper } + foreground { chmod 4550 /run/dbus-daemon-launch-helper } + ${dbus}/bin/dbus-daemon + --nofork --nosyslog --nopidfile --config-file=/etc/dbus-1/system.conf + ''; + }; + + rcServices.connman = { + type = writeText "connman-type" '' + longrun + ''; + run = writeScript "connman-run" '' + #! ${execline}/bin/execlineb -S0 + backtick -in HARDWARE_INTERFACES { + pipeline { + find -L /sys/class/net -mindepth 2 -maxdepth 2 -name address -print0 + } + + # Filter out other VMs and the loopback device. + pipeline { xargs -0 grep -iL ^\\(0A:B3:EC:\\|00:00:00:00:00:00$\\) } + + # Extract the interface names from the address file paths. + awk -F/ "{if (NR > 1) printf \",\"; printf \"%s\", $5}" + } + importas -iu HARDWARE_INTERFACES HARDWARE_INTERFACES + + ${connman}/bin/connmand -ni $HARDWARE_INTERFACES + ''; + dependencies = writeText "connman-dependencies" '' + dbus + ''; + }; + + rcServices.sysctl = { + type = writeText "sysctl-type" '' + oneshot + ''; + up = writeText "sysctl-up" '' + redirfd -w 1 /proc/sys/net/ipv4/ip_forward + echo 1 + ''; + }; + + services.getty.run = writeScript "getty-run" '' + #! ${execline}/bin/execlineb -P + ${busybox}/bin/getty -i -n -l ${login} 38400 ttyS0 + ''; + + path = [ iproute iptables jq ]; + }; + + inherit (rootfs) squashfs; +} '' + mkdir $out + ln -s $linux/bzImage $out/kernel + ln -s $squashfs $out/squashfs +'' -- 2.30.0

This produces a shell script that sets up a host system for running the VMs under sys-vms, and then starts an s6-rc service manager that can run the VMs. This mirrors how I imagine things working on the eventual Spectrum host system. With s6-rc, we can express dependencies between services, so when vm-app is started, vm-net will automatically be started too if it isn't already running. One thing I haven't implemented yet is readiness notification. Ideally, the cloud-hypervisor instance running the router VM would be able to tell s6 once its control socket was listening, and s6 wouldn't consider it to be up until that point. But it can't do that at the moment, so s6 considers it to be up immediately, and starts vm-app right away. This means that vm-app will usually fail once due to vm-net's socket not existing, and then immediately be restarted and work the second time. I think that's fine for now. The serial console for vm-app will be connected to the terminal. To interact with vm-net instead, the serial console for vm-app can be disconnected uncommenting the two commented out lines in its definition, and the serial console for vm-net can be enabled by commenting the redirfd that disables its stdin, and uncommenting the --serial line. We're using cloud-hypervisor instead of crosvm for vm-net because cloud-hypervisor supports adding virtual ethernet devices at runtime and crosvm doesn't, and it'll be important to be able to add connections to new VMs as applications are started on a running system. The TODO about removing the device from cloud-hypervisor is going to stay a TODO for now, because the solution is quite complicated: if we tell cloud-hypervisor to remove the device from the VM using its API, it'll still be trying to read from it for a short time after returning, so we'll still get read errors in cloud-hypervisor after we delete the TAP. I think the only good way to handle this will be to use a non-persistent TAP device, so that it automatically gets cleaned up by the kernel when cloud-hypervisor is done with it. But to do that, cloud-hypervisor will have to be able to add TAPs from file descriptors at runtime, which will probably be quite difficult to fit into its HTTP API -- at least it's over a Unix socket. --- pkgs/os-specific/linux/spectrum/default.nix | 2 + .../linux/spectrum/testhost/default.nix | 205 ++++++++++++++++++ 2 files changed, 207 insertions(+) create mode 100644 pkgs/os-specific/linux/spectrum/testhost/default.nix diff --git a/pkgs/os-specific/linux/spectrum/default.nix b/pkgs/os-specific/linux/spectrum/default.nix index 7e07ee60f43..c4cccab3787 100644 --- a/pkgs/os-specific/linux/spectrum/default.nix +++ b/pkgs/os-specific/linux/spectrum/default.nix @@ -8,6 +8,8 @@ let spectrum-vm = callPackage ./spectrum-vm { linux = linux_vm; }; + spectrum-testhost = callPackage ./testhost { }; + linux_vm = callPackage ./linux/vm.nix { linux = linux_cros; }; makeRootfs = callPackage ./rootfs { }; diff --git a/pkgs/os-specific/linux/spectrum/testhost/default.nix b/pkgs/os-specific/linux/spectrum/testhost/default.nix new file mode 100644 index 00000000000..7e1a973e8c6 --- /dev/null +++ b/pkgs/os-specific/linux/spectrum/testhost/default.nix @@ -0,0 +1,205 @@ +{ lib, runCommandNoCC, writeScript, writeScriptBin, writeShellScript, writeText +, coreutils, cloud-hypervisor, crosvm, curl, execline, gnutar, gnused, iproute +, iptables, jq, kmod, mktuntap, rsync, s6, s6-rc, sys-vms, utillinux +}: + +let + inherit (lib) concatStrings escapeShellArg makeBinPath mapAttrsToList + optionalString; + + compose2 = f: g: a: b: f (g a b); + + concatMapAttrs = compose2 concatStrings mapAttrsToList; + + makeServicesDir = { services }: + runCommandNoCC "services" {} '' + mkdir $out + ${concatMapAttrs (name: attrs: '' + mkdir $out/${name} + ${concatMapAttrs (key: value: '' + cp -r ${value} $out/${name}/${key} + '') attrs} + '') services} + ''; + + s6RcCompile = { fdhuser ? null }: source: + runCommandNoCC "s6-rc-compile" {} '' + ${s6-rc}/bin/s6-rc-compile \ + ${optionalString (fdhuser != null) "-h ${escapeShellArg fdhuser}"} \ + dest ${source} + tar -C dest -cf $out . + ''; + + compiledRcServicesDir = s6RcCompile {} (makeServicesDir { + services = { + vm-app = { + run = writeScript "app-run" '' + #! ${execline}/bin/execlineb -S0 + # fdclose 0 + + # Checking the return value of the bridge creation is + # important, because if it fails due to the bridge already + # existing that means something else could already be using + # this bridge. + if { ip link add name br0 type bridge } + if { ip link set br0 up } + + # Calculate the MACs for our TAP and the router's TAP. + backtick -in router_nic_dec { + expr ${toString sys-vms.app.vmID} * 2 + 64 * 256 * 256 + } + backtick -in client_nic_dec { + expr ${toString sys-vms.app.vmID} * 2 + 64 * 256 * 256 + 1 + } + multisubstitute { + importas -iu router_nic_dec router_nic_dec + importas -iu client_nic_dec client_nic_dec + } + backtick -i router_mac { + pipeline { printf %x $router_nic_dec } + sed s/^\\(..\\)\\(..\\)\\(..\\)$/0A:B3:EC:\\1:\\2:\\3/ + } + backtick -i client_mac { + pipeline { printf %x $client_nic_dec } + sed s/^\\(..\\)\\(..\\)\\(..\\)$/0A:B3:EC:\\1:\\2:\\3/ + } + multisubstitute { + importas -iu router_mac router_mac + importas -iu client_mac client_mac + } + + # Create the net VM end, and attach it to the net VM. + # + # Use a hardcoded name for now because if we use a dynamic + # one iproute2 has no way of telling us the name that was + # chosen: + # https://lore.kernel.org/netdev/20210406134240.wwumpnrzfjbttnmd@eve.qyliss.ne... + define other_tap_name vmtapnet + # Try to delete the device in case the VM was powered off + # (as the finish script wouldn't have been run in that + # case.) Since we check the return value of ip tuntap add, + # in the case of a race condition between deleting the + # device and creating it again, we'll just fail and try + # again. + foreground { ip link delete $other_tap_name } + if { ip tuntap add name $other_tap_name mode tap } + if { ip link set $other_tap_name master br0 } + if { ip link set $other_tap_name up } + if { + pipeline { + jq -n "$ARGS.named" + --arg tap $other_tap_name + --arg mac $router_mac + } + curl -iX PUT + -H "Accept: application/json" + -H "Content-Type: application/json" + --data-binary @- + --unix-socket ../vm-net/env/cloud-hypervisor.sock + http://localhost/api/v1/vm.add-net + } + + mktuntap -pvBi vmtap%d 6 + importas -iu tap_name TUNTAP_NAME + if { ip link set $tap_name master br0 } + if { ip link set $tap_name up } + if { iptables -t nat -A POSTROUTING -o $tap_name -j MASQUERADE } + + ${crosvm}/bin/crosvm run -p init=/sbin/init -p notifyport=''${port} + # --serial type=file,path=/tmp/app.log + --cid 4 + --tap-fd 6,mac=''${client_mac} + --root ${sys-vms.app.rootfs.squashfs} ${sys-vms.app.linux}/bzImage + ''; + finish = writeScript "app-finish" '' + #! ${execline}/bin/execlineb -S0 + # TODO: remove from vm-net + foreground { ip link delete vmtapnet } + ip link delete br0 + ''; + type = writeText "app-type" '' + longrun + ''; + dependencies = writeText "app-dependencies" '' + vm-net + ''; + }; + + vm-net = { + run = writeScript "net-run" '' + #! ${execline}/bin/execlineb -S0 + # This is only necessary for when running s6 from a tty. + # (i.e. when debugging or running the demo). + redirfd -w 0 /dev/null + + define PCI_LOCATION 0000:00:19.0 + define PCI_PATH /sys/bus/pci/devices/''${PCI_LOCATION} + + # Unbind the network device from the driver it's already + # attached to, if any. + foreground { + redirfd -w 1 ''${PCI_PATH}/driver/unbind + printf "%s" $PCI_LOCATION + } + + # (Re)bind the device to the VFIO PCI driver. + if { modprobe vfio-pci } + backtick -in device_id { + if { dd bs=2 skip=1 count=2 status=none if=''${PCI_PATH}/vendor } + if { printf " " } + dd bs=2 skip=1 count=2 status=none if=''${PCI_PATH}/device + } + importas -iu device_id device_id + foreground { + redirfd -w 1 /sys/bus/pci/drivers/vfio-pci/new_id + printf "%s" $device_id + } + + foreground { mkdir env } + + ${cloud-hypervisor}/bin/cloud-hypervisor + --api-socket env/cloud-hypervisor.sock + --console off + # --serial tty + --cmdline "console=ttyS0 panic=30 root=/dev/vda" + --device path=''${PCI_PATH} + --disk path=${sys-vms.net.rootfs.squashfs},readonly=on + --kernel ${sys-vms.net.linux.dev}/vmlinux + ''; + type = writeText "net-type" '' + longrun + ''; + }; + }; + }); + + servicesDir = makeServicesDir { + services = { + ".s6-svscan" = { + finish = writeShellScript ".s6-svscan-finish" ""; + }; + }; + }; +in + +writeScriptBin "spectrum-testhost" '' + #! ${execline}/bin/execlineb -S0 + export PATH ${makeBinPath [ + coreutils curl execline gnused gnutar iproute iptables jq kmod mktuntap rsync + s6 s6-rc + ]} + + if { redirfd -w 1 /proc/sys/net/ipv4/ip_forward echo 1 } + + importas -iu runtime_dir XDG_RUNTIME_DIR + backtick -in TOP { mktemp -dp $runtime_dir spectrum.XXXXXXXXXX } + importas -iu top TOP + if { echo $top } + if { rsync -r --chmod=Du+w ${servicesDir}/ ''${top}/service } + background { + if { mkdir -p ''${top}/s6-rc/compiled } + if { tar -C ''${top}/s6-rc/compiled -xf ${compiledRcServicesDir} } + s6-rc-init -c ''${top}/s6-rc/compiled -l ''${top}/s6-rc/live ''${top}/service + } + s6-svscan ''${top}/service +'' -- 2.30.0