From: Li Dongyang Date: Fri, 12 Nov 2021 12:30:43 +0000 (+1100) Subject: LU-15208 ldiskfs: add support for Ubuntu20 kernel 5.4.0.90 X-Git-Tag: 2.14.56~4 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=dacdcb037f6385fd8156614f5a689ee695553353 LU-15208 ldiskfs: add support for Ubuntu20 kernel 5.4.0.90 Also fix the lustre-build-ldiskfs.m4 to select correct series file. We use -ge to check the kernel release version, so greater version should come on top. Change-Id: Id6b599ef5b2ea823e203aaa6a40917e49f98f4d9 Test-Parameters: trivial Signed-off-by: Li Dongyang Reviewed-on: https://review.whamcloud.com/45547 Reviewed-by: James Simmons Tested-by: jenkins Tested-by: Maloo Reviewed-by: Jian Yu Reviewed-by: Oleg Drokin --- diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4 index 20acbde..2ce5684 100644 --- a/config/lustre-build-ldiskfs.m4 +++ b/config/lustre-build-ldiskfs.m4 @@ -107,11 +107,12 @@ AS_IF([test x$RHEL_KERNEL = xyes], [ AS_IF( [test -z "$KPLEV"], [ AC_MSG_WARN([Failed to determine Kernel patch level. Assume latest.]) - LDISKFS_SERIES="5.4.0-80-ubuntu20.series" + LDISKFS_SERIES="5.4.0-90-ubuntu20.series" ], [test $KPLEV -eq 1007], [LDISKFS_SERIES="5.4.0-42-ubuntu20.series"], - [test $KPLEV -ge 66], [LDISKFS_SERIES="5.4.0-66-ubuntu20.series"], + [test $KPLEV -ge 90], [LDISKFS_SERIES="5.4.0-90-ubuntu20.series"], [test $KPLEV -ge 80], [LDISKFS_SERIES="5.4.0-80-ubuntu20.series"], + [test $KPLEV -ge 66], [LDISKFS_SERIES="5.4.0-66-ubuntu20.series"], [LDISKFS_SERIES="5.4.0-42-ubuntu20.series"] ) ], diff --git a/ldiskfs/kernel_patches/patches/ubuntu2004/ext4-misc.patch b/ldiskfs/kernel_patches/patches/ubuntu2004/ext4-misc.patch new file mode 100644 index 0000000..1fe02a0 --- /dev/null +++ b/ldiskfs/kernel_patches/patches/ubuntu2004/ext4-misc.patch @@ -0,0 +1,189 @@ +Index: linux-4.18.0-80.1.2.el8_0/fs/ext4/ext4.h +=================================================================== +--- linux-4.18.0-80.1.2.el8_0.orig/fs/ext4/ext4.h ++++ linux-4.18.0-80.1.2.el8_0/fs/ext4/ext4.h +@@ -1591,6 +1591,8 @@ static inline void ext4_clear_state_flag + */ + #define NEXT_ORPHAN(inode) EXT4_I(inode)->i_dtime + ++#define JOURNAL_START_HAS_3ARGS 1 ++ + /* + * Codes for operating systems + */ +@@ -1805,7 +1807,21 @@ static inline bool ext4_has_unknown_ext# + + EXTN_FEATURE_FUNCS(2) + EXTN_FEATURE_FUNCS(3) +-EXTN_FEATURE_FUNCS(4) ++static inline bool ext4_has_unknown_ext4_compat_features(struct super_block *sb) ++{ ++ return ((EXT4_SB(sb)->s_es->s_feature_compat & ++ cpu_to_le32(~EXT4_FEATURE_COMPAT_SUPP)) != 0); ++} ++static inline bool ext4_has_unknown_ext4_ro_compat_features(struct super_block *sb) ++{ ++ return ((EXT4_SB(sb)->s_es->s_feature_ro_compat & ++ cpu_to_le32(~EXT4_FEATURE_RO_COMPAT_SUPP)) != 0); ++} ++static inline bool ext4_has_unknown_ext4_incompat_features(struct super_block *sb) ++{ ++ return ((EXT4_SB(sb)->s_es->s_feature_incompat & ++ cpu_to_le32(~EXT4_FEATURE_INCOMPAT_SUPP)) != 0); ++} + + static inline bool ext4_has_compat_features(struct super_block *sb) + { +@@ -3111,6 +3127,11 @@ struct ext4_extent; + + extern int ext4_ext_tree_init(handle_t *handle, struct inode *); + extern int ext4_ext_writepage_trans_blocks(struct inode *, int); ++extern struct buffer_head *ext4_read_inode_bitmap(struct super_block *sb, ++ ext4_group_t block_group); ++extern struct buffer_head *ext4_append(handle_t *handle, ++ struct inode *inode, ++ ext4_lblk_t *block); + extern int ext4_ext_index_trans_blocks(struct inode *inode, int extents); + extern int ext4_ext_map_blocks(handle_t *handle, struct inode *inode, + struct ext4_map_blocks *map, int flags); +Index: linux-4.18.0-80.1.2.el8_0/fs/ext4/ialloc.c +=================================================================== +--- linux-4.18.0-80.1.2.el8_0.orig/fs/ext4/ialloc.c ++++ linux-4.18.0-80.1.2.el8_0/fs/ext4/ialloc.c +@@ -114,7 +114,7 @@ verified: + * + * Return buffer_head of bitmap on success or NULL. + */ +-static struct buffer_head * ++struct buffer_head * + ext4_read_inode_bitmap(struct super_block *sb, ext4_group_t block_group) + { + struct ext4_group_desc *desc; +@@ -211,6 +211,7 @@ out: + put_bh(bh); + return ERR_PTR(err); + } ++EXPORT_SYMBOL(ext4_read_inode_bitmap); + + /* + * NOTE! When we get the inode, we're the only people +Index: linux-4.18.0-240.1.1.el8/fs/ext4/inode.c +=================================================================== +--- linux-4.18.0-240.1.1.el8.orig/fs/ext4/inode.c ++++ linux-4.18.0-240.1.1.el8/fs/ext4/inode.c +@@ -6343,3 +6343,18 @@ vm_fault_t ext4_filemap_fault(struct vm_ + + return ret; + } ++EXPORT_SYMBOL(ext4_map_blocks); ++EXPORT_SYMBOL(ext4_truncate); ++EXPORT_SYMBOL(ext4_iget); ++EXPORT_SYMBOL(ext4_bread); ++EXPORT_SYMBOL(ext4_itable_unused_count); ++EXPORT_SYMBOL(ext4_force_commit); ++EXPORT_SYMBOL(ext4_mark_inode_dirty); ++EXPORT_SYMBOL(ext4_get_group_desc); ++EXPORT_SYMBOL(__ext4_journal_get_write_access); ++EXPORT_SYMBOL(__ext4_journal_start_sb); ++EXPORT_SYMBOL(__ext4_journal_stop); ++EXPORT_SYMBOL(__ext4_handle_dirty_metadata); ++EXPORT_SYMBOL(__ext4_std_error); ++EXPORT_SYMBOL(ext4fs_dirhash); ++EXPORT_SYMBOL(ext4_get_inode_loc); +Index: linux-4.18.0-80.1.2.el8_0/fs/ext4/namei.c +=================================================================== +--- linux-4.18.0-80.1.2.el8_0.orig/fs/ext4/namei.c ++++ linux-4.18.0-80.1.2.el8_0/fs/ext4/namei.c +@@ -49,7 +49,7 @@ + #define NAMEI_RA_BLOCKS 4 + #define NAMEI_RA_SIZE (NAMEI_RA_CHUNKS * NAMEI_RA_BLOCKS) + +-static struct buffer_head *ext4_append(handle_t *handle, ++struct buffer_head *ext4_append(handle_t *handle, + struct inode *inode, + ext4_lblk_t *block) + { +@@ -160,6 +160,7 @@ static struct buffer_head *__ext4_read_d + } + return bh; + } ++EXPORT_SYMBOL(ext4_append); + + #ifndef assert + #define assert(test) J_ASSERT(test) +@@ -2415,23 +2416,25 @@ EXPORT_SYMBOL(ext4_delete_entry); + * for checking S_ISDIR(inode) (since the INODE_INDEX feature will not be set + * on regular files) and to avoid creating huge/slow non-HTREE directories. + */ +-static void ext4_inc_count(handle_t *handle, struct inode *inode) ++void ext4_inc_count(handle_t *handle, struct inode *inode) + { + inc_nlink(inode); + if (is_dx(inode) && + (inode->i_nlink > EXT4_LINK_MAX || inode->i_nlink == 2)) + set_nlink(inode, 1); + } ++EXPORT_SYMBOL(ext4_inc_count); + + /* + * If a directory had nlink == 1, then we should let it be 1. This indicates + * directory has >EXT4_LINK_MAX subdirs. + */ +-static void ext4_dec_count(handle_t *handle, struct inode *inode) ++void ext4_dec_count(handle_t *handle, struct inode *inode) + { + if (!S_ISDIR(inode->i_mode) || inode->i_nlink > 2) + drop_nlink(inode); + } ++EXPORT_SYMBOL(ext4_dec_count); + + + static int ext4_add_nondir(handle_t *handle, +Index: linux-4.18.0-240.1.1.el8/fs/ext4/super.c +=================================================================== +--- linux-4.18.0-240.1.1.el8.orig/fs/ext4/super.c ++++ linux-4.18.0-240.1.1.el8/fs/ext4/super.c +@@ -366,7 +366,7 @@ static void __save_error_info(struct sup + return; + es->s_state |= cpu_to_le16(EXT4_ERROR_FS); + ext4_update_tstamp(es, s_last_error_time); +- strncpy(es->s_last_error_func, func, sizeof(es->s_last_error_func)); ++ strlcpy(es->s_last_error_func, func, sizeof(es->s_last_error_func)); + es->s_last_error_line = cpu_to_le32(line); + es->s_last_error_ino = cpu_to_le32(ino); + es->s_last_error_block = cpu_to_le64(block); +@@ -427,7 +427,7 @@ static void __save_error_info(struct sup + if (!es->s_first_error_time) { + es->s_first_error_time = es->s_last_error_time; + es->s_first_error_time_hi = es->s_last_error_time_hi; +- strncpy(es->s_first_error_func, func, ++ strlcpy(es->s_first_error_func, func, + sizeof(es->s_first_error_func)); + es->s_first_error_line = cpu_to_le32(line); + es->s_first_error_ino = es->s_last_error_ino; +@@ -6152,16 +6152,12 @@ static int __init ext4_init_fs(void) + err = init_inodecache(); + if (err) + goto out1; +- register_as_ext3(); +- register_as_ext2(); + err = register_filesystem(&ext4_fs_type); + if (err) + goto out; + + return 0; + out: +- unregister_as_ext2(); +- unregister_as_ext3(); + destroy_inodecache(); + out1: + ext4_exit_mballoc(); +@@ -6182,8 +6178,6 @@ out6: + static void __exit ext4_exit_fs(void) + { + ext4_destroy_lazyinit_thread(); +- unregister_as_ext2(); +- unregister_as_ext3(); + unregister_filesystem(&ext4_fs_type); + destroy_inodecache(); + ext4_exit_mballoc(); diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-90-ubuntu20.series b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-90-ubuntu20.series new file mode 100644 index 0000000..beeecbd --- /dev/null +++ b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-90-ubuntu20.series @@ -0,0 +1,30 @@ +rhel8/ext4-inode-version.patch +linux-5.4/ext4-lookup-dotdot.patch +suse15/ext4-print-inum-in-htree-warning.patch +rhel8/ext4-prealloc.patch +ubuntu18/ext4-osd-iop-common.patch +ubuntu2004/ext4-misc.patch +rhel8.3/ext4-mballoc-extra-checks.patch +linux-5.4/ext4-hash-indexed-dir-dotdot-update.patch +linux-5.4/ext4-kill-dx-root.patch +rhel7.6/ext4-mballoc-pa-free-mismatch.patch +linux-5.4/ext4-data-in-dirent.patch +rhel8/ext4-nocmtime.patch +base/ext4-htree-lock.patch +ubuntu2004/ext4-pdirop.patch +linux-5.8/ext4-max-dir-size.patch +rhel8.3/ext4-corrupted-inode-block-bitmaps-handling-patches.patch +linux-5.4/ext4-give-warning-with-dir-htree-growing.patch +ubuntu18/ext4-jcb-optimization.patch +linux-5.4/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 +ubuntu19/ext4-iget-with-flags.patch +linux-5.4/export-ext4fs-dirhash-helper.patch +linux-5.4/ext4-misc.patch +linux-5.4/ext4-simple-blockalloc.patch +linux-5.4/ext4-xattr-disable-credits-check.patch +base/ext4-no-max-dir-size-limit-for-iam-objects.patch +rhel8/ext4-ialloc-uid-gid-and-pass-owner-down.patch