X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-modules%2Fparam-build.sh;h=e79dc65189e4edf55499dcd7c72c500ab4793a04;hb=a9aea01c2ebb42a5a021a1621e17145b9d1c29da;hp=8594994434a68565a151a3e109e0ad3fef0d7a89;hpb=02c6a56a450847f8c5b88bde837d4006461a7023;p=lttng-ci.git

diff --git a/scripts/lttng-modules/param-build.sh b/scripts/lttng-modules/param-build.sh
index 8594994..e79dc65 100644
--- a/scripts/lttng-modules/param-build.sh
+++ b/scripts/lttng-modules/param-build.sh
@@ -230,6 +230,7 @@ build_linux_kernel() {
     cd "$LINUX_SRCOBJ_DIR"
 
     kversion=$(make -s kernelversion "${make_args[@]}")
+    pahole_version="$(pahole --version | tr -d 'v')"
 
     if { verlt "${kversion}" "3.3"; } && [ "${vanilla_config}" = "imx_v6_v7_defconfig" ] ; then
         # imx_v6_v7 didn't exist before 06965c39b4c63933fa0a1cde2237ef85477c5655
@@ -345,11 +346,6 @@ build_linux_kernel() {
             patch_linux_kernel 854e55ad289ef8888e7991f0ada85d5846f5afb9
         fi
 
-        # More recent compiler optimizations expose build errors with netronome.
-        # It seems easier to disable the driver than to attempt patching.
-        scripts/config --disable CONFIG_NET_VENDOR_NETRONOME
-        scripts/config --disable CONFIG_MICREL_PHY
-
         # Duplicate decalarations of __force_order
         # @see https://gitlab.com/linux-kernel/stable/-/commit/df6d4f9db79c1a5d6f48b59db35ccd1e9ff9adfc
         # However, kaslr_64.c doesn't exit in 4.15, 4.16, it's named pagetable.c
@@ -366,8 +362,11 @@ build_linux_kernel() {
         patch_linux_kernel 9feeb638cde083c737e295c0547f1b4f28e99583
     fi
 
-    if { vergte "${kversion}" "4.12"; } && { verlt "${kversion}" "4.18"; } ; then
-        # Old kernels can fail to build while on newer host kernels
+    if { vergte "${kversion}" "4.12"; } && { verlt "${kversion}" "4.19"; } ; then
+        # Old kernels can fail to build while on newer host kernels with errors
+        # such as:
+        #   In file included from scripts/selinux/genheaders/genheaders.c:19:
+        #   ./security/selinux/include/classmap.h:249:2: error: #error New address family defined, please update secclass_map.
         # @see https://gitlab.com/linux-kernel/stable/-/commit/dfbd199a7cfe3e3cd8531e1353cdbd7175bfbc5e
         #
         patch_linux_kernel dfbd199a7cfe3e3cd8531e1353cdbd7175bfbc5e
@@ -481,6 +480,28 @@ EOF
         fi
     fi
 
+    if [ "$(scripts/config --state CONFIG_DEBUG_INFO_BTF)" == "y" ] &&
+           { vergte "${pahole_version}" "1.24"; } &&
+           { vergte "${kversion}" "5.10"; } && { verlt "${kversion}" "6.0"; } ;then
+        # Some kernels Eg. Ubuntu-hwe-5.13-5.13.0-52.59_20.04.1
+        # fail with the following error:
+        #   BTFIDS  vmlinux
+        #   FAILED: load BTF from vmlinux: Invalid argument
+        #
+        # When CONFIG_DEBUG_INFO_BTF is set, certain versions of pahole require
+        # `--skip_encoding_btf_enum64` to be passed as the kernel doesn't define
+        # BTF_KIND_ENUM64.
+        #
+        # Introduced in 341dfcf8d78eaa3a2dc96dea06f0392eb2978364 (~v5.10)
+        # @see https://lore.kernel.org/bpf/20220825171620.cioobudss6ovyrkc@altlinux.org/t/
+        #
+        if [ -f "scripts/pahole-flags.sh" ] ; then
+            sed -i 's/ -J ${PAHOLE_FLAGS} / -J ${PAHOLE_FLAGS} --skip_encoding_btf_enum64 /' scripts/link-vmlinux.sh
+        else
+            sed -i 's/ -J ${extra_paholeopt} / -J ${extra_paholeopt} --skip_encoding_btf_enum64 /' scripts/link-vmlinux.sh
+        fi
+    fi
+
     # GCC 4.8
     if [ "$HOSTCC" == "gcc-4.8" ]; then
         scripts/config --disable CONFIG_CC_STACKPROTECTOR_STRONG
@@ -512,6 +533,27 @@ EOF
     scripts/config --disable CONFIG_MFD_WM8994
     scripts/config --disable CONFIG_DRM_RADEON
     scripts/config --disable CONFIG_SND_SOC_WM5100
+    # More recent compiler optimizations (from gcc 8 onwards )expose build errors
+    # with netronome on older kernels.
+    # Observed in 4.11-rt, 4.15-4.17, 5.0-rt - 5.16-rt
+    # It seems easier to disable the driver than to attempt patching.
+    # Eg.
+    #   In function ‘ur_load_imm_any’,
+    #   inlined from ‘jeq_imm’ at drivers/net/ethernet/netronome/nfp/bpf/jit.c:3146:13:
+    #   ./include/linux/compiler.h:350:45: error: call to ‘__compiletime_assert_1062’ declared with attribute error: FIELD_FIT: value too large for the field
+    #   350 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
+    #
+    scripts/config --disable CONFIG_NET_VENDOR_NETRONOME
+    # Eg.
+    #  In function ‘memcpy’,
+    #  inlined from ‘kszphy_get_strings’ at drivers/net/phy/micrel.c:664:3:
+    #  ./include/linux/string.h:305:25: error: call to ‘__read_overflow2’ declared with attribute error: detected read beyond size of object passed as 2nd parameter
+    #  305 |                         __read_overflow2();
+    #      |                         ^~~~~~~~~~~~~~~~~~
+    #  make[3]: *** [scripts/Makefile.build:308: drivers/net/phy/micrel.o] Error 1
+    #
+    scripts/config --disable CONFIG_MICREL_PHY
+
 
     # IGBVF won't build with recent gcc on 2.6.38.x
     if { vergte "$kversion" "2.6.37" && verlt "$kversion" "2.6.38"; }; then
@@ -542,7 +584,7 @@ EOF
     make "$update_conf_target" "${make_args[@]}"
     make -j"$NPROC" "${make_args[@]}"
 
-    krelease=$(make -s kernelrelease "${mark_args[@]}")
+    krelease=$(make -s kernelrelease "${make_args[@]}")
 
     # Save the kernel and modules
     mkdir -p "$LINUX_INSTOBJ_DIR/boot"