From: Alyssa Ross <hi@alyssa.is>
To: devel@spectrum-os.org
Subject: [PATCH nixpkgs 16/16] spectrumPackages.spectrum-testhost: init
Date: Sun, 11 Apr 2021 11:57:40 +0000 [thread overview]
Message-ID: <20210411115740.29615-17-hi@alyssa.is> (raw)
In-Reply-To: <20210411115740.29615-1-hi@alyssa.is>
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.net/
+ 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
next prev parent reply other threads:[~2021-04-11 12:01 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-11 11:57 [PATCH nixpkgs 00/16] Inter-guest networking Alyssa Ross
2021-04-11 11:57 ` [PATCH nixpkgs 01/16] linux: enable Xen everywhere it can be Alyssa Ross
2021-04-11 11:57 ` [PATCH nixpkgs 02/16] cloud-hypervisor: 0.8.0 -> 0.14.1 Alyssa Ross
2021-04-11 11:57 ` [PATCH nixpkgs 03/16] mdevd: init at 0.1.3.0 Alyssa Ross
2021-04-11 11:57 ` [PATCH nixpkgs 04/16] spectrumPackages.linux_vm: fix cloud-hypervisor hotplug Alyssa Ross
2021-04-11 11:57 ` [PATCH nixpkgs 05/16] spectrumPackages.linux_vm: allow config overrides Alyssa Ross
2021-04-11 11:57 ` [PATCH nixpkgs 06/16] crosvm: support setting guest MAC from --tap-fd Alyssa Ross
2021-04-11 11:57 ` [PATCH nixpkgs 07/16] spectrumPackages: export makeRootfs Alyssa Ross
2021-04-11 11:57 ` [PATCH nixpkgs 08/16] spectrumPackages.rootfs: add s6-rc support Alyssa Ross
2021-04-11 11:57 ` [PATCH nixpkgs 09/16] spectrumPackages.rootfs: make /var/lib and /var/run Alyssa Ross
2021-04-11 11:57 ` [PATCH nixpkgs 10/16] spectrumPackages.rootfs: add dbus configuration Alyssa Ross
2021-04-11 11:57 ` [PATCH nixpkgs 11/16] spectrumPackages.rootfs: add connman dbus services Alyssa Ross
2021-04-11 11:57 ` [PATCH nixpkgs 12/16] spectrumPackages.sys-vms.comp: init Alyssa Ross
2021-04-11 11:57 ` [PATCH nixpkgs 13/16] spectrumPackages.makeRootfs: move to default.nix Alyssa Ross
2021-04-11 11:57 ` [PATCH nixpkgs 14/16] spectrumPackages.sys-vms.net: init Alyssa Ross
2021-04-14 20:49 ` Alyssa Ross
2021-04-11 11:57 ` [PATCH nixpkgs 15/16] spectrumPackages.sys-vms.app: init Alyssa Ross
2021-04-11 11:57 ` Alyssa Ross [this message]
2021-04-14 22:15 ` [PATCH nixpkgs 00/16] Inter-guest networking Cole Helbling
2021-04-14 23:56 ` Alyssa Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210411115740.29615-17-hi@alyssa.is \
--to=hi@alyssa.is \
--cc=devel@spectrum-os.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).