From a470552d6d02b0f148a3bfc34a04aa8a000af7f2 Mon Sep 17 00:00:00 2001 From: Benjamin Leggett Date: Mon, 25 Aug 2025 21:30:51 -0400 Subject: [PATCH 1/3] Add BTF support to host kernel, rename `zone-debug` to `zone-bpf` --- config.yaml | 2 +- ...zone-debug.fragment.config => zone-bpf.fragment.config} | 5 +++-- configs/x86_64/host.config | 7 +++++++ ...zone-debug.fragment.config => zone-bpf.fragment.config} | 3 ++- hack/build/build.sh | 4 ++-- 5 files changed, 15 insertions(+), 6 deletions(-) rename configs/aarch64/{zone-debug.fragment.config => zone-bpf.fragment.config} (65%) rename configs/x86_64/{zone-debug.fragment.config => zone-bpf.fragment.config} (84%) diff --git a/config.yaml b/config.yaml index 05951121..a47b57ef 100644 --- a/config.yaml +++ b/config.yaml @@ -4,7 +4,7 @@ architectures: - aarch64 flavors: - name: zone -- name: zone-debug +- name: zone-bpf constraints: lower: '6.1' - name: zone-amdgpu diff --git a/configs/aarch64/zone-debug.fragment.config b/configs/aarch64/zone-bpf.fragment.config similarity index 65% rename from configs/aarch64/zone-debug.fragment.config rename to configs/aarch64/zone-bpf.fragment.config index 12e5123b..1de51b8b 100644 --- a/configs/aarch64/zone-debug.fragment.config +++ b/configs/aarch64/zone-bpf.fragment.config @@ -1,12 +1,13 @@ # # Edera kernel config snippet -# - Generated from delta config: configs/aarch64/zone-debug.fragment.config +# - Generated from delta config: configs/aarch64/zone-bpf.fragment.config # - Against base config: configs/aarch64/zone.config # CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_DEBUG_INFO_REDUCED=n +CONFIG_DEBUG_INFO_SPLIT=n CONFIG_DEBUG_INFO_NONE=n CONFIG_DEBUG_INFO_BTF=y CONFIG_DEBUG_INFO_BTF_MODULES=y - +CONFIG_DEBUG_INFO_COMPRESSED_ZSTD=y diff --git a/configs/x86_64/host.config b/configs/x86_64/host.config index 9ad0ceac..f7ce9144 100644 --- a/configs/x86_64/host.config +++ b/configs/x86_64/host.config @@ -5961,3 +5961,10 @@ CONFIG_ARCH_HAS_KCOV=y CONFIG_CC_HAS_SANCOV_TRACE_PC=y CONFIG_ARCH_USE_MEMTEST=y +# BTF support (needed by some eBPF stuff) +CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y +CONFIG_DEBUG_INFO_REDUCED=n +CONFIG_DEBUG_INFO_NONE=n +CONFIG_DEBUG_INFO_BTF=y +CONFIG_DEBUG_INFO_BTF_MODULES=y diff --git a/configs/x86_64/zone-debug.fragment.config b/configs/x86_64/zone-bpf.fragment.config similarity index 84% rename from configs/x86_64/zone-debug.fragment.config rename to configs/x86_64/zone-bpf.fragment.config index 22e77add..a8f51fd5 100644 --- a/configs/x86_64/zone-debug.fragment.config +++ b/configs/x86_64/zone-bpf.fragment.config @@ -6,7 +6,8 @@ CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_DEBUG_INFO_REDUCED=n +CONFIG_DEBUG_INFO_SPLIT=n CONFIG_DEBUG_INFO_NONE=n CONFIG_DEBUG_INFO_BTF=y CONFIG_DEBUG_INFO_BTF_MODULES=y - +CONFIG_DEBUG_INFO_COMPRESSED_ZSTD=y diff --git a/hack/build/build.sh b/hack/build/build.sh index f5561bd5..0d0f4712 100755 --- a/hack/build/build.sh +++ b/hack/build/build.sh @@ -38,8 +38,8 @@ SQUASH_SIZE=$(stat -c %s "${ADDONS_SQUASHFS_PATH}") # We don't really care how big the host kernel is. # Nvidia kernels have chonker firmwares, even compressed (like 200MB total size), so not much we can really do there. case "$KERNEL_FLAVOR" in - zone-debug) - # Skip the check for zone-debug, it is allowed to be big + zone-bpf) + # Skip the check for zone-bpf, it is allowed to be big ;; zone-nvidiagpu) # Firmware means this is unavoidably quite large From 264cd8bf1cc394ca1f1553f747e8d877cfe7eebd Mon Sep 17 00:00:00 2001 From: Benjamin Leggett Date: Tue, 26 Aug 2025 13:37:28 -0400 Subject: [PATCH 2/3] Host kernel build is running out of build space :/ --- .github/workflows/build.yml | 3 +++ .github/workflows/test.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4cca947f..e8be5ed4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,6 +31,9 @@ jobs: with: egress-policy: audit + - name: Maximize build space + uses: ublue-os/remove-unwanted-software@6bdddc50e67c21ebe9d3316539b3a025345fdc81 # v9 + - name: checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 89423f11..6be023e5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,6 +23,9 @@ jobs: with: egress-policy: audit + - name: Maximize build space + uses: ublue-os/remove-unwanted-software@6bdddc50e67c21ebe9d3316539b3a025345fdc81 # v9 + - name: checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: From 02e47372da4d574ce3c145de394568801e21bf73 Mon Sep 17 00:00:00 2001 From: Benjamin Leggett Date: Tue, 26 Aug 2025 14:08:18 -0400 Subject: [PATCH 3/3] use large runner for test too, that should be better --- .github/workflows/build.yml | 3 --- .github/workflows/test.yml | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e8be5ed4..4cca947f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,9 +31,6 @@ jobs: with: egress-policy: audit - - name: Maximize build space - uses: ublue-os/remove-unwanted-software@6bdddc50e67c21ebe9d3316539b3a025345fdc81 # v9 - - name: checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6be023e5..b3c6834e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ env: jobs: test: name: test - runs-on: ubuntu-latest + runs-on: edera-large env: FIRMWARE_URL: "https://cdn.kernel.org/pub/linux/kernel/firmware/linux-firmware-20250410.tar.xz" FIRMWARE_SIG_URL: "https://cdn.kernel.org/pub/linux/kernel/firmware/linux-firmware-20250410.tar.sign" @@ -23,9 +23,6 @@ jobs: with: egress-policy: audit - - name: Maximize build space - uses: ublue-os/remove-unwanted-software@6bdddc50e67c21ebe9d3316539b3a025345fdc81 # v9 - - name: checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: