kernel-6.1: include efa from efa-installer

The EFA driver in the Amazon Linux kernel can have some delay between
when the installer is released and it making it into the kernel tree.
This adds a build step to update the driver from the installer to get
the latest changes as soon as the installer is available.

As part of this change, the `efa.cmake` file was updated to do a serial
execution of the tests to validate the available configurations in the
kernel sources. This is a problem unique to Bottlerocket due to how out
of tree kmod builds are treated.

Signed-off-by: Arnaldo Garcia Rincon <[email protected]>

Author: arnaldo2792

packages/kernel-6.1/2000-config-efa.cmake-execute-config-tests-in-serial.patch

@@ -0,0 +1,41 @@
+From ca4c769ebfd7aa545ace9ebe8df7e250619c1c8e Mon Sep 17 00:00:00 2001
+From: Arnaldo Garcia Rincon <[email protected]>
+Date: Wed, 12 Nov 2025 03:12:41 +0000
+Subject: [PATCH] config/efa.cmake: execute config tests in serial
+
+Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
+---
+ config/efa.cmake | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/config/efa.cmake b/config/efa.cmake
+index 5bdad0b..02fc5f4 100644
+--- a/config/efa.cmake
++++ b/config/efa.cmake
+@@ -53,15 +53,10 @@ include(ProcessorCount)
+ ProcessorCount(max_process)
+ 
+ function(try_compile prologue body success_def fail_def)
+-  # Rate limit processes
+-  process_rl()
+   set_conf_tmp_dir("${prologue}" "${body}")
+-  execute_process(COMMAND ${CMAKE_SOURCE_DIR}/config/runbg.sh ${CMAKE_SOURCE_DIR}/config/compile_conftest.sh ${CMAKE_CURRENT_BINARY_DIR}/${tmp_dir} ${KERNEL_DIR} "${success_def}" "${fail_def}"
++  execute_process(COMMAND ${CMAKE_SOURCE_DIR}/config/compile_conftest.sh ${CMAKE_CURRENT_BINARY_DIR}/${tmp_dir} ${KERNEL_DIR} "${success_def}" "${fail_def}"
+     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-    OUTPUT_VARIABLE pid)
+-  list(APPEND pids ${pid})
+-  set(pids "${pids}" CACHE INTERNAL "")
++    RESULT_VARIABLE res)
+ endfunction()
+ 
+ function(try_compile_dev_or_ops fp_name prologue fn success_def fail_def)
+@@ -535,5 +530,4 @@ struct ib_mr *efa_reg_user_mr_dmabuf(struct ib_pd *ibpd, u64 start, u64 length,
+   "
+   HAVE_REG_USER_MR_DMAH "")
+ 
+-wait_for_pids()
+ message("-- Inspecting kernel - done")
+-- 
+2.50.1
+

packages/kernel-6.1/Cargo.toml

@@ -27,5 +27,9 @@ sha512 = "4bdb01d846f12a04bdbe6902c3008ebadbcb50d4d94e8f81b524c02a4e94da7041cdb5
 url = "https://yum.repos.neuron.amazonaws.com/aws-neuronx-dkms-2.24.7.0.noarch.rpm"
 sha512 = "2892ad1c6c4ff670d8e4aa0151af57b2b437f647a58ffa58901377b2ddeb504a9e4cce6c148643f8340e1ede8bb26ab66039b0a6bbb184bf5d647c6c71720186"
 
+[[package.metadata.build-package.external-files]]
+url = "https://efa-installer.amazonaws.com/aws-efa-installer-1.44.0.tar.gz"
+sha512 = "eaa336d8eb2affed5f5960a133af9f98b2b113c2dde17246c51947324f2318710012e7bced124e73f7113c8261748aaa0f4856063d71340b2d85a7f089551526"
+
 [build-dependencies]
 microcode = { path = "../microcode" }

packages/kernel-6.1/EFACMakeLists.txt.in

@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 3.10)
+project(efa C)
+
+set(KERNEL_VER "__KERNEL_VERSION__")
+set(KERNEL_DIR "__KERNEL_DIR__")
+set(KERNEL_MAKEFILE "__KERNEL_MAKEFILE__")
+
+set(GCOV_PROFILE OFF CACHE BOOL "Enable GCOV profiling")
+set(ENABLE_P2P ON CACHE BOOL "Enable Peer-to-peer memory")
+set(ENABLE_KVERBS ON CACHE BOOL "Enable kernel verbs support")
+
+add_subdirectory(src)

packages/kernel-6.1/kernel-6.1.spec

@@ -14,6 +14,7 @@ Source2: https://yum.repos.neuron.amazonaws.com/aws-neuronx-dkms-2.21.37.0.noarc
 # Use latest-neuron-srpm-url.sh to get this.
 Source3: https://yum.repos.neuron.amazonaws.com/aws-neuronx-dkms-2.24.7.0.noarch.rpm
 Source4: gpgkey-00FA2C1079260870A76D2C285749CAD8646D9185.asc
+Source5: https://efa-installer.amazonaws.com/aws-efa-installer-1.44.0.tar.gz
 
 # Custom Bottlerocket kernel configurations.
 Source100: config-bottlerocket
@@ -44,6 +45,9 @@ Source300: bootconfig-aws.conf
 Source301: bootconfig-vmware.conf
 Source302: bootconfig-metal.conf
 
+# Replace upstream CMakeLists.txt with one that allows overriding kernel paths.
+Source400: EFACMakeLists.txt.in
+
 # Help out-of-tree module builds run `make prepare` automatically.
 Patch1001: 1001-Makefile-add-prepare-target-for-external-modules.patch
 # Expose tools/* targets for out-of-tree module builds.
@@ -59,6 +63,8 @@ Patch1005: 1005-Revert-Revert-drm-fb_helper-improve-CONFIG_FB-depend.patch
 Patch1006: 1006-strscpy-write-destination-buffer-only-once.patch
 # Disable incomplete measurement into PCR 9 on aarch64.
 Patch1007: 1007-efi-libstub-don-t-measure-kernel-command-line-into-P.patch
+# Execute EFA tests in serial; concurrency doesn't work with the `make prepare` patch.
+Patch2000: 2000-config-efa.cmake-execute-config-tests-in-serial.patch
 
 BuildRequires: bc
 BuildRequires: elfutils-devel
@@ -221,7 +227,7 @@ for patch in ${patches[@]}; do
     patch -p1 <../"$patch"
 done
 # Patches listed in this spec (Patch0001...)
-%autopatch -p1
+%autopatch -p1 -m 1000 -M 1999
 
 %if "%{_cross_arch}" == "x86_64"
 microcode="$(find %{_cross_libdir}/firmware -type f -path '*/*-ucode/*' -printf '%%P\n' | sort | tr '\n' ' ')"
@@ -276,14 +282,29 @@ find usr/src/ -mindepth 1 -maxdepth 1 -type d -exec mv {} neuron_latest \;
 rm -r usr
 %endif
 
-%global kmake \
-make -s\\\
-  ARCH="%{_cross_karch}"\\\
-  CROSS_COMPILE="%{_cross_target}-"\\\
-  INSTALL_HDR_PATH="%{buildroot}%{_cross_prefix}"\\\
-  INSTALL_MOD_PATH="%{buildroot}%{_cross_prefix}"\\\
-  INSTALL_MOD_STRIP=1\\\
-%{nil}
+# EFA driver
+tar -xf %{S:5}
+rpm2cpio aws-efa-installer/RPMS/ALINUX2023/%{_cross_arch}/efa-driver/efa-*.%{_cross_arch}.rpm | cpio -idmu './usr/src/efa-*'
+find usr/src/ -mindepth 1 -maxdepth 1 -type d -exec mv {} efa_driver \;
+rm -r aws-efa-installer
+mkdir efa_driver/build
+sed \
+  -e "s|__KERNEL_VERSION__|%{version}|g" \
+  -e "s|__KERNEL_DIR__|%{builddir}/linux-%{version}|g" \
+  -e "s|__KERNEL_MAKEFILE__|%{builddir}/linux-%{version}/Makefile|g" %{S:400} > efa_driver/CMakeLists.txt
+
+pushd efa_driver
+%patch -P 2000 -p1 -d .
+popd
+
+%global kmake %{shrink: \
+make -s \
+  ARCH="%{_cross_karch}" \
+  CROSS_COMPILE="%{_cross_target}-" \
+  INSTALL_HDR_PATH="%{buildroot}%{_cross_prefix}" \
+  INSTALL_MOD_PATH="%{buildroot}%{_cross_prefix}" \
+  INSTALL_MOD_STRIP=1 \
+  %{nil}}
 
 %build
 %kmake mrproper
@@ -296,6 +317,18 @@ make -s\\\
 %kmake %{?_smp_mflags} M=%{_builddir}/neuron_latest
 %endif
 
+# Build EFA driver
+pushd %{_builddir}/efa_driver/build
+sed -i -e 's,$(MAKE),%{kmake},g' ../config/Makefile
+
+# Prevent polluting the parent environment by configuring CMAKE in a subshell
+(
+%{cross_cmake} ..
+)
+
+%kmake %{?_smp_mflags} M=%{_builddir}/efa_driver/build modules
+popd
+
 %install
 %kmake %{?_smp_mflags} headers_install
 %kmake %{?_smp_mflags} modules_install
@@ -309,6 +342,9 @@ mv %{buildroot}%{_cross_kmoddir}/neuron_2_21/neuron.ko.gz %{buildroot}%{_cross_l
 mv %{buildroot}%{_cross_kmoddir}/neuron_latest/neuron.ko.gz %{buildroot}%{_cross_libexecdir}/neuron/neuron_latest/
 %endif
 
+%kmake %{?_smp_mflags} INSTALL_MOD_DIR=efa_driver M=%{_builddir}/efa_driver/build/src V=1 modules_install
+mv %{buildroot}%{_cross_kmoddir}/efa_driver/efa.ko.gz %{buildroot}%{_cross_kmoddir}/kernel/drivers/amazon/net/efa/
+
 install -d %{buildroot}/boot
 install -T -m 0755 arch/%{_cross_karch}/boot/%{_cross_kimage} %{buildroot}/boot/vmlinuz
 install -m 0644 .config %{buildroot}/boot/config