From 26ef616817d7f158fb2313ca59a2d8737669313b Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Mon, 10 Jun 2024 23:25:06 -0700 Subject: [PATCH] LU-17404 kernel: new kernel [RHEL 9.4 5.14.0-427.20.1.el9_4] This patch makes changes to support new RHEL 9.4 release for Lustre client. Test-Parameters: trivial \ mdtcount=4 mdscount=2 clientdistro=el9.4 testlist=sanity Test-Parameters: optional clientdistro=el9.4 testgroup=full-part-1 Test-Parameters: optional clientdistro=el9.4 testgroup=full-part-2 Test-Parameters: optional clientdistro=el9.4 testgroup=full-part-3 Change-Id: Ic292c01ad16dc06e8dee966c4a211896fea284c0 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/54712 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Yang Sheng Reviewed-by: Oleg Drokin --- contrib/lbuild/funcs.sh | 1 + lustre/ChangeLog | 3 ++- lustre/autoconf/lustre-core.m4 | 1 + .../kernel_patches/targets/5.14-rhel9.4.target.in | 26 ++++++++++++++++++++++ lustre/tests/sanity.sh | 5 ++++- 5 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 lustre/kernel_patches/targets/5.14-rhel9.4.target.in diff --git a/contrib/lbuild/funcs.sh b/contrib/lbuild/funcs.sh index 3261a47..1627f0c 100644 --- a/contrib/lbuild/funcs.sh +++ b/contrib/lbuild/funcs.sh @@ -210,6 +210,7 @@ autodetect_target() { rhel-9.1) target="5.14-rhel9.1";; rhel-9.2) target="5.14-rhel9.2";; rhel-9.3) target="5.14-rhel9.3";; + rhel-9.4) target="5.14-rhel9.4";; 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 43a105a..bf16c5e 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -36,8 +36,8 @@ TBD Whamcloud 5.10.0-153.19.0.95.oe2203sp2 (openEuler 22.03 LTS SP2) * ldiskfs needs an ldiskfs patch series for that kernel, ZFS does not * Client primary kernels built and tested during release cycle: + 5.14.0-427.20.1.el9 (RHEL9.4) 5.14.0-362.24.1.el9 (RHEL9.3) - 5.14.0-284.30.1.el9 (RHEL9.2) 4.18.0-553.el8 (RHEL8.10) 4.18.0-513.24.1.el8 (RHEL8.9) 4.18.0-477.27.1.el8 (RHEL8.8) @@ -61,6 +61,7 @@ TBD Whamcloud 4.18.0-425.10.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) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 98d5d8c..a37281bb 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -5571,6 +5571,7 @@ lustre/doc/Makefile lustre/include/Makefile lustre/include/lustre/Makefile lustre/include/uapi/linux/lustre/Makefile +lustre/kernel_patches/targets/5.14-rhel9.4.target lustre/kernel_patches/targets/5.14-rhel9.3.target lustre/kernel_patches/targets/5.14-rhel9.2.target lustre/kernel_patches/targets/5.14-rhel9.1.target diff --git a/lustre/kernel_patches/targets/5.14-rhel9.4.target.in b/lustre/kernel_patches/targets/5.14-rhel9.4.target.in new file mode 100644 index 0000000..2489369 --- /dev/null +++ b/lustre/kernel_patches/targets/5.14-rhel9.4.target.in @@ -0,0 +1,26 @@ +lnxmaj="5.14.0" +lnxrel="427.20.1.el9_4" + +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 diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 2914fb4..e7fbfa6 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -83,7 +83,10 @@ fi # Check if running on specific distros to skip certain subtests if [[ "$CLIENT_OS_ID_LIKE" =~ "rhel" ]]; then - if (( $CLIENT_OS_VERSION_CODE == $(version_code 9.3.0) )); then + if (( $CLIENT_OS_VERSION_CODE >= $(version_code 9.4.0) )); then + always_except LU-17927 119e 119f 119g 119h + fi + if (( $CLIENT_OS_VERSION_CODE >= $(version_code 9.3.0) )); then # disable test_906 temporarily until rhel9.3 solves the # failure on fio io_uring I/O engine. always_except LU-17289 906 -- 1.8.3.1