From ef175797b61d5a33057e5121526cf474cb7cdcb1 Mon Sep 17 00:00:00 2001 From: Alex Lyn Date: Fri, 1 Aug 2025 16:38:56 +0800 Subject: [PATCH 01/15] runtime-rs: move get_scsi_id_lun upper within hotplug_block_device Move the closure get_scsi_id_lun upper within hotplug_block_device and make it more helpful. Signed-off-by: Alex Lyn --- .../crates/hypervisor/src/qemu/qmp.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs b/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs index a3fb754433..8683d61428 100644 --- a/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs +++ b/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs @@ -541,6 +541,15 @@ impl Qmp { is_readonly: bool, no_drop: bool, ) -> Result<(Option, Option)> { + // Helper closure to decode a flattened u16 SCSI index into an (ID, LUN) pair. + let get_scsi_id_lun = |index_u16: u16| -> Result<(u8, u8)> { + // Uses bitwise operations for efficient and clear conversion. + let scsi_id = (index_u16 >> 8) as u8; // Equivalent to index_u16 / 256 + let lun = (index_u16 & 0xFF) as u8; // Equivalent to index_u16 % 256 + + Ok((scsi_id, lun)) + }; + // `blockdev-add` let node_name = format!("drive-{index}"); @@ -618,15 +627,6 @@ impl Qmp { blkdev_add_args.insert("drive".to_owned(), node_name.clone().into()); if block_driver == VIRTIO_SCSI { - // Helper closure to decode a flattened u16 SCSI index into an (ID, LUN) pair. - let get_scsi_id_lun = |index_u16: u16| -> Result<(u8, u8)> { - // Uses bitwise operations for efficient and clear conversion. - let scsi_id = (index_u16 >> 8) as u8; // Equivalent to index_u16 / 256 - let lun = (index_u16 & 0xFF) as u8; // Equivalent to index_u16 % 256 - - Ok((scsi_id, lun)) - }; - // Safely convert the u64 index to u16, ensuring it does not exceed `u16::MAX` (65535). let (scsi_id, lun) = get_scsi_id_lun(u16::try_from(index)?)?; let scsi_addr = format!("{}:{}", scsi_id, lun); From e0e5cf21802a87033def4b43c4f094b2e5673c8f Mon Sep 17 00:00:00 2001 From: Alex Lyn Date: Fri, 1 Aug 2025 16:44:26 +0800 Subject: [PATCH 02/15] runtime-rs: Add idempotency to hotplug block device operations Due to the lack of atomicity in the operation, a partial failure can lead to an inconsistent QEMU state, which pollutes subsequent operations. This can easily trigger a "Duplicate nodes" error. To prevent this, we should query the state before performing the operation. ee should ensure its validation and idempotency when making the function idempotent allows it to be safely retried. Fixes #11649 Signed-off-by: Alex Lyn --- .../crates/hypervisor/src/qemu/qmp.rs | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs b/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs index 8683d61428..4952629641 100644 --- a/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs +++ b/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs @@ -553,6 +553,55 @@ impl Qmp { // `blockdev-add` let node_name = format!("drive-{index}"); + // Pre-check block drive and block device with qapi + { + let node_exists = self + .qmp + .execute(&qapi_qmp::query_named_block_nodes { flat: Some(true) })? + .into_iter() + .any(|d| d.node_name == Some(node_name.clone())); + let device_exists = self + .qmp + .execute(&qapi_qmp::query_block {})? + .into_iter() + .any(|d| match d.inserted { + Some(node) => node.node_name == Some(node_name.clone()), + None => false, + }); + + if node_exists && device_exists { + if block_driver == VIRTIO_SCSI { + // Safely convert the u64 index to u16, ensuring it does not exceed `u16::MAX` (65535). + let (scsi_id, lun) = get_scsi_id_lun(u16::try_from(index)?)?; + let scsi_addr = format!("{}:{}", scsi_id, lun); + + return Ok((None, Some(scsi_addr))); + } else { + let pci_path = self + .get_device_by_qdev_id(&node_name) + .context("get device by qdev_id failed")?; + info!( + sl!(), + "hotplug block device return pci path: {:?}", &pci_path + ); + + return Ok((Some(pci_path), None)); + } + } + + if node_exists && !device_exists { + warn!( + sl!(), + "Found orphaned backend node {:?}, do cleanup before retry.", &node_name + ); + self.qmp + .execute(&qapi_qmp::blockdev_del { + node_name: node_name.clone(), + }) + .ok(); + } + } + let create_base_options = || qapi_qmp::BlockdevOptionsBase { auto_read_only: None, cache: if is_direct.is_none() { From f0b3fb2796c2c4c126ed48e347a630fafdcf5dee Mon Sep 17 00:00:00 2001 From: Alex Lyn Date: Thu, 7 Aug 2025 18:58:09 +0800 Subject: [PATCH 03/15] runtime-rs: Support share-rw=true when hotplug block device within qemu Support for the share-rw=true parameter has been added. While this parameter is essential for maintaining data consistency across multiple QEMU instances sharing a backend disk image, its implementation also serves to standardize parameters with the block device hotplug functionality in kata-runtime/qemu. Signed-off-by: Alex Lyn --- src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs b/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs index 4952629641..65976d41b3 100644 --- a/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs +++ b/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs @@ -683,6 +683,7 @@ impl Qmp { // add SCSI frontend device blkdev_add_args.insert("scsi-id".to_string(), scsi_id.into()); blkdev_add_args.insert("lun".to_string(), lun.into()); + blkdev_add_args.insert("share-rw".to_string(), true.into()); self.qmp .execute(&qmp::device_add { @@ -703,6 +704,7 @@ impl Qmp { } else { let (bus, slot) = self.find_free_slot()?; blkdev_add_args.insert("addr".to_owned(), format!("{:02}", slot).into()); + blkdev_add_args.insert("share-rw".to_string(), true.into()); self.qmp .execute(&qmp::device_add { From 3c7cfd0c36ac92e9195cd52de3e2d9a9ea583a40 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Thu, 19 Jun 2025 17:26:03 +0100 Subject: [PATCH 04/15] runtime-rs: Add qemu-runtime-rs-coco-dev Create non-tee runtime class for runtime-rs qemu CoCo development without requiring TEE hardware. Based on the qemu-runtime-rs config, but with updated guest image, kernel and shared_fs Signed-off-by: stevenhorsman --- src/runtime-rs/Makefile | 33 + ...iguration-qemu-runtime-rs-coco-dev.toml.in | 825 ++++++++++++++++++ 2 files changed, 858 insertions(+) create mode 100644 src/runtime-rs/config/configuration-qemu-runtime-rs-coco-dev.toml.in diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile index 7cf88ac042..c3ad4b9bac 100644 --- a/src/runtime-rs/Makefile +++ b/src/runtime-rs/Makefile @@ -77,7 +77,9 @@ CLHBINDIR := $(PREFIXDEPS)/bin QEMUBINDIR := $(PREFIXDEPS)/bin PROJECT_DIR = $(PROJECT_TAG) IMAGENAME = $(PROJECT_TAG).img +IMAGECONFIDENTIALNAME = $(PROJECT_TAG)-confidential.img INITRDNAME = $(PROJECT_TAG)-initrd.img +INITRDCONFIDENTIALNAME = $(PROJECT_TAG)-initrd-confidential.img TARGET = $(PROJECT_COMPONENT) SYSCONFDIR := /etc LOCALSTATEDIR := /var @@ -112,7 +114,9 @@ PKGDATADIR := $(PREFIXDEPS)/share/$(PROJECT_DIR) PKGRUNDIR := $(LOCALSTATEDIR)/run/$(PROJECT_DIR) KERNELDIR := $(PKGDATADIR) IMAGEPATH := $(PKGDATADIR)/$(IMAGENAME) +IMAGECONFIDENTIALPATH := $(PKGDATADIR)/$(IMAGECONFIDENTIALNAME) INITRDPATH := $(PKGDATADIR)/$(INITRDNAME) +INITRDCONFIDENTIALPATH := $(PKGDATADIR)/$(INITRDCONFIDENTIALNAME) ROOTFSTYPE_EXT4 := \"ext4\" ROOTFSTYPE_XFS := \"xfs\" @@ -297,6 +301,18 @@ ifneq (,$(QEMUCMD)) CONFIGS += $(CONFIG_QEMU_SE) + CONFIG_FILE_QEMU_COCO_DEV = configuration-qemu-runtime-rs-coco-dev.toml + CONFIG_QEMU_COCO_DEV = config/$(CONFIG_FILE_QEMU_COCO_DEV) + CONFIG_QEMU_COCO_DEV_IN = $(CONFIG_QEMU_COCO_DEV).in + + CONFIG_PATH_QEMU_COCO_DEV = $(abspath $(CONFDIR)/$(CONFIG_FILE_QEMU_COCO_DEV)) + CONFIG_PATHS += $(CONFIG_PATH_QEMU_COCO_DEV) + + SYSCONFIG_QEMU_COCO_DEV = $(abspath $(SYSCONFDIR)/$(CONFIG_FILE_QEMU_COCO_DEV)) + SYSCONFIG_PATHS += $(SYSCONFIG_QEMU_COCO_DEV) + + CONFIGS += $(CONFIG_QEMU_COCO_DEV) + KERNELTYPE_QEMU = uncompressed KERNEL_NAME_QEMU = $(call MAKE_KERNEL_NAME,$(KERNELTYPE_QEMU)) KERNELPATH_QEMU = $(KERNELDIR)/$(KERNEL_NAME_QEMU) @@ -304,6 +320,10 @@ ifneq (,$(QEMUCMD)) KERNEL_NAME_QEMU_SE = kata-containers-se.img KERNELPATH_QEMU_SE = $(KERNELDIR)/$(KERNEL_NAME_QEMU_SE) + KERNEL_TYPE_COCO = compressed + KERNEL_NAME_COCO = $(call MAKE_KERNEL_NAME_COCO,$(KERNELCONFIDENTIALTYPE)) + KERNELPATH_COCO = $(KERNELDIR)/$(KERNEL_NAME_COCO) + # overriding options DEFSTATICRESOURCEMGMT_QEMU := true @@ -320,6 +340,7 @@ endif DEFMAXVCPUS_QEMU := 0 DEFSHAREDFS_QEMU_VIRTIOFS := virtio-fs DEFSHAREDFS_QEMU_SEL_VIRTIOFS := none + DEFSHAREDFS_QEMU_COCO_DEV_VIRTIOFS := none DEFBLOCKDEVICEAIO_QEMU := io_uring DEFNETWORKMODEL_QEMU := tcfilter DEFDISABLEGUESTSELINUX := true @@ -386,6 +407,7 @@ USER_VARS += CONFIG_PATH USER_VARS += CONFIG_QEMU_IN USER_VARS += CONFIG_QEMU_SE_IN USER_VARS += CONFIG_REMOTE_IN +USER_VARS += CONFIG_QEMU_COCO_DEV_IN USER_VARS += DESTDIR USER_VARS += HYPERVISOR USER_VARS += USE_BUILDIN_DB @@ -411,8 +433,13 @@ USER_VARS += FCVALIDJAILERPATHS USER_VARS += DEFMAXMEMSZ_FC USER_VARS += SYSCONFIG USER_VARS += IMAGENAME +USER_VARS += IMAGECONFIDENTIALNAME USER_VARS += IMAGEPATH +USER_VARS += IMAGECONFIDENTIALPATH +USER_VARS += INITRDNAME +USER_VARS += INITRDCONFIDENTIALNAME USER_VARS += INITRDPATH +USER_VARS += INITRDCONFIDENTIALPATH USER_VARS += DEFROOTFSTYPE USER_VARS += VMROOTFSDRIVER_DB USER_VARS += VMROOTFSDRIVER_CLH @@ -424,6 +451,7 @@ USER_VARS += KERNELPATH_DB USER_VARS += KERNELPATH_QEMU USER_VARS += KERNELPATH_QEMU_SE USER_VARS += KERNELPATH_FC +USER_VARS += KERNELPATH_COCO USER_VARS += KERNELPATH USER_VARS += KERNELVIRTIOFSPATH USER_VARS += FIRMWAREPATH @@ -475,6 +503,7 @@ USER_VARS += DEFBLOCKSTORAGEDRIVER_FC USER_VARS += DEFSHAREDFS_CLH_VIRTIOFS USER_VARS += DEFSHAREDFS_QEMU_VIRTIOFS USER_VARS += DEFSHAREDFS_QEMU_SEL_VIRTIOFS +USER_VARS += DEFSHAREDFS_QEMU_COCO_DEV_VIRTIOFS USER_VARS += DEFVIRTIOFSDAEMON USER_VARS += DEFVALIDVIRTIOFSDAEMONPATHS USER_VARS += DEFVIRTIOFSCACHESIZE @@ -608,6 +637,10 @@ define MAKE_KERNEL_NAME $(if $(findstring uncompressed,$1),vmlinux.container,vmlinuz.container) endef +define MAKE_KERNEL_NAME_COCO +$(if $(findstring uncompressed,$1),vmlinux-confidential.container,vmlinuz-confidential.container) +endef + .DEFAULT_GOAL := default GENERATED_FILES += $(CONFIGS) diff --git a/src/runtime-rs/config/configuration-qemu-runtime-rs-coco-dev.toml.in b/src/runtime-rs/config/configuration-qemu-runtime-rs-coco-dev.toml.in new file mode 100644 index 0000000000..ce25840a81 --- /dev/null +++ b/src/runtime-rs/config/configuration-qemu-runtime-rs-coco-dev.toml.in @@ -0,0 +1,825 @@ +# Copyright (c) 2017-2019 Intel Corporation +# Copyright (c) 2021 Adobe Inc. +# Copyright (c) 2024-2025 IBM Corp. +# +# SPDX-License-Identifier: Apache-2.0 +# + +# XXX: WARNING: this file is auto-generated. +# XXX: +# XXX: Source file: "@CONFIG_QEMU_IN@" +# XXX: Project: +# XXX: Name: @PROJECT_NAME@ +# XXX: Type: @PROJECT_TYPE@ + +[hypervisor.qemu] +path = "@QEMUPATH@" +kernel = "@KERNELPATH_COCO@" +image = "@IMAGECONFIDENTIALPATH@" +# initrd = "@INITRDCONFIDENTIALPATH@" +machine_type = "@MACHINETYPE@" + +# rootfs filesystem type: +# - ext4 (default) +# - xfs +# - erofs +rootfs_type=@DEFROOTFSTYPE@ + +# Block storage driver to be used for the VM rootfs is backed +# by a block device. This is virtio-blk-pci, virtio-blk-mmio or nvdimm +vm_rootfs_driver = "@VMROOTFSDRIVER_QEMU@" + +# Enable confidential guest support. +# Toggling that setting may trigger different hardware features, ranging +# from memory encryption to both memory and CPU-state encryption and integrity. +# The Kata Containers runtime dynamically detects the available feature set and +# aims at enabling the largest possible one, returning an error if none is +# available, or none is supported by the hypervisor. +# +# Known limitations: +# * Does not work by design: +# - CPU Hotplug +# - Memory Hotplug +# - NVDIMM devices +# +# Default false +# confidential_guest = true + +# Choose AMD SEV-SNP confidential guests +# In case of using confidential guests on AMD hardware that supports both SEV +# and SEV-SNP, the following enables SEV-SNP guests. SEV guests are default. +# Default false +# sev_snp_guest = true + +# Enable running QEMU VMM as a non-root user. +# By default QEMU VMM run as root. When this is set to true, QEMU VMM process runs as +# a non-root random user. See documentation for the limitations of this mode. +# rootless = true + +# List of valid annotation names for the hypervisor +# Each member of the list is a regular expression, which is the base name +# of the annotation, e.g. "path" for io.katacontainers.config.hypervisor.path" +enable_annotations = @DEFENABLEANNOTATIONS@ + +# List of valid annotations values for the hypervisor +# Each member of the list is a path pattern as described by glob(3). +# The default if not set is empty (all annotations rejected.) +# Your distribution recommends: @QEMUVALIDHYPERVISORPATHS@ +valid_hypervisor_paths = @QEMUVALIDHYPERVISORPATHS@ + +# Optional space-separated list of options to pass to the guest kernel. +# For example, use `kernel_params = "vsyscall=emulate"` if you are having +# trouble running pre-2.15 glibc. +# +# WARNING: - any parameter specified here will take priority over the default +# parameter value of the same name used to start the virtual machine. +# Do not set values here unless you understand the impact of doing so as you +# may stop the virtual machine from booting. +# To see the list of default parameters, enable hypervisor debug, create a +# container and look for 'default-kernel-parameters' log entries. +kernel_params = "@KERNELPARAMS@" + +# Path to the firmware. +# If you want that qemu uses the default firmware leave this option empty +firmware = "@FIRMWAREPATH@" + +# Path to the firmware volume. +# firmware TDVF or OVMF can be split into FIRMWARE_VARS.fd (UEFI variables +# as configuration) and FIRMWARE_CODE.fd (UEFI program image). UEFI variables +# can be customized per each user while UEFI code is kept same. +firmware_volume = "@FIRMWAREVOLUMEPATH@" + +# Machine accelerators +# comma-separated list of machine accelerators to pass to the hypervisor. +# For example, `machine_accelerators = "nosmm,nosmbus,nosata,nopit,static-prt,nofw"` +machine_accelerators="@MACHINEACCELERATORS@" + +# Qemu seccomp sandbox feature +# comma-separated list of seccomp sandbox features to control the syscall access. +# For example, `seccompsandbox= "on,obsolete=deny,spawn=deny,resourcecontrol=deny"` +# Note: "elevateprivileges=deny" doesn't work with daemonize option, so it's removed from the seccomp sandbox +# Another note: enabling this feature may reduce performance, you may enable +# /proc/sys/net/core/bpf_jit_enable to reduce the impact. see https://man7.org/linux/man-pages/man8/bpfc.8.html +#seccompsandbox="@DEFSECCOMPSANDBOXPARAM@" + +# CPU features +# comma-separated list of cpu features to pass to the cpu +# For example, `cpu_features = "pmu=off,vmx=off" +cpu_features="@CPUFEATURES@" + +# Default number of vCPUs per SB/VM: +# unspecified or 0 --> will be set to @DEFVCPUS@ +# < 0 --> will be set to the actual number of physical cores +# > 0 <= number of physical cores --> will be set to the specified number +# > number of physical cores --> will be set to the actual number of physical cores +default_vcpus = @DEFVCPUS_QEMU@ + +# Default maximum number of vCPUs per SB/VM: +# unspecified or == 0 --> will be set to the actual number of physical cores or to the maximum number +# of vCPUs supported by KVM if that number is exceeded +# > 0 <= number of physical cores --> will be set to the specified number +# > number of physical cores --> will be set to the actual number of physical cores or to the maximum number +# of vCPUs supported by KVM if that number is exceeded +# WARNING: Depending of the architecture, the maximum number of vCPUs supported by KVM is used when +# the actual number of physical cores is greater than it. +# WARNING: Be aware that this value impacts the virtual machine's memory footprint and CPU +# the hotplug functionality. For example, `default_maxvcpus = 240` specifies that until 240 vCPUs +# can be added to a SB/VM, but the memory footprint will be big. Another example, with +# `default_maxvcpus = 8` the memory footprint will be small, but 8 will be the maximum number of +# vCPUs supported by the SB/VM. In general, we recommend that you do not edit this variable, +# unless you know what are you doing. +# NOTICE: on arm platform with gicv2 interrupt controller, set it to 8. +default_maxvcpus = @DEFMAXVCPUS_QEMU@ + +# Bridges can be used to hot plug devices. +# Limitations: +# * Currently only pci bridges are supported +# * Until 30 devices per bridge can be hot plugged. +# * Until 5 PCI bridges can be cold plugged per VM. +# This limitation could be a bug in qemu or in the kernel +# Default number of bridges per SB/VM: +# unspecified or 0 --> will be set to @DEFBRIDGES@ +# > 1 <= 5 --> will be set to the specified number +# > 5 --> will be set to 5 +default_bridges = @DEFBRIDGES@ + +# Reclaim guest freed memory. +# Enabling this will result in the VM balloon device having f_reporting=on set. +# Then the hypervisor will use it to reclaim guest freed memory. +# This is useful for reducing the amount of memory used by a VM. +# Enabling this feature may sometimes reduce the speed of memory access in +# the VM. +# +# Default false +#reclaim_guest_freed_memory = true + +# Default memory size in MiB for SB/VM. +# If unspecified then it will be set @DEFMEMSZ@ MiB. +default_memory = @DEFMEMSZ@ +# +# Default memory slots per SB/VM. +# If unspecified then it will be set @DEFMEMSLOTS@. +# This is will determine the times that memory will be hotadded to sandbox/VM. +#memory_slots = @DEFMEMSLOTS@ + +# Default maximum memory in MiB per SB / VM +# unspecified or == 0 --> will be set to the actual amount of physical RAM +# > 0 <= amount of physical RAM --> will be set to the specified number +# > amount of physical RAM --> will be set to the actual amount of physical RAM +default_maxmemory = @DEFMAXMEMSZ@ + +# The size in MiB will be plused to max memory of hypervisor. +# It is the memory address space for the NVDIMM devie. +# If set block storage driver (block_device_driver) to "nvdimm", +# should set memory_offset to the size of block device. +# Default 0 +#memory_offset = 0 + +# Specifies virtio-mem will be enabled or not. +# Please note that this option should be used with the command +# "echo 1 > /proc/sys/vm/overcommit_memory". +# Default false +#enable_virtio_mem = true + +# Disable block device from being used for a container's rootfs. +# In case of a storage driver like devicemapper where a container's +# root file system is backed by a block device, the block device is passed +# directly to the hypervisor for performance reasons. +# This flag prevents the block device from being passed to the hypervisor, +# virtio-fs is used instead to pass the rootfs. +disable_block_device_use = @DEFDISABLEBLOCK@ + +# Shared file system type: +# - virtio-fs (default) +# - virtio-9p +# - virtio-fs-nydus +# - none +shared_fs = "@DEFSHAREDFS_QEMU_COCO_DEV_VIRTIOFS@" + +# Path to vhost-user-fs daemon. +virtio_fs_daemon = "@DEFVIRTIOFSDAEMON@" + +# List of valid annotations values for the virtiofs daemon +# The default if not set is empty (all annotations rejected.) +# Your distribution recommends: @DEFVALIDVIRTIOFSDAEMONPATHS@ +valid_virtio_fs_daemon_paths = @DEFVALIDVIRTIOFSDAEMONPATHS@ + +# Default size of DAX cache in MiB +virtio_fs_cache_size = @DEFVIRTIOFSCACHESIZE@ + +# Default size of virtqueues +virtio_fs_queue_size = @DEFVIRTIOFSQUEUESIZE@ + +# Extra args for virtiofsd daemon +# +# Format example: +# ["--arg1=xxx", "--arg2=yyy"] +# Examples: +# Set virtiofsd log level to debug : ["--log-level=debug"] +# +# see `virtiofsd -h` for possible options. +virtio_fs_extra_args = @DEFVIRTIOFSEXTRAARGS@ + +# Cache mode: +# +# - never +# Metadata, data, and pathname lookup are not cached in guest. They are +# always fetched from host and any changes are immediately pushed to host. +# +# - auto +# Metadata and pathname lookup cache expires after a configured amount of +# time (default is 1 second). Data is cached while the file is open (close +# to open consistency). +# +# - always +# Metadata, data, and pathname lookup are cached in guest and never expire. +virtio_fs_cache = "@DEFVIRTIOFSCACHE@" + +# Block storage driver to be used for the hypervisor in case the container +# rootfs is backed by a block device. This is virtio-scsi, virtio-blk +# or nvdimm. +block_device_driver = "@DEFBLOCKSTORAGEDRIVER_QEMU@" + +# aio is the I/O mechanism used by qemu +# Options: +# +# - threads +# Pthread based disk I/O. +# +# - native +# Native Linux I/O. +# +# - io_uring +# Linux io_uring API. This provides the fastest I/O operations on Linux, requires kernel>5.1 and +# qemu >=5.0. +block_device_aio = "@DEFBLOCKDEVICEAIO_QEMU@" + +# Specifies cache-related options will be set to block devices or not. +# Default false +#block_device_cache_set = true + +# Specifies cache-related options for block devices. +# Denotes whether use of O_DIRECT (bypass the host page cache) is enabled. +# Default false +#block_device_cache_direct = true + +# Specifies cache-related options for block devices. +# Denotes whether flush requests for the device are ignored. +# Default false +#block_device_cache_noflush = true + +# Enable iothreads (data-plane) to be used. This causes IO to be +# handled in a separate IO thread. This is currently only implemented +# for SCSI. +# +enable_iothreads = @DEFENABLEIOTHREADS@ + +# Enable pre allocation of VM RAM, default false +# Enabling this will result in lower container density +# as all of the memory will be allocated and locked +# This is useful when you want to reserve all the memory +# upfront or in the cases where you want memory latencies +# to be very predictable +# Default false +#enable_mem_prealloc = true + +# Enable huge pages for VM RAM, default false +# Enabling this will result in the VM memory +# being allocated using huge pages. +# This is useful when you want to use vhost-user network +# stacks within the container. This will automatically +# result in memory pre allocation +#enable_hugepages = true + +# Enable vhost-user storage device, default false +# Enabling this will result in some Linux reserved block type +# major range 240-254 being chosen to represent vhost-user devices. +enable_vhost_user_store = @DEFENABLEVHOSTUSERSTORE@ + +# The base directory specifically used for vhost-user devices. +# Its sub-path "block" is used for block devices; "block/sockets" is +# where we expect vhost-user sockets to live; "block/devices" is where +# simulated block device nodes for vhost-user devices to live. +vhost_user_store_path = "@DEFVHOSTUSERSTOREPATH@" + +# Enable vIOMMU, default false +# Enabling this will result in the VM having a vIOMMU device +# This will also add the following options to the kernel's +# command line: intel_iommu=on,iommu=pt +#enable_iommu = true + +# Enable IOMMU_PLATFORM, default false +# Enabling this will result in the VM device having iommu_platform=on set +#enable_iommu_platform = true + +# List of valid annotations values for the vhost user store path +# The default if not set is empty (all annotations rejected.) +# Your distribution recommends: @DEFVALIDVHOSTUSERSTOREPATHS@ +valid_vhost_user_store_paths = @DEFVALIDVHOSTUSERSTOREPATHS@ + +# The timeout for reconnecting on non-server spdk sockets when the remote end goes away. +# qemu will delay this many seconds and then attempt to reconnect. +# Zero disables reconnecting, and the default is zero. +vhost_user_reconnect_timeout_sec = 0 + +# Enable file based guest memory support. The default is an empty string which +# will disable this feature. In the case of virtio-fs, this is enabled +# automatically and '/dev/shm' is used as the backing folder. +# This option will be ignored if VM templating is enabled. +#file_mem_backend = "@DEFFILEMEMBACKEND@" + +# List of valid annotations values for the file_mem_backend annotation +# The default if not set is empty (all annotations rejected.) +# Your distribution recommends: @DEFVALIDFILEMEMBACKENDS@ +valid_file_mem_backends = @DEFVALIDFILEMEMBACKENDS@ + +# -pflash can add image file to VM. The arguments of it should be in format +# of ["/path/to/flash0.img", "/path/to/flash1.img"] +pflashes = [] + +# This option changes the default hypervisor and kernel parameters +# to enable debug output where available. +# +# Default false +#enable_debug = true + +# This option allows to add an extra HMP or QMP socket when `enable_debug = true` +# +# WARNING: Anyone with access to the extra socket can take full control of +# Qemu. This is for debugging purpose only and must *NEVER* be used in +# production. +# +# Valid values are : +# - "hmp" +# - "qmp" +# - "qmp-pretty" (same as "qmp" with pretty json formatting) +# +# If set to the empty string "", no extra monitor socket is added. This is +# the default. +#extra_monitor_socket = "hmp" + +# Disable the customizations done in the runtime when it detects +# that it is running on top a VMM. This will result in the runtime +# behaving as it would when running on bare metal. +# +#disable_nesting_checks = true + +# This is the msize used for 9p shares. It is the number of bytes +# used for 9p packet payload. +#msize_9p = @DEFMSIZE9P@ + +# If false and nvdimm is supported, use nvdimm device to plug guest image. +# Otherwise virtio-block device is used. +# +# nvdimm is not supported when `confidential_guest = true`. +# +# Default is false +#disable_image_nvdimm = true + +# VFIO devices are hotplugged on a bridge by default. +# Enable hotplugging on root bus. This may be required for devices with +# a large PCI bar, as this is a current limitation with hotplugging on +# a bridge. +# Default false +#hotplug_vfio_on_root_bus = true + +# Enable hot-plugging of VFIO devices to a bridge-port, +# root-port or switch-port. +# The default setting is "no-port" +#hot_plug_vfio = "root-port" + +# In a confidential compute environment hot-plugging can compromise +# security. +# Enable cold-plugging of VFIO devices to a bridge-port, +# root-port or switch-port. +# The default setting is "no-port", which means disabled. +#cold_plug_vfio = "root-port" + +# Before hot plugging a PCIe device, you need to add a pcie_root_port device. +# Use this parameter when using some large PCI bar devices, such as Nvidia GPU +# The value means the number of pcie_root_port +# This value is valid when hotplug_vfio_on_root_bus is true and machine_type is "q35" +# Default 0 +#pcie_root_port = 2 + +# Before hot plugging a PCIe device onto a switch port, you need add a pcie_switch_port device fist. +# Use this parameter when using some large PCI bar devices, such as Nvidia GPU +# The value means how many devices attached onto pcie_switch_port will be created. +# This value is valid when hotplug_vfio_on_root_bus is true, and machine_type is "q35" +# Default 0 +#pcie_switch_port = 2 + +# If vhost-net backend for virtio-net is not desired, set to true. Default is false, which trades off +# security (vhost-net runs ring0) for network I/O performance. +#disable_vhost_net = true + +# +# Default entropy source. +# The path to a host source of entropy (including a real hardware RNG) +# /dev/urandom and /dev/random are two main options. +# Be aware that /dev/random is a blocking source of entropy. If the host +# runs out of entropy, the VMs boot time will increase leading to get startup +# timeouts. +# The source of entropy /dev/urandom is non-blocking and provides a +# generally acceptable source of entropy. It should work well for pretty much +# all practical purposes. +#entropy_source= "@DEFENTROPYSOURCE@" + +# List of valid annotations values for entropy_source +# The default if not set is empty (all annotations rejected.) +# Your distribution recommends: @DEFVALIDENTROPYSOURCES@ +valid_entropy_sources = @DEFVALIDENTROPYSOURCES@ + +# Path to OCI hook binaries in the *guest rootfs*. +# This does not affect host-side hooks which must instead be added to +# the OCI spec passed to the runtime. +# +# You can create a rootfs with hooks by customizing the osbuilder scripts: +# https://github.com/kata-containers/kata-containers/tree/main/tools/osbuilder +# +# Hooks must be stored in a subdirectory of guest_hook_path according to their +# hook type, i.e. "guest_hook_path/{prestart,poststart,poststop}". +# The agent will scan these directories for executable files and add them, in +# lexicographical order, to the lifecycle of the guest container. +# Hooks are executed in the runtime namespace of the guest. See the official documentation: +# https://github.com/opencontainers/runtime-spec/blob/v1.0.1/config.md#posix-platform-hooks +# Warnings will be logged if any error is encountered while scanning for hooks, +# but it will not abort container execution. +#guest_hook_path = "/usr/share/oci/hooks" + +# Enable connection to Quote Generation Service (QGS) +# The "tdx_quote_generation_service_socket_port" parameter configures how QEMU connects to the TDX Quote Generation Service (QGS). +# This connection is essential for Trusted Domain (TD) attestation, as QGS signs the TDREPORT sent by QEMU via the GetQuote hypercall. +# By default QGS runs on vsock port 4050, but can be modified by the host admin. For QEMU's tdx-guest object, this connection needs to +# be specified in a JSON format, for example: +# -object '{"qom-type":"tdx-guest","id":"tdx","quote-generation-socket":{"type":"vsock","cid":"2","port":"4050"}}' +# It's important to note that setting "tdx_quote_generation_service_socket_port" to 0 enables communication via Unix Domain Sockets (UDS). +# To activate UDS, the QGS service itself must be launched with the "-port=0" parameter and the UDS will always be located at /var/run/tdx-qgs/qgs.socket. +# -object '{"qom-type":"tdx-guest","id":"tdx","quote-generation-socket":{"type":"unix","path":"/var/run/tdx-qgs/qgs.socket"}}' +# tdx_quote_generation_service_socket_port = @QEMUTDXQUOTEGENERATIONSERVICESOCKETPORT@ + +# +# Use rx Rate Limiter to control network I/O inbound bandwidth(size in bits/sec for SB/VM). +# In Qemu, we use classful qdiscs HTB(Hierarchy Token Bucket) to discipline traffic. +# Default 0-sized value means unlimited rate. +#rx_rate_limiter_max_rate = 0 +# Use tx Rate Limiter to control network I/O outbound bandwidth(size in bits/sec for SB/VM). +# In Qemu, we use classful qdiscs HTB(Hierarchy Token Bucket) and ifb(Intermediate Functional Block) +# to discipline traffic. +# Default 0-sized value means unlimited rate. +#tx_rate_limiter_max_rate = 0 + +# Set where to save the guest memory dump file. +# If set, when GUEST_PANICKED event occurred, +# guest memeory will be dumped to host filesystem under guest_memory_dump_path, +# This directory will be created automatically if it does not exist. +# +# The dumped file(also called vmcore) can be processed with crash or gdb. +# +# WARNING: +# Dump guest’s memory can take very long depending on the amount of guest memory +# and use much disk space. +#guest_memory_dump_path="/var/crash/kata" + +# If enable paging. +# Basically, if you want to use "gdb" rather than "crash", +# or need the guest-virtual addresses in the ELF vmcore, +# then you should enable paging. +# +# See: https://www.qemu.org/docs/master/qemu-qmp-ref.html#Dump-guest-memory for details +#guest_memory_dump_paging=false + +# use legacy serial for guest console if available and implemented for architecture. Default false +#use_legacy_serial = true + +# disable applying SELinux on the VMM process (default false) +disable_selinux=@DEFDISABLESELINUX@ + +# disable applying SELinux on the container process +# If set to false, the type `container_t` is applied to the container process by default. +# Note: To enable guest SELinux, the guest rootfs must be CentOS that is created and built +# with `SELINUX=yes`. +# (default: true) +disable_guest_selinux=@DEFDISABLEGUESTSELINUX@ + + +[factory] +# VM templating support. Once enabled, new VMs are created from template +# using vm cloning. They will share the same initial kernel, initramfs and +# agent memory by mapping it readonly. It helps speeding up new container +# creation and saves a lot of memory if there are many kata containers running +# on the same host. +# +# When disabled, new VMs are created from scratch. +# +# Note: Requires "initrd=" to be set ("image=" is not supported). +# +# Default false +#enable_template = true + +# Specifies the path of template. +# +# Default "/run/vc/vm/template" +#template_path = "/run/vc/vm/template" + +# The number of caches of VMCache: +# unspecified or == 0 --> VMCache is disabled +# > 0 --> will be set to the specified number +# +# VMCache is a function that creates VMs as caches before using it. +# It helps speed up new container creation. +# The function consists of a server and some clients communicating +# through Unix socket. The protocol is gRPC in protocols/cache/cache.proto. +# The VMCache server will create some VMs and cache them by factory cache. +# It will convert the VM to gRPC format and transport it when gets +# requestion from clients. +# Factory grpccache is the VMCache client. It will request gRPC format +# VM and convert it back to a VM. If VMCache function is enabled, +# kata-runtime will request VM from factory grpccache when it creates +# a new sandbox. +# +# Default 0 +#vm_cache_number = 0 + +# Specify the address of the Unix socket that is used by VMCache. +# +# Default /var/run/kata-containers/cache.sock +#vm_cache_endpoint = "/var/run/kata-containers/cache.sock" + +[agent.@PROJECT_TYPE@] +# If enabled, make the agent display debug-level messages. +# (default: disabled) +#enable_debug = true + +# Enable agent tracing. +# +# If enabled, the agent will generate OpenTelemetry trace spans. +# +# Notes: +# +# - If the runtime also has tracing enabled, the agent spans will be +# associated with the appropriate runtime parent span. +# - If enabled, the runtime will wait for the container to shutdown, +# increasing the container shutdown time slightly. +# +# (default: disabled) +#enable_tracing = true + +# Comma separated list of kernel modules and their parameters. +# These modules will be loaded in the guest kernel using modprobe(8). +# The following example can be used to load two kernel modules with parameters +# - kernel_modules=["e1000e InterruptThrottleRate=3000,3000,3000 EEE=1", "i915 enable_ppgtt=0"] +# The first word is considered as the module name and the rest as its parameters. +# Container will not be started when: +# * A kernel module is specified and the modprobe command is not installed in the guest +# or it fails loading the module. +# * The module is not available in the guest or it doesn't met the guest kernel +# requirements, like architecture and version. +# +kernel_modules=[] + +# Enable debug console. + +# If enabled, user can connect guest OS running inside hypervisor +# through "kata-runtime exec " command + +#debug_console_enabled = true + +# Agent dial timeout in millisecond. +# (default: 10) +#dial_timeout_ms = 10 + +# Agent reconnect timeout in millisecond. +# Retry times = reconnect_timeout_ms / dial_timeout_ms (default: 300) +# If you find pod cannot connect to the agent when starting, please +# consider increasing this value to increase the retry times. +# You'd better not change the value of dial_timeout_ms, unless you have an +# idea of what you are doing. +# (default: 3000) +#reconnect_timeout_ms = 3000 + +[agent.@PROJECT_TYPE@.mem_agent] +# Control the mem-agent function enable or disable. +# Default to false +#mem_agent_enable = true + +# Control the mem-agent memcg function disable or enable +# Default to false +#memcg_disable = false + +# Control the mem-agent function swap enable or disable. +# Default to false +#memcg_swap = false + +# Control the mem-agent function swappiness max number. +# Default to 50 +#memcg_swappiness_max = 50 + +# Control the mem-agent memcg function wait period seconds +# Default to 600 +#memcg_period_secs = 600 + +# Control the mem-agent memcg wait period PSI percent limit. +# If the percentage of memory and IO PSI stall time within +# the memcg waiting period for a cgroup exceeds this value, +# then the aging and eviction for this cgroup will not be +# executed after this waiting period. +# Default to 1 +#memcg_period_psi_percent_limit = 1 + +# Control the mem-agent memcg eviction PSI percent limit. +# If the percentage of memory and IO PSI stall time for a cgroup +# exceeds this value during an eviction cycle, the eviction for +# this cgroup will immediately stop and will not resume until +# the next memcg waiting period. +# Default to 1 +#memcg_eviction_psi_percent_limit = 1 + +# Control the mem-agent memcg eviction run aging count min. +# A cgroup will only perform eviction when the number of aging cycles +# in memcg is greater than or equal to memcg_eviction_run_aging_count_min. +# Default to 3 +#memcg_eviction_run_aging_count_min = 3 + +# Control the mem-agent compact function disable or enable +# Default to false +#compact_disable = false + +# Control the mem-agent compaction function wait period seconds +# Default to 600 +#compact_period_secs = 600 + +# Control the mem-agent compaction function wait period PSI percent limit. +# If the percentage of memory and IO PSI stall time within +# the compaction waiting period exceeds this value, +# then the compaction will not be executed after this waiting period. +# Default to 1 +#compact_period_psi_percent_limit = 1 + +# Control the mem-agent compaction function compact PSI percent limit. +# During compaction, the percentage of memory and IO PSI stall time +# is checked every second. If this percentage exceeds +# compact_psi_percent_limit, the compaction process will stop. +# Default to 5 +#compact_psi_percent_limit = 5 + +# Control the maximum number of seconds for each compaction of mem-agent compact function. +# Default to 180 +#compact_sec_max = 180 + +# Control the mem-agent compaction function compact order. +# compact_order is use with compact_threshold. +# Default to 9 +#compact_order = 9 + +# Control the mem-agent compaction function compact threshold. +# compact_threshold is the pages number. +# When examining the /proc/pagetypeinfo, if there's an increase in the +# number of movable pages of orders smaller than the compact_order +# compared to the amount following the previous compaction, +# and this increase surpasses a certain threshold—specifically, +# more than 'compact_threshold' number of pages. +# Or the number of free pages has decreased by 'compact_threshold' +# since the previous compaction. +# then the system should initiate another round of memory compaction. +# Default to 1024 +#compact_threshold = 1024 + +# Control the mem-agent compaction function force compact times. +# After one compaction, if there has not been a compaction within +# the next compact_force_times times, a compaction will be forced +# regardless of the system's memory situation. +# If compact_force_times is set to 0, will do force compaction each time. +# If compact_force_times is set to 18446744073709551615, will never do force compaction. +# Default to 18446744073709551615 +#compact_force_times = 18446744073709551615 + +[runtime] +# If enabled, the runtime will log additional debug messages to the +# system log +# (default: disabled) +#enable_debug = true +# +# Internetworking model +# Determines how the VM should be connected to the +# the container network interface +# Options: +# +# - macvtap +# Used when the Container network interface can be bridged using +# macvtap. +# +# - none +# Used when customize network. Only creates a tap device. No veth pair. +# +# - tcfilter +# Uses tc filter rules to redirect traffic from the network interface +# provided by plugin to a tap interface connected to the VM. +# +internetworking_model="@DEFNETWORKMODEL_QEMU@" + +name="@RUNTIMENAME@" +hypervisor_name="@HYPERVISOR_QEMU@" +agent_name="@PROJECT_TYPE@" + +# disable guest seccomp +# Determines whether container seccomp profiles are passed to the virtual +# machine and applied by the kata agent. If set to true, seccomp is not applied +# within the guest +# (default: true) +disable_guest_seccomp=@DEFDISABLEGUESTSECCOMP@ + +# vCPUs pinning settings +# if enabled, each vCPU thread will be scheduled to a fixed CPU +# qualified condition: num(vCPU threads) == num(CPUs in sandbox's CPUSet) +# enable_vcpus_pinning = false + +# Apply a custom SELinux security policy to the container process inside the VM. +# This is used when you want to apply a type other than the default `container_t`, +# so general users should not uncomment and apply it. +# (format: "user:role:type") +# Note: You cannot specify MCS policy with the label because the sensitivity levels and +# categories are determined automatically by high-level container runtimes such as containerd. +#guest_selinux_label="@DEFGUESTSELINUXLABEL@" + +# If enabled, the runtime will create opentracing.io traces and spans. +# (See https://www.jaegertracing.io/docs/getting-started). +# (default: disabled) +#enable_tracing = true + +# Set the full url to the Jaeger HTTP Thrift collector. +# The default if not set will be "http://localhost:14268/api/traces" +#jaeger_endpoint = "" + +# Sets the username to be used if basic auth is required for Jaeger. +#jaeger_user = "" + +# Sets the password to be used if basic auth is required for Jaeger. +#jaeger_password = "" + +# If enabled, the runtime will not create a network namespace for shim and hypervisor processes. +# This option may have some potential impacts to your host. It should only be used when you know what you're doing. +# `disable_new_netns` conflicts with `internetworking_model=tcfilter` and `internetworking_model=macvtap`. It works only +# with `internetworking_model=none`. The tap device will be in the host network namespace and can connect to a bridge +# (like OVS) directly. +# (default: false) +#disable_new_netns = true + +# if enabled, the runtime will add all the kata processes inside one dedicated cgroup. +# The container cgroups in the host are not created, just one single cgroup per sandbox. +# The runtime caller is free to restrict or collect cgroup stats of the overall Kata sandbox. +# The sandbox cgroup path is the parent cgroup of a container with the PodSandbox annotation. +# The sandbox cgroup is constrained if there is no container type annotation. +# See: https://pkg.go.dev/github.com/kata-containers/kata-containers/src/runtime/virtcontainers#ContainerType +sandbox_cgroup_only=@DEFSANDBOXCGROUPONLY_QEMU@ + +# If enabled, the runtime will attempt to determine appropriate sandbox size (memory, CPU) before booting the virtual machine. In +# this case, the runtime will not dynamically update the amount of memory and CPU in the virtual machine. This is generally helpful +# when a hardware architecture or hypervisor solutions is utilized which does not support CPU and/or memory hotplug. +# Compatibility for determining appropriate sandbox (VM) size: +# - When running with pods, sandbox sizing information will only be available if using Kubernetes >= 1.23 and containerd >= 1.6. CRI-O +# does not yet support sandbox sizing annotations. +# - When running single containers using a tool like ctr, container sizing information will be available. +static_sandbox_resource_mgmt=@DEFSTATICRESOURCEMGMT_QEMU@ + +# If specified, sandbox_bind_mounts identifieds host paths to be mounted (ro) into the sandboxes shared path. +# This is only valid if filesystem sharing is utilized. The provided path(s) will be bindmounted into the shared fs directory. +# If defaults are utilized, these mounts should be available in the guest at `/run/kata-containers/shared/containers/sandbox-mounts` +# These will not be exposed to the container workloads, and are only provided for potential guest services. +sandbox_bind_mounts=@DEFBINDMOUNTS@ + +# VFIO Mode +# Determines how VFIO devices should be be presented to the container. +# Options: +# +# - vfio +# Matches behaviour of OCI runtimes (e.g. runc) as much as +# possible. VFIO devices will appear in the container as VFIO +# character devices under /dev/vfio. The exact names may differ +# from the host (they need to match the VM's IOMMU group numbers +# rather than the host's) +# +# - guest-kernel +# This is a Kata-specific behaviour that's useful in certain cases. +# The VFIO device is managed by whatever driver in the VM kernel +# claims it. This means it will appear as one or more device nodes +# or network interfaces depending on the nature of the device. +# Using this mode requires specially built workloads that know how +# to locate the relevant device interfaces within the VM. +# +vfio_mode="@DEFVFIOMODE@" + +# If enabled, the runtime will not create Kubernetes emptyDir mounts on the guest filesystem. Instead, emptyDir mounts will +# be created on the host and shared via virtio-fs. This is potentially slower, but allows sharing of files from host to guest. +disable_guest_empty_dir=@DEFDISABLEGUESTEMPTYDIR@ + +# Enabled experimental feature list, format: ["a", "b"]. +# Experimental features are features not stable enough for production, +# they may break compatibility, and are prepared for a big version bump. +# Supported experimental features: +# (default: []) +experimental=@DEFAULTEXPFEATURES@ + +# If enabled, user can run pprof tools with shim v2 process through kata-monitor. +# (default: false) +# enable_pprof = true From 2741e42b349acc45d1a29a40827798ac89a0377d Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Fri, 20 Jun 2025 14:17:15 +0100 Subject: [PATCH 05/15] kata-deploy: Add kata-qemu-runtime-rs-coco-dev runtime class Add the runtime class and shim references for the new non-tee runtime-rs class Signed-off-by: stevenhorsman --- tools/packaging/kata-deploy/helm-chart/README.md | 2 +- .../kata-deploy/helm-chart/kata-deploy/values.yaml | 2 +- .../kata-deploy/kata-deploy/base/kata-deploy.yaml | 2 +- .../kata-qemu-runtime-rs-coco-dev.yaml | 13 +++++++++++++ .../runtimeclasses/kata-runtimeClasses.yaml | 13 +++++++++++++ tools/packaging/kata-deploy/scripts/kata-deploy.sh | 8 ++++---- 6 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 tools/packaging/kata-deploy/runtimeclasses/kata-qemu-runtime-rs-coco-dev.yaml diff --git a/tools/packaging/kata-deploy/helm-chart/README.md b/tools/packaging/kata-deploy/helm-chart/README.md index 9651004023..ef9ee4ec9e 100644 --- a/tools/packaging/kata-deploy/helm-chart/README.md +++ b/tools/packaging/kata-deploy/helm-chart/README.md @@ -127,7 +127,7 @@ All values can be overridden with --set key=value or a custom `-f myvalues.yaml` | `k8sDistribution` | Set the k8s distribution to use: `k8s`, `k0s`, `k3s`, `rke2`, `microk8s` | `k8s` | | `nodeSelector` | Node labels for pod assignment. Allows restricting deployment to specific nodes | `{}` | | `env.debug` | Enable debugging in the `configuration.toml` | `false` | -| `env.shims` | List of shims to deploy | `clh cloud-hypervisor dragonball fc qemu qemu-coco-dev qemu-runtime-rs qemu-se-runtime-rs qemu-snp qemu-tdx stratovirt qemu-nvidia-gpu qemu-nvidia-gpu-snp qemu-nvidia-gpu-tdx` | +| `env.shims` | List of shims to deploy | `clh cloud-hypervisor dragonball fc qemu qemu-coco-dev qemu-runtime-rs qemu-runtime-rs-coco-dev qemu-se-runtime-rs qemu-snp qemu-tdx stratovirt qemu-nvidia-gpu qemu-nvidia-gpu-snp qemu-nvidia-gpu-tdx` | | `env.defaultShim` | The default shim to use if none specified | `qemu` | | `env.createRuntimeClasses` | Create the k8s `runtimeClasses` | `true` | | `env.createDefaultRuntimeClass` | Create the default k8s `runtimeClass` | `false` | diff --git a/tools/packaging/kata-deploy/helm-chart/kata-deploy/values.yaml b/tools/packaging/kata-deploy/helm-chart/kata-deploy/values.yaml index 71a3495c80..b1989344ed 100644 --- a/tools/packaging/kata-deploy/helm-chart/kata-deploy/values.yaml +++ b/tools/packaging/kata-deploy/helm-chart/kata-deploy/values.yaml @@ -13,7 +13,7 @@ k8sDistribution: "k8s" nodeSelector: {} env: debug: "false" - shims: "clh cloud-hypervisor dragonball fc qemu qemu-coco-dev qemu-runtime-rs qemu-se-runtime-rs qemu-snp qemu-tdx stratovirt qemu-nvidia-gpu qemu-nvidia-gpu-snp qemu-nvidia-gpu-tdx" + shims: "clh cloud-hypervisor dragonball fc qemu qemu-coco-dev qemu-runtime-rs qemu-runtime-rs-coco-dev qemu-se-runtime-rs qemu-snp qemu-tdx stratovirt qemu-nvidia-gpu qemu-nvidia-gpu-snp qemu-nvidia-gpu-tdx" defaultShim: "qemu" createRuntimeClasses: "true" createDefaultRuntimeClass: "false" diff --git a/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml b/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml index 20fec5a95b..f2ee4177bb 100644 --- a/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml +++ b/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml @@ -33,7 +33,7 @@ spec: - name: DEBUG value: "false" - name: SHIMS - value: "clh cloud-hypervisor dragonball fc qemu qemu-coco-dev qemu-runtime-rs qemu-se-runtime-rs qemu-snp qemu-tdx stratovirt qemu-nvidia-gpu qemu-nvidia-gpu-snp qemu-nvidia-gpu-tdx" + value: "clh cloud-hypervisor dragonball fc qemu qemu-coco-dev qemu-runtime-rs qemu-runtime-rs-coco-dev qemu-se-runtime-rs qemu-snp qemu-tdx stratovirt qemu-nvidia-gpu qemu-nvidia-gpu-snp qemu-nvidia-gpu-tdx" - name: DEFAULT_SHIM value: "qemu" - name: CREATE_RUNTIMECLASSES diff --git a/tools/packaging/kata-deploy/runtimeclasses/kata-qemu-runtime-rs-coco-dev.yaml b/tools/packaging/kata-deploy/runtimeclasses/kata-qemu-runtime-rs-coco-dev.yaml new file mode 100644 index 0000000000..c9cf9f97f0 --- /dev/null +++ b/tools/packaging/kata-deploy/runtimeclasses/kata-qemu-runtime-rs-coco-dev.yaml @@ -0,0 +1,13 @@ +--- +kind: RuntimeClass +apiVersion: node.k8s.io/v1 +metadata: + name: kata-qemu-runtime-rs-coco-dev +handler: kata-qemu-runtime-rs-coco-dev +overhead: + podFixed: + memory: "160Mi" + cpu: "250m" +scheduling: + nodeSelector: + katacontainers.io/kata-runtime: "true" diff --git a/tools/packaging/kata-deploy/runtimeclasses/kata-runtimeClasses.yaml b/tools/packaging/kata-deploy/runtimeclasses/kata-runtimeClasses.yaml index c2c7c90cf8..8c0f81e3fc 100644 --- a/tools/packaging/kata-deploy/runtimeclasses/kata-runtimeClasses.yaml +++ b/tools/packaging/kata-deploy/runtimeclasses/kata-runtimeClasses.yaml @@ -131,6 +131,19 @@ scheduling: --- kind: RuntimeClass apiVersion: node.k8s.io/v1 +metadata: + name: kata-qemu-runtime-rs-coco-dev +handler: kata-qemu-runtime-rs-coco-dev +overhead: + podFixed: + memory: "160Mi" + cpu: "250m" +scheduling: + nodeSelector: + katacontainers.io/kata-runtime: "true" +--- +kind: RuntimeClass +apiVersion: node.k8s.io/v1 metadata: name: kata-qemu-se handler: kata-qemu-se diff --git a/tools/packaging/kata-deploy/scripts/kata-deploy.sh b/tools/packaging/kata-deploy/scripts/kata-deploy.sh index 745e2f6740..c7042288d5 100755 --- a/tools/packaging/kata-deploy/scripts/kata-deploy.sh +++ b/tools/packaging/kata-deploy/scripts/kata-deploy.sh @@ -35,7 +35,7 @@ info() { DEBUG="${DEBUG:-"false"}" -SHIMS="${SHIMS:-"clh cloud-hypervisor dragonball fc qemu qemu-coco-dev qemu-runtime-rs qemu-se-runtime-rs qemu-snp qemu-tdx stratovirt qemu-nvidia-gpu qemu-nvidia-gpu-snp qemu-nvidia-gpu-tdx"}" +SHIMS="${SHIMS:-"clh cloud-hypervisor dragonball fc qemu qemu-coco-dev qemu-runtime-rs qemu-runtime-rs-coco-dev qemu-se-runtime-rs qemu-snp qemu-tdx stratovirt qemu-nvidia-gpu qemu-nvidia-gpu-snp qemu-nvidia-gpu-tdx"}" IFS=' ' read -a shims <<< "$SHIMS" DEFAULT_SHIM="${DEFAULT_SHIM:-"qemu"}" default_shim="$DEFAULT_SHIM" @@ -216,7 +216,7 @@ function is_containerd_capable_of_using_drop_in_files() { echo "false" return fi - + local version_major=$(kubectl get node $NODE_NAME -o jsonpath='{.status.nodeInfo.containerRuntimeVersion}' | grep -oE '[0-9]+\.[0-9]+' | cut -d'.' -f1) if [ $version_major -lt 2 ]; then # Only containerd 2.0 does the merge of the plugins section from different snippets, @@ -261,7 +261,7 @@ function get_kata_containers_config_path() { # Map the runtime shim name to the appropriate configuration # file directory. case "$shim" in - cloud-hypervisor | dragonball | qemu-runtime-rs | qemu-se-runtime-rs) config_path="$rust_config_path" ;; + cloud-hypervisor | dragonball | qemu-runtime-rs | qemu-runtime-rs-coco-dev | qemu-se-runtime-rs) config_path="$rust_config_path" ;; *) config_path="$golang_config_path" ;; esac @@ -273,7 +273,7 @@ function get_kata_containers_runtime_path() { local runtime_path case "$shim" in - cloud-hypervisor | dragonball | qemu-runtime-rs | qemu-se-runtime-rs) + cloud-hypervisor | dragonball | qemu-runtime-rs | qemu-runtime-rs-coco-dev | qemu-se-runtime-rs) runtime_path="${dest_dir}/runtime-rs/bin/containerd-shim-kata-v2" ;; *) From 86ecaffb7899d7699681694ddaea55639099b2f5 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Mon, 23 Jun 2025 15:21:41 +0100 Subject: [PATCH 06/15] tests/k8s: Enable tests for qemu-runtime-rs-coco-dev Add the runtime class to the non-tee tests and enable it to run in the test code Signed-off-by: stevenhorsman --- .github/workflows/run-kata-coco-tests.yaml | 1 + tests/integration/kubernetes/confidential_common.sh | 2 +- tests/integration/kubernetes/k8s-initdata.bats | 8 ++++---- tests/integration/kubernetes/setup.sh | 2 +- tests/integration/kubernetes/tests_common.sh | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/run-kata-coco-tests.yaml b/.github/workflows/run-kata-coco-tests.yaml index e71e59fd8c..147f152f7f 100644 --- a/.github/workflows/run-kata-coco-tests.yaml +++ b/.github/workflows/run-kata-coco-tests.yaml @@ -218,6 +218,7 @@ jobs: matrix: vmm: - qemu-coco-dev + - qemu-runtime-rs-coco-dev snapshotter: - nydus pull-type: diff --git a/tests/integration/kubernetes/confidential_common.sh b/tests/integration/kubernetes/confidential_common.sh index 617deaf6a0..4625134537 100644 --- a/tests/integration/kubernetes/confidential_common.sh +++ b/tests/integration/kubernetes/confidential_common.sh @@ -11,7 +11,7 @@ source "${BATS_TEST_DIRNAME}/../../common.bash" load "${BATS_TEST_DIRNAME}/confidential_kbs.sh" SUPPORTED_TEE_HYPERVISORS=("qemu-snp" "qemu-tdx" "qemu-se") -SUPPORTED_NON_TEE_HYPERVISORS=("qemu-coco-dev") +SUPPORTED_NON_TEE_HYPERVISORS=("qemu-coco-dev" "qemu-runtime-rs-coco-dev") function setup_unencrypted_confidential_pod() { get_pod_config_dir diff --git a/tests/integration/kubernetes/k8s-initdata.bats b/tests/integration/kubernetes/k8s-initdata.bats index 1dd801dca8..53ad9f2504 100644 --- a/tests/integration/kubernetes/k8s-initdata.bats +++ b/tests/integration/kubernetes/k8s-initdata.bats @@ -10,7 +10,7 @@ # 3. Pull an image from a banned registry # 4. Check if the pulling fails with log `image security validation failed`, # the initdata works. -# +# # Note that if initdata does not work, the pod still fails to launch (hang at # CreatingContainer status). The error information is # `[CDH] [ERROR]: Get Resource failed` which internally means that the KBS URL @@ -35,7 +35,7 @@ setup() { setup_common || die "setup_common failed" FAIL_TEST_IMAGE="quay.io/prometheus/busybox:latest" - + SECURITY_POLICY_KBS_URI="kbs:///default/security-policy/test" } @@ -51,7 +51,7 @@ function setup_kbs_image_policy_for_initdata() { # TODO: Enable for more archs case "$KATA_HYPERVISOR" in - "qemu-tdx"|"qemu-coco-dev"|"qemu-snp") + "qemu-tdx"|"qemu-coco-dev"|"qemu-runtime-rs-coco-dev"|"qemu-snp") ;; *) skip "Test not supported for ${KATA_HYPERVISOR}." @@ -88,7 +88,7 @@ EOF @test "Test that creating a container from an rejected image configured by initdata, fails according to policy reject" { setup_kbs_image_policy_for_initdata - + CC_KBS_ADDRESS=$(kbs_k8s_svc_http_addr) kernel_parameter="agent.image_policy_file=${SECURITY_POLICY_KBS_URI} agent.enable_signature_verification=true" diff --git a/tests/integration/kubernetes/setup.sh b/tests/integration/kubernetes/setup.sh index 98a6054bd0..ed8600558c 100644 --- a/tests/integration/kubernetes/setup.sh +++ b/tests/integration/kubernetes/setup.sh @@ -126,7 +126,7 @@ add_runtime_handler_annotations() { fi case "${KATA_HYPERVISOR}" in - qemu-coco-dev | qemu-snp | qemu-tdx) + qemu-coco-dev | qemu-snp | qemu-tdx | qemu-runtime-rs-coco-dev) info "Add runtime handler annotations for ${KATA_HYPERVISOR}" local handler_value="kata-${KATA_HYPERVISOR}" for K8S_TEST_YAML in runtimeclass_workloads_work/*.yaml diff --git a/tests/integration/kubernetes/tests_common.sh b/tests/integration/kubernetes/tests_common.sh index 473358a579..32944f4bed 100644 --- a/tests/integration/kubernetes/tests_common.sh +++ b/tests/integration/kubernetes/tests_common.sh @@ -87,7 +87,7 @@ auto_generate_policy_enabled() { is_coco_platform() { case "${KATA_HYPERVISOR}" in - "qemu-tdx"|"qemu-snp"|"qemu-coco-dev") + "qemu-tdx"|"qemu-snp"|"qemu-coco-dev"|"qemu-runtime-rs-coco-dev") return 0 ;; *) @@ -274,7 +274,7 @@ hard_coded_policy_tests_enabled() { # CI is testing hard-coded policies just on a the platforms listed here. Outside of CI, # users can enable testing of the same policies (plus the auto-generated policies) by # specifying AUTO_GENERATE_POLICY=yes. - local -r enabled_hypervisors=("qemu-coco-dev" "qemu-snp" "qemu-tdx") + local -r enabled_hypervisors=("qemu-coco-dev" "qemu-snp" "qemu-tdx" "qemu-runtime-rs-coco-dev") for enabled_hypervisor in "${enabled_hypervisors[@]}" do if [[ "${enabled_hypervisor}" == "${KATA_HYPERVISOR}" ]]; then From 6b395c85562aed0891bfe4f6264ff7a62a4dd83f Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Thu, 17 Jul 2025 11:57:38 +0100 Subject: [PATCH 07/15] DO NOT MERGE: Comment out tests to save ci cycles --- .github/workflows/ci.yaml | 362 ++++++++++----------- .github/workflows/run-kata-coco-tests.yaml | 288 ++++++++-------- 2 files changed, 325 insertions(+), 325 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e157f9fbd4..39b46bfb29 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -279,55 +279,55 @@ jobs: platforms: linux/amd64 file: src/tools/csi-kata-directvolume/Dockerfile - run-kata-monitor-tests: - if: ${{ inputs.skip-test != 'yes' }} - needs: build-kata-static-tarball-amd64 - uses: ./.github/workflows/run-kata-monitor-tests.yaml - with: - tarball-suffix: -${{ inputs.tag }} - commit-hash: ${{ inputs.commit-hash }} - target-branch: ${{ inputs.target-branch }} + # run-kata-monitor-tests: + # if: ${{ inputs.skip-test != 'yes' }} + # needs: build-kata-static-tarball-amd64 + # uses: ./.github/workflows/run-kata-monitor-tests.yaml + # with: + # tarball-suffix: -${{ inputs.tag }} + # commit-hash: ${{ inputs.commit-hash }} + # target-branch: ${{ inputs.target-branch }} - run-k8s-tests-on-aks: - if: ${{ inputs.skip-test != 'yes' }} - needs: publish-kata-deploy-payload-amd64 - uses: ./.github/workflows/run-k8s-tests-on-aks.yaml - with: - tarball-suffix: -${{ inputs.tag }} - registry: ghcr.io - repo: ${{ github.repository_owner }}/kata-deploy-ci - tag: ${{ inputs.tag }}-amd64 - commit-hash: ${{ inputs.commit-hash }} - pr-number: ${{ inputs.pr-number }} - target-branch: ${{ inputs.target-branch }} - secrets: - AZ_APPID: ${{ secrets.AZ_APPID }} - AZ_TENANT_ID: ${{ secrets.AZ_TENANT_ID }} - AZ_SUBSCRIPTION_ID: ${{ secrets.AZ_SUBSCRIPTION_ID }} + # run-k8s-tests-on-aks: + # if: ${{ inputs.skip-test != 'yes' }} + # needs: publish-kata-deploy-payload-amd64 + # uses: ./.github/workflows/run-k8s-tests-on-aks.yaml + # with: + # tarball-suffix: -${{ inputs.tag }} + # registry: ghcr.io + # repo: ${{ github.repository_owner }}/kata-deploy-ci + # tag: ${{ inputs.tag }}-amd64 + # commit-hash: ${{ inputs.commit-hash }} + # pr-number: ${{ inputs.pr-number }} + # target-branch: ${{ inputs.target-branch }} + # secrets: + # AZ_APPID: ${{ secrets.AZ_APPID }} + # AZ_TENANT_ID: ${{ secrets.AZ_TENANT_ID }} + # AZ_SUBSCRIPTION_ID: ${{ secrets.AZ_SUBSCRIPTION_ID }} - run-k8s-tests-on-amd64: - if: ${{ inputs.skip-test != 'yes' }} - needs: publish-kata-deploy-payload-amd64 - uses: ./.github/workflows/run-k8s-tests-on-amd64.yaml - with: - registry: ghcr.io - repo: ${{ github.repository_owner }}/kata-deploy-ci - tag: ${{ inputs.tag }}-amd64 - commit-hash: ${{ inputs.commit-hash }} - pr-number: ${{ inputs.pr-number }} - target-branch: ${{ inputs.target-branch }} + # run-k8s-tests-on-amd64: + # if: ${{ inputs.skip-test != 'yes' }} + # needs: publish-kata-deploy-payload-amd64 + # uses: ./.github/workflows/run-k8s-tests-on-amd64.yaml + # with: + # registry: ghcr.io + # repo: ${{ github.repository_owner }}/kata-deploy-ci + # tag: ${{ inputs.tag }}-amd64 + # commit-hash: ${{ inputs.commit-hash }} + # pr-number: ${{ inputs.pr-number }} + # target-branch: ${{ inputs.target-branch }} - run-k8s-tests-on-arm64: - if: ${{ inputs.skip-test != 'yes' }} - needs: publish-kata-deploy-payload-arm64 - uses: ./.github/workflows/run-k8s-tests-on-arm64.yaml - with: - registry: ghcr.io - repo: ${{ github.repository_owner }}/kata-deploy-ci - tag: ${{ inputs.tag }}-arm64 - commit-hash: ${{ inputs.commit-hash }} - pr-number: ${{ inputs.pr-number }} - target-branch: ${{ inputs.target-branch }} + # run-k8s-tests-on-arm64: + # if: ${{ inputs.skip-test != 'yes' }} + # needs: publish-kata-deploy-payload-arm64 + # uses: ./.github/workflows/run-k8s-tests-on-arm64.yaml + # with: + # registry: ghcr.io + # repo: ${{ github.repository_owner }}/kata-deploy-ci + # tag: ${{ inputs.tag }}-arm64 + # commit-hash: ${{ inputs.commit-hash }} + # pr-number: ${{ inputs.pr-number }} + # target-branch: ${{ inputs.target-branch }} run-k8s-tests-on-nvidia-gpu: if: ${{ inputs.skip-test != 'yes' }} @@ -366,146 +366,146 @@ jobs: AZ_SUBSCRIPTION_ID: ${{ secrets.AZ_SUBSCRIPTION_ID }} ITA_KEY: ${{ secrets.ITA_KEY }} - run-k8s-tests-on-zvsi: - if: ${{ inputs.skip-test != 'yes' }} - needs: [publish-kata-deploy-payload-s390x, build-and-publish-tee-confidential-unencrypted-image] - uses: ./.github/workflows/run-k8s-tests-on-zvsi.yaml - with: - registry: ghcr.io - repo: ${{ github.repository_owner }}/kata-deploy-ci - tag: ${{ inputs.tag }}-s390x - commit-hash: ${{ inputs.commit-hash }} - pr-number: ${{ inputs.pr-number }} - target-branch: ${{ inputs.target-branch }} - secrets: - AUTHENTICATED_IMAGE_PASSWORD: ${{ secrets.AUTHENTICATED_IMAGE_PASSWORD }} + # run-k8s-tests-on-zvsi: + # if: ${{ inputs.skip-test != 'yes' }} + # needs: [publish-kata-deploy-payload-s390x, build-and-publish-tee-confidential-unencrypted-image] + # uses: ./.github/workflows/run-k8s-tests-on-zvsi.yaml + # with: + # registry: ghcr.io + # repo: ${{ github.repository_owner }}/kata-deploy-ci + # tag: ${{ inputs.tag }}-s390x + # commit-hash: ${{ inputs.commit-hash }} + # pr-number: ${{ inputs.pr-number }} + # target-branch: ${{ inputs.target-branch }} + # secrets: + # AUTHENTICATED_IMAGE_PASSWORD: ${{ secrets.AUTHENTICATED_IMAGE_PASSWORD }} - run-k8s-tests-on-ppc64le: - if: ${{ inputs.skip-test != 'yes' }} - needs: publish-kata-deploy-payload-ppc64le - uses: ./.github/workflows/run-k8s-tests-on-ppc64le.yaml - with: - registry: ghcr.io - repo: ${{ github.repository_owner }}/kata-deploy-ci - tag: ${{ inputs.tag }}-ppc64le - commit-hash: ${{ inputs.commit-hash }} - pr-number: ${{ inputs.pr-number }} - target-branch: ${{ inputs.target-branch }} + # run-k8s-tests-on-ppc64le: + # if: ${{ inputs.skip-test != 'yes' }} + # needs: publish-kata-deploy-payload-ppc64le + # uses: ./.github/workflows/run-k8s-tests-on-ppc64le.yaml + # with: + # registry: ghcr.io + # repo: ${{ github.repository_owner }}/kata-deploy-ci + # tag: ${{ inputs.tag }}-ppc64le + # commit-hash: ${{ inputs.commit-hash }} + # pr-number: ${{ inputs.pr-number }} + # target-branch: ${{ inputs.target-branch }} - run-kata-deploy-tests: - if: ${{ inputs.skip-test != 'yes' }} - needs: [publish-kata-deploy-payload-amd64] - uses: ./.github/workflows/run-kata-deploy-tests.yaml - with: - registry: ghcr.io - repo: ${{ github.repository_owner }}/kata-deploy-ci - tag: ${{ inputs.tag }}-amd64 - commit-hash: ${{ inputs.commit-hash }} - pr-number: ${{ inputs.pr-number }} - target-branch: ${{ inputs.target-branch }} + # run-kata-deploy-tests: + # if: ${{ inputs.skip-test != 'yes' }} + # needs: [publish-kata-deploy-payload-amd64] + # uses: ./.github/workflows/run-kata-deploy-tests.yaml + # with: + # registry: ghcr.io + # repo: ${{ github.repository_owner }}/kata-deploy-ci + # tag: ${{ inputs.tag }}-amd64 + # commit-hash: ${{ inputs.commit-hash }} + # pr-number: ${{ inputs.pr-number }} + # target-branch: ${{ inputs.target-branch }} - run-basic-amd64-tests: - if: ${{ inputs.skip-test != 'yes' }} - needs: build-kata-static-tarball-amd64 - uses: ./.github/workflows/basic-ci-amd64.yaml - with: - tarball-suffix: -${{ inputs.tag }} - commit-hash: ${{ inputs.commit-hash }} - target-branch: ${{ inputs.target-branch }} + # run-basic-amd64-tests: + # if: ${{ inputs.skip-test != 'yes' }} + # needs: build-kata-static-tarball-amd64 + # uses: ./.github/workflows/basic-ci-amd64.yaml + # with: + # tarball-suffix: -${{ inputs.tag }} + # commit-hash: ${{ inputs.commit-hash }} + # target-branch: ${{ inputs.target-branch }} - run-basic-s390x-tests: - if: ${{ inputs.skip-test != 'yes' }} - needs: build-kata-static-tarball-s390x - uses: ./.github/workflows/basic-ci-s390x.yaml - with: - tarball-suffix: -${{ inputs.tag }} - commit-hash: ${{ inputs.commit-hash }} - target-branch: ${{ inputs.target-branch }} + # run-basic-s390x-tests: + # if: ${{ inputs.skip-test != 'yes' }} + # needs: build-kata-static-tarball-s390x + # uses: ./.github/workflows/basic-ci-s390x.yaml + # with: + # tarball-suffix: -${{ inputs.tag }} + # commit-hash: ${{ inputs.commit-hash }} + # target-branch: ${{ inputs.target-branch }} - run-cri-containerd-amd64: - if: ${{ inputs.skip-test != 'yes' }} - needs: build-kata-static-tarball-amd64 - strategy: - fail-fast: false - matrix: - params: [ - { containerd_version: lts, vmm: clh }, - { containerd_version: lts, vmm: dragonball }, - { containerd_version: lts, vmm: qemu }, - { containerd_version: lts, vmm: stratovirt }, - { containerd_version: lts, vmm: cloud-hypervisor }, - { containerd_version: lts, vmm: qemu-runtime-rs }, - { containerd_version: active, vmm: clh }, - { containerd_version: active, vmm: dragonball }, - { containerd_version: active, vmm: qemu }, - { containerd_version: active, vmm: stratovirt }, - { containerd_version: active, vmm: cloud-hypervisor }, - { containerd_version: active, vmm: qemu-runtime-rs }, - ] - uses: ./.github/workflows/run-cri-containerd-tests.yaml - with: - tarball-suffix: -${{ inputs.tag }} - commit-hash: ${{ inputs.commit-hash }} - target-branch: ${{ inputs.target-branch }} - runner: ubuntu-22.04 - arch: amd64 - containerd_version: ${{ matrix.params.containerd_version }} - vmm: ${{ matrix.params.vmm }} + # run-cri-containerd-amd64: + # if: ${{ inputs.skip-test != 'yes' }} + # needs: build-kata-static-tarball-amd64 + # strategy: + # fail-fast: false + # matrix: + # params: [ + # { containerd_version: lts, vmm: clh }, + # { containerd_version: lts, vmm: dragonball }, + # { containerd_version: lts, vmm: qemu }, + # { containerd_version: lts, vmm: stratovirt }, + # { containerd_version: lts, vmm: cloud-hypervisor }, + # { containerd_version: lts, vmm: qemu-runtime-rs }, + # { containerd_version: active, vmm: clh }, + # { containerd_version: active, vmm: dragonball }, + # { containerd_version: active, vmm: qemu }, + # { containerd_version: active, vmm: stratovirt }, + # { containerd_version: active, vmm: cloud-hypervisor }, + # { containerd_version: active, vmm: qemu-runtime-rs }, + # ] + # uses: ./.github/workflows/run-cri-containerd-tests.yaml + # with: + # tarball-suffix: -${{ inputs.tag }} + # commit-hash: ${{ inputs.commit-hash }} + # target-branch: ${{ inputs.target-branch }} + # runner: ubuntu-22.04 + # arch: amd64 + # containerd_version: ${{ matrix.params.containerd_version }} + # vmm: ${{ matrix.params.vmm }} - run-cri-containerd-s390x: - if: ${{ inputs.skip-test != 'yes' }} - needs: build-kata-static-tarball-s390x - strategy: - fail-fast: false - matrix: - params: [ - { containerd_version: active, vmm: qemu }, - { containerd_version: active, vmm: qemu-runtime-rs }, - ] - uses: ./.github/workflows/run-cri-containerd-tests.yaml - with: - tarball-suffix: -${{ inputs.tag }} - commit-hash: ${{ inputs.commit-hash }} - target-branch: ${{ inputs.target-branch }} - runner: s390x-large - arch: s390x - containerd_version: ${{ matrix.params.containerd_version }} - vmm: ${{ matrix.params.vmm }} + # run-cri-containerd-s390x: + # if: ${{ inputs.skip-test != 'yes' }} + # needs: build-kata-static-tarball-s390x + # strategy: + # fail-fast: false + # matrix: + # params: [ + # { containerd_version: active, vmm: qemu }, + # { containerd_version: active, vmm: qemu-runtime-rs }, + # ] + # uses: ./.github/workflows/run-cri-containerd-tests.yaml + # with: + # tarball-suffix: -${{ inputs.tag }} + # commit-hash: ${{ inputs.commit-hash }} + # target-branch: ${{ inputs.target-branch }} + # runner: s390x-large + # arch: s390x + # containerd_version: ${{ matrix.params.containerd_version }} + # vmm: ${{ matrix.params.vmm }} - run-cri-containerd-tests-ppc64le: - if: ${{ inputs.skip-test != 'yes' }} - needs: build-kata-static-tarball-ppc64le - strategy: - fail-fast: false - matrix: - params: [ - { containerd_version: active, vmm: qemu }, - ] - uses: ./.github/workflows/run-cri-containerd-tests.yaml - with: - tarball-suffix: -${{ inputs.tag }} - commit-hash: ${{ inputs.commit-hash }} - target-branch: ${{ inputs.target-branch }} - runner: ppc64le - arch: ppc64le - containerd_version: ${{ matrix.params.containerd_version }} - vmm: ${{ matrix.params.vmm }} + # run-cri-containerd-tests-ppc64le: + # if: ${{ inputs.skip-test != 'yes' }} + # needs: build-kata-static-tarball-ppc64le + # strategy: + # fail-fast: false + # matrix: + # params: [ + # { containerd_version: active, vmm: qemu }, + # ] + # uses: ./.github/workflows/run-cri-containerd-tests.yaml + # with: + # tarball-suffix: -${{ inputs.tag }} + # commit-hash: ${{ inputs.commit-hash }} + # target-branch: ${{ inputs.target-branch }} + # runner: ppc64le + # arch: ppc64le + # containerd_version: ${{ matrix.params.containerd_version }} + # vmm: ${{ matrix.params.vmm }} - run-cri-containerd-tests-arm64: - if: ${{ inputs.skip-test != 'yes' }} - needs: build-kata-static-tarball-arm64 - strategy: - fail-fast: false - matrix: - params: [ - { containerd_version: active, vmm: qemu }, - ] - uses: ./.github/workflows/run-cri-containerd-tests.yaml - with: - tarball-suffix: -${{ inputs.tag }} - commit-hash: ${{ inputs.commit-hash }} - target-branch: ${{ inputs.target-branch }} - runner: arm64-non-k8s - arch: arm64 - containerd_version: ${{ matrix.params.containerd_version }} - vmm: ${{ matrix.params.vmm }} + # run-cri-containerd-tests-arm64: + # if: ${{ inputs.skip-test != 'yes' }} + # needs: build-kata-static-tarball-arm64 + # strategy: + # fail-fast: false + # matrix: + # params: [ + # { containerd_version: active, vmm: qemu }, + # ] + # uses: ./.github/workflows/run-cri-containerd-tests.yaml + # with: + # tarball-suffix: -${{ inputs.tag }} + # commit-hash: ${{ inputs.commit-hash }} + # target-branch: ${{ inputs.target-branch }} + # runner: arm64-non-k8s + # arch: arm64 + # containerd_version: ${{ matrix.params.containerd_version }} + # vmm: ${{ matrix.params.vmm }} diff --git a/.github/workflows/run-kata-coco-tests.yaml b/.github/workflows/run-kata-coco-tests.yaml index 147f152f7f..4f322e4b40 100644 --- a/.github/workflows/run-kata-coco-tests.yaml +++ b/.github/workflows/run-kata-coco-tests.yaml @@ -41,175 +41,175 @@ permissions: id-token: write jobs: - run-k8s-tests-on-tdx: - strategy: - fail-fast: false - matrix: - vmm: - - qemu-tdx - snapshotter: - - nydus - pull-type: - - guest-pull - runs-on: tdx - env: - DOCKER_REGISTRY: ${{ inputs.registry }} - DOCKER_REPO: ${{ inputs.repo }} - DOCKER_TAG: ${{ inputs.tag }} - GH_PR_NUMBER: ${{ inputs.pr-number }} - KATA_HYPERVISOR: ${{ matrix.vmm }} - KUBERNETES: "vanilla" - USING_NFD: "true" - KBS: "true" - K8S_TEST_HOST_TYPE: "baremetal" - KBS_INGRESS: "nodeport" - SNAPSHOTTER: ${{ matrix.snapshotter }} - PULL_TYPE: ${{ matrix.pull-type }} - AUTHENTICATED_IMAGE_USER: ${{ vars.AUTHENTICATED_IMAGE_USER }} - AUTHENTICATED_IMAGE_PASSWORD: ${{ secrets.AUTHENTICATED_IMAGE_PASSWORD }} - ITA_KEY: ${{ secrets.ITA_KEY }} - AUTO_GENERATE_POLICY: "yes" - steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ inputs.commit-hash }} - fetch-depth: 0 - persist-credentials: false + # run-k8s-tests-on-tdx: + # strategy: + # fail-fast: false + # matrix: + # vmm: + # - qemu-tdx + # snapshotter: + # - nydus + # pull-type: + # - guest-pull + # runs-on: tdx + # env: + # DOCKER_REGISTRY: ${{ inputs.registry }} + # DOCKER_REPO: ${{ inputs.repo }} + # DOCKER_TAG: ${{ inputs.tag }} + # GH_PR_NUMBER: ${{ inputs.pr-number }} + # KATA_HYPERVISOR: ${{ matrix.vmm }} + # KUBERNETES: "vanilla" + # USING_NFD: "true" + # KBS: "true" + # K8S_TEST_HOST_TYPE: "baremetal" + # KBS_INGRESS: "nodeport" + # SNAPSHOTTER: ${{ matrix.snapshotter }} + # PULL_TYPE: ${{ matrix.pull-type }} + # AUTHENTICATED_IMAGE_USER: ${{ vars.AUTHENTICATED_IMAGE_USER }} + # AUTHENTICATED_IMAGE_PASSWORD: ${{ secrets.AUTHENTICATED_IMAGE_PASSWORD }} + # ITA_KEY: ${{ secrets.ITA_KEY }} + # AUTO_GENERATE_POLICY: "yes" + # steps: + # - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + # with: + # ref: ${{ inputs.commit-hash }} + # fetch-depth: 0 + # persist-credentials: false - - name: Rebase atop of the latest target branch - run: | - ./tests/git-helper.sh "rebase-atop-of-the-latest-target-branch" - env: - TARGET_BRANCH: ${{ inputs.target-branch }} + # - name: Rebase atop of the latest target branch + # run: | + # ./tests/git-helper.sh "rebase-atop-of-the-latest-target-branch" + # env: + # TARGET_BRANCH: ${{ inputs.target-branch }} - - name: Deploy Snapshotter - timeout-minutes: 5 - run: bash tests/integration/kubernetes/gha-run.sh deploy-snapshotter + # - name: Deploy Snapshotter + # timeout-minutes: 5 + # run: bash tests/integration/kubernetes/gha-run.sh deploy-snapshotter - - name: Deploy Kata - timeout-minutes: 10 - run: bash tests/integration/kubernetes/gha-run.sh deploy-kata-tdx + # - name: Deploy Kata + # timeout-minutes: 10 + # run: bash tests/integration/kubernetes/gha-run.sh deploy-kata-tdx - - name: Uninstall previous `kbs-client` - timeout-minutes: 10 - run: bash tests/integration/kubernetes/gha-run.sh uninstall-kbs-client + # - name: Uninstall previous `kbs-client` + # timeout-minutes: 10 + # run: bash tests/integration/kubernetes/gha-run.sh uninstall-kbs-client - - name: Deploy CoCo KBS - timeout-minutes: 10 - run: bash tests/integration/kubernetes/gha-run.sh deploy-coco-kbs + # - name: Deploy CoCo KBS + # timeout-minutes: 10 + # run: bash tests/integration/kubernetes/gha-run.sh deploy-coco-kbs - - name: Install `kbs-client` - timeout-minutes: 10 - run: bash tests/integration/kubernetes/gha-run.sh install-kbs-client + # - name: Install `kbs-client` + # timeout-minutes: 10 + # run: bash tests/integration/kubernetes/gha-run.sh install-kbs-client - - name: Deploy CSI driver - timeout-minutes: 5 - run: bash tests/integration/kubernetes/gha-run.sh deploy-csi-driver + # - name: Deploy CSI driver + # timeout-minutes: 5 + # run: bash tests/integration/kubernetes/gha-run.sh deploy-csi-driver - - name: Run tests - timeout-minutes: 100 - run: bash tests/integration/kubernetes/gha-run.sh run-tests + # - name: Run tests + # timeout-minutes: 100 + # run: bash tests/integration/kubernetes/gha-run.sh run-tests - - name: Delete kata-deploy - if: always() - run: bash tests/integration/kubernetes/gha-run.sh cleanup-tdx + # - name: Delete kata-deploy + # if: always() + # run: bash tests/integration/kubernetes/gha-run.sh cleanup-tdx - - name: Delete Snapshotter - if: always() - run: bash tests/integration/kubernetes/gha-run.sh cleanup-snapshotter + # - name: Delete Snapshotter + # if: always() + # run: bash tests/integration/kubernetes/gha-run.sh cleanup-snapshotter - - name: Delete CoCo KBS - if: always() - run: bash tests/integration/kubernetes/gha-run.sh delete-coco-kbs + # - name: Delete CoCo KBS + # if: always() + # run: bash tests/integration/kubernetes/gha-run.sh delete-coco-kbs - - name: Delete CSI driver - timeout-minutes: 5 - run: bash tests/integration/kubernetes/gha-run.sh delete-csi-driver + # - name: Delete CSI driver + # timeout-minutes: 5 + # run: bash tests/integration/kubernetes/gha-run.sh delete-csi-driver - run-k8s-tests-sev-snp: - strategy: - fail-fast: false - matrix: - vmm: - - qemu-snp - snapshotter: - - nydus - pull-type: - - guest-pull - runs-on: sev-snp - env: - DOCKER_REGISTRY: ${{ inputs.registry }} - DOCKER_REPO: ${{ inputs.repo }} - DOCKER_TAG: ${{ inputs.tag }} - GH_PR_NUMBER: ${{ inputs.pr-number }} - KATA_HYPERVISOR: ${{ matrix.vmm }} - KUBECONFIG: /home/kata/.kube/config - KUBERNETES: "vanilla" - USING_NFD: "false" - KBS: "true" - KBS_INGRESS: "nodeport" - K8S_TEST_HOST_TYPE: "baremetal" - SNAPSHOTTER: ${{ matrix.snapshotter }} - PULL_TYPE: ${{ matrix.pull-type }} - AUTHENTICATED_IMAGE_USER: ${{ vars.AUTHENTICATED_IMAGE_USER }} - AUTHENTICATED_IMAGE_PASSWORD: ${{ secrets.AUTHENTICATED_IMAGE_PASSWORD }} - AUTO_GENERATE_POLICY: "yes" - steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ inputs.commit-hash }} - fetch-depth: 0 - persist-credentials: false + # run-k8s-tests-sev-snp: + # strategy: + # fail-fast: false + # matrix: + # vmm: + # - qemu-snp + # snapshotter: + # - nydus + # pull-type: + # - guest-pull + # runs-on: sev-snp + # env: + # DOCKER_REGISTRY: ${{ inputs.registry }} + # DOCKER_REPO: ${{ inputs.repo }} + # DOCKER_TAG: ${{ inputs.tag }} + # GH_PR_NUMBER: ${{ inputs.pr-number }} + # KATA_HYPERVISOR: ${{ matrix.vmm }} + # KUBECONFIG: /home/kata/.kube/config + # KUBERNETES: "vanilla" + # USING_NFD: "false" + # KBS: "true" + # KBS_INGRESS: "nodeport" + # K8S_TEST_HOST_TYPE: "baremetal" + # SNAPSHOTTER: ${{ matrix.snapshotter }} + # PULL_TYPE: ${{ matrix.pull-type }} + # AUTHENTICATED_IMAGE_USER: ${{ vars.AUTHENTICATED_IMAGE_USER }} + # AUTHENTICATED_IMAGE_PASSWORD: ${{ secrets.AUTHENTICATED_IMAGE_PASSWORD }} + # AUTO_GENERATE_POLICY: "yes" + # steps: + # - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + # with: + # ref: ${{ inputs.commit-hash }} + # fetch-depth: 0 + # persist-credentials: false - - name: Rebase atop of the latest target branch - run: | - ./tests/git-helper.sh "rebase-atop-of-the-latest-target-branch" - env: - TARGET_BRANCH: ${{ inputs.target-branch }} + # - name: Rebase atop of the latest target branch + # run: | + # ./tests/git-helper.sh "rebase-atop-of-the-latest-target-branch" + # env: + # TARGET_BRANCH: ${{ inputs.target-branch }} - - name: Deploy Snapshotter - timeout-minutes: 5 - run: bash tests/integration/kubernetes/gha-run.sh deploy-snapshotter + # - name: Deploy Snapshotter + # timeout-minutes: 5 + # run: bash tests/integration/kubernetes/gha-run.sh deploy-snapshotter - - name: Deploy Kata - timeout-minutes: 10 - run: bash tests/integration/kubernetes/gha-run.sh deploy-kata-snp + # - name: Deploy Kata + # timeout-minutes: 10 + # run: bash tests/integration/kubernetes/gha-run.sh deploy-kata-snp - - name: Uninstall previous `kbs-client` - timeout-minutes: 10 - run: bash tests/integration/kubernetes/gha-run.sh uninstall-kbs-client + # - name: Uninstall previous `kbs-client` + # timeout-minutes: 10 + # run: bash tests/integration/kubernetes/gha-run.sh uninstall-kbs-client - - name: Deploy CoCo KBS - timeout-minutes: 10 - run: bash tests/integration/kubernetes/gha-run.sh deploy-coco-kbs + # - name: Deploy CoCo KBS + # timeout-minutes: 10 + # run: bash tests/integration/kubernetes/gha-run.sh deploy-coco-kbs - - name: Install `kbs-client` - timeout-minutes: 10 - run: bash tests/integration/kubernetes/gha-run.sh install-kbs-client + # - name: Install `kbs-client` + # timeout-minutes: 10 + # run: bash tests/integration/kubernetes/gha-run.sh install-kbs-client - - name: Deploy CSI driver - timeout-minutes: 5 - run: bash tests/integration/kubernetes/gha-run.sh deploy-csi-driver + # - name: Deploy CSI driver + # timeout-minutes: 5 + # run: bash tests/integration/kubernetes/gha-run.sh deploy-csi-driver - - name: Run tests - timeout-minutes: 50 - run: bash tests/integration/kubernetes/gha-run.sh run-tests + # - name: Run tests + # timeout-minutes: 50 + # run: bash tests/integration/kubernetes/gha-run.sh run-tests - - name: Delete kata-deploy - if: always() - run: bash tests/integration/kubernetes/gha-run.sh cleanup-snp + # - name: Delete kata-deploy + # if: always() + # run: bash tests/integration/kubernetes/gha-run.sh cleanup-snp - - name: Delete Snapshotter - if: always() - run: bash tests/integration/kubernetes/gha-run.sh cleanup-snapshotter + # - name: Delete Snapshotter + # if: always() + # run: bash tests/integration/kubernetes/gha-run.sh cleanup-snapshotter - - name: Delete CoCo KBS - if: always() - run: bash tests/integration/kubernetes/gha-run.sh delete-coco-kbs + # - name: Delete CoCo KBS + # if: always() + # run: bash tests/integration/kubernetes/gha-run.sh delete-coco-kbs - - name: Delete CSI driver - timeout-minutes: 5 - run: bash tests/integration/kubernetes/gha-run.sh delete-csi-driver + # - name: Delete CSI driver + # timeout-minutes: 5 + # run: bash tests/integration/kubernetes/gha-run.sh delete-csi-driver # Generate jobs for testing CoCo on non-TEE environments run-k8s-tests-coco-nontee: From 284c2db931d74fc68e25c626620ccd0246e65b93 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Mon, 21 Jul 2025 11:28:20 +0100 Subject: [PATCH 08/15] tests/k8s: call teardown_common in k8s-job.bats The teardown_common will print the description of the running pods, kill them all and print the system's syslogs afterwards. Signed-off-by: stevenhorsman --- tests/integration/kubernetes/k8s-job.bats | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/integration/kubernetes/k8s-job.bats b/tests/integration/kubernetes/k8s-job.bats index 9b64d4dec3..4584d0224c 100644 --- a/tests/integration/kubernetes/k8s-job.bats +++ b/tests/integration/kubernetes/k8s-job.bats @@ -6,12 +6,15 @@ # load "${BATS_TEST_DIRNAME}/../../common.bash" +load "${BATS_TEST_DIRNAME}/lib.sh" load "${BATS_TEST_DIRNAME}/tests_common.sh" setup() { + setup_common get_pod_config_dir job_name="job-pi-test" yaml_file="${pod_config_dir}/job.yaml" + set_node "${yaml_file}" "${node}" policy_settings_dir="$(create_tmp_policy_settings_dir "${pod_config_dir}")" add_requests_to_policy_settings "${policy_settings_dir}" "ReadStreamRequest" @@ -52,8 +55,10 @@ teardown() { kubectl delete jobs/"$job_name" # Verify that the job is not running run kubectl get jobs - echo "$output" - [[ "$output" =~ "No resources found" ]] + echo "${output}" + [[ "${output}" =~ "No resources found" ]] delete_tmp_policy_settings_dir "${policy_settings_dir}" + + teardown_common "${node}" "${node_start_time:-}" } From 8a53ac561886b09195159336f071b4b303ff7b16 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Mon, 28 Jul 2025 13:40:05 +0100 Subject: [PATCH 09/15] workflows: Add Delete AKS cluster timeout When testing this branch, on several occasions the Delete AKS cluster step has hung for multiple hours, so add a timeout to prevent this. Signed-off-by: stevenhorsman --- .github/workflows/run-kata-coco-tests.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run-kata-coco-tests.yaml b/.github/workflows/run-kata-coco-tests.yaml index 4f322e4b40..ce6e4e22e1 100644 --- a/.github/workflows/run-kata-coco-tests.yaml +++ b/.github/workflows/run-kata-coco-tests.yaml @@ -326,4 +326,5 @@ jobs: - name: Delete AKS cluster if: always() + timeout-minutes: 15 run: bash tests/integration/kubernetes/gha-run.sh delete-cluster From e451e3dcd014bd798084504dbf4f09a261fc7d96 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Tue, 12 Aug 2025 11:29:34 +0100 Subject: [PATCH 10/15] WIP: tests/k8s: call teardown_common in some policy tests The teardown_common will print the description of the running pods, kill them all and print the system's syslogs afterwards. Signed-off-by: stevenhorsman --- tests/integration/kubernetes/k8s-policy-job.bats | 7 +++++-- tests/integration/kubernetes/k8s-policy-pod.bats | 12 ++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/tests/integration/kubernetes/k8s-policy-job.bats b/tests/integration/kubernetes/k8s-policy-job.bats index e3b7070fac..2637a05160 100644 --- a/tests/integration/kubernetes/k8s-policy-job.bats +++ b/tests/integration/kubernetes/k8s-policy-job.bats @@ -6,17 +6,18 @@ # load "${BATS_TEST_DIRNAME}/../../common.bash" +load "${BATS_TEST_DIRNAME}/lib.sh" load "${BATS_TEST_DIRNAME}/tests_common.sh" setup() { auto_generate_policy_enabled || skip "Auto-generated policy tests are disabled." - + setup_common get_pod_config_dir job_name="policy-job" correct_yaml="${pod_config_dir}/k8s-policy-job.yaml" incorrect_yaml="${pod_config_dir}/k8s-policy-job-incorrect.yaml" - + set_node "${correct_yaml}" "${node}" # Save some time by executing genpolicy a single time. if [ "${BATS_TEST_NUMBER}" == "1" ]; then # Add an appropriate policy to the correct YAML file. @@ -163,4 +164,6 @@ teardown() { if [ "${BATS_TEST_NUMBER}" == "1" ]; then delete_tmp_policy_settings_dir "${policy_settings_dir}" fi + + teardown_common "${node}" "${node_start_time:-}" } diff --git a/tests/integration/kubernetes/k8s-policy-pod.bats b/tests/integration/kubernetes/k8s-policy-pod.bats index b0c38bcd54..4c30694404 100644 --- a/tests/integration/kubernetes/k8s-policy-pod.bats +++ b/tests/integration/kubernetes/k8s-policy-pod.bats @@ -6,20 +6,21 @@ # load "${BATS_TEST_DIRNAME}/../../common.bash" +load "${BATS_TEST_DIRNAME}/lib.sh" load "${BATS_TEST_DIRNAME}/tests_common.sh" issue="https://github.com/kata-containers/kata-containers/issues/10297" setup() { auto_generate_policy_enabled || skip "Auto-generated policy tests are disabled." - + setup_common configmap_name="policy-configmap" pod_name="policy-pod" priority_class_name="test-high-priority" get_pod_config_dir policy_settings_dir="$(create_tmp_policy_settings_dir "${pod_config_dir}")" - + exec_command=(printenv data-3) add_exec_to_policy_settings "${policy_settings_dir}" "${exec_command[@]}" add_requests_to_policy_settings "${policy_settings_dir}" "ReadStreamRequest" @@ -43,7 +44,7 @@ setup() { prometheus_image_supported || replace_prometheus_image # Save pre-generated yaml files - cp "${correct_configmap_yaml}" "${pre_generate_configmap_yaml}" + cp "${correct_configmap_yaml}" "${pre_generate_configmap_yaml}" cp "${correct_pod_yaml}" "${pre_generate_pod_yaml}" # Add policy to the correct pod yaml file @@ -57,6 +58,9 @@ setup() { # Also give each testcase a copy of the pre-generated yaml files. cp "${pre_generate_configmap_yaml}" "${testcase_pre_generate_configmap_yaml}" cp "${pre_generate_pod_yaml}" "${testcase_pre_generate_pod_yaml}" + + set_node "${testcase_pre_generate_pod_yaml}" "${node}" + set_node "${correct_pod_yaml}" "${node}" } prometheus_image_supported() { @@ -96,7 +100,7 @@ wait_for_pod_ready() { runtime_class_name=$(yq ".spec.runtimeClassName" < "${testcase_pre_generate_pod_yaml}") auto_generate_policy "${pod_config_dir}" "${testcase_pre_generate_pod_yaml}" "${testcase_pre_generate_configmap_yaml}" \ - "--runtime-class-names=other-runtime-class-name --runtime-class-names=${runtime_class_name}" + "--runtime-class-names=other-runtime-class-name --runtime-class-names=${runtime_class_name}" kubectl create -f "${testcase_pre_generate_configmap_yaml}" kubectl create -f "${testcase_pre_generate_pod_yaml}" From 0398073c55ea09bf466faaad68efd61f26bba154 Mon Sep 17 00:00:00 2001 From: Sumedh Alok Sharma Date: Thu, 10 Jul 2025 17:43:14 +0000 Subject: [PATCH 11/15] agent-ctl: Add option --vm to boot pod VM for testing. This change introduces a new command line option `--vm` to boot up a pod VM for testing. The tool connects with kata agent running inside the VM to send the test commands. The tool uses `hypervisor` crates from runtime-rs for VM lifecycle management. Current implementation supports Qemu & Cloud Hypervisor as VMMs. In summary: - tool parses the VMM specific runtime-rs kata config file in /opt/kata/share/defaults/kata-containers/runtime-rs/* - prepares and starts a VM using runtime-rs::hypervisor vm APIs - retrieves agent's server address to setup connection - tests the requested commands & shutdown the VM Fixes #11566 Signed-off-by: Sumedh Alok Sharma --- src/tools/agent-ctl/Cargo.lock | 629 +++++++++++++++--- src/tools/agent-ctl/Cargo.toml | 7 +- src/tools/agent-ctl/src/client.rs | 189 ++++-- src/tools/agent-ctl/src/main.rs | 31 +- src/tools/agent-ctl/src/rpc.rs | 2 +- src/tools/agent-ctl/src/types.rs | 1 + src/tools/agent-ctl/src/vm/mod.rs | 56 ++ src/tools/agent-ctl/src/vm/vm_ops.rs | 166 +++++ src/tools/agent-ctl/src/vm/vm_utils.rs | 53 ++ .../api-tests/test_vm_GuestDetails.bats | 34 + 10 files changed, 1022 insertions(+), 146 deletions(-) create mode 100644 src/tools/agent-ctl/src/vm/mod.rs create mode 100644 src/tools/agent-ctl/src/vm/vm_ops.rs create mode 100644 src/tools/agent-ctl/src/vm/vm_utils.rs create mode 100755 tests/functional/kata-agent-apis/api-tests/test_vm_GuestDetails.bats diff --git a/src/tools/agent-ctl/Cargo.lock b/src/tools/agent-ctl/Cargo.lock index 81dfdc08c1..b07a43d5f7 100644 --- a/src/tools/agent-ctl/Cargo.lock +++ b/src/tools/agent-ctl/Cargo.lock @@ -2,6 +2,27 @@ # It is not intended for manual editing. version = 4 +[[package]] +name = "actix-macros" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" +dependencies = [ + "quote", + "syn 2.0.87", +] + +[[package]] +name = "actix-rt" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eda4e2a6e042aa4e55ac438a2ae052d3b5da0ecf83d7411e1a368946925208" +dependencies = [ + "actix-macros", + "futures-core", + "tokio", +] + [[package]] name = "addr2line" version = "0.22.0" @@ -39,7 +60,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", "cipher", "cpufeatures", "zeroize", @@ -150,6 +171,14 @@ version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +[[package]] +name = "api_client" +version = "0.1.0" +source = "git+https://github.com/cloud-hypervisor/cloud-hypervisor?tag=v27.0#2ba6a9bfcfd79629aecf77504fa554ab821d138e" +dependencies = [ + "vmm-sys-util 0.10.0", +] + [[package]] name = "arc-swap" version = "1.6.0" @@ -271,7 +300,7 @@ checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ "async-lock 2.8.0", "autocfg", - "cfg-if", + "cfg-if 1.0.1", "concurrent-queue", "futures-lite 1.13.0", "log", @@ -290,7 +319,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1237c0ae75a0f3765f58910ff9cdd0a12eeb39ab2f4c7de23262f337f0aacbb3" dependencies = [ "async-lock 3.4.0", - "cfg-if", + "cfg-if 1.0.1", "concurrent-queue", "futures-io", "futures-lite 2.0.0", @@ -332,7 +361,7 @@ dependencies = [ "async-lock 2.8.0", "async-signal", "blocking", - "cfg-if", + "cfg-if 1.0.1", "event-listener 3.1.0", "futures-lite 1.13.0", "rustix 0.38.34", @@ -359,7 +388,7 @@ dependencies = [ "async-io 2.4.1", "async-lock 3.4.0", "atomic-waker", - "cfg-if", + "cfg-if 1.0.1", "futures-core", "futures-io", "rustix 1.0.7", @@ -474,8 +503,8 @@ dependencies = [ "axum-core", "bytes 1.7.2", "futures-util", - "http", - "http-body", + "http 1.1.0", + "http-body 1.0.1", "http-body-util", "itoa", "matchit", @@ -500,8 +529,8 @@ dependencies = [ "async-trait", "bytes 1.7.2", "futures-util", - "http", - "http-body", + "http 1.1.0", + "http-body 1.0.1", "http-body-util", "mime", "pin-project-lite", @@ -519,7 +548,7 @@ checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", - "cfg-if", + "cfg-if 1.0.1", "libc", "miniz_oxide 0.7.3", "object", @@ -829,7 +858,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbdc32a78afc325d71a48d13084f1c3ddf67cc5dc06c6e5439a8630b14612cad" dependencies = [ "bitflags 1.3.2", - "cfg-if", + "cfg-if 1.0.1", "libc", ] @@ -890,6 +919,12 @@ dependencies = [ "cipher", ] +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + [[package]] name = "cfg-if" version = "1.0.1" @@ -914,6 +949,21 @@ dependencies = [ "thiserror 1.0.40", ] +[[package]] +name = "ch-config" +version = "0.1.0" +dependencies = [ + "anyhow", + "api_client", + "kata-sys-util", + "kata-types", + "nix 0.26.4", + "serde", + "serde_json", + "thiserror 1.0.40", + "tokio", +] + [[package]] name = "chrono" version = "0.4.38" @@ -1089,7 +1139,7 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", ] [[package]] @@ -1098,7 +1148,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6eb9105919ca8e40d437fc9cbb8f1975d916f1bd28afe795a48aae32a2cc8920" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -1121,7 +1171,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", "crossbeam-epoch", "crossbeam-utils", ] @@ -1133,7 +1183,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 1.0.1", "crossbeam-utils", ] @@ -1143,7 +1193,7 @@ version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adc6598521bb5a83d491e8c1fe51db7296019d2ca3cb93cc6c2a20369a4d78a2" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", "crossbeam-utils", ] @@ -1153,7 +1203,7 @@ version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", ] [[package]] @@ -1215,7 +1265,7 @@ version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", "cpufeatures", "curve25519-dalek-derive", "digest", @@ -1314,6 +1364,20 @@ dependencies = [ "generic-array", ] +[[package]] +name = "dbs-utils" +version = "0.2.1" +dependencies = [ + "anyhow", + "event-manager", + "libc", + "log", + "serde", + "thiserror 1.0.40", + "timerfd", + "vmm-sys-util 0.11.2", +] + [[package]] name = "der" version = "0.7.9" @@ -1428,7 +1492,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", "dirs-sys-next", ] @@ -1454,6 +1518,12 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "dlv-list" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" + [[package]] name = "downcast" version = "0.11.0" @@ -1681,6 +1751,16 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "event-manager" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "377fa591135fbe23396a18e2655a6d5481bf7c5823cdfa3cc81b01a229cbe640" +dependencies = [ + "libc", + "vmm-sys-util 0.14.0", +] + [[package]] name = "fail" version = "0.5.1" @@ -1729,7 +1809,7 @@ version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", "libc", "libredox", "windows-sys 0.59.0", @@ -1933,7 +2013,7 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", "js-sys", "libc", "wasi", @@ -1974,6 +2054,15 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +[[package]] +name = "go-flag" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4a40c9ca507513f573aabaf6a8558173a1ac9aa1363d8de30c7f89b34f8d2b" +dependencies = [ + "cfg-if 0.1.10", +] + [[package]] name = "group" version = "0.13.0" @@ -1996,7 +2085,7 @@ dependencies = [ "fnv", "futures-core", "futures-sink", - "http", + "http 1.1.0", "indexmap 2.6.0", "slab", "tokio", @@ -2088,6 +2177,17 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes 1.7.2", + "fnv", + "itoa", +] + [[package]] name = "http" version = "1.1.0" @@ -2108,6 +2208,17 @@ dependencies = [ "memchr", ] +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes 1.7.2", + "http 0.2.12", + "pin-project-lite", +] + [[package]] name = "http-body" version = "1.0.1" @@ -2115,7 +2226,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes 1.7.2", - "http", + "http 1.1.0", ] [[package]] @@ -2126,8 +2237,8 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes 1.7.2", "futures-util", - "http", - "http-body", + "http 1.1.0", + "http-body 1.0.1", "pin-project-lite", ] @@ -2149,6 +2260,29 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +[[package]] +name = "hyper" +version = "0.14.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" +dependencies = [ + "bytes 1.7.2", + "futures-channel", + "futures-core", + "futures-util", + "http 0.2.12", + "http-body 0.4.6", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.5.10", + "tokio", + "tower-service", + "tracing", + "want", +] + [[package]] name = "hyper" version = "1.6.0" @@ -2159,8 +2293,8 @@ dependencies = [ "futures-channel", "futures-util", "h2", - "http", - "http-body", + "http 1.1.0", + "http-body 1.0.1", "httparse", "httpdate", "itoa", @@ -2177,8 +2311,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", - "http", - "hyper", + "http 1.1.0", + "hyper 1.6.0", "hyper-util", "rustls", "rustls-native-certs", @@ -2195,7 +2329,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ - "hyper", + "hyper 1.6.0", "hyper-util", "pin-project-lite", "tokio", @@ -2212,9 +2346,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "http", - "http-body", - "hyper", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.6.0", "libc", "pin-project-lite", "socket2 0.5.10", @@ -2223,6 +2357,65 @@ dependencies = [ "tracing", ] +[[package]] +name = "hyperlocal" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fafdf7b2b2de7c9784f76e02c0935e65a8117ec3b768644379983ab333ac98c" +dependencies = [ + "futures-util", + "hex", + "hyper 0.14.32", + "pin-project", + "tokio", +] + +[[package]] +name = "hypervisor" +version = "0.1.0" +dependencies = [ + "actix-rt", + "anyhow", + "async-trait", + "ch-config", + "crossbeam-channel", + "dbs-utils", + "futures", + "go-flag", + "hyper 0.14.32", + "hyperlocal", + "kata-sys-util", + "kata-types", + "lazy_static", + "libc", + "logging", + "nix 0.26.4", + "oci-spec", + "path-clean", + "persist", + "protobuf 3.7.2", + "protocols", + "qapi", + "qapi-qmp", + "qapi-spec", + "rand", + "rust-ini", + "safe-path 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "seccompiler", + "serde", + "serde_json", + "shim-interface", + "slog", + "slog-scope", + "tests_utils", + "thiserror 1.0.40", + "tokio", + "tracing", + "ttrpc", + "ttrpc-codegen 0.4.2", + "vmm-sys-util 0.11.2", +] + [[package]] name = "iana-time-zone" version = "0.1.56" @@ -2378,7 +2571,7 @@ dependencies = [ "async-compression", "async-trait", "base64 0.22.1", - "cfg-if", + "cfg-if 1.0.1", "filetime", "flate2", "futures", @@ -2472,7 +2665,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", ] [[package]] @@ -2493,7 +2686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013" dependencies = [ "bitflags 2.6.0", - "cfg-if", + "cfg-if 1.0.1", "libc", ] @@ -2595,18 +2788,20 @@ dependencies = [ "clap", "hex", "humantime", + "hypervisor", "image-rs", + "kata-types", "lazy_static", "libc", "log", "logging", - "nix 0.23.2", + "nix 0.24.3", "oci-spec", - "protobuf", + "protobuf 3.7.2", "protocols", "rand", "rustjail", - "safe-path", + "safe-path 0.1.0", "serde", "serde_json", "slog", @@ -2635,7 +2830,7 @@ dependencies = [ "pci-ids", "rand", "runtime-spec", - "safe-path", + "safe-path 0.1.0", "serde", "serde_json", "slog", @@ -2659,7 +2854,7 @@ dependencies = [ "num_cpus", "oci-spec", "regex", - "safe-path", + "safe-path 0.1.0", "serde", "serde-enum-str", "serde_json", @@ -2737,7 +2932,6 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ - "cfg-if", "windows-targets 0.48.0", ] @@ -2845,7 +3039,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", "digest", ] @@ -2946,7 +3140,7 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39a6bfcc6c8c7eed5ee98b9c3e33adc726054389233e201c95dab2d41a3839d2" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", "downcast", "fragile", "mockall_derive", @@ -2960,7 +3154,7 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25ca3004c2efe9011bd4e461bd8256445052b9615405b4f7ea43fc8ca5c20898" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", "proc-macro2", "quote", "syn 2.0.87", @@ -2986,7 +3180,19 @@ checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" dependencies = [ "bitflags 1.3.2", "cc", - "cfg-if", + "cfg-if 1.0.1", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags 1.3.2", + "cfg-if 1.0.1", "libc", "memoffset 0.6.5", ] @@ -2999,7 +3205,7 @@ checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ "autocfg", "bitflags 1.3.2", - "cfg-if", + "cfg-if 1.0.1", "libc", ] @@ -3010,7 +3216,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", - "cfg-if", + "cfg-if 1.0.1", "libc", "memoffset 0.7.1", "pin-utils", @@ -3023,7 +3229,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" dependencies = [ "bitflags 2.6.0", - "cfg-if", + "cfg-if 1.0.1", "cfg_aliases", "libc", ] @@ -3119,7 +3325,7 @@ dependencies = [ "base64 0.22.1", "chrono", "getrandom", - "http", + "http 1.1.0", "rand", "reqwest", "serde", @@ -3169,7 +3375,7 @@ dependencies = [ "bytes 1.7.2", "chrono", "futures-util", - "http", + "http 1.1.0", "http-auth", "jwt", "lazy_static", @@ -3210,7 +3416,7 @@ source = "git+https://github.com/confidential-containers/guest-components?rev=4c dependencies = [ "anyhow", "base64 0.22.1", - "cfg-if", + "cfg-if 1.0.1", "prost 0.13.5", "serde", "serde_json", @@ -3258,7 +3464,7 @@ dependencies = [ "dyn-clone", "ed25519-dalek", "hmac", - "http", + "http 1.1.0", "itertools 0.10.5", "log", "oauth2", @@ -3293,6 +3499,16 @@ dependencies = [ "num-traits", ] +[[package]] +name = "ordered-multimap" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" +dependencies = [ + "dlv-list", + "hashbrown 0.12.3", +] + [[package]] name = "ordered-stream" version = "0.2.0" @@ -3363,7 +3579,7 @@ version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", "libc", "redox_syscall 0.5.7", "smallvec", @@ -3391,6 +3607,12 @@ dependencies = [ "slash-formatter", ] +[[package]] +name = "path-clean" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef" + [[package]] name = "path-dedot" version = "1.2.4" @@ -3454,6 +3676,21 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "persist" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "kata-sys-util", + "kata-types", + "libc", + "safe-path 0.1.0", + "serde", + "serde_json", + "shim-interface", +] + [[package]] name = "petgraph" version = "0.5.1" @@ -3607,7 +3844,7 @@ checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", "bitflags 1.3.2", - "cfg-if", + "cfg-if 1.0.1", "concurrent-queue", "libc", "log", @@ -3621,7 +3858,7 @@ version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b53a684391ad002dd6a596ceb6c74fd004fdce75f4be2e3f615068abbea5fd50" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", "concurrent-queue", "hermit-abi 0.5.2", "pin-project-lite", @@ -3647,7 +3884,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", "cpufeatures", "opaque-debug", "universal-hash", @@ -3884,6 +4121,12 @@ dependencies = [ "prost 0.13.5", ] +[[package]] +name = "protobuf" +version = "2.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" + [[package]] name = "protobuf" version = "3.7.2" @@ -3895,6 +4138,15 @@ dependencies = [ "thiserror 1.0.40", ] +[[package]] +name = "protobuf-codegen" +version = "2.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "033460afb75cf755fcfc16dfaed20b86468082a2ea24e05ac35ab4a099a017d6" +dependencies = [ + "protobuf 2.28.0", +] + [[package]] name = "protobuf-codegen" version = "3.7.2" @@ -3903,7 +4155,7 @@ checksum = "5d3976825c0014bbd2f3b34f0001876604fe87e0c86cd8fa54251530f1544ace" dependencies = [ "anyhow", "once_cell", - "protobuf", + "protobuf 3.7.2", "protobuf-parse", "regex", "tempfile", @@ -3919,7 +4171,7 @@ dependencies = [ "anyhow", "indexmap 2.6.0", "log", - "protobuf", + "protobuf 3.7.2", "protobuf-support", "tempfile", "thiserror 1.0.40", @@ -3939,12 +4191,13 @@ dependencies = [ name = "protocols" version = "0.1.0" dependencies = [ + "async-trait", "oci-spec", - "protobuf", + "protobuf 3.7.2", "serde", "serde_json", "ttrpc", - "ttrpc-codegen", + "ttrpc-codegen 0.6.0", ] [[package]] @@ -3967,6 +4220,65 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "qapi" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6412bdd014ebee03ddbbe79ac03a0b622cce4d80ba45254f6357c847f06fa38" +dependencies = [ + "bytes 1.7.2", + "futures", + "log", + "memchr", + "qapi-qmp", + "qapi-spec", + "serde", + "serde_json", + "tokio", + "tokio-util", +] + +[[package]] +name = "qapi-codegen" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb959fed63a69baa2e3ae57224d885e686bc3f56c9bb3b03406969980ea57a44" +dependencies = [ + "qapi-parser", +] + +[[package]] +name = "qapi-parser" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b37f643cfdf67a409a9323334138a11636a5db5d56cedcc780d7a82a7fb7659" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "qapi-qmp" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8b944db7e544d2fa97595e9a000a6ba5c62c426fa185e7e00aabe4b5640b538" +dependencies = [ + "qapi-codegen", + "qapi-spec", + "serde", +] + +[[package]] +name = "qapi-spec" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49e6bdbbe5d13015b21a49a778a29ae3cee9c450c3154e1648aed670d57fe5ba" +dependencies = [ + "base64 0.22.1", + "serde", + "serde_json", +] + [[package]] name = "quinn" version = "0.11.5" @@ -4167,10 +4479,10 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "http", - "http-body", + "http 1.1.0", + "http-body 1.0.1", "http-body-util", - "hyper", + "hyper 1.6.0", "hyper-rustls", "hyper-util", "ipnet", @@ -4220,7 +4532,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", - "cfg-if", + "cfg-if 1.0.1", "getrandom", "libc", "untrusted 0.9.0", @@ -4304,6 +4616,16 @@ dependencies = [ "serde_json", ] +[[package]] +name = "rust-ini" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" +dependencies = [ + "cfg-if 1.0.1", + "ordered-multimap", +] + [[package]] name = "rust_decimal" version = "1.37.1" @@ -4397,7 +4719,7 @@ dependencies = [ "bit-vec", "capctl", "caps", - "cfg-if", + "cfg-if 1.0.1", "cgroups-rs", "futures", "inotify", @@ -4407,12 +4729,12 @@ dependencies = [ "nix 0.26.4", "oci-spec", "path-absolutize", - "protobuf", + "protobuf 3.7.2", "protocols", "regex", "rlimit", "runtime-spec", - "safe-path", + "safe-path 0.1.0", "scan_fmt", "scopeguard", "serde", @@ -4420,7 +4742,7 @@ dependencies = [ "slog", "slog-scope", "tokio", - "tokio-vsock", + "tokio-vsock 0.3.4", "xattr 0.2.3", "zbus", ] @@ -4500,6 +4822,15 @@ dependencies = [ "libc", ] +[[package]] +name = "safe-path" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "980abdd3220aa19b67ca3ea07b173ca36383f18ae48cde696d90c8af39447ffb" +dependencies = [ + "libc", +] + [[package]] name = "salsa20" version = "0.10.2" @@ -4586,6 +4917,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "seccompiler" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01d1292a1131b22ccea49f30bd106f1238b5ddeec1a98d39268dcc31d540e68" +dependencies = [ + "libc", +] + [[package]] name = "security-framework" version = "3.2.0" @@ -4848,7 +5188,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", "cpufeatures", "digest", ] @@ -4870,7 +5210,7 @@ version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", "cpufeatures", "digest", ] @@ -4885,6 +5225,19 @@ dependencies = [ "keccak", ] +[[package]] +name = "shim-interface" +version = "0.1.0" +dependencies = [ + "anyhow", + "hyper 0.14.32", + "hyperlocal", + "kata-sys-util", + "kata-types", + "nix 0.26.4", + "tokio", +] + [[package]] name = "shlex" version = "1.3.0" @@ -4919,7 +5272,7 @@ dependencies = [ "async-trait", "aws-lc-rs", "base64 0.22.1", - "cfg-if", + "cfg-if 1.0.1", "chrono", "const-oid", "crypto_secretbox", @@ -5218,7 +5571,7 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", "fastrand 1.9.0", "redox_syscall 0.3.5", "rustix 0.37.28", @@ -5242,6 +5595,15 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683" +[[package]] +name = "tests_utils" +version = "0.1.0" +dependencies = [ + "anyhow", + "kata-types", + "rand", +] + [[package]] name = "thiserror" version = "1.0.40" @@ -5288,7 +5650,7 @@ version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", "once_cell", ] @@ -5323,6 +5685,15 @@ dependencies = [ "time-core", ] +[[package]] +name = "timerfd" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84e482e368cf7efa2c8b570f476e5b9fd9fd5e9b9219fc567832b05f13511091" +dependencies = [ + "rustix 0.38.34", +] + [[package]] name = "tiny-keccak" version = "2.0.2" @@ -5454,7 +5825,20 @@ dependencies = [ "futures", "libc", "tokio", - "vsock", + "vsock 0.2.6", +] + +[[package]] +name = "tokio-vsock" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52a15c15b1bc91f90902347eff163b5b682643aff0c8e972912cca79bd9208dd" +dependencies = [ + "bytes 1.7.2", + "futures", + "libc", + "tokio", + "vsock 0.3.0", ] [[package]] @@ -5530,10 +5914,10 @@ dependencies = [ "base64 0.22.1", "bytes 1.7.2", "h2", - "http", - "http-body", + "http 1.1.0", + "http-body 1.0.1", "http-body-util", - "hyper", + "hyper 1.6.0", "hyper-timeout", "hyper-util", "percent-encoding", @@ -5652,28 +6036,59 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c580c498a547b4c083ec758be543e11a0772e03013aef4cdb1fbe77c8b62cae" dependencies = [ + "async-trait", "byteorder", "crossbeam", + "futures", "home", "libc", "log", "nix 0.26.4", - "protobuf", - "protobuf-codegen", + "protobuf 3.7.2", + "protobuf-codegen 3.7.2", "thiserror 1.0.40", + "tokio", + "tokio-vsock 0.4.0", "windows-sys 0.48.0", ] +[[package]] +name = "ttrpc-codegen" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94d7f7631d7a9ebed715a47cd4cb6072cbc7ae1d4ec01598971bbec0024340c2" +dependencies = [ + "protobuf 2.28.0", + "protobuf-codegen 3.7.2", + "protobuf-support", + "ttrpc-compiler 0.6.2", +] + [[package]] name = "ttrpc-codegen" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e5c657ef5cea6f6c6073c1be0787ba4482f42a569d4821e467daec795271f86" dependencies = [ - "protobuf", - "protobuf-codegen", + "protobuf 3.7.2", + "protobuf-codegen 3.7.2", "protobuf-support", - "ttrpc-compiler", + "ttrpc-compiler 0.8.0", +] + +[[package]] +name = "ttrpc-compiler" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0672eb06e5663ad190c7b93b2973f5d730259859b62e4e3381301a12a7441107" +dependencies = [ + "derive-new", + "prost 0.8.0", + "prost-build 0.8.0", + "prost-types 0.8.0", + "protobuf 2.28.0", + "protobuf-codegen 2.28.0", + "tempfile", ] [[package]] @@ -5686,8 +6101,8 @@ dependencies = [ "prost 0.8.0", "prost-build 0.8.0", "prost-types 0.8.0", - "protobuf", - "protobuf-codegen", + "protobuf 3.7.2", + "protobuf-codegen 3.7.2", "tempfile", ] @@ -5829,6 +6244,36 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "vmm-sys-util" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08604d7be03eb26e33b3cee3ed4aef2bf550b305d1cca60e84da5d28d3790b62" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "vmm-sys-util" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48b7b084231214f7427041e4220d77dfe726897a6d41fddee450696e66ff2a29" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "vmm-sys-util" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d21f366bf22bfba3e868349978766a965cbe628c323d58e026be80b8357ab789" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + [[package]] name = "vsock" version = "0.2.6" @@ -5839,6 +6284,16 @@ dependencies = [ "nix 0.23.2", ] +[[package]] +name = "vsock" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8e1df0bf1e1b28095c24564d1b90acae64ca69b097ed73896e342fa6649c57" +dependencies = [ + "libc", + "nix 0.24.3", +] + [[package]] name = "waker-fn" version = "1.1.0" @@ -5876,7 +6331,7 @@ version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", "once_cell", "wasm-bindgen-macro", ] @@ -5902,7 +6357,7 @@ version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ - "cfg-if", + "cfg-if 1.0.1", "js-sys", "wasm-bindgen", "web-sys", diff --git a/src/tools/agent-ctl/Cargo.toml b/src/tools/agent-ctl/Cargo.toml index 5badfbab7e..425e56cbec 100644 --- a/src/tools/agent-ctl/Cargo.toml +++ b/src/tools/agent-ctl/Cargo.toml @@ -30,7 +30,7 @@ rand = "0.8.4" protobuf = "3.2.0" log = "0.4.22" -nix = "0.23.0" +nix = "0.24.2" libc = "0.2.112" # XXX: Must be the same as the version used by the agent ttrpc = "0.8.4" @@ -49,6 +49,11 @@ image-rs = { git = "https://github.com/confidential-containers/guest-components" "signature-cosign-rustls", ] } +kata-types = { path = "../../libs/kata-types" } + +# hypervisor crate from runtime-rs +hypervisor = { path = "../../runtime-rs/crates/hypervisor", features = ["cloud-hypervisor"]} + safe-path = { path = "../../libs/safe-path" } tokio = { version = "1.44.2", features = ["signal"] } diff --git a/src/tools/agent-ctl/src/client.rs b/src/tools/agent-ctl/src/client.rs index 401f7acb69..c292e91af3 100644 --- a/src/tools/agent-ctl/src/client.rs +++ b/src/tools/agent-ctl/src/client.rs @@ -7,14 +7,15 @@ use crate::types::*; use crate::utils; +use crate::vm; use anyhow::{anyhow, Result}; use byteorder::ByteOrder; -use nix::sys::socket::{connect, socket, AddressFamily, SockAddr, SockFlag, SockType, UnixAddr}; +use nix::sys::socket::{connect, socket, AddressFamily, SockFlag, SockType, UnixAddr, VsockAddr}; use protocols::agent::*; use protocols::agent_ttrpc::*; use protocols::health::*; use protocols::health_ttrpc::*; -use slog::{debug, info}; +use slog::{debug, info, warn}; use std::convert::TryFrom; use std::fs; use std::io::Write; // XXX: for flush() @@ -107,6 +108,12 @@ const METADATA_CFG_NS: &str = "agent-ctl-cfg"; // automatically. const AUTO_VALUES_CFG_NAME: &str = "auto-values"; +// Retry count and dial timeout to try connecting to the agent +// Static value taken from runtime-rs configuration calculation +// # Retry times = reconnect_timeout_ms / dial_timeout_ms (default: 300) +const RETRY_AGENT_CONNECT: u64 = 300; +const DIAL_TIMEOUT: u64 = 10; + static AGENT_CMDS: &[AgentCmd] = &[ AgentCmd { name: "AddARPNeighbors", @@ -403,25 +410,43 @@ fn get_builtin_cmd_func(name: &str) -> Result { } fn client_create_vsock_fd(cid: libc::c_uint, port: u32) -> Result { - let fd = socket( - AddressFamily::Vsock, - SockType::Stream, - SockFlag::SOCK_CLOEXEC, - None, - ) - .map_err(|e| anyhow!(e))?; + let sock_addr = VsockAddr::new(cid, port); - let sock_addr = SockAddr::new_vsock(cid, port); + for i in 0..RETRY_AGENT_CONNECT { + let fd = socket( + AddressFamily::Vsock, + SockType::Stream, + SockFlag::SOCK_CLOEXEC, + None, + ) + .map_err(|e| anyhow!(e))?; - connect(fd, &sock_addr).map_err(|e| anyhow!(e))?; + // Connect the socket to vsock server. + match connect(fd, &sock_addr) { + Ok(_) => return Ok(fd), + Err(e) => { + debug!( + sl!(), + "Failed to connect to vsock in attempt:{} error:{:?}", i, e + ); + sleep(Duration::from_millis(DIAL_TIMEOUT)); + continue; + } + } + } - Ok(fd) + Err(anyhow!("Failed to establish vsock connection with agent")) } // Setup the existing stream by making a Hybrid VSOCK host-initiated // connection request to the Hybrid VSOCK-capable hypervisor (CLH or FC), // asking it to route the connection to the Kata Agent running inside the VM. -fn setup_hybrid_vsock(mut stream: &UnixStream, hybrid_vsock_port: u64) -> Result<()> { +fn setup_hybrid_vsock(path: &str, hybrid_vsock_port: u64) -> Result { + debug!( + sl!(), + "setup_hybrid_vsock path:{} port: {}", path, hybrid_vsock_port + ); + // Challenge message sent to the Hybrid VSOCK capable hypervisor asking // for a connection to a real VSOCK server running in the VM on the // port specified as part of this message. @@ -431,39 +456,39 @@ fn setup_hybrid_vsock(mut stream: &UnixStream, hybrid_vsock_port: u64) -> Result // hypervisor informing the client that the CONNECT_CMD was successful. const OK_CMD: &str = "OK"; - // Contact the agent by dialing it's port number and - // waiting for the hybrid vsock hypervisor to route the call for us ;) - // - // See: https://github.com/firecracker-microvm/firecracker/blob/main/docs/vsock.md#host-initiated-connections - let msg = format!("{} {}\n", CONNECT_CMD, hybrid_vsock_port); + for i in 0..RETRY_AGENT_CONNECT { + let mut stream = UnixStream::connect(path)?; + // Contact the agent by dialing it's port number and + // waiting for the hybrid vsock hypervisor to route the call for us ;) + // + // See: https://github.com/firecracker-microvm/firecracker/blob/main/docs/vsock.md#host-initiated-connections + let msg = format!("{} {}\n", CONNECT_CMD, hybrid_vsock_port); + stream.write_all(msg.as_bytes())?; - stream.write_all(msg.as_bytes())?; + // Now, see if we get the expected response + let mut reader = BufReader::new(&mut stream); - // Now, see if we get the expected response - let stream_reader = stream.try_clone()?; - let mut reader = BufReader::new(&stream_reader); + let mut msg = String::new(); + reader.read_line(&mut msg)?; - let mut msg = String::new(); - reader.read_line(&mut msg)?; + if msg.starts_with(OK_CMD) { + let response = msg + .strip_prefix(OK_CMD) + .ok_or(format!("invalid response: {:?}", msg)) + .map_err(|e| anyhow!(e))? + .trim(); - if msg.starts_with(OK_CMD) { - let response = msg - .strip_prefix(OK_CMD) - .ok_or(format!("invalid response: {:?}", msg)) - .map_err(|e| anyhow!(e))? - .trim(); - - debug!(sl!(), "Hybrid VSOCK host-side port: {:?}", response); - } else { - return Err(anyhow!( - "failed to setup Hybrid VSOCK connection: response was: {:?}", - msg - )); + // The Unix stream is now connected directly to the VSOCK socket + // the Kata agent is listening to in the VM. + debug!(sl!(), "Hybrid VSOCK host-side port: {:?}", response); + return Ok(stream); + } else { + debug!(sl!(), "attempt:{} message: {:?}", i, msg); + sleep(Duration::from_millis(DIAL_TIMEOUT)); + continue; + } } - - // The Unix stream is now connected directly to the VSOCK socket - // the Kata agent is listening to in the VM. - Ok(()) + Err(anyhow!("Failed to establish hvsock connection with agent")) } fn create_ttrpc_client( @@ -524,27 +549,21 @@ fn create_ttrpc_client( } }; - let sock_addr = SockAddr::Unix(unix_addr); - - connect(socket_fd, &sock_addr).map_err(|e| { + connect(socket_fd, &unix_addr).map_err(|e| { anyhow!(e).context("Failed to connect to Unix Domain abstract socket") })?; socket_fd + } else if hybrid_vsock { + let stream = setup_hybrid_vsock(&path, hybrid_vsock_port)?; + stream.into_raw_fd() } else { let stream = match UnixStream::connect(path) { Ok(s) => s, - Err(e) => { - return Err( - anyhow!(e).context("failed to create named UNIX Domain stream socket") - ) + Err(err) => { + return Err(anyhow!("failed to setup unix stream: {:?}", err)); } }; - - if hybrid_vsock { - setup_hybrid_vsock(&stream, hybrid_vsock_port)? - } - stream.into_raw_fd() } } @@ -605,7 +624,7 @@ fn announce(cfg: &Config) { info!(sl!(), "announce"; "config" => format!("{:?}", cfg)); } -pub fn client(cfg: &Config, commands: Vec<&str>) -> Result<()> { +pub fn client(cfg: &mut Config, commands: Vec<&str>) -> Result<()> { if commands.len() == 1 && commands[0].eq("list") { println!("Built-in commands:\n"); @@ -628,6 +647,68 @@ pub fn client(cfg: &Config, commands: Vec<&str>) -> Result<()> { announce(cfg); + let vm_ref = handle_vm(cfg)?; + + info!(sl!(), "run commands"); + let result = run_commands(cfg, commands); + + // stop the vm if booted + if vm_ref.is_some() { + info!(sl!(), "stopping test vm"); + // TODO: The error handling here is for cloud-hypervisor. + // We use tokio::runtime to call the async operations of + // runtime-rs::crates::hypervisor::_vm + // These methods can spawn some additional functions, ex + // `clh::inner_hypervisor::cloud_hypervisor_log_output` + // But since we return from the tokio::runtime block + // the runtime is dropped. During stop_vm call, cloud hypervisor + // waits for the logger task which is in cancelled state as a result. + match vm::remove_vm(vm_ref.unwrap()) { + Ok(_) => info!(sl!(), "Successfully shut down test vm"), + Err(e) => warn!(sl!(), "Error shutting down vm:{:?}", e), + } + } + + result.map_err(|e| anyhow!(e)) +} + +fn handle_vm(cfg: &mut Config) -> Result> { + info!(sl!(), "handle vm request"); + + // Return if no vm requested + if cfg.hypervisor_name.is_empty() { + return Ok(None); + } + + // Boot the test vm + let vm_instance = vm::setup_vm(&cfg.hypervisor_name)?; + info!( + sl!(), + "booted test vm with hypervisor: {:?}", vm_instance.hypervisor_name + ); + + // set the vsock server address for connecting with ttrpc server + if !vm_instance.socket_addr.is_empty() { + match vm_instance.hybrid_vsock { + true => { + // hybrid vsock URI expects unix prefix + let addr_fields: Vec<&str> = vm_instance.socket_addr.split("://").collect(); + cfg.server_address = format!("{}://{}", "unix", addr_fields[1]); + cfg.hybrid_vsock = true; + } + false => { + let addr = vm_instance.socket_addr.clone(); + cfg.server_address = format!("{}:{}", addr, 1024); + cfg.hybrid_vsock = false; + } + } + } + + info!(sl!(), "socket server addr: {}", cfg.server_address); + Ok(Some(vm_instance)) +} + +fn run_commands(cfg: &Config, commands: Vec<&str>) -> Result<()> { // Create separate connections for each of the services provided // by the agent. let client = kata_service_agent( diff --git a/src/tools/agent-ctl/src/main.rs b/src/tools/agent-ctl/src/main.rs index 08a3bf82bc..1f36d511a0 100644 --- a/src/tools/agent-ctl/src/main.rs +++ b/src/tools/agent-ctl/src/main.rs @@ -25,6 +25,7 @@ mod image; mod rpc; mod types; mod utils; +mod vm; const DEFAULT_LOG_LEVEL: slog::Level = slog::Level::Info; @@ -73,6 +74,10 @@ fn make_examples_text(program_name: &str) -> String { # Abstract socket $ {program} connect --server-address "{abstract_server_address}" --cmd Check +- Boot up a test VM and connect to the agent (socket address determined by the tool): + + $ {program} connect --vm qemu --cmd Check + - Query the agent environment: $ {program} connect --server-address "{vsock_server_address}" --cmd GetGuestDetails @@ -140,12 +145,25 @@ fn connect(name: &str, global_args: clap::ArgMatches) -> Result<()> { let interactive = args.contains_id("interactive"); let ignore_errors = args.contains_id("ignore-errors"); + // boot-up a test vm for testing commands + let hypervisor_name = args + .get_one::("vm") + .map(|s| s.as_str()) + .unwrap_or_default() + .to_string(); + let server_address = args .get_one::("server-address") .map(|s| s.as_str()) - .ok_or_else(|| anyhow!("need server adddress"))? + .unwrap_or_default() .to_string(); + // if vm is requested, we retrieve the server + // address after the boot-up is completed + if hypervisor_name.is_empty() && server_address.is_empty() { + return Err(anyhow!("need server address")); + } + let mut commands: Vec<&str> = Vec::new(); if !interactive { @@ -187,7 +205,7 @@ fn connect(name: &str, global_args: clap::ArgMatches) -> Result<()> { let hybrid_vsock = args.contains_id("hybrid-vsock"); let no_auto_values = args.contains_id("no-auto-values"); - let cfg = Config { + let mut cfg = Config { server_address, bundle_dir, timeout_nano, @@ -196,9 +214,10 @@ fn connect(name: &str, global_args: clap::ArgMatches) -> Result<()> { hybrid_vsock, ignore_errors, no_auto_values, + hypervisor_name, }; - let result = rpc::run(&logger, &cfg, commands); + let result = rpc::run(&logger, &mut cfg, commands); result.map_err(|e| anyhow!(e)) } @@ -283,6 +302,12 @@ fn real_main() -> Result<()> { .help("timeout value as nanoseconds or using human-readable suffixes (0 [forever], 99ns, 30us, 2ms, 5s, 7m, etc)") .value_name("human-time"), ) + .arg( + Arg::new("vm") + .long("vm") + .help("boot a pod vm for testing") + .value_name("HYPERVISOR"), + ) ) .subcommand( Command::new("generate-cid") diff --git a/src/tools/agent-ctl/src/rpc.rs b/src/tools/agent-ctl/src/rpc.rs index fd9ad96936..b39fbaea7c 100644 --- a/src/tools/agent-ctl/src/rpc.rs +++ b/src/tools/agent-ctl/src/rpc.rs @@ -11,7 +11,7 @@ use slog::{o, Logger}; use crate::client::client; use crate::types::Config; -pub fn run(logger: &Logger, cfg: &Config, commands: Vec<&str>) -> Result<()> { +pub fn run(logger: &Logger, cfg: &mut Config, commands: Vec<&str>) -> Result<()> { // Maintain the global logger for the duration of the ttRPC comms let _guard = slog_scope::set_global_logger(logger.new(o!("subsystem" => "rpc"))); diff --git a/src/tools/agent-ctl/src/types.rs b/src/tools/agent-ctl/src/types.rs index e1d343b89a..198a8a274a 100644 --- a/src/tools/agent-ctl/src/types.rs +++ b/src/tools/agent-ctl/src/types.rs @@ -19,6 +19,7 @@ pub struct Config { pub hybrid_vsock: bool, pub ignore_errors: bool, pub no_auto_values: bool, + pub hypervisor_name: String, } // CopyFile input struct diff --git a/src/tools/agent-ctl/src/vm/mod.rs b/src/tools/agent-ctl/src/vm/mod.rs new file mode 100644 index 0000000000..d49a97d3ad --- /dev/null +++ b/src/tools/agent-ctl/src/vm/mod.rs @@ -0,0 +1,56 @@ +// Copyright (c) 2024 Microsoft Corporation +// +// SPDX-License-Identifier: Apache-2.0 +// +// Description: Boot UVM for testing container storages/volumes. + +use anyhow::{anyhow, Context, Result}; +use hypervisor::Hypervisor; +use kata_types::config::{hypervisor::HYPERVISOR_NAME_CH, hypervisor::HYPERVISOR_NAME_QEMU}; +use slog::info; +use std::sync::Arc; + +mod vm_ops; +mod vm_utils; + +lazy_static! { + pub(crate) static ref SUPPORTED_VMMS: Vec<&'static str> = + vec![HYPERVISOR_NAME_CH, HYPERVISOR_NAME_QEMU]; +} + +#[derive(Clone)] +pub struct TestVm { + pub hypervisor_name: String, + pub hypervisor_instance: Arc, + pub socket_addr: String, + pub hybrid_vsock: bool, +} + +// Helper method to boot a test pod VM +pub fn setup_vm(hypervisor_name: &str) -> Result { + info!( + sl!(), + "booting a pod vm using hypervisor:{:?}", hypervisor_name + ); + + if !SUPPORTED_VMMS.contains(&hypervisor_name) { + return Err(anyhow!("Unsupported hypervisor:{}", hypervisor_name)); + } + + tokio::runtime::Builder::new_current_thread() + .enable_all() + .build()? + .block_on(vm_ops::boot_vm(hypervisor_name)) + .context("booting the test vm") +} + +// Helper method to stop a test pod VM +pub fn remove_vm(instance: TestVm) -> Result<()> { + info!(sl!(), "Stopping booted pod vm"); + + tokio::runtime::Builder::new_current_thread() + .enable_all() + .build()? + .block_on(vm_ops::stop_vm(instance.hypervisor_instance)) + .context("stopping the test vm") +} diff --git a/src/tools/agent-ctl/src/vm/vm_ops.rs b/src/tools/agent-ctl/src/vm/vm_ops.rs new file mode 100644 index 0000000000..74a807bcd0 --- /dev/null +++ b/src/tools/agent-ctl/src/vm/vm_ops.rs @@ -0,0 +1,166 @@ +// Copyright (c) 2024 Microsoft Corporation +// +// SPDX-License-Identifier: Apache-2.0 +// +// Description: Boot UVM for testing container storages/volumes. + +use crate::vm::{vm_utils, TestVm}; +use anyhow::{anyhow, Context, Result}; +use hypervisor::{ + ch::CloudHypervisor, + device::{ + device_manager::{do_handle_device, DeviceManager}, + DeviceConfig, + }, + qemu::Qemu, + BlockConfig, Hypervisor, VsockConfig, +}; +use kata_types::config::{ + hypervisor::register_hypervisor_plugin, hypervisor::TopologyConfigInfo, + hypervisor::HYPERVISOR_NAME_CH, hypervisor::HYPERVISOR_NAME_QEMU, CloudHypervisorConfig, + QemuConfig, +}; +use std::collections::HashMap; +use std::sync::Arc; +use tokio::sync::RwLock; + +// Clh specific configuration path +const CLH_CONFIG_PATH: &str = + "/opt/kata/share/defaults/kata-containers/runtime-rs/configuration-cloud-hypervisor.toml"; + +// qemu specific configuration path +const QEMU_CONFIG_PATH: &str = + "/opt/kata/share/defaults/kata-containers/runtime-rs/configuration-qemu-runtime-rs.toml"; + +const VM_NAME: &str = "agent-ctl-testvm"; +const VM_START_TIMEOUT: i32 = 10_000; + +// Boot the test vm. +// In summary, this method +// - parses hypervisor specific kata config file +// - loads hypervisor specific config +// - instantiates a hypervisor object +// - calls prepare_vm +// - instantiates device manager to handle devices +// - calls start_vm to boot pod vm +// - retrieves the agent ttrpc server socket address +pub(crate) async fn boot_vm(name: &str) -> Result { + let config_path; + let mut is_hybrid_vsock = false; + + // Register the hypervisor config plugin + match name { + HYPERVISOR_NAME_CH => { + register_hypervisor_plugin(HYPERVISOR_NAME_CH, Arc::new(CloudHypervisorConfig::new())); + config_path = CLH_CONFIG_PATH; + is_hybrid_vsock = true; + } + &_ => { + register_hypervisor_plugin(HYPERVISOR_NAME_QEMU, Arc::new(QemuConfig::new())); + config_path = QEMU_CONFIG_PATH; + } + }; + + // get the kata configuration toml + let toml_config = vm_utils::load_config(config_path)?; + + let hypervisor_config = toml_config + .hypervisor + .get(name) + .ok_or_else(|| anyhow!("Failed to get hypervisor config")) + .context("get hypervisor config")?; + + let hypervisor: Arc = match name { + HYPERVISOR_NAME_CH => { + let hyp_ch = Arc::new(CloudHypervisor::new()); + hyp_ch + .set_hypervisor_config(hypervisor_config.clone()) + .await; + hyp_ch + } + &_ => { + let hyp_qemu = Arc::new(Qemu::new()); + hyp_qemu + .set_hypervisor_config(hypervisor_config.clone()) + .await; + hyp_qemu + } + }; + + // prepare vm + // we do not pass any network namesapce since we dont want any + let empty_anno_map: HashMap = HashMap::new(); + hypervisor + .prepare_vm(VM_NAME, None, &empty_anno_map) + .await + .context(" prepare test vm")?; + + // instantiate device manager + let topo_config = TopologyConfigInfo::new(&toml_config); + let dev_manager = Arc::new(RwLock::new( + DeviceManager::new(hypervisor.clone(), topo_config.as_ref()) + .await + .context("failed to create device manager")?, + )); + + // For qemu, we need some additional device handling + // - vsock device + // - block device for rootfs if using image + if name.contains(HYPERVISOR_NAME_QEMU) { + add_vsock_device(dev_manager.clone()) + .await + .context("qemu::adding vsock device")?; + if !hypervisor_config.boot_info.image.is_empty() { + let blk_config = BlockConfig { + path_on_host: hypervisor_config.boot_info.image.clone(), + is_readonly: true, + driver_option: hypervisor_config.boot_info.vm_rootfs_driver.clone(), + ..Default::default() + }; + add_block_device(dev_manager.clone(), blk_config) + .await + .context("qemu: handle rootfs")?; + } + } + + // start vm + hypervisor + .start_vm(VM_START_TIMEOUT) + .await + .context("start pod vm")?; + + let agent_socket_addr = hypervisor + .get_agent_socket() + .await + .context("get agent socket path")?; + + // return the vm structure + Ok(TestVm { + hypervisor_name: name.to_string(), + hypervisor_instance: hypervisor, + socket_addr: agent_socket_addr, + hybrid_vsock: is_hybrid_vsock, + }) +} + +pub(crate) async fn stop_vm(instance: Arc) -> Result<()> { + instance.stop_vm().await.context("stopping pod vm") +} + +async fn add_block_device(dev_mgr: Arc>, cfg: BlockConfig) -> Result<()> { + do_handle_device(&dev_mgr, &DeviceConfig::BlockCfg(cfg)) + .await + .context("handle block device failed")?; + Ok(()) +} + +async fn add_vsock_device(dev_mgr: Arc>) -> Result<()> { + let vsock_config = VsockConfig { + guest_cid: libc::VMADDR_CID_ANY, + }; + + do_handle_device(&dev_mgr, &DeviceConfig::VsockCfg(vsock_config)) + .await + .context("handle vsock device failed")?; + Ok(()) +} diff --git a/src/tools/agent-ctl/src/vm/vm_utils.rs b/src/tools/agent-ctl/src/vm/vm_utils.rs new file mode 100644 index 0000000000..6020532ed6 --- /dev/null +++ b/src/tools/agent-ctl/src/vm/vm_utils.rs @@ -0,0 +1,53 @@ +// Copyright (c) 2025 Microsoft Corporation +// +// SPDX-License-Identifier: Apache-2.0 +// +// Description: Boot UVM for testing container storages/volumes. + +use anyhow::{anyhow, Context, Result}; +use kata_types::config::TomlConfig; +use slog::info; + +// Helper function to parse a configuration file. +pub fn load_config(config_file: &str) -> Result { + info!(sl!(), "Load kata configuration file {}", config_file); + + let (mut toml_config, _) = TomlConfig::load_from_file(config_file) + .context("Failed to load kata configuration file")?; + + // Update the agent kernel params in hypervisor config + update_agent_kernel_params(&mut toml_config)?; + + // validate configuration and return the error + toml_config.validate()?; + + info!(sl!(), "parsed config content {:?}", &toml_config); + Ok(toml_config) +} + +pub fn to_kernel_string(key: String, val: String) -> Result { + if key.is_empty() && val.is_empty() { + Err(anyhow!("Empty key and value")) + } else if key.is_empty() { + Err(anyhow!("Empty key")) + } else if val.is_empty() { + Ok(key.to_string()) + } else { + Ok(format!("{}{}{}", key, "=", val)) + } +} + +fn update_agent_kernel_params(config: &mut TomlConfig) -> Result<()> { + let mut params = vec![]; + if let Ok(kv) = config.get_agent_kernel_params() { + for (k, v) in kv.into_iter() { + if let Ok(s) = to_kernel_string(k.to_owned(), v.to_owned()) { + params.push(s); + } + } + if let Some(h) = config.hypervisor.get_mut(&config.runtime.hypervisor_name) { + h.boot_info.add_kernel_params(params); + } + } + Ok(()) +} diff --git a/tests/functional/kata-agent-apis/api-tests/test_vm_GuestDetails.bats b/tests/functional/kata-agent-apis/api-tests/test_vm_GuestDetails.bats new file mode 100755 index 0000000000..74f9d750ce --- /dev/null +++ b/tests/functional/kata-agent-apis/api-tests/test_vm_GuestDetails.bats @@ -0,0 +1,34 @@ +#!/usr/bin/env bats + +# Copyright (c) 2024 Microsoft Corporation +# +# SPDX-License-Identifier: Apache-2.0 + +load "${BATS_TEST_DIRNAME}/../../../common.bash" +load "${BATS_TEST_DIRNAME}/../setup_common.sh" + +setup_file() { + info "setup" + sudo rm qmp.sock console.sock || echo "No existing qmp.sock/console.sock" +} + +@test "Test GetGuestDetails: Boot qemu pod vm and run GetGuestDetails" { + info "Boot qemu vm, establish connection with agent inside the vm and send GetGuestDetails command" + local cmds=() + cmds+=("--vm qemu -c GetGuestDetails") + run_agent_ctl "${cmds[@]}" + sudo rm qmp.sock console.sock +} + +@test "Test GetGuestDetails: Boot cloud hypervisor pod vm and run GetGuestDetails" { + info "Boot cloud hypervisor vm, establish connection with agent inside the vm and send GetGuestDetails command" + local cmds=() + cmds+=("--vm cloud-hypervisor -c GetGuestDetails") + run_agent_ctl "${cmds[@]}" +} + +teardown_file() { + info "teardown" + sudo rm -r /run/kata/agent-ctl-testvm || echo "Failed to clean /run/kata/agent-ctl-testvm" + sudo rm -r /run/kata-containers/ || echo "Failed to clean /run/kata-containers" +} From 873df29b3f1ad3e6d53a1a3c11b143cef67fd995 Mon Sep 17 00:00:00 2001 From: Alex Lyn Date: Tue, 12 Aug 2025 14:23:42 +0800 Subject: [PATCH 12/15] CI: debug guest pull image Debug guest pull image Signed-off-by: Alex Lyn --- tests/integration/kubernetes/k8s-guest-pull-image.bats | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/integration/kubernetes/k8s-guest-pull-image.bats b/tests/integration/kubernetes/k8s-guest-pull-image.bats index ca53140644..acbf2c3ab4 100644 --- a/tests/integration/kubernetes/k8s-guest-pull-image.bats +++ b/tests/integration/kubernetes/k8s-guest-pull-image.bats @@ -110,7 +110,7 @@ setup() { # Set CreateContainerRequest timeout for qemu-coco-dev - if [ "${KATA_HYPERVISOR}" == "qemu-coco-dev" ]; then + if [[ "${KATA_HYPERVISOR}" == "qemu-coco-dev" || "${KATA_HYPERVISOR}" == "qemu-runtime-rs-coco-dev" ]]; then create_container_timeout=300 set_metadata_annotation "$pod_config" \ "io.katacontainers.config.runtime.create_container_timeout" \ @@ -133,7 +133,7 @@ setup() { add_allow_all_policy_to_yaml "$pod_config" local wait_time=120 - [ "${KATA_HYPERVISOR}" == "qemu-coco-dev" ] && wait_time=300 + [[ "${KATA_HYPERVISOR}" == "qemu-coco-dev" || "${KATA_HYPERVISOR}" == "qemu-runtime-rs-coco-dev" ]] && wait_time=300 k8s_create_pod "$pod_config" "$wait_time" } @@ -187,7 +187,7 @@ setup() { [ "${KATA_HYPERVISOR}" == "qemu-snp" ] && skip "See: https://github.com/kata-containers/kata-containers/issues/10838" [ "${KATA_HYPERVISOR}" == "qemu-tdx" ] && skip "See: https://github.com/kata-containers/kata-containers/issues/10838" - if [ "${KATA_HYPERVISOR}" = "qemu-coco-dev" ] && [ "${KBS_INGRESS}" = "aks" ]; then + if [[ "${KATA_HYPERVISOR}" == "qemu-coco-dev" || "${KATA_HYPERVISOR}" == "qemu-runtime-rs-coco-dev" ]] && [ "${KBS_INGRESS}" = "aks" ]; then skip "skip this specific one due to issue https://github.com/kata-containers/kata-containers/issues/10299" fi storage_config=$(mktemp "${BATS_FILE_TMPDIR}/$(basename "${storage_config_template}").XXX") @@ -206,7 +206,7 @@ setup() { # Set CreateContainerRequest timeout in the annotation to pull large image in guest create_container_timeout=120 - [ "${KATA_HYPERVISOR}" == "qemu-coco-dev" ] && create_container_timeout=600 + [[ "${KATA_HYPERVISOR}" == "qemu-coco-dev" || "${KATA_HYPERVISOR}" == "qemu-runtime-rs-coco-dev" ]] && create_container_timeout=600 set_metadata_annotation "$pod_config" \ "io.katacontainers.config.runtime.create_container_timeout" \ "${create_container_timeout}" @@ -227,7 +227,7 @@ setup() { add_allow_all_policy_to_yaml "$pod_config" local wait_time=120 - [ "${KATA_HYPERVISOR}" == "qemu-coco-dev" ] && wait_time=600 + [[ "${KATA_HYPERVISOR}" == "qemu-coco-dev" || "${KATA_HYPERVISOR}" == "qemu-runtime-rs-coco-dev" ]] && wait_time=600 k8s_create_pod "$pod_config" "$wait_time" } From aa973f8b596af45d7f9b1fdaddc685831d57668a Mon Sep 17 00:00:00 2001 From: Alex Lyn Date: Tue, 12 Aug 2025 14:25:29 +0800 Subject: [PATCH 13/15] kata-types: adjust initdata with runtime.cc_init_data Debug cc_init_data Signed-off-by: Alex Lyn --- src/libs/kata-types/src/config/hypervisor/mod.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libs/kata-types/src/config/hypervisor/mod.rs b/src/libs/kata-types/src/config/hypervisor/mod.rs index 52ac7ba2b9..b237221525 100644 --- a/src/libs/kata-types/src/config/hypervisor/mod.rs +++ b/src/libs/kata-types/src/config/hypervisor/mod.rs @@ -23,7 +23,7 @@ //! hypervisors, so let's contain it... use super::{default, ConfigOps, ConfigPlugin, TomlConfig}; -use crate::annotations::KATA_ANNO_CFG_HYPERVISOR_PREFIX; +use crate::annotations::{KATA_ANNO_CFG_HYPERVISOR_PREFIX, KATA_ANNO_CFG_RUNTIME_INIT_DATA}; use crate::{eother, resolve_path, sl, validate_path}; use byte_unit::{Byte, Unit}; use lazy_static::lazy_static; @@ -956,6 +956,10 @@ impl SecurityInfo { /// Check whether annotation key is enabled or not. pub fn is_annotation_enabled(&self, path: &str) -> bool { + if matches!(path, KATA_ANNO_CFG_RUNTIME_INIT_DATA) { + return true; + } + if !path.starts_with(KATA_ANNO_CFG_HYPERVISOR_PREFIX) { return false; } From 4a091438a9b1e57436e6ead8d4795fdb5d35fbc9 Mon Sep 17 00:00:00 2001 From: Alex Lyn Date: Tue, 12 Aug 2025 14:26:23 +0800 Subject: [PATCH 14/15] runtime-rs: support initdata within nontee scenarios NoProtection cases Signed-off-by: Alex Lyn --- .../crates/runtimes/virt_container/src/sandbox.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/runtime-rs/crates/runtimes/virt_container/src/sandbox.rs b/src/runtime-rs/crates/runtimes/virt_container/src/sandbox.rs index 801718e734..4554bfc3bc 100644 --- a/src/runtime-rs/crates/runtimes/virt_container/src/sandbox.rs +++ b/src/runtime-rs/crates/runtimes/virt_container/src/sandbox.rs @@ -429,6 +429,7 @@ impl VirtSandbox { debug: false, }))) }, + GuestProtection::NoProtection => Ok(None), _ => Err(anyhow!("confidential_guest requested by configuration but no supported protection available")) } } @@ -437,6 +438,10 @@ impl VirtSandbox { &self, hypervisor_config: &HypervisorConfig, ) -> Result> { + if !hypervisor_config.security_info.confidential_guest { + return Ok(None); + } + let initdata = hypervisor_config.security_info.initdata.clone(); if initdata.is_empty() { return Ok(None); @@ -452,6 +457,9 @@ impl VirtSandbox { GuestProtection::Snp(_details) => { calculate_initdata_digest(&initdata, ProtectedPlatform::Snp)? } + GuestProtection::NoProtection => { + calculate_initdata_digest(&initdata, ProtectedPlatform::NoProtection)? + } // TODO: there's more `GuestProtection` types to be supported. _ => return Ok(None), }; From 556255cdd53b2deb1075d2779fb622c1f7b7c0bf Mon Sep 17 00:00:00 2001 From: Alex Lyn Date: Tue, 12 Aug 2025 18:02:51 +0800 Subject: [PATCH 15/15] ci: bugfix Signed-off-by: Alex Lyn --- .../crates/runtimes/virt_container/src/sandbox.rs | 12 ++++++------ tests/integration/kubernetes/k8s-block-volume.bats | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/runtime-rs/crates/runtimes/virt_container/src/sandbox.rs b/src/runtime-rs/crates/runtimes/virt_container/src/sandbox.rs index 4554bfc3bc..ced7b6fa6f 100644 --- a/src/runtime-rs/crates/runtimes/virt_container/src/sandbox.rs +++ b/src/runtime-rs/crates/runtimes/virt_container/src/sandbox.rs @@ -374,9 +374,9 @@ impl VirtSandbox { hypervisor_config: &HypervisorConfig, init_data: Option, ) -> Result> { - if !hypervisor_config.security_info.confidential_guest { - return Ok(None); - } + // if !hypervisor_config.security_info.confidential_guest { + // return Ok(None); + // } let available_protection = available_guest_protection()?; info!( @@ -438,9 +438,9 @@ impl VirtSandbox { &self, hypervisor_config: &HypervisorConfig, ) -> Result> { - if !hypervisor_config.security_info.confidential_guest { - return Ok(None); - } + // if !hypervisor_config.security_info.confidential_guest { + // return Ok(None); + // } let initdata = hypervisor_config.security_info.initdata.clone(); if initdata.is_empty() { diff --git a/tests/integration/kubernetes/k8s-block-volume.bats b/tests/integration/kubernetes/k8s-block-volume.bats index 05ff8326b0..79f4704635 100644 --- a/tests/integration/kubernetes/k8s-block-volume.bats +++ b/tests/integration/kubernetes/k8s-block-volume.bats @@ -62,7 +62,7 @@ setup() { kubectl get "pvc/${volume_claim}" | grep "Bound" # make fs, mount device and write on it - kubectl exec "$pod_name" -- sh -c "mkfs.ext4 $ctr_dev_path" + kubectl exec "$pod_name" -- sh -c "mkfs.ext4 $ctr_dev_path && sleep 1" ctr_mount_path="/mnt" ctr_message="Hello World" ctr_file="${ctr_mount_path}/file.txt"