Skip to contentSkip to conversation

fix the SDK kernel module test

PATCH New Trevor Woerner 1 participant 3 messages Aug 22

lore
Share & tools
lore
#0 lore raw

v3 cover fix the SDK kernel module test

The kernel module test in the SDK test suite does not pass today.

The cryptodev revision it builds no longer builds against kernel 6.18, and the kernel's host tools are compiled with a pkg-config that the SDK environment has pointed at the target sysroot, so a host compile is handed target include paths and fails under -Werror. OE-Core already solves the second one for its own kernel builds, where kernel.bbclass passes HOSTPKG_CONFIG=pkg-config-native; the SDK simply had no equivalent.

These are independent of any SDK feature work and fix a test that is broken in master today.

Changes in v3:
- the kernel module test asks for pkg-config-native, the wrapper kernel.bbclass already gives its own host tools, rather than spelling out an env -u invocation of the SDK's own pkg-config

Changes in v2:
- the SDK environment script no longer exports HOSTPKG_CONFIG. That half only ever took effect against a proposed kernel change that has since been abandoned, so nothing honoured it. The make command line assignment, which is what makes the test work, is unchanged
- the second patch loses its toolchain-scripts subject prefix, since it no longer touches that file

Trevor Woerner (2):
oeqa/sdk: update cryptodev to a revision that builds on kernel 6.18 oeqa/sdk: build the kernel's host tools with a host pkg-config

 meta/lib/oeqa/sdk/cases/kmod.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
Signature · 1 line
2.50.0.173.g8b6f19ccfc3a
#1 lore raw

PATCH v3 1/2 oeqa/sdk: update cryptodev to a revision that builds on kernel 6.18

The out-of-tree kernel module test pins a cryptodev-linux revision from before the 1.14 release, which predates the removal of crypto_ahash_alignmask() from the kernel and so no longer compiles:

cryptlib.c:384:28: error: implicit declaration of function 'crypto_ahash_alignmask' [-Wimplicit-function-declaration]

Move to upstream's "Fix build for Linux 6.18-rc1", which is the revision that restores compatibility.

AI-Generated: codex/claude-opus 5 (xhigh)

---
changes in v3:
- none

changes in v2:
- none

---
 meta/lib/oeqa/sdk/cases/kmod.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/lib/oeqa/sdk/cases/kmod.py +2 -2
index 0c4d8ddb543f..1be23e994fd2 100644
@@ -31,8 +31,8 @@ class KernelModuleTest(OESDKTestCase):
 
         with tempfile.TemporaryDirectory(prefix="cryptodev", dir=self.tc.sdk_dir) as testdir:
             git_url = "https://github.com/cryptodev-linux/cryptodev-linux"
-            # This is a knnown-good commit post-1.13 that builds with kernel 6.7+
-            git_sha = "bb8bc7cf60d2c0b097c8b3b0e807f805b577a53f"
+            # This is a known-good commit post-1.14 that builds with kernel 6.18+
+            git_sha = "08644db02d43478f802755903212f5ee506af73b"
 
             sourcedir = os.path.join(testdir, "cryptodev-linux")
             subprocess.check_output(["git", "clone", git_url, sourcedir], stderr=subprocess.STDOUT)
Signature · 1 line
2.50.0.173.g8b6f19ccfc3a
#2 lore raw

PATCH v3 2/2 oeqa/sdk: build the kernel's host tools with a host pkg-config

In reply to Trevor Woerner

The SDK environment sets PKG_CONFIG_SYSROOT_DIR, PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR so that pkg-config answers for the target. That is right for everything built to run there and wrong for a program built to run on the SDK host.

The kernel build compiles host tools of its own, and objtool queries pkg-config for the libelf include path. The answer is the target's include directory, so a host tool is compiled against the target's C library headers, and the build stops on warnings that -Wno-system-headers would otherwise have covered:

usr/include/sys/cdefs.h:486: error: "__attribute_const__" redefined

Pass pkg-config-native on the make command line when the test builds an external module. The SDK already ships that wrapper, it already answers for the build machine, and kernel.bbclass already gives its own host tools the same one, so the two agree rather than each undoing the environment in its own way. It has to be a command line assignment: the kernel assigns HOSTPKG_CONFIG with '=', so an exported value is ignored.

Fixes [YOCTO #16239].

AI-Generated: codex/claude-opus 5 (xhigh)

---
changes in v3:
- use pkg-config-native, the wrapper kernel.bbclass already gives its own host tools, instead of spelling out an env -u invocation of the SDK's pkg-config

changes in v2:
- drop the HOSTPKG_CONFIG export from the SDK environment script. It only ever took effect against a proposed kernel change that has since been abandoned, so no kernel honours it and it was dead weight. The make command line assignment, which is what makes the test work, is unchanged
- the subject loses its toolchain-scripts prefix, since that file is no longer touched
- drop the paragraph citing the kernel proposal

---
 meta/lib/oeqa/sdk/cases/kmod.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
meta/lib/oeqa/sdk/cases/kmod.py +6 -2
index 1be23e994fd2..a55071a3e79a 100644
@@ -26,8 +26,12 @@ class KernelModuleTest(OESDKTestCase):
         parallel_make = "-j %d" % (pmv) if pmv else ""
 
         self.ensure_target_package("kernel-devsrc")
+        # the kernel assigns HOSTPKG_CONFIG with '=', so it has to come from
+        # the make command line, and kernel.bbclass already gives its own
+        # host tools this same wrapper
+        host_pkg_config = 'HOSTPKG_CONFIG="pkg-config-native"'
         # These targets need to be built before kernel modules can be built.
-        self._run("make %s -C $OECORE_TARGET_SYSROOT/usr/src/kernel prepare scripts" % (parallel_make))
+        self._run("make %s %s -C $OECORE_TARGET_SYSROOT/usr/src/kernel prepare scripts" % (parallel_make, host_pkg_config))
 
         with tempfile.TemporaryDirectory(prefix="cryptodev", dir=self.tc.sdk_dir) as testdir:
             git_url = "https://github.com/cryptodev-linux/cryptodev-linux"
@@ -39,5 +43,5 @@ class KernelModuleTest(OESDKTestCase):
             self.assertTrue(os.path.isdir(sourcedir))
             subprocess.check_output(["git", "-C", sourcedir, "checkout", git_sha], stderr=subprocess.STDOUT)
 
-            self._run("make -C %s V=1 KERNEL_DIR=$OECORE_TARGET_SYSROOT/usr/src/kernel" % sourcedir)
+            self._run("make -C %s V=1 %s KERNEL_DIR=$OECORE_TARGET_SYSROOT/usr/src/kernel" % (sourcedir, host_pkg_config))
             self.check_elf(os.path.join(sourcedir, "cryptodev.ko"))
Signature · 1 line
2.50.0.173.g8b6f19ccfc3a