From b0b8f3ea11da88ebdd55961b41bd634bcff97625 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Tue, 13 May 2025 23:24:34 -0700 Subject: [PATCH] LU-18970 kernel: update RHEL 8.10 [4.18.0-553.51.1.el8_10] Update RHEL 8.10 kernel to 4.18.0-553.51.1.el8_10. The patch also provides a fallback series which uses the former base/ext4-delayed-iput.patch for kernel before 4.18.0-553.22.1.el8_10. Lustre-change: https://review.whamcloud.com/59201 Lustre-commit: e1ccf4865dfcaa02c52a6a27440da36779c733a4 Build-Parameters: distro=el8.10 arch=x86_64 Build-Parameters: distro=el9.5 arch=x86_64 Test-Parameters: trivial fstype=ldiskfs mdtcount=4 mdscount=2 \ clientdistro=el8.10 serverdistro=el8.10 testlist=sanity Test-Parameters: optional fstype=zfs mdtcount=4 mdscount=2 \ clientdistro=el8.10 serverdistro=el8.10 testlist=sanity Test-Parameters: optional fstype=ldiskfs mdtcount=4 mdscount=2 \ clientdistro=el8.10 serverdistro=el8.10 testgroup=full-dne-part-1 Test-Parameters: optional fstype=ldiskfs mdtcount=4 mdscount=2 \ clientdistro=el8.10 serverdistro=el8.10 testgroup=full-dne-part-2 Test-Parameters: optional fstype=ldiskfs mdtcount=4 mdscount=2 \ clientdistro=el8.10 serverdistro=el8.10 testgroup=full-dne-part-3 Test-Parameters: optional fstype=zfs mdtcount=4 mdscount=2 \ clientdistro=el8.10 serverdistro=el8.10 testgroup=full-dne-zfs-part-1 Test-Parameters: optional fstype=zfs mdtcount=4 mdscount=2 \ clientdistro=el8.10 serverdistro=el8.10 testgroup=full-dne-zfs-part-2 Test-Parameters: optional fstype=zfs mdtcount=4 mdscount=2 \ clientdistro=el8.10 serverdistro=el8.10 testgroup=full-dne-zfs-part-3 Change-Id: I210fcf4be1bf39a0cb6fc64dcdfa898bb98f87ca Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/59221 Tested-by: Maloo Tested-by: jenkins Reviewed-by: Oleg Drokin Reviewed-by: Yang Sheng Reviewed-by: Alex Deiter --- config/lustre-build-ldiskfs.m4 | 5 ++- config/lustre-build-linux.m4 | 4 ++ .../series/ldiskfs-4.18-rhel8.10-553.series | 44 ++++++++++++++++++++++ lustre/ChangeLog | 4 +- .../kernel_patches/targets/4.18-rhel8.10.target.in | 2 +- lustre/kernel_patches/which_patch | 2 +- 6 files changed, 56 insertions(+), 5 deletions(-) create mode 100644 ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.10-553.series diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4 index 396f46d..d6466ec 100644 --- a/config/lustre-build-ldiskfs.m4 +++ b/config/lustre-build-ldiskfs.m4 @@ -13,7 +13,10 @@ esac AS_IF([test -z "$LDISKFS_SERIES"], [ AS_IF([test x$RHEL_KERNEL = xyes], [ case $RHEL_RELEASE_NO in - 810) LDISKFS_SERIES="4.18-rhel8.10.series" ;; + 810) LDISKFS_SERIES="4.18-rhel8.10.series" + AS_VERSION_COMPARE([$RHEL_RELEASE_STR],[553.22.1], + [LDISKFS_SERIES="4.18-rhel8.10-553.series"],[],[]) + ;; 89) LDISKFS_SERIES="4.18-rhel8.9.series" ;; 88) LDISKFS_SERIES="4.18-rhel8.8.series" ;; 87) LDISKFS_SERIES="4.18-rhel8.7.series" ;; diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4 index db1b2ea..5092648 100644 --- a/config/lustre-build-linux.m4 +++ b/config/lustre-build-linux.m4 @@ -123,12 +123,16 @@ AC_DEFUN([LB_LINUX_RELEASE], [ $LINUX_OBJ/include/$VERSION_HDIR/version.h)$(awk \ '/ RHEL_MINOR / { print [$]3 }' \ $LINUX_OBJ/include/$VERSION_HDIR/version.h) + lb_cv_rhel_kernel_release=$(awk \ + '/ RHEL_RELEASE / { print [$]3 }' \ + $LINUX_OBJ/include/$VERSION_HDIR/version.h | tr -d '"') ]) ]) AS_IF([test -n "$lb_cv_rhel_kernel_version"], [ RHEL_KERNEL="yes" KERNEL_FOUND="yes" RHEL_RELEASE_NO=$lb_cv_rhel_kernel_version + RHEL_RELEASE_STR=$lb_cv_rhel_kernel_release ]) # Check for SuSE diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.10-553.series b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.10-553.series new file mode 100644 index 0000000..ea6a0d1 --- /dev/null +++ b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.10-553.series @@ -0,0 +1,44 @@ +rhel8.1/ext4-inode-version.patch +suse15/ext4-lookup-dotdot.patch +suse15/ext4-print-inum-in-htree-warning.patch +rhel8/ext4-prealloc.patch +ubuntu18/ext4-osd-iop-common.patch +rhel8.7/ext4-misc.patch +rhel8.7/ext4-mballoc-extra-checks.patch +rhel8.7/ext4-hash-indexed-dir-dotdot-update.patch +rhel8.1/ext4-kill-dx-root.patch +rhel8.7/ext4-mballoc-pa-free-mismatch.patch +rhel8.4/ext4-data-in-dirent.patch +rhel8/ext4-nocmtime.patch +base/ext4-htree-lock.patch +rhel8.7/ext4-pdirop.patch +rhel8/ext4-deep-tree.patch +rhel8/ext4-max-dir-size.patch +rhel8.7/ext4-corrupted-inode-block-bitmaps-handling-patches.patch +ubuntu18/ext4-give-warning-with-dir-htree-growing.patch +ubuntu18/ext4-jcb-optimization.patch +rhel8.2/ext4-attach-jinode-in-writepages.patch +rhel8/ext4-dont-check-before-replay.patch +rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch +rhel7.6/ext4-export-orphan-add.patch +rhel8/ext4-export-mb-stream-allocator-variables.patch +rhel8/ext4-simple-blockalloc.patch +rhel8.7/ext4-mballoc-skip-uninit-groups-cr0.patch +rhel8.7/ext4-mballoc-prefetch.patch +rhel8.3/ext4-xattr-disable-credits-check.patch +base/ext4-no-max-dir-size-limit-for-iam-objects.patch +rhel7.6/ext4-dquot-commit-speedup.patch +rhel8.7/ext4-introduce-EXT4_BG_TRIMMED-to-optimize-fstrim.patch +rhel8/ext4-ialloc-uid-gid-and-pass-owner-down.patch +base/ext4-projid-xattrs.patch +rhel8.5/ext4-enc-flag.patch +rhel8/ext4-ext-merge.patch +base/ext4-delayed-iput.patch +rhel8/ext4-add-periodic-superblock-update.patch +rhel8.7/ext4-filename-encode.patch +rhel8/ext4-old_ea_inodes_handling_fix.patch +rhel8.4/ext4-optimize-find_delayed_extent.patch +rhel8/ext4-encdata.patch +rhel8/ext4-race-in-ext4-destroy-inode.patch +rhel8/ext4-mballoc-dense.patch +rhel8/ext4-limit-per-inode-preallocation-list.patch diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 64b6fda..4519c96 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -3,7 +3,7 @@ TBD Whamcloud * 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-553.51.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) @@ -34,7 +34,7 @@ TBD Whamcloud 5.14.0-503.40.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-553.51.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) diff --git a/lustre/kernel_patches/targets/4.18-rhel8.10.target.in b/lustre/kernel_patches/targets/4.18-rhel8.10.target.in index 2952129..5216019 100644 --- a/lustre/kernel_patches/targets/4.18-rhel8.10.target.in +++ b/lustre/kernel_patches/targets/4.18-rhel8.10.target.in @@ -1,5 +1,5 @@ lnxmaj="4.18.0" -lnxrel="553.27.1.el8_10" +lnxrel="553.51.1.el8_10" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm SERIES=4.18-rhel8.10.series diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 6f0c679..59e82b6 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -27,6 +27,6 @@ PATCH SERIES FOR SERVER KERNELS: 4.18-rhel8.7.series 4.18.0-425.3.1.el8 (RHEL 8.7) 4.18-rhel8.8.series 4.18.0-477.27.1.el8 (RHEL 8.8) 4.18-rhel8.9.series 4.18.0-513.24.1.el8 (RHEL 8.9) -4.18-rhel8.10.series 4.18.0-553.27.1.el8 (RHEL 8.10) +4.18-rhel8.10.series 4.18.0-553.51.1.el8 (RHEL 8.10) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1