jjb: Refine range of patching for duplicate decls of __force_order

[lttng-ci.git] / scripts / lttng-modules / param-build.sh

diff --git a/scripts/lttng-modules/param-build.sh b/scripts/lttng-modules/param-build.sh
index 6a96fc098610bc4218d525e6a4e9d3ad4ca23d6e..fd13877184758d43f835bc0fc8c21c678ec72c7f 100644 (file)
--- a/scripts/lttng-modules/param-build.sh
+++ b/scripts/lttng-modules/param-build.sh
@@ -346,13 +346,12 @@ 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
+    fi
 
+    if { vergt "${selected_cc_version}" "9"; } && { verlt "${kversion}" "5.6"; } ; then
         # Duplicate decalarations of __force_order
         # @see https://gitlab.com/linux-kernel/stable/-/commit/df6d4f9db79c1a5d6f48b59db35ccd1e9ff9adfc
+        patch_linux_kernel df6d4f9db79c1a5d6f48b59db35ccd1e9ff9adfc
         # However, kaslr_64.c doesn't exit in 4.15, 4.16, it's named pagetable.c
         if [ -f arch/x86/boot/compressed/pagetable.c ] ; then
             sed -i '/^unsigned long __force_order;$/d' arch/x86/boot/compressed/pagetable.c
@@ -367,8 +366,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
@@ -535,6 +537,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