From 08e81305953b2399e880cf23ed3233350972a56f Mon Sep 17 00:00:00 2001 From: Grayson Guarino Date: Mon, 26 Oct 2026 14:00:31 -0400 Subject: [PATCH 1/2] feat(zone-kvm): enable TUN in the zone-kvm kernel protect's KVM backend runs cloud-hypervisor, which gives each networked zone a TAP device through /dev/net/tun. Without CONFIG_TUN, protect cannot run its KVM zones inside a zone-kvm zone, which the Edera CI runners need to run protect's E2E suite without a nested rig VM. CONFIG_TUN depends on NETDEVICES and NET_CORE, both already set in zone.config. Refs ENGINFR-116 --- config.yaml | 2 +- configs/x86_64/zone-kvm.fragment.config | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config.yaml b/config.yaml index d4f24b7..22bfacc 100644 --- a/config.yaml +++ b/config.yaml @@ -37,7 +37,7 @@ flavors: - x86_64 - aarch64 - name: zone-kvm - # zone kernel built with kvm (AMD and Intel) and nbd enabled for e2e testing in the protect repo + # zone kernel built with kvm (AMD and Intel), nbd and tun enabled for e2e testing in the protect repo architectures: - x86_64 constraints: diff --git a/configs/x86_64/zone-kvm.fragment.config b/configs/x86_64/zone-kvm.fragment.config index 166fdc4..468266f 100644 --- a/configs/x86_64/zone-kvm.fragment.config +++ b/configs/x86_64/zone-kvm.fragment.config @@ -7,3 +7,4 @@ CONFIG_KVM=y CONFIG_KVM_AMD=y CONFIG_KVM_INTEL=y CONFIG_BLK_DEV_NBD=y +CONFIG_TUN=y From 52ea0c888ba054a67f84f91081600848d47d1cd7 Mon Sep 17 00:00:00 2001 From: Grayson Guarino Date: Mon, 26 Oct 2026 14:17:31 -0400 Subject: [PATCH 2/2] feat(zone-kvm): build the zone-kvm kernel for aarch64 The aarch64 fragment lists the same options as x86_64's: KVM, NBD and TUN. The arm64 defconfig already enables VIRTUALIZATION, KVM and TUN in the aarch64 zone kernel, so in practice only NBD changes, from a module to built in. Setting them here keeps the flavor from depending on defconfig. Refs ENGINFR-116 --- config.yaml | 3 ++- configs/aarch64/zone-kvm.fragment.config | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 configs/aarch64/zone-kvm.fragment.config diff --git a/config.yaml b/config.yaml index 22bfacc..7c567d8 100644 --- a/config.yaml +++ b/config.yaml @@ -37,9 +37,10 @@ flavors: - x86_64 - aarch64 - name: zone-kvm - # zone kernel built with kvm (AMD and Intel), nbd and tun enabled for e2e testing in the protect repo + # zone kernel built with kvm (AMD, Intel and arm64), nbd and tun enabled for e2e testing in the protect repo architectures: - x86_64 + - aarch64 constraints: lower: '6.1' - name: zone-tiny diff --git a/configs/aarch64/zone-kvm.fragment.config b/configs/aarch64/zone-kvm.fragment.config new file mode 100644 index 0000000..a9c6df2 --- /dev/null +++ b/configs/aarch64/zone-kvm.fragment.config @@ -0,0 +1,7 @@ +# +# Edera kernel config snippet +# +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=y +CONFIG_BLK_DEV_NBD=y +CONFIG_TUN=y