ci: build debug kernels

Enabling ftrace in our kernels changed the performance of several tests,
so it was reverted.

Make a new set of kernels that will not be used for performance tests.

Signed-off-by: Pablo Barbáchano <[email protected]>

Author: pb8o

resources/guest_configs/patches-debug/0001-fix-Adjust-config-options-for-what-is-needed-by-our-.patch

@@ -0,0 +1 @@
+../patches/0001-fix-Adjust-config-options-for-what-is-needed-by-our-.patch

resources/guest_configs/patches-debug/0002-ci-adjust-6.1-guest-kernel-configs-for-our-CI.patch

@@ -0,0 +1 @@
+../patches/0002-ci-adjust-6.1-guest-kernel-configs-for-our-CI.patch

resources/guest_configs/patches/0003-enable-ftrace.patch renamed to resources/guest_configs/patches-debug/0003-enable-ftrace.patch

@@ -135,8 +135,10 @@ function clone_amazon_linux_repo {
 }
 
 function apply_kernel_patches_for_ci {
-    for p in $PWD/guest_configs/patches/* ; do
-        patch -p2 < $p
+    local PATCHES_DIR=$1
+    for patch in $PATCHES_DIR/*; do
+        echo "Applying $patch"
+        patch -p2 < $patch
     done
 }
 
@@ -224,7 +226,7 @@ function build_al_kernels {
     clone_amazon_linux_repo
 
     # Apply kernel patches on top of AL configuration
-    apply_kernel_patches_for_ci
+    apply_kernel_patches_for_ci guest_configs/patches
 
     if [[ "$KERNEL_VERSION" == @(all|5.10) ]]; then
         build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10.config
@@ -239,6 +241,13 @@ function build_al_kernels {
     # Undo kernel patches on top of AL configuration
     git restore $PWD/guest_configs
     rm -rf $PWD/guest_configs/*.orig
+
+    # Build debug kernels
+    OUTPUT_DIR=$OUTPUT_DIR/debug
+    mkdir -pv $OUTPUT_DIR
+    apply_kernel_patches_for_ci guest_configs/patches-debug
+    build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10.config
+    build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-6.1.config
 }
 
 function print_help {

resources/guest_configs/patches/0004-disable-CONFIG_ARM64_ERRATUM_3194386-for-aarch64.patch renamed to resources/guest_configs/patches/0003-disable-CONFIG_ARM64_ERRATUM_3194386-for-aarch64.patch

@@ -444,6 +444,17 @@ def uvm_plain_any(microvm_factory, guest_kernel, rootfs_ubuntu_22):
     return microvm_factory.build(guest_kernel, rootfs_ubuntu_22)
 
 
+guest_kernel_6_1_debug = pytest.fixture(
+    guest_kernel_fxt,
+    params=kernel_params("vmlinux-6.1*", artifact_dir=defs.ARTIFACT_DIR / "debug"),
+)
+
+
+@pytest.fixture
+def uvm_plain_debug(microvm_factory, guest_kernel_6_1_debug, rootfs_rw):
+    return microvm_factory.build(guest_kernel_6_1_debug, rootfs_rw)
+
+
 @pytest.fixture
 def uvm_with_initrd(
     microvm_factory, guest_kernel_linux_5_10, record_property, artifact_dir

resources/rebuild.sh

@@ -33,12 +33,12 @@ def select_supported_kernels():
     return supported_kernels
 
 
-def kernels(glob) -> Iterator:
+def kernels(glob, artifact_dir: Path = ARTIFACT_DIR) -> Iterator:
     """Return supported kernels as kernels supported by the current combination of kernel and
     instance type.
     """
     supported_kernels = select_supported_kernels()
-    for kernel in sorted(ARTIFACT_DIR.rglob(glob)):
+    for kernel in sorted(artifact_dir.glob(glob)):
         for kernel_regex in supported_kernels:
             if re.fullmatch(kernel_regex, kernel.name):
                 yield kernel
@@ -50,9 +50,11 @@ def disks(glob) -> Iterator:
     yield from sorted(ARTIFACT_DIR.glob(glob))
 
 
-def kernel_params(glob="vmlinux-*", select=kernels) -> Iterator:
+def kernel_params(
+    glob="vmlinux-*", select=kernels, artifact_dir=ARTIFACT_DIR
+) -> Iterator:
     """Return supported kernels"""
-    for kernel in select(glob):
+    for kernel in select(glob, artifact_dir):
         yield pytest.param(kernel, id=kernel.name)
 
 

tests/conftest.py

@@ -73,6 +73,8 @@ def parse_byte_size(param):
 if args.cpu_template_path is not None:
     cpu_template = json.loads(args.cpu_template_path.read_text())
 vmfcty = MicroVMFactory(*bins)
+
+print(f"uvm with kernel {args.kernel} ...")
 uvm = vmfcty.build(args.kernel, args.rootfs)
 uvm.help.enable_console()
 uvm.help.resize_disk(uvm.rootfs_file, args.rootfs_size)
@@ -85,3 +87,12 @@ def parse_byte_size(param):
     print(cpu_template)
 uvm.start()
 uvm.get_all_metrics()
+
+kernel_dbg_dir = args.kernel.parent / "debug"
+kernel_dbg = kernel_dbg_dir / args.kernel.name
+print(f"uvm2 with kernel {kernel_dbg} ...")
+uvm2 = vmfcty.build(kernel_dbg, args.rootfs)
+uvm2.spawn()
+uvm2.add_net_iface()
+uvm2.basic_config(vcpu_count=args.vcpus, mem_size_mib=args.guest_mem_size // 2**20)
+uvm2.start()