Whamcloud - gitweb
LU-11838 kernel: harden current_time autoconf test
[fs/lustre-release.git] / lustre / autoconf / lustre-core.m4
index 0fe194b..227fd38 100644 (file)
@@ -266,23 +266,6 @@ kernel SUNRPC support is required by using GSS.
 ]) # LC_CONFIG_SUNRPC
 
 #
-# LC_HAVE_CRYPTO_HASH
-#
-# 4.6 kernel commit 896545098777564212b9e91af4c973f094649aa7
-# removed crypto_hash support. Since GSS only works with
-# crypto_hash it has to be disabled for newer distros.
-#
-AC_DEFUN([LC_HAVE_CRYPTO_HASH], [
-LB_CHECK_COMPILE([if crypto_hash API is supported],
-crypto_hash, [
-       #include <linux/crypto.h>
-],[
-       crypto_hash_digestsize(NULL);
-], [], [enable_gss="no"])
-])
-]) # LC_HAVE_CRYPTO_HASH
-
-#
 # LC_CONFIG_GSS (default 'auto' (tests for dependencies, if found, enables))
 #
 # Build gss and related tools of Lustre. Currently both kernel and user space
@@ -297,7 +280,6 @@ AC_MSG_RESULT([$enable_gss])
 
 AS_IF([test "x$enable_gss" != xno], [
        LC_CONFIG_GSS_KEYRING
-       LC_HAVE_CRYPTO_HASH
        LC_HAVE_CRED_TGCRED
        LC_KEY_TYPE_INSTANTIATE_2ARGS
        sunrpc_required=$enable_gss
@@ -323,14 +305,17 @@ AS_IF([test "x$enable_gss" != xno], [
                gss_conf_test="failure"
        ])
 
-       AS_IF([test "x$gss_conf_test" = xsuccess && "x$enable_gss" != xno], [
+       AS_IF([test "x$gss_conf_test" = xsuccess && test "x$enable_gss" != xno], [
                AC_DEFINE([HAVE_GSS], [1], [Define this is if you enable gss])
                enable_gss="yes"
        ], [
+               enable_gss_keyring="no"
                enable_gss="no"
        ])
 
        enable_ssk=$enable_gss
+], [
+       enable_gss_keyring="no"
 ])
 ]) # LC_CONFIG_GSS
 
@@ -346,9 +331,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 
        int main(void) {
                int rc;
-               HMAC_CTX ctx;
-               HMAC_CTX_init(&ctx);
-               rc = HMAC_Init_ex(&ctx, "test", 4, EVP_md_null(), NULL);
+               rc = HMAC_Init_ex(NULL, "test", 4, EVP_md_null(), NULL);
        }
 ])],[AC_DEFINE(HAVE_OPENSSL_SSK, 1,
               [OpenSSL HMAC functions needed for SSK])],
@@ -505,8 +488,9 @@ LB_CHECK_COMPILE([if '__add_wait_queue_exclusive' exists],
 __add_wait_queue_exclusive, [
        #include <linux/wait.h>
 ],[
-       wait_queue_head_t queue;
-       wait_queue_t      wait;
+       wait_queue_head_t queue = { };
+       wait_queue_t wait = { };
+
        __add_wait_queue_exclusive(&queue, &wait);
 ],[
        AC_DEFINE(HAVE___ADD_WAIT_QUEUE_EXCLUSIVE, 1,
@@ -526,7 +510,10 @@ fs_struct_rwlock, [
        #include <linux/spinlock.h>
        #include <linux/fs_struct.h>
 ],[
-       ((struct fs_struct *)0)->lock = (rwlock_t){ 0 };
+       struct fs_struct fss = { };
+       rwlock_t rwl = { };
+
+       fss.lock = rwl;
 ],[
        AC_DEFINE(HAVE_FS_STRUCT_RWLOCK, 1, [fs_struct.lock use rwlock])
 ])
@@ -755,8 +742,10 @@ LB_CHECK_COMPILE([if 'file_system_type' has 'mount' field],
 file_system_type_mount, [
        #include <linux/fs.h>
 ],[
-       struct file_system_type fst;
-       void *i = (void *) fst.mount;
+       struct file_system_type fst = { };
+       void *mount;
+
+       mount = (void *)fst.mount;
 ],[
        AC_DEFINE(HAVE_FSTYPE_MOUNT, 1,
                [struct file_system_type has mount field])
@@ -805,7 +794,7 @@ LB_CHECK_COMPILE([if 'dirty_inode' super_operation takes flag],
 dirty_inode_super_operation_flag, [
        #include <linux/fs.h>
 ],[
-       struct inode *inode;
+       struct inode *inode = NULL;
        inode->i_sb->s_op->dirty_inode(NULL, 0);
 ],[
        AC_DEFINE(HAVE_DIRTY_INODE_HAS_FLAG, 1,
@@ -1017,7 +1006,7 @@ address_space_ops_migratepage_4args, [
        #include <linux/migrate_mode.h>
 #endif
 ],[
-       struct address_space_operations aops;
+       struct address_space_operations aops = { };
        aops.migratepage(NULL, NULL, NULL, MIGRATE_ASYNC);
 ],[
        AC_DEFINE(HAVE_MIGRATEPAGE_4ARGS, 1,
@@ -1390,9 +1379,10 @@ LB_CHECK_COMPILE([if 'bio_end_sector' is defined],
 bio_end_sector, [
        #include <linux/bio.h>
 ],[
-       struct bio bio;
+       struct bio bio = { };
+       unsigned long long end;
 
-       bio_end_sector(&bio);
+       end = bio_end_sector(&bio);
 ],[
        AC_DEFINE(HAVE_BIO_END_SECTOR, 1,
                  [bio_end_sector is defined])
@@ -1407,7 +1397,7 @@ LB_CHECK_COMPILE([if 'is_sxid' is defined],
 is_sxid, [
        #include <linux/fs.h>
 ],[
-       struct inode inode;
+       struct inode inode = { };
 
        is_sxid(inode.i_mode);
 ],[
@@ -1452,9 +1442,10 @@ proc_remove, [
 AC_DEFUN([LC_HAVE_PROJECT_QUOTA], [
 LB_CHECK_COMPILE([if get_projid exists],
 get_projid, [
+       struct inode;
        #include <linux/quota.h>
 ],[
-       struct dquot_operations ops;
+       struct dquot_operations ops = { };
 
        ops.get_projid(NULL, NULL);
 ],[
@@ -1513,6 +1504,7 @@ dir_context, [
 #error "back to use readdir in kabi_extand mode"
 #else
        struct dir_context ctx;
+
        ctx.pos = 0;
 #endif
 ],[
@@ -1544,12 +1536,14 @@ d_compare_5args, [
 # 3.11 need to access d_count to get dentry reference count
 #
 AC_DEFUN([LC_HAVE_DCOUNT], [
-LB_CHECK_COMPILE([if 'd_count' exist],
+LB_CHECK_COMPILE([if 'd_count' exists],
 d_count, [
        #include <linux/dcache.h>
 ],[
-       struct dentry de;
-       d_count(&de);
+       struct dentry de = { };
+       int count;
+
+       count = d_count(&de);
 ],[
        AC_DEFINE(HAVE_D_COUNT, 1,
                [d_count exist])
@@ -1592,6 +1586,24 @@ truncate_pagecache_old_size, [
 ]) # LC_OLDSIZE_TRUNCATE_PAGECACHE
 
 #
+# LC_PTR_ERR_OR_ZERO
+#
+# For some reason SLES11SP4 is missing the PTR_ERR_OR_ZERO macro
+# It was added to linux kernel 3.12
+#
+AC_DEFUN([LC_PTR_ERR_OR_ZERO_MISSING], [
+LB_CHECK_COMPILE([if 'PTR_ERR_OR_ZERO' is missing],
+is_err_or_null, [
+       #include <linux/err.h>
+],[
+       if (PTR_ERR_OR_ZERO(NULL)) return 0;
+],[
+       AC_DEFINE(HAVE_PTR_ERR_OR_ZERO, 1,
+               ['PTR_ERR_OR_ZERO' exist])
+])
+]) # LC_PTR_ERR_OR_ZERO_MISSING
+
+#
 # LC_HAVE_DENTRY_D_U_D_ALIAS
 #
 # 3.11 kernel moved d_alias to the union d_u in struct dentry
@@ -1664,6 +1676,27 @@ kiocb_ki_left, [
 ]) # LC_KIOCB_KI_LEFT
 
 #
+# LC_INIT_LIST_HEAD_RCU
+#
+# 3.12 added INIT_LIST_HEAD_RCU in commit 2a855b644c310d5db5
+# which is unfortunately an inline function and not a macro
+# that can be tested directly, so it needs a configure check.
+#
+AC_DEFUN([LC_INIT_LIST_HEAD_RCU], [
+LB_CHECK_COMPILE([if 'INIT_LIST_HEAD_RCU' exists],
+init_list_head_rcu, [
+       #include <linux/list.h>
+       #include <linux/rculist.h>
+],[
+       struct list_head list;
+       INIT_LIST_HEAD_RCU(&list);
+],[
+       AC_DEFINE(HAVE_INIT_LIST_HEAD_RCU, 1,
+                 [INIT_LIST_HEAD_RCU exists])
+])
+]) # LC_INIT_LIST_HEAD_RCU
+
+#
 # LC_VFS_RENAME_5ARGS
 #
 # 3.13 has vfs_rename with 5 args
@@ -1709,6 +1742,7 @@ have_bvec_iter, [
        #include <linux/bio.h>
 ],[
        struct bvec_iter iter;
+
        iter.bi_bvec_done = 0;
 ], [
        AC_DEFINE(HAVE_BVEC_ITER, 1,
@@ -1746,7 +1780,7 @@ have_bi_cnt, [
        #include <asm/atomic.h>
        #include <linux/bio.h>
 ],[
-       struct bio bio;
+       struct bio bio = { };
        int cnt;
        cnt = atomic_read(&bio.bi_cnt);
 ], [
@@ -1766,7 +1800,8 @@ have_bi_rw, [
        #include <linux/bio.h>
 ],[
        struct bio bio;
-       bio.bi_rw;
+
+       bio.bi_rw = 0;
 ], [
        AC_DEFINE(HAVE_BI_RW, 1,
                [struct bio has bi_rw])
@@ -1874,7 +1909,7 @@ LB_CHECK_COMPILE([if direct IO uses iov_iter],
 direct_io_iter, [
        #include <linux/fs.h>
 ],[
-       struct address_space_operations ops;
+       struct address_space_operations ops = { };
        struct iov_iter *iter = NULL;
        loff_t offset = 0;
 
@@ -1953,6 +1988,23 @@ file_function_iter, [
 ]) # LC_HAVE_FILE_OPERATIONS_READ_WRITE_ITER
 
 #
+# LC_HAVE_INTERVAL_BLK_INTEGRITY
+#
+# 3.17 replace sector_size with interval in struct blk_integrity
+#
+AC_DEFUN([LC_HAVE_INTERVAL_BLK_INTEGRITY], [
+LB_CHECK_COMPILE([if 'blk_integrity.interval' exist],
+interval_blk_integrity, [
+       #include <linux/blkdev.h>
+],[
+       ((struct blk_integrity *)0)->interval = 0;
+],[
+       AC_DEFINE(HAVE_INTERVAL_BLK_INTEGRITY, 1,
+               [blk_integrity.interval exist])
+])
+]) # LC_HAVE_INTERVAL_BLK_INTEGRITY
+
+#
 # LC_KEY_MATCH_DATA
 #
 # 3.17 replaces key_type::match with match_preparse
@@ -1964,6 +2016,8 @@ key_match, [
        #include <linux/key-type.h>
 ],[
        struct key_match_data data;
+
+       data.raw_data = NULL;
 ],[
        AC_DEFINE(HAVE_KEY_MATCH_DATA, 1,
                [struct key_match_data exist])
@@ -2029,7 +2083,7 @@ LB_CHECK_COMPILE([if struct kiocb has ki_nbytes field],
 ki_nbytes, [
        #include <linux/fs.h>
 ],[
-       struct kiocb iocb;
+       struct kiocb iocb = { };
 
        iocb.ki_nbytes = 0;
 ],[
@@ -2205,6 +2259,25 @@ bio_endio, [
 ]) # LC_BIO_ENDIO_USES_ONE_ARG
 
 #
+# LC_HAVE_INTERVAL_EXP_BLK_INTEGRITY
+#
+# 4.3 replace interval with interval_exp in 'struct blk_integrity'
+# 'struct blk_integrity_profile' is also added in this version,
+# thus use this to determine whether 'struct blk_integrity' has profile
+#
+AC_DEFUN([LC_HAVE_INTERVAL_EXP_BLK_INTEGRITY], [
+LB_CHECK_COMPILE([if 'blk_integrity.interval_exp' exist],
+blk_integrity_interval_exp, [
+       #include <linux/blkdev.h>
+],[
+       ((struct blk_integrity *)0)->interval_exp = 0;
+],[
+       AC_DEFINE(HAVE_INTERVAL_EXP_BLK_INTEGRITY, 1,
+               [blk_integrity.interval_exp exist])
+])
+]) # LC_HAVE_INTERVAL_EXP_BLK_INTEGRITY
+
+#
 # LC_HAVE_LOOP_CTL_GET_FREE
 #
 # 4.x kernel have moved userspace APIs to
@@ -2271,6 +2344,44 @@ EXTRA_KCFLAGS="$tmp_flags"
 ]) # LC_HAVE_XATTR_HANDLER_SIMPLIFIED
 
 #
+# LC_HAVE_BIP_ITER_BIO_INTEGRITY_PAYLOAD
+#
+# 4.3 replace interval with interval_exp in 'struct blk_integrity'.
+#
+AC_DEFUN([LC_HAVE_BIP_ITER_BIO_INTEGRITY_PAYLOAD], [
+LB_CHECK_COMPILE([if 'bio_integrity_payload.bip_iter' exist],
+bio_integrity_payload_bip_iter, [
+       #include <linux/bio.h>
+],[
+       ((struct bio_integrity_payload *)0)->bip_iter.bi_size = 0;
+],[
+       AC_DEFINE(HAVE_BIP_ITER_BIO_INTEGRITY_PAYLOAD, 1,
+               [bio_integrity_payload.bip_iter exist])
+])
+]) # LC_HAVE_BIP_ITER_BIO_INTEGRITY_PAYLOAD
+
+#
+# LC_BIO_INTEGRITY_PREP_FN
+#
+# Lustre kernel patch extents bio_integrity_prep to accept optional
+# generate/verify_fn as extra args.
+#
+AC_DEFUN([LC_BIO_INTEGRITY_PREP_FN], [
+LB_CHECK_COMPILE([if 'bio_integrity_prep_fn' exists],
+bio_integrity_prep_fn, [
+       #include <linux/bio.h>
+],[
+       bio_integrity_prep_fn(NULL, NULL, NULL);
+],[
+       AC_DEFINE(HAVE_BIO_INTEGRITY_PREP_FN, 1,
+               [kernel has bio_integrity_prep_fn])
+       AC_SUBST(PATCHED_INTEGRITY_INTF)
+],[
+       AC_SUBST(PATCHED_INTEGRITY_INTF, [#])
+])
+]) # LC_BIO_INTEGRITY_PREP_FN
+
+#
 # LC_HAVE_LOCKS_LOCK_FILE_WAIT
 #
 # 4.4 kernel have moved locks API users to
@@ -2298,13 +2409,35 @@ LB_CHECK_COMPILE([if 'struct key' has 'payload.data' as an array],
 key_payload_data_array, [
        #include <linux/key.h>
 ],[
-       ((struct key *)0)->payload.data[0] = NULL;
+       struct key key = { };
+
+       key.payload.data[0] = NULL;
 ],[
        AC_DEFINE(HAVE_KEY_PAYLOAD_DATA_ARRAY, 1, [payload.data is an array])
 ])
 ]) #LC_HAVE_KEY_PAYLOAD_DATA_ARRAY
 
 #
+# LC_HAVE_XATTR_HANDLER_NAME
+#
+# Kernel version 4.4 commit 98e9cb5711c68223f0e4d5201b9a6add255ec550
+# add a name member to struct xattr_handler
+#
+AC_DEFUN([LC_HAVE_XATTR_HANDLER_NAME], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if 'struct xattr_handler' has a name member],
+xattr_handler_name, [
+       #include <linux/xattr.h>
+],[
+       ((struct xattr_handler *)NULL)->name = NULL;
+],[
+       AC_DEFINE(HAVE_XATTR_HANDLER_NAME, 1, [xattr_handler has a name member])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LC_HAVE_XATTR_HANDLER_NAME
+
+#
 # LC_HAVE_FILE_DENTRY
 #
 # 4.5 adds wrapper file_dentry
@@ -2409,10 +2542,11 @@ LB_CHECK_COMPILE([if '->direct_IO()' taken 2 arguments],
 direct_io_2args, [
        #include <linux/fs.h>
 ],[
-       struct address_space_operations ops;
+       struct address_space_operations ops = { };
        struct iov_iter *iter = NULL;
        struct kiocb *iocb = NULL;
        int rc;
+
        rc = ops.direct_IO(iocb, iter);
 ],[
        AC_DEFINE(HAVE_DIRECTIO_2ARGS, 1,
@@ -2433,6 +2567,7 @@ generic_write_sync_2args, [
 ],[
        struct kiocb *iocb = NULL;
        ssize_t rc;
+
        rc = generic_write_sync(iocb, 0);
 ],[
        AC_DEFINE(HAVE_GENERIC_WRITE_SYNC_2ARGS, 1,
@@ -2441,6 +2576,47 @@ generic_write_sync_2args, [
 ]) # LC_GENERIC_WRITE_SYNC_2ARGS
 
 #
+# LC_FOP_ITERATE_SHARED
+#
+# Kernel version 4.7 adds iterate_shared method to file_operations
+#
+AC_DEFUN([LC_FOP_ITERATE_SHARED], [
+LB_CHECK_COMPILE([if 'file_operations' has 'iterate_shared'],
+fop_iterate_shared, [
+       #include <linux/fs.h>
+],[
+       struct file_operations fop;
+       fop.iterate_shared = NULL;
+],[
+       AC_DEFINE(HAVE_FOP_ITERATE_SHARED, 1,
+               [file_operations has iterate_shared])
+])
+]) # LC_FOP_ITERATE_SHARED
+
+#
+# LC_FOPS_ITERATE_SHARED
+#
+# 4.7 commit ae05327a00fd47c34dfe25294b359a3f3fef96e8
+# ext4: switch to ->iterate_shared()
+# this replaces ext4_dir_operations iterate with iterate_shared.
+# dir_relaxed_shared() was also added in this commit, so we can
+# use that function to verify that the ext4_dir_operations is using
+# iterate_shared.
+#
+AC_DEFUN([LC_FOPS_ITERATE_SHARED], [
+LB_CHECK_COMPILE([if ext4_dir_operations uses iterate_shared],
+iterate_shared, [
+       #include <linux/fs.h>
+],[
+       ((struct file_operations *)0)->iterate_shared(NULL, NULL);
+       dir_relax_shared(NULL);
+],[
+       AC_DEFINE(HAVE_ITERATE_SHARED, 1,
+               ['iterate_shared' is available])
+])
+]) # LC_FOPS_ITERATE_SHARED
+
+#
 # LC_HAVE_POSIX_ACL_VALID_USER_NS
 #
 # 4.8 posix_acl_valid takes struct user_namespace
@@ -2675,6 +2851,45 @@ vm_operations_no_vm_area_struct, [
 ]) # LC_VM_OPERATIONS_REMOVE_VMF_ARG
 
 #
+# LC_HAVE_KEY_USAGE_REFCOUNT
+#
+# Kernel version 4.11 commit fff292914d3a2f1efd05ca71c2ba72a3c663201e
+# converted key.usage from atomic_t to refcount_t.
+#
+AC_DEFUN([LC_HAVE_KEY_USAGE_REFCOUNT], [
+LB_CHECK_COMPILE([if 'key.usage' is refcount_t],
+key_usage_refcount, [
+       #include <linux/key.h>
+],[
+       struct key key = { };
+
+       refcount_read(&key.usage);
+],[
+       AC_DEFINE(HAVE_KEY_USAGE_REFCOUNT, 1, [key.usage is of type refcount_t])
+])
+]) #LC_HAVE_KEY_USAGE_REFCOUNT
+
+#
+# LC_HAVE_CRYPTO_MAX_ALG_NAME_128
+#
+# Kernel version 4.11 commit f437a3f477cce402dbec6537b29e9e33962c9f73
+# switched CRYPTO_MAX_ALG_NAME from 64 to 128.
+#
+AC_DEFUN([LC_HAVE_CRYPTO_MAX_ALG_NAME_128], [
+LB_CHECK_COMPILE([if 'CRYPTO_MAX_ALG_NAME' is 128],
+crypto_max_alg_name, [
+       #include <linux/crypto.h>
+],[
+       #if CRYPTO_MAX_ALG_NAME != 128
+       exit(1);
+       #endif
+],[
+       AC_DEFINE(HAVE_CRYPTO_MAX_ALG_NAME_128, 1,
+               ['CRYPTO_MAX_ALG_NAME' is 128])
+])
+]) # LC_HAVE_CRYPTO_MAX_ALG_NAME_128
+
+#
 # Kernel version 4.12 commit 47f38c539e9a42344ff5a664942075bd4df93876
 # CURRENT_TIME is not 64 bit time safe so it was replaced with
 # current_time()
@@ -2684,7 +2899,9 @@ LB_CHECK_COMPILE([if CURRENT_TIME has been replaced with current_time],
 current_time, [
        #include <linux/fs.h>
 ],[
-       struct timespec ts = current_time(NULL);
+       struct iattr attr;
+
+       attr.ia_atime = current_time(NULL);
 ],[
        AC_DEFINE(HAVE_CURRENT_TIME, 1,
                [current_time() has replaced CURRENT_TIME])
@@ -2710,6 +2927,74 @@ super_setup_bdi_name, [
 ]) # LC_SUPER_SETUP_BDI_NAME
 
 #
+# LC_BI_STATUS
+#
+# 4.12 replace bi_error to bi_status
+#
+AC_DEFUN([LC_BI_STATUS], [
+LB_CHECK_COMPILE([if 'bi_status' exist],
+bi_status, [
+       #include <linux/blk_types.h>
+],[
+       ((struct bio *)0)->bi_status = 0;
+],[
+       AC_DEFINE(HAVE_BI_STATUS, 1,
+               ['bi_status' is available])
+])
+]) # LC_BI_STATUS
+
+#
+# LC_BIO_INTEGRITY_ENABLED
+#
+# 4.13 removed bio_integrity_enabled
+#
+AC_DEFUN([LC_BIO_INTEGRITY_ENABLED], [
+LB_CHECK_COMPILE([if 'bio_integrity_enabled' exist],
+bio_integrity_enabled, [
+       #include <linux/bio.h>
+],[
+       bio_integrity_enabled(NULL);
+],[
+       AC_DEFINE(HAVE_BIO_INTEGRITY_ENABLED, 1,
+               ['bio_integrity_enabled' is available])
+])
+]) # LC_BIO_INTEGRITY_ENABLED
+
+#
+# LC_PAGEVEC_INIT_ONE_PARAM
+#
+# 4.14 pagevec_init takes one parameter
+#
+AC_DEFUN([LC_PAGEVEC_INIT_ONE_PARAM], [
+LB_CHECK_COMPILE([if 'pagevec_init' takes one parameter],
+pagevec_init, [
+       #include <linux/pagevec.h>
+],[
+       pagevec_init(NULL);
+],[
+       AC_DEFINE(HAVE_PAGEVEC_INIT_ONE_PARAM, 1,
+               ['pagevec_init' takes one parameter])
+])
+]) # LC_PAGEVEC_INIT_ONE_PARAM
+
+#
+# LC_BI_BDEV
+#
+# 4.14 replaced bi_bdev to bi_disk
+#
+AC_DEFUN([LC_BI_BDEV], [
+LB_CHECK_COMPILE([if 'bi_bdev' exist],
+bi_bdev, [
+       #include <linux/bio.h>
+],[
+       ((struct bio *)0)->bi_bdev = NULL;
+],[
+       AC_DEFINE(HAVE_BI_BDEV, 1,
+               ['bi_bdev' is available])
+])
+]) # LC_BI_BDEV
+
+#
 # LC_PROG_LINUX
 #
 # Lustre linux kernel checks
@@ -2835,7 +3120,9 @@ AC_DEFUN([LC_PROG_LINUX], [
 
        # 3.12
        LC_OLDSIZE_TRUNCATE_PAGECACHE
+       LC_PTR_ERR_OR_ZERO_MISSING
        LC_KIOCB_KI_LEFT
+       LC_INIT_LIST_HEAD_RCU
 
        # 3.13
        LC_VFS_RENAME_5ARGS
@@ -2857,6 +3144,7 @@ AC_DEFUN([LC_PROG_LINUX], [
        LC_HAVE_FILE_OPERATIONS_READ_WRITE_ITER
 
        # 3.17
+       LC_HAVE_INTERVAL_BLK_INTEGRITY
        LC_KEY_MATCH_DATA
 
        # 3.18
@@ -2884,12 +3172,15 @@ AC_DEFUN([LC_PROG_LINUX], [
        LC_SYMLINK_OPS_USE_NAMEIDATA
 
        # 4.3
+       LC_HAVE_INTERVAL_EXP_BLK_INTEGRITY
+       LC_HAVE_BIP_ITER_BIO_INTEGRITY_PAYLOAD
        LC_HAVE_CACHE_HEAD_HLIST
        LC_HAVE_XATTR_HANDLER_SIMPLIFIED
 
        # 4.4
        LC_HAVE_LOCKS_LOCK_FILE_WAIT
        LC_HAVE_KEY_PAYLOAD_DATA_ARRAY
+       LC_HAVE_XATTR_HANDLER_NAME
        LC_HAVE_BI_CNT
        LC_HAVE_BI_RW
        LC_HAVE_SUBMIT_BIO_2ARGS
@@ -2909,6 +3200,7 @@ AC_DEFUN([LC_PROG_LINUX], [
        # 4.7
        LC_DIRECTIO_2ARGS
        LC_GENERIC_WRITE_SYNC_2ARGS
+       LC_FOPS_ITERATE_SHARED
 
        # 4.8
        LC_HAVE_POSIX_ACL_VALID_USER_NS
@@ -2929,10 +3221,23 @@ AC_DEFUN([LC_PROG_LINUX], [
        # 4.11
        LC_INODEOPS_ENHANCED_GETATTR
        LC_VM_OPERATIONS_REMOVE_VMF_ARG
+       LC_HAVE_KEY_USAGE_REFCOUNT
+       LC_HAVE_CRYPTO_MAX_ALG_NAME_128
 
        # 4.12
        LC_CURRENT_TIME
        LC_SUPER_SETUP_BDI_NAME
+       LC_BI_STATUS
+
+       # 4.13
+       LC_BIO_INTEGRITY_ENABLED
+
+       # 4.14
+       LC_PAGEVEC_INIT_ONE_PARAM
+       LC_BI_BDEV
+
+       # kernel patch to extend integrity interface
+       LC_BIO_INTEGRITY_PREP_FN
 
        #
        AS_IF([test "x$enable_server" != xno], [
@@ -3246,12 +3551,16 @@ lustre/Makefile
 lustre/autoMakefile
 lustre/autoconf/Makefile
 lustre/conf/Makefile
+lustre/conf/resource/Makefile
 lustre/contrib/Makefile
 lustre/doc/Makefile
 lustre/include/Makefile
 lustre/include/lustre/Makefile
 lustre/include/uapi/linux/lustre/Makefile
-lustre/kernel_patches/targets/3.10-rhel7.target
+lustre/kernel_patches/targets/3.10-rhel7.6.target
+lustre/kernel_patches/targets/3.10-rhel7.5.target
+lustre/kernel_patches/targets/4.14-rhel7.5.target
+lustre/kernel_patches/targets/4.14-rhel7.6.target
 lustre/kernel_patches/targets/2.6-rhel6.9.target
 lustre/kernel_patches/targets/2.6-rhel6.8.target
 lustre/kernel_patches/targets/2.6-rhel6.7.target
@@ -3290,7 +3599,6 @@ lustre/fld/Makefile
 lustre/fld/autoMakefile
 lustre/obdclass/Makefile
 lustre/obdclass/autoMakefile
-lustre/obdclass/linux/Makefile
 lustre/obdecho/Makefile
 lustre/obdecho/autoMakefile
 lustre/ofd/Makefile