X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=config%2Flustre-build-ldiskfs.m4;h=63b4e7b00daded0b30d0cf4f727cf1b61812cdeb;hb=1989badcd5d21f04074e7b10e494498942f4f97e;hp=2217f50976f7cb3d26a446d6def39b4edb465eb2;hpb=9067f1b50aaeae2a79dfa9f777f96637c3d4bb05;p=fs%2Flustre-release.git diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4 index 2217f50..63b4e7b 100644 --- a/config/lustre-build-ldiskfs.m4 +++ b/config/lustre-build-ldiskfs.m4 @@ -2,17 +2,37 @@ # LDISKFS_LINUX_SERIES # AC_DEFUN([LDISKFS_LINUX_SERIES], [ -LDISKFS_SERIES= AC_MSG_CHECKING([which ldiskfs series to use]) +case x$LDISKFS_SERIES in + x) # not set + ;; + *.series) # set externally + ;; + *) LDISKFS_SERIES= +esac +AS_IF([test -z "$LDISKFS_SERIES"], [ AS_IF([test x$RHEL_KERNEL = xyes], [ case $RHEL_RELEASE_NO in + 81) LDISKFS_SERIES="4.18-rhel8.1.series" ;; + 80) LDISKFS_SERIES="4.18-rhel8.series" ;; + 77) LDISKFS_SERIES="3.10-rhel7.7.series" ;; + 76) LDISKFS_SERIES="3.10-rhel7.6.series" ;; + 75) LDISKFS_SERIES="3.10-rhel7.5.series" ;; + 74) LDISKFS_SERIES="3.10-rhel7.4.series" ;; + 73) LDISKFS_SERIES="3.10-rhel7.3.series" ;; + 72) LDISKFS_SERIES="3.10-rhel7.2.series" ;; 71) LDISKFS_SERIES="3.10-rhel7.series" ;; + 69) LDISKFS_SERIES="2.6-rhel6.9.series" ;; + 68) LDISKFS_SERIES="2.6-rhel6.8.series" ;; + 67) LDISKFS_SERIES="2.6-rhel6.7.series" ;; 66) LDISKFS_SERIES="2.6-rhel6.6.series" ;; 65) LDISKFS_SERIES="2.6-rhel6.5.series" ;; 64) LDISKFS_SERIES="2.6-rhel6.4.series" ;; 6[0-3]) LDISKFS_SERIES="2.6-rhel6.series" ;; esac ], [test x$SUSE_KERNEL = xyes], [ + AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.82],[ + AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.0],[ AS_VERSION_COMPARE([$LINUXRELEASE],[3.12.0],[ AS_VERSION_COMPARE([$LINUXRELEASE],[3.0.0],[ AS_VERSION_COMPARE([$LINUXRELEASE],[2.6.32], [], @@ -24,12 +44,73 @@ AS_IF([test x$RHEL_KERNEL = xyes], [ ;; 3) LDISKFS_SERIES="3.0-sles11sp3.series" ;; + 4) LDISKFS_SERIES="3.0-sles11sp4.series" + ;; + esac + ])],[LDISKFS_SERIES="3.12-sles12.series"],[ + PLEV=$(grep PATCHLEVEL /etc/SuSE-release | sed -e 's/.*= *//') + case $PLEV in + 1) LDISKFS_SERIES="3.12-sles12sp1.series" + ;; + *) LDISKFS_SERIES="3.12-sles12.series" + ;; esac - ])],[LDISKFS_SERIES="3.12-sles12.series"],[LDISKFS_SERIES="3.12-sles12.series"]) + ])],[LDISKFS_SERIES="4.4-sles12sp2.series"], + [LDISKFS_SERIES="4.4-sles12sp2.series"] + )], [LDISKFS_SERIES="4.4-sles12sp3.series"], + [LDISKFS_SERIES="4.4-sles12sp3.series"]) +], [test x$UBUNTU_KERNEL = xyes], [ + AS_VERSION_COMPARE([$LINUXRELEASE],[5.3.0],[ + AS_VERSION_COMPARE([$LINUXRELEASE],[5.0.0],[ + AS_VERSION_COMPARE([$LINUXRELEASE],[4.15.0],[ + AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.0], [], + [ + KPLEV=$(echo $LINUXRELEASE | sed -n 's/.*-\([0-9]\+\).*/\1/p') + AS_IF( + [test -z "$KPLEV"], [ + AC_MSG_WARN([Failed to determine Kernel patch level. Assume latest.]) + LDISKFS_SERIES="4.4.0-73-ubuntu14+16.series" + ], + [test $KPLEV -ge 73], [LDISKFS_SERIES="4.4.0-73-ubuntu14+16.series"], + [test $KPLEV -ge 62], [LDISKFS_SERIES="4.4.0-62-ubuntu14+16.series"], + [test $KPLEV -ge 49], [LDISKFS_SERIES="4.4.0-49-ubuntu14+16.series"], + [LDISKFS_SERIES="4.4.0-45-ubuntu14+16.series"] + ) + ], + [LDISKFS_SERIES="4.4.0-73-ubuntu14+16.series"])], + [ + KPLEV=$(echo $LINUXRELEASE | sed -n 's/.*-\([0-9]\+\).*/\1/p') + AS_IF( + [test -z "$KPLEV"], [ + AC_MSG_WARN([Failed to determine Kernel patch level. Assume latest.]) + LDISKFS_SERIES="4.15.0-24-ubuntu18.series" + ], + [test $KPLEV -ge 24], [LDISKFS_SERIES="4.15.0-24-ubuntu18.series"], + [test $KPLEV -ge 20], [LDISKFS_SERIES="4.15.0-20-ubuntu18.series"] + ) + ], + [LDISKFS_SERIES="4.15.0-24-ubuntu18.series"])], + [LDISKFS_SERIES="5.0.0-13-ubuntu19.series"], + [LDISKFS_SERIES="5.0.0-13-ubuntu19.series"])], + [LDISKFS_SERIES="5.4.0-ml.series"], + [LDISKFS_SERIES="5.4.0-ml.series"]) ]) +]) +# Not RHEL/SLES or Ubuntu .. probably mainline +AS_IF([test -z "$LDISKFS_SERIES"], + [ + AS_VERSION_COMPARE([$LINUXRELEASE],[5.4.0],[], + [LDISKFS_SERIES="5.4.0-ml.series"],[ + AS_VERSION_COMPARE([$LINUXRELEASE],[5.4.0], + [LDISKFS_SERIES="5.4.0-ml.series"], # lt + [LDISKFS_SERIES="5.4.0-ml.series"], # eq + [LDISKFS_SERIES="5.4.0-ml.series"] # gt + )]) + ], +[]) AS_IF([test -z "$LDISKFS_SERIES"], - [AC_MSG_WARN([Unknown kernel version $LDISKFS_VERSIONRELEASE])]) -AC_MSG_RESULT([$LDISKFS_SERIES]) + [AC_MSG_RESULT([failed to identify series])], + [AC_MSG_RESULT([$LDISKFS_SERIES])]) AC_SUBST(LDISKFS_SERIES) ]) # LDISKFS_LINUX_SERIES @@ -53,23 +134,6 @@ ext4_free_blocks_with_buffer_head, [ ]) # LB_EXT_FREE_BLOCKS_WITH_BUFFER_HEAD # -# LB_EXT_PBLOCK -# -# 2.6.35 renamed ext_pblock to ext4_ext_pblock(ex) -# -AC_DEFUN([LB_EXT_PBLOCK], [ -LB_CHECK_COMPILE([if Linux kernel has 'ext_pblock'], -ext_pblock, [ - #include - #include "$EXT4_SRC_DIR/ext4_extents.h" -],[ - ext_pblock(NULL); -],[ - AC_DEFINE(HAVE_EXT_PBLOCK, 1, [Linux kernel has ext_pblock]) -]) -]) # LB_EXT_PBLOCK - -# # LB_EXT4_JOURNAL_START_3ARGS # # 3.9 added a type argument to ext4_journal_start and friends @@ -87,23 +151,113 @@ ext4_journal_start, [ ]) # LB_EXT4_JOURNAL_START_3ARGS # -# LB_LDISKFS_MAP_BLOCKS +# LB_EXT4_BREAD_4ARGS # -# Since 2.6.35 brought ext4_map_blocks() for IO. -# We just check this function whether existed. -# it must be exported by ldiskfs patches. +# 3.18 ext4_bread has 4 arguments +# NOTE: It may not be exported for modules, use a positive compiler test here. # -AC_DEFUN([LB_LDISKFS_MAP_BLOCKS], [ -LB_CHECK_COMPILE([if kernel has ext4_map_blocks], -ext4_map_blocks, [ +AC_DEFUN([LB_EXT4_BREAD_4ARGS], [ +LB_CHECK_COMPILE([if ext4_bread takes 4 arguments], +ext4_bread, [ #include #include "$EXT4_SRC_DIR/ext4.h" + + struct buffer_head *ext4_bread(handle_t *handle, struct inode *inode, + ext4_lblk_t block, int map_flags) + { + struct buffer_head *bh = NULL; + (void)handle; + (void)inode; + (void)block; + (void)map_flags; + return bh; + } ],[ - ext4_map_blocks(NULL, NULL, NULL, 0); + ext4_bread(NULL, NULL, 0, 0); ],[ - AC_DEFINE(HAVE_LDISKFS_MAP_BLOCKS, 1, [kernel has ext4_map_blocks]) + AC_DEFINE(HAVE_EXT4_BREAD_4ARGS, 1, [ext4_bread takes 4 arguments]) ]) +]) # LB_EXT4_BREAD_4ARGS + +# +# LB_EXT4_HAVE_INFO_DQUOT +# +# in linux 4.4 i_dqout is in ext4_inode_info, not in struct inode +# +AC_DEFUN([LB_EXT4_HAVE_INFO_DQUOT], [ +LB_CHECK_COMPILE([if i_dquot is in ext4_inode_info], +ext4_info_dquot, [ + #include + #include + #include "$EXT4_SRC_DIR/ext4.h" +],[ + struct ext4_inode_info in; + struct dquot *dq; + + dq = in.i_dquot[0]; +],[ + AC_DEFINE(HAVE_EXT4_INFO_DQUOT, 1, [i_dquot is in ext4_inode_info]) +]) +]) # LB_EXT4_HAVE_INFO_DQUOT + +# +# LB_EXT4_HAVE_I_CRYPT_INFO +# +# in linux 4.8 i_crypt_info moved from ext4_inode_info to struct inode +# +# Determine if we need to enable CONFIG_LDISKFS_FS_ENCRYPTION. +# If we have i_crypt_info in ext4_inode_info, the config option +# should be enabled to make the ldiskfs module compilation happy. +# Otherwise i_crypy_info is in struct inode, we need to check kernel +# config option to determine that. +# +AC_DEFUN([LB_EXT4_HAVE_I_CRYPT_INFO], [ +LB_CHECK_COMPILE([if i_crypt_info is in ext4_inode_info], +ext4_i_crypt_info, [ + #define CONFIG_EXT4_FS_ENCRYPTION 1 + #include + #include "$EXT4_SRC_DIR/ext4.h" +],[ + struct ext4_inode_info in; + + in.i_crypt_info = NULL; +],[ + AC_DEFINE( + CONFIG_LDISKFS_FS_ENCRYPTION, 1, + [enable encryption for ldiskfs] + ) +],[ + LB_CHECK_CONFIG([EXT4_FS_ENCRYPTION],[ + AC_DEFINE( + CONFIG_LDISKFS_FS_ENCRYPTION, 1, + [enable encryption for ldiskfs] + ) + ]) ]) +]) # LB_EXT4_HAVE_I_CRYPT_INFO + +# +# LB_LDISKFS_IGET_HAS_FLAGS_ARG +# +# kernel 4.19 commit 8a363970d1dc38c4ec4ad575c862f776f468d057 +# ext4_iget changed to a macro with 3 args was function with 2 args +# +AC_DEFUN([LB_LDISKFS_IGET_HAS_FLAGS_ARG], [ +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_CHECK_COMPILE([if ldiskfs_iget takes a flags argument], +ext4_iget_3args, [ + #include + #include "$EXT4_SRC_DIR/ext4.h" +],[ + int f = EXT4_IGET_SPECIAL; + (void)f; +],[ + AC_DEFINE(HAVE_LDISKFS_IGET_WITH_FLAGS, 1, + [if ldiskfs_iget takes a flags argument]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) # LB_LDISKFS_IGET_HAS_FLAGS_ARG # # LDISKFS_AC_PATCH_PROGRAM @@ -139,6 +293,94 @@ AC_DEFUN([LDISKFS_AC_PATCH_PROGRAM], [ ]) # LDISKFS_AC_PATCH_PROGRAM # +# LB_HAVE_BVEC_ITER_ALL +# +# kernel 5.1 commit 6dc4f100c175dd0511ae8674786e7c9006cdfbfa +# block: allow bio_for_each_segment_all() to iterate over multi-page bvec +# +AC_DEFUN([LB_HAVE_BVEC_ITER_ALL], [ +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_CHECK_COMPILE([if bvec_iter_all exists for multi-page bvec iternation], +ext4fs_dirhash, [ + #include +],[ + struct bvec_iter_all iter; + (void)iter; +],[ + AC_DEFINE(HAVE_BVEC_ITER_ALL, 1, + [if bvec_iter_all exists for multi-page bvec iternation]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) # LB_HAVE_BVEC_ITER_ALL + +# +# LB_LDISKFS_FIND_ENTRY_LOCKED_EXISTS +# +# kernel 5.2 commit 8a363970d1dc38c4ec4ad575c862f776f468d057 +# ext4: avoid declaring fs inconsistent due to invalid file handles +# __ext4_find_entry became a helper function for ext4_find_entry +# conflicting with previous ldiskfs patches. +# ldiskfs patches map ext4_find_entry to ldiskfs_find_entry_locked to +# avoid conflicting with __ext4_find_entry +# +# When the following check succeeds __ext4_find_entry helper is not +# used. +# +AC_DEFUN([LB_LDISKFS_FIND_ENTRY_LOCKED_EXISTS], [ +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_CHECK_COMPILE([if __ldiskfs_find_entry is available], +ldiskfs_find_entry_locked, [ + #include + #include "$EXT4_SRC_DIR/ext4.h" + #include "$EXT4_SRC_DIR/namei.c" + + static int __ext4_find_entry(void) { return 0; } +],[ + int x = __ext4_find_entry(); + (void)x; +],[ + AC_DEFINE(HAVE___LDISKFS_FIND_ENTRY, 1, + [if __ldiskfs_find_entry is available]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) # LB_LDISKFS_FIND_ENTRY_LOCKED_EXISTS + +# +# LB_LDISKFSFS_DIRHASH_WANTS_DIR +# +# kernel 5.2 commit 8a363970d1dc38c4ec4ad575c862f776f468d057 +# ext4fs_dirhash UNICODE support +# +AC_DEFUN([LB_LDISKFSFS_DIRHASH_WANTS_DIR], [ +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_CHECK_COMPILE([if ldiskfsfs_dirhash takes an inode argument], +ext4fs_dirhash, [ + #include + #include "$EXT4_SRC_DIR/ext4.h" + + int ext4fs_dirhash(const struct inode *dir, const char *name, int len, + struct dx_hash_info *hinfo) + { + (void)dir; + (void)name; + (void)len; + (void)hinfo; + return 0; + } +],[ + int f = ext4fs_dirhash(NULL, NULL, 0, NULL); + (void)f; +],[ + AC_DEFINE(HAVE_LDISKFSFS_GETHASH_INODE_ARG, 1, + [if ldiskfsfs_dirhash takes an inode argument]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) # LB_LDISKFSFS_DIRHASH_WANTS_DIR + +# # LB_CONFIG_LDISKFS # AC_DEFUN([LB_CONFIG_LDISKFS], [ @@ -177,19 +419,27 @@ AS_IF([test x$enable_ldiskfs != xno],[ # set is available for the detected kernel. For now, we just always # set it to "yes". AS_IF([test x$enable_ldiskfs = xmaybe], [enable_ldiskfs=yes]) + AC_SUBST(ENABLE_LDISKFS, yes) LDISKFS_LINUX_SERIES LDISKFS_AC_PATCH_PROGRAM LB_EXT_FREE_BLOCKS_WITH_BUFFER_HEAD - LB_EXT_PBLOCK LB_EXT4_JOURNAL_START_3ARGS - LB_LDISKFS_MAP_BLOCKS + LB_EXT4_BREAD_4ARGS + LB_EXT4_HAVE_INFO_DQUOT + LB_EXT4_HAVE_I_CRYPT_INFO + LB_LDISKFS_IGET_HAS_FLAGS_ARG + LB_HAVE_BVEC_ITER_ALL + LB_LDISKFS_FIND_ENTRY_LOCKED_EXISTS + LB_LDISKFSFS_DIRHASH_WANTS_DIR AC_DEFINE(CONFIG_LDISKFS_FS_POSIX_ACL, 1, [posix acls for ldiskfs]) AC_DEFINE(CONFIG_LDISKFS_FS_SECURITY, 1, [fs security for ldiskfs]) AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1, [extened attributes for ldiskfs]) AC_DEFINE(CONFIG_LDISKFS_FS_RW, 1, [enable rw access for ldiskfs]) AC_SUBST(LDISKFS_SUBDIR, ldiskfs) AC_DEFINE(HAVE_LDISKFS_OSD, 1, Enable ldiskfs osd) +], [ + AC_SUBST(ENABLE_LDISKFS, no) ]) AC_MSG_CHECKING([whether to build ldiskfs]) @@ -255,11 +505,21 @@ AS_IF([test -e "$linux_src/fs/ext4/super.c"], [ EXT4_SRC_DIR="$linux_src/fs/ext4" ], [ # Kernel ext source provided by kernel-debuginfo-common package - linux_src=$(ls -1d /usr/src/debug/*/linux-$LINUXRELEASE \ + # that extracted to $LINUX + linux_src=$(ls -1d $linux_src/../../debug/*/linux-${LINUXRELEASE%.*}* \ 2>/dev/null | tail -1) - AS_IF([test -e "$linux_src/fs/ext4/super.c"], - [EXT4_SRC_DIR="$linux_src/fs/ext4"], - [EXT4_SRC_DIR=""]) + AS_IF([test -e "$linux_src/fs/ext4/super.c"], [ + EXT4_SRC_DIR="$linux_src/fs/ext4" + ], [ + # Kernel ext source provided by kernel-debuginfo-common package + linux_src=$(ls -1d /usr/src/debug/*/linux-${LINUXRELEASE%.*}* \ + 2>/dev/null | tail -1) + AS_IF([test -e "$linux_src/fs/ext4/super.c"], [ + EXT4_SRC_DIR="$linux_src/fs/ext4" + ], [ + EXT4_SRC_DIR="" + ]) + ]) ]) AC_MSG_RESULT([$EXT4_SRC_DIR]) AC_SUBST(EXT4_SRC_DIR)