- Spectrum Development - spectrum-os.org

[PATCH] release/combined: fix for __structuredAttrs
by Alyssa Ross 30 Nov '24

30 Nov '24

When I set __structuredAttrs for this derivation, these variables were no longer passed to the build, resulting in GRUB not getting installed properly. Fixes: 296ccff ("Build images with __structuredAttrs") Signed-off-by: Alyssa Ross <hi(a)alyssa.is> --- release/combined/default.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/release/combined/default.nix b/release/combined/default.nix index 764e2c3..537c5ef 100644 --- a/release/combined/default.nix +++ b/release/combined/default.nix @@ -60,15 +60,22 @@ let esp = runCommand "esp.img" { nativeBuildInputs = [ grub libfaketime dosfstools mtools ]; - grubTargetDir = "${grub}/lib/grub/${grub.grubTarget}"; - # Definition copied from util/grub-install-common.c. - # Last checked: GRUB 2.06 - pkglib_DATA = [ - "efiemu32.o" "efiemu64.o" "moddep.lst" "command.lst" "fs.lst" "partmap.lst" - "parttool.lst" "video.lst" "crypto.lst" "terminal.lst" "modinfo.sh" - ]; + + env = { + grubTargetDir = "${grub}/lib/grub/${grub.grubTarget}"; + # Definition copied from util/grub-install-common.c. + # Last checked: GRUB 2.06 + pkglib_DATA = lib.escapeShellArgs [ + "efiemu32.o" "efiemu64.o" "moddep.lst" "command.lst" "fs.lst" + "partmap.lst" "parttool.lst" "video.lst" "crypto.lst" "terminal.lst" + "modinfo.sh" + ]; + }; + __structuredAttrs = true; + unsafeDiscardReferences = { out = true; }; + passthru = { inherit grubCfg; }; } '' truncate -s 15M $out base-commit: 741ed49303ffaba63c409962326ab447639e6e20 -- 2.47.0

1 0

[PATCH v1] crosvm: Rename `--vhost-user-gpu` flag in checks
by Dom Rodriguez 12 Nov '24

12 Nov '24

Following on from c9052a4, Alyssa quite rightly pointed out the remaining `--vhost-user-gpu` invocation in the release checks (Wayland). Same principle as c9052a4, just one more replacement to the crosvm flag. Signed-off-by: Dom Rodriguez <shymega(a)shymega.org.uk> --- release/checks/wayland/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/checks/wayland/default.nix b/release/checks/wayland/default.nix index d4806db..083e60d 100644 --- a/release/checks/wayland/default.nix +++ b/release/checks/wayland/default.nix @@ -38,7 +38,7 @@ nixosTest ({ lib, pkgs, ... }: { systemd.services.crosvm = { after = [ "crosvm-gpu.service" "weston.service" ]; requires = [ "crosvm-gpu.service" "weston.service" ]; - serviceConfig.ExecStart = "${lib.getExe pkgs.crosvm} run -s /run/crosvm --disk ${appvm}/img/appvm/blk/root.img -p \"console=ttyS0 root=PARTLABEL=root\" --vhost-user-fs /run/virtiofsd.sock,tag=virtiofs0 --vhost-user-gpu /run/crosvm-gpu.sock --vsock cid=3 --serial type=stdout,hardware=virtio-console,stdin=true ${appvm}/img/appvm/vmlinux"; + serviceConfig.ExecStart = "${lib.getExe pkgs.crosvm} run -s /run/crosvm --disk ${appvm}/img/appvm/blk/root.img -p \"console=ttyS0 root=PARTLABEL=root\" --vhost-user-fs /run/virtiofsd.sock,tag=virtiofs0 --vhost-user gpu,socket=/run/crosvm-gpu.sock --vsock cid=3 --serial type=stdout,hardware=virtio-console,stdin=true ${appvm}/img/appvm/vmlinux"; serviceConfig.ExecStop = "${lib.getExe pkgs.crosvm} stop /run/crosvm"; }; -- 2.44.2

3 3

[PATCH v2] crosvm: Rename `--vhost-user-{fs,gpu}` args
by Dom Rodriguez 11 Nov '24

11 Nov '24

crosvm was producing warnings when using `--vhost-user-gpu` and `--vhost-user-fs`. In this commit, I have adjusted the `crosvm` invocations to look something like `--vhost-user $DEVICE,socket=$PATH`, where `$DEVICE` is, in this case, `gpu` or `fs`, and `$PATH` is the path to the Unix socket. Signed-off-by: Dom Rodriguez <shymega(a)shymega.org.uk> --- img/app/Makefile | 4 ++-- release/checks/wayland/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/img/app/Makefile b/img/app/Makefile index 3adf8c4..11ef6e1 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -152,8 +152,8 @@ run-crosvm: $(imgdir)/appvm/blk/root.img start-vhost-user-gpu start-virtiofsd --disk $(RUN_IMG) \ -p "console=ttyS0 root=PARTLABEL=root" \ --net tap-name=tap0 \ - --vhost-user-fs build/virtiofsd.sock:virtiofs0 \ - --vhost-user-gpu build/vhost-user-gpu.sock \ + --vhost-user fs,socket=build/virtiofsd.sock:virtiofs0 \ + --vhost-user gpu,socket=build/vhost-user-gpu.sock \ --vsock cid=3 \ --serial type=file,hardware=serial,path=build/serial.log \ --serial type=stdout,hardware=virtio-console,stdin=true \ diff --git a/release/checks/wayland/default.nix b/release/checks/wayland/default.nix index d05aa88..a36dbab 100644 --- a/release/checks/wayland/default.nix +++ b/release/checks/wayland/default.nix @@ -29,7 +29,7 @@ nixosTest ({ lib, pkgs, ... }: { systemd.services.crosvm = { after = [ "crosvm-gpu.service" "weston.service" ]; requires = [ "crosvm-gpu.service" "weston.service" ]; - serviceConfig.ExecStart = "${lib.getExe pkgs.crosvm} run -s /run/crosvm --disk ${appvm}/img/appvm/blk/root.img --disk ${run}/blk/run.img -p \"console=ttyS0 root=PARTLABEL=root\" --vhost-user-gpu /run/crosvm-gpu.sock --vsock cid=3 --serial type=stdout,hardware=virtio-console,stdin=true ${appvm}/img/appvm/vmlinux"; + serviceConfig.ExecStart = "${lib.getExe pkgs.crosvm} run -s /run/crosvm --disk ${appvm}/img/appvm/blk/root.img --disk ${run}/blk/run.img -p \"console=ttyS0 root=PARTLABEL=root\" --vhost-user gpu,socket=/run/crosvm-gpu.sock --vsock cid=3 --serial type=stdout,hardware=virtio-console,stdin=true ${appvm}/img/appvm/vmlinux"; serviceConfig.ExecStop = "${lib.getExe pkgs.crosvm} stop /run/crosvm"; }; -- 2.44.1

3 10

[PATCH v4] crosvm: Rename `--vhost-user-gpu` flag
by Dom Rodriguez 11 Nov '24

11 Nov '24

crosvm was producing warnings when using `--vhost-user-gpu` and `--vhost-user-fs`, of which the former is fixable, but the latter requires some more work. The latter will be patched later on. To mitigate the former, I have adjusted the `crosvm` invocations to look something like `--vhost-user $DEVICE,socket=$PATH`, where `$DEVICE` is, in this case, `gpu`, and `$PATH` is the path to the Unix socket. Signed-off-by: Dom Rodriguez <shymega(a)shymega.org.uk> --- The typo gremlins snuck into that last v3 patch, but hopefully v4 will fix it. img/app/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/img/app/Makefile b/img/app/Makefile index 2aa78a0..d914cab 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -168,7 +168,7 @@ run-crosvm: $(imgdir)/appvm/blk/root.img start-vhost-user-gpu start-virtiofsd -p "console=ttyS0 root=PARTLABEL=root" \ --net tap-name=tap0 \ --vhost-user-fs build/virtiofsd.sock:virtiofs0 \ - --vhost-user-gpu build/vhost-user-gpu.sock \ + --vhost-user gpu,socket=build/vhost-user-gpu.sock \ --vsock cid=3 \ --serial type=file,hardware=serial,path=build/serial.log \ --serial type=stdout,hardware=virtio-console,stdin=true \ -- 2.44.1

3 3

[PATCH v3] crosvm: Rename `--vhost-user-gpu` flag
by Dom Rodriguez 09 Nov '24

09 Nov '24

crosvm was producing warnings when using `--vhost-user-gpu` and `--vhost-user-fs`, of which the former is fixable, but the latter requires some more work. The latter will be patched later on. To mitigate the former, I have adjusted the `crosvm` invocations to look something like `--vhost-user $DEVICE,socket=$PATH`, where `$DEVICE` is, in this case, `gpu`, and `$PATH` is the path to the Unix socket. Signed-off-by: Dom Rodriguez <shymega(a)shymega.org.uk> --- img/app/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/img/app/Makefile b/img/app/Makefile index 7c3e3e8..db9fbea 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -167,7 +167,7 @@ run-crosvm: $(imgdir)/appvm/blk/root.img start-vhost-user-gpu start-virtiofsd -p "console=ttyS0 root=PARTLABEL=root" \ --net tap-name=tap0 \ --vhost-user-fs build/virtiofsd.sock:virtiofs0 \ - --vhost-user-gpu build/vhost-user-gpu.sock \ + --vhost-user gpu socket=build/vhost-user-gpu.sock \ --vsock cid=3 \ --serial type=file,hardware=serial,path=build/serial.log \ --serial type=stdout,hardware=virtio-console,stdin=true \ -- 2.44.1

2 2

[PATCH] Documentation: explain Nix using too many cores
by Alyssa Ross 29 Sep '24

29 Sep '24

This is confusing to people, and will be especially so if Spectrum is the first big Nix build they've done, which is not unlikely. Signed-off-by: Alyssa Ross <hi(a)alyssa.is> --- Documentation/installation/getting-spectrum.adoc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Documentation/installation/getting-spectrum.adoc b/Documentation/installation/getting-spectrum.adoc index 3620c79..29803aa 100644 --- a/Documentation/installation/getting-spectrum.adoc +++ b/Documentation/installation/getting-spectrum.adoc @@ -2,7 +2,7 @@ :page-parent: Build and Run :page-nav_order: 2 -// SPDX-FileCopyrightText: 2022-2023 Alyssa Ross <hi(a)alyssa.is> +// SPDX-FileCopyrightText: 2022-2024 Alyssa Ross <hi(a)alyssa.is> // SPDX-License-Identifier: GFDL-1.3-no-invariants-or-later OR CC-BY-SA-4.0 To get Spectrum, you need to build it from source. As long as you're @@ -16,6 +16,13 @@ TIP: Before you start, consider setting up the xref:binary-cache.adoc[Spectrum binary cache], which will save you a lot of time waiting for builds. +TIP: If you encounter build failures, especially timeouts or +out-of-memory (OOM) kills, Nix might be configured to run too many +builds at once, with too many cores per build. See Nix's +documentation for +https://nix.dev/manual/nix/2.24/advanced-topics/cores-vs-jobs.html[tuning +cores and jobs]. + == Trying Spectrum If you want to try Spectrum out to get a feel for it, without base-commit: 6e9c1f7967a44206e8f70d1d20e0f4e71987bed8 -- 2.45.2

1 0

[PATCH] lib/common.mk: move .POSIX out
by Alyssa Ross 21 Sep '24

21 Sep '24

The standard says the following, so I don't think it's specified that it's allowed to be in an include file: > If it appears as the first non-comment line in the makefile, make > shall process the makefile as specified by this section; otherwise, > the behavior of make is unspecified. Link: https://pubs.opengroup.org/onlinepubs/9799919799/utilities/make.html#tag_20… Fixes: c3fbeca ("lib/common.mk: init") Signed-off-by: Alyssa Ross <hi(a)alyssa.is> --- host/initramfs/Makefile | 2 ++ host/rootfs/Makefile | 2 ++ img/app/Makefile | 2 ++ lib/common.mk | 2 -- release/live/Makefile | 2 ++ vm/sys/net/Makefile | 2 ++ 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/host/initramfs/Makefile b/host/initramfs/Makefile index 06f69b3..8382296 100644 --- a/host/initramfs/Makefile +++ b/host/initramfs/Makefile @@ -1,6 +1,8 @@ # SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2021-2023 Alyssa Ross <hi(a)alyssa.is> +.POSIX: + include ../../lib/common.mk dest = build/initramfs diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile index f4fb7a4..2f4445d 100644 --- a/host/rootfs/Makefile +++ b/host/rootfs/Makefile @@ -1,6 +1,8 @@ # SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2021-2024 Alyssa Ross <hi(a)alyssa.is> +.POSIX: + include ../../lib/common.mk dest = build/rootfs.erofs diff --git a/img/app/Makefile b/img/app/Makefile index 3adf8c4..79dd22e 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -2,6 +2,8 @@ # SPDX-FileCopyrightText: 2021-2024 Alyssa Ross <hi(a)alyssa.is> # SPDX-FileCopyrightText: 2022 Unikie +.POSIX: + include ../../lib/common.mk prefix = build/host diff --git a/lib/common.mk b/lib/common.mk index 8f11ecc..7733878 100644 --- a/lib/common.mk +++ b/lib/common.mk @@ -1,8 +1,6 @@ # SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2021, 2023 Alyssa Ross <hi(a)alyssa.is> -.POSIX: - # qemu-kvm is non-standard, but is present in at least Fedora and # Nixpkgs. If you don't have qemu-kvm, you'll need to set e.g. # QEMU_KVM = qemu-system-x86_64 -enable-kvm. diff --git a/release/live/Makefile b/release/live/Makefile index f45870d..a8c81c3 100644 --- a/release/live/Makefile +++ b/release/live/Makefile @@ -1,6 +1,8 @@ # SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2021-2023 Alyssa Ross <hi(a)alyssa.is> +.POSIX: + include ../../lib/common.mk dest = build/live.img diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile index 00757db..2c2f084 100644 --- a/vm/sys/net/Makefile +++ b/vm/sys/net/Makefile @@ -1,6 +1,8 @@ # SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2021-2024 Alyssa Ross <hi(a)alyssa.is> +.POSIX: + include ../../../lib/common.mk prefix = build/svc base-commit: 0f5cfe23285d31c3f7ea1d0fbca967fa8bae8d59 -- 2.45.2

2 1

[PATCH] crosvm: Rename `--vhost-user-{fs,gpu}` args
by Dom Rodriguez 21 Sep '24

21 Sep '24

crosvm was producing warnings when using `--vhost-user-gpu` and `--vhost-user-fs`. In this commit, I have adjusted the `crosvm` invocations to look something like `--vhost-user $DEVICE`, where `$DEVICE` is, in this case, `gpu` or `fs`. I have run unit tests, but would appreciate testing. Signed-off-by: Dom Rodriguez <shymega(a)shymega.org.uk> --- img/app/Makefile | 4 ++-- release/checks/wayland/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/img/app/Makefile b/img/app/Makefile index 3adf8c4..fd8befe 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -152,8 +152,8 @@ run-crosvm: $(imgdir)/appvm/blk/root.img start-vhost-user-gpu start-virtiofsd --disk $(RUN_IMG) \ -p "console=ttyS0 root=PARTLABEL=root" \ --net tap-name=tap0 \ - --vhost-user-fs build/virtiofsd.sock:virtiofs0 \ - --vhost-user-gpu build/vhost-user-gpu.sock \ + --vhost-user fs build/virtiofsd.sock:virtiofs0 \ + --vhost-user gpu build/vhost-user-gpu.sock \ --vsock cid=3 \ --serial type=file,hardware=serial,path=build/serial.log \ --serial type=stdout,hardware=virtio-console,stdin=true \ diff --git a/release/checks/wayland/default.nix b/release/checks/wayland/default.nix index d05aa88..774c9b9 100644 --- a/release/checks/wayland/default.nix +++ b/release/checks/wayland/default.nix @@ -29,7 +29,7 @@ nixosTest ({ lib, pkgs, ... }: { systemd.services.crosvm = { after = [ "crosvm-gpu.service" "weston.service" ]; requires = [ "crosvm-gpu.service" "weston.service" ]; - serviceConfig.ExecStart = "${lib.getExe pkgs.crosvm} run -s /run/crosvm --disk ${appvm}/img/appvm/blk/root.img --disk ${run}/blk/run.img -p \"console=ttyS0 root=PARTLABEL=root\" --vhost-user-gpu /run/crosvm-gpu.sock --vsock cid=3 --serial type=stdout,hardware=virtio-console,stdin=true ${appvm}/img/appvm/vmlinux"; + serviceConfig.ExecStart = "${lib.getExe pkgs.crosvm} run -s /run/crosvm --disk ${appvm}/img/appvm/blk/root.img --disk ${run}/blk/run.img -p \"console=ttyS0 root=PARTLABEL=root\" --vhost-user gpu /run/crosvm-gpu.sock --vsock cid=3 --serial type=stdout,hardware=virtio-console,stdin=true ${appvm}/img/appvm/vmlinux"; serviceConfig.ExecStop = "${lib.getExe pkgs.crosvm} stop /run/crosvm"; }; -- 2.44.1

2 4

Flake support - what are your thoughts?
by Dom (shymega) Rodriguez 09 Sep '24

09 Sep '24

Hello all! I'm picking up the Flake patch previously posted on this list, and want to get some input from developers & users alike. Do you prefer `nix-shell`/`nix-build` or Flakes? Would you be satisfied if we had compatibility shims for these tools? How do you feel about impure Flakes? Would you mind passing `--impure` to `nix $CMD` invocations? Any thoughts are welcome - feel free to DM me on Matrix/IRC if you don't want to reply to the list. My Matrix ID is: @dom:rodriguez, and my IRC nick is 'shymega[i]'. Thanks! Best wishes, -- Dom Rodriguez GPG Fingerprint: EB0D 45E6 D0DC 1BA1 A2B5 FC24 72DC F123 1E54 BD43

2 1

[PATCH v3] host/start-vmm: replace jq calls with miniserde
by Yureka 26 Aug '24

26 Aug '24

Signed-off-by: Yureka <yuka(a)yuka.dev> --- host/start-vmm/ch.rs | 50 +++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/host/start-vmm/ch.rs b/host/start-vmm/ch.rs index cf164c6..1ff2b26 100644 --- a/host/start-vmm/ch.rs +++ b/host/start-vmm/ch.rs @@ -1,5 +1,6 @@ // SPDX-License-Identifier: EUPL-1.2+ // SPDX-FileCopyrightText: 2022-2024 Alyssa Ross <hi(a)alyssa.is> +// SPDX-FileCopyrightText: 2024 Yureka <yuka(a)yuka.dev> use std::ffi::{CStr, OsStr, OsString}; use std::io::Write; @@ -8,8 +9,9 @@ use std::num::NonZeroI32; use std::os::raw::{c_char, c_int}; use std::os::unix::prelude::*; use std::process::{Command, Stdio}; +use std::str; -use miniserde::{json, Serialize}; +use miniserde::{json, Deserialize, Serialize}; use crate::net::MacAddress; @@ -125,38 +127,30 @@ pub fn create_vm(vm_name: &str, mut config: VmConfig) -> Result<(), String> { Ok(()) } -pub fn add_net(vm_name: &str, net: &NetConfig) -> Result<OsString, NonZeroI32> { - let mut ch_remote = command(vm_name, "add-net") +pub fn add_net(vm_name: &str, net: &NetConfig) -> Result<String, NonZeroI32> { + let ch_output = command(vm_name, "add-net") .arg(format!("fd={},mac={}", net.fd, net.mac)) - .stdout(Stdio::piped()) .spawn() - .or(Err(EPERM))?; + .or(Err(EPERM))? + .wait_with_output() + .or(Err(EPROTO))?; - let jq_out = match Command::new("jq") - .args(["-j", ".id"]) - .stdin(ch_remote.stdout.take().unwrap()) - .stderr(Stdio::inherit()) - .output() - { - Ok(o) => o, - Err(_) => { - // Try not to leave a zombie. - let _ = ch_remote.kill(); - let _ = ch_remote.wait(); - return Err(EPERM); - } - }; + if !ch_output.status.success() { + return Err(EPROTO); + } - if let Ok(ch_remote_status) = ch_remote.wait() { - if ch_remote_status.success() && jq_out.status.success() { - return Ok(OsString::from_vec(jq_out.stdout)); - } + #[derive(Deserialize)] + struct AddNetOutput { + id: String, } - Err(EPROTO) + let output_str = str::from_utf8(&ch_output.stdout).map_err(|_| EPROTO)?; + let output_parsed: AddNetOutput = json::from_str(output_str).map_err(|_| EPROTO)?; + + Ok(output_parsed.id) } -pub fn remove_device(vm_name: &str, device_id: &OsStr) -> Result<(), NonZeroI32> { +pub fn remove_device(vm_name: &str, device_id: &str) -> Result<(), NonZeroI32> { let ch_remote = command(vm_name, "remove-device") .arg(device_id) .status() @@ -178,7 +172,7 @@ pub fn remove_device(vm_name: &str, device_id: &OsStr) -> Result<(), NonZeroI32> unsafe extern "C" fn add_net_c( vm_name: *const c_char, net: &NetConfig, - id: *mut *mut OsString, + id: *mut *mut String, ) -> c_int { let Ok(vm_name) = CStr::from_ptr(vm_name).to_str() else { return EINVAL.into(); @@ -202,7 +196,7 @@ unsafe extern "C" fn add_net_c( /// - `id` must be a device ID obtained by calling `add_net_c`. After /// calling `remove_device_c`, the pointer is no longer valid. #[export_name = "ch_remove_device"] -unsafe extern "C" fn remove_device_c(vm_name: *const c_char, device_id: *mut OsString) -> c_int { +unsafe extern "C" fn remove_device_c(vm_name: *const c_char, device_id: *mut String) -> c_int { let Ok(vm_name) = CStr::from_ptr(vm_name).to_str() else { return EINVAL.into(); }; @@ -220,7 +214,7 @@ unsafe extern "C" fn remove_device_c(vm_name: *const c_char, device_id: *mut OsS /// `id` must be a device ID obtained by calling `add_net_c`. After /// calling `device_free`, the pointer is no longer valid. #[export_name = "ch_device_free"] -unsafe extern "C" fn device_free(id: *mut OsString) { +unsafe extern "C" fn device_free(id: *mut String) { if !id.is_null() { drop(Box::from_raw(id)) } -- 2.45.2

2 2