From 6e2ceedf78799d406ec9cfac94f87f8922e1876a Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Fri, 9 May 2025 13:21:43 -0700 Subject: [PATCH] LU-18668 kernel: new kernel [RHEL 9.6 5.14.0-570.16.1.el9_6] This patch makes changes to support new RHEL 9.6 release for Lustre client. Test-Parameters: trivial \ mdtcount=4 mdscount=2 clientdistro=el9.6 testlist=sanity Test-Parameters: optional clientdistro=el9.6 testgroup=full-part-1 Test-Parameters: optional clientdistro=el9.6 testgroup=full-part-2 Test-Parameters: optional clientdistro=el9.6 testgroup=full-part-3 Lustre-change: https://review.whamcloud.com/57876 Lustre-commit: TBD (from fb56a56e6a9620801a938e28cd539b6fb0065bf2) Change-Id: Idf8c96ee9389978d9497da73b05c5ed400c429d4 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/59063 Tested-by: jenkins Reviewed-by: Oleg Drokin --- contrib/lbuild/funcs.sh | 1 + lustre/ChangeLog | 84 ++++++++++++++++++++++ lustre/autoconf/lustre-core.m4 | 1 + .../kernel_patches/targets/5.14-rhel9.6.target.in | 26 +++++++ 4 files changed, 112 insertions(+) create mode 100644 lustre/kernel_patches/targets/5.14-rhel9.6.target.in diff --git a/contrib/lbuild/funcs.sh b/contrib/lbuild/funcs.sh index 0dfbce8..3170810 100644 --- a/contrib/lbuild/funcs.sh +++ b/contrib/lbuild/funcs.sh @@ -198,6 +198,7 @@ autodetect_target() { rhel-9.3) target="5.14-rhel9.3";; rhel-9.4) target="5.14-rhel9.4";; rhel-9.5) target="5.14-rhel9.5";; + rhel-9.6) target="5.14-rhel9.6";; sles11.4) target="$(uname -r | cut -d . -f 1,2)-sles11sp4";; sles11.3) target="$(uname -r | cut -d . -f 1,2)-sles11sp3";; sles11*) target="$(uname -r | cut -d . -f 1,2)-sles11";; diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 1e32e4a..0dc42d8 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -1,3 +1,87 @@ +TBD Whamcloud + * version 2.15.7 + * See https://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix + for currently supported client and server kernel versions. + * Server primary kernels built and tested during release cycle: + 4.18.0-553.27.1.el8 (RHEL8.10) + 4.18.0-513.24.1.el8 (RHEL8.9) + * Other server kernels known to build and work at some point (others may also work): + 3.10.0-862.14.4.el7 (RHEL7.5) + 3.10.0-957.27.2.el7 (RHEL7.6) + 3.10.0-1062.18.1.el7 (RHEL7.7) + 3.10.0-1127.19.1.el7 (RHEL7.8) + 3.10.0-1160.88.1.el7 (RHEL7.9) + 4.18.0-80.11.2.el8 (RHEL8.0) + 4.18.0-147.8.1.el8 (RHEL8.1) + 4.18.0-193.28.1.el8 (RHEL8.2) + 4.18.0-240.22.1.el8 (RHEL8.3) + 4.18.0-305.25.1.el8 (RHEL8.4) + 4.18.0-348.23.1.el8 (RHEL8.5) + 4.18.0-372.32.1.el8 (RHEL8.6) + 4.18.0-425.3.1.el8 (RHEL8.7) + 4.18.0-477.27.1.el8 (RHEL8.8) + 4.4.120-92.70 (SLES12 SP2) + 4.4.180-94.100 (SLES12 SP3) + 4.4.0-131 (Ubuntu 16.04) + 4.15.0-32 (Ubuntu 18.04) + 5.4.0-48 (Ubuntu 20.04) + vanilla linux 5.4.0 (ZFS + ldiskfs) + vanilla linux 5.4.21 (ZFS + ldiskfs) + vanilla linux 5.4.136 (ZFS + ldiskfs) + * ldiskfs needs an ldiskfs patch series for that kernel, ZFS does not + * Client primary kernels built and tested during release cycle: + 5.14.0-570.16.1.el9 (RHEL9.6) + 5.14.0-503.14.1.el9 (RHEL9.5) + 5.14.0-427.42.1.el9 (RHEL9.4) + 5.14.0-362.24.1.el9 (RHEL9.3) + 4.18.0-553.27.1.el8 (RHEL8.10) + 4.18.0-513.24.1.el8 (RHEL8.9) + 4.18.0-477.27.1.el8 (RHEL8.8) + 5.15.0-88 (Ubuntu 22.04) + 5.4.0-110 (Ubuntu 20.04) + 5.14.21-150500.55.65 (SLES15 SP5) + 5.14.21-150400.24.100 (SLES15 SP4) + * Other clients known to build on these kernels at some point (others may also work): + 3.10.0-862.14.4.el7 (RHEL7.5) + 3.10.0-957.27.2.el7 (RHEL7.6) + 4.14.0-49.13.1.el7a (RHEL7.5) + 4.14.0-115.2.2.el7a (RHEL7.6) + 3.10.0-1062.18.1.el7 (RHEL7.7) + 3.10.0-1127.19.1.el7 (RHEL7.8) + 3.10.0-1160.88.1.el7 (RHEL7.9) + 4.18.0-80.11.2.el8 (RHEL8.0) + 4.18.0-147.8.1.el8 (RHEL8.1) + 4.18.0-193.28.1.el8 (RHEL8.2) + 4.18.0-240.22.1.el8 (RHEL8.3) + 4.18.0-305.25.1.el8 (RHEL8.4) + 4.18.0-348.23.1.el8 (RHEL8.5) + 4.18.0-372.32.1.el8 (RHEL8.6) + 4.18.0-425.3.1.el8 (RHEL8.7) + 5.14.0-70.30.1.el9 (RHEL9.0) + 5.14.0-162.23.1.el9 (RHEL9.1) + 5.14.0-284.30.1.el9 (RHEL9.2) + 4.4.120-92.70 (SLES12 SP2) + 4.4.180-94.100 (SLES12 SP3) + 4.12.14-95.48 (SLES12 SP4) + 4.12.14-122.91 (SLES12 SP5) + 4.12.14-197.75 (SLES15 SP1) + 5.3.18-24.96 (SLES15 SP2) + 5.3.18-150300.59.93 (SLES15 SP3) + 4.4.0-131 (Ubuntu 16.04) + 4.15.0-48 (Ubuntu 18.04) + 5.8.0-53 (Ubuntu 20.04.2 HWE) + 5.11.0-31 (Ubuntu 20.04.3 HWE) + 5.11.0 (vanilla kernel.org) + * Recommended e2fsprogs version: 1.47.2-wc1 or newer + * Recommended ZFS version: 2.1.15 + * NFS export disabled when stack size < 8192 (32-bit Lustre clients), + since the NFSv4 export of Lustre filesystem with 4K stack may cause a + stack overflow. For more information, please refer to bugzilla 17630. + * NFSv4 reexport to 32-bit NFS client nodes requires Lustre client on + the re-exporting nodes to be mounted with "32bitapi" mount option + +-------------------------------------------------------------------------------- + 2024-11-27 Whamcloud * version 2.15.6 * See https://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 8f2c281..1fb10d1 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -5064,6 +5064,7 @@ lustre/doc/Makefile lustre/include/Makefile lustre/include/lustre/Makefile lustre/include/uapi/linux/lustre/Makefile +lustre/kernel_patches/targets/5.14-rhel9.6.target lustre/kernel_patches/targets/5.14-rhel9.5.target lustre/kernel_patches/targets/5.14-rhel9.4.target lustre/kernel_patches/targets/5.14-rhel9.3.target diff --git a/lustre/kernel_patches/targets/5.14-rhel9.6.target.in b/lustre/kernel_patches/targets/5.14-rhel9.6.target.in new file mode 100644 index 0000000..e19e98b --- /dev/null +++ b/lustre/kernel_patches/targets/5.14-rhel9.6.target.in @@ -0,0 +1,26 @@ +lnxmaj="5.14.0" +lnxrel="570.16.1.el9_6" + +KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm +SERIES="" +EXTRA_VERSION=${lnxrel}_lustre.@VERSION@ +LUSTRE_VERSION=@VERSION@ + +DEVEL_PATH_ARCH_DELIMETER="." +OFED_VERSION=inkernel + +BASE_ARCHS="i686 x86_64 ia64 ppc64" +BIGMEM_ARCHS="" +BOOT_ARCHS="" +JENSEN_ARCHS="" +#SMP_ARCHS="i686 x86_64 ia64 ppc64" +# RHEL8 doesn't use smp specific kernels +SMP_ARCHS="" +UP_ARCHS="" + +for cc in gcc ; do + if which $cc >/dev/null 2>/dev/null ; then + export CC=$cc + break + fi +done -- 1.8.3.1