]> granicus.if.org Git - zfs/blobdiff - config/kernel.m4
Allow mounting datasets more than once
[zfs] / config / kernel.m4
index 62a9b4299ef41d1d2c24171a27eddd919f9fbc6a..e3daeffa8117f9937113783388b1c291297765ae 100644 (file)
@@ -1,15 +1,21 @@
 dnl #
-dnl # Default ZFS kernel configuration 
+dnl # Default ZFS kernel configuration
 dnl #
 AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
        ZFS_AC_KERNEL
        ZFS_AC_SPL
+       ZFS_AC_QAT
        ZFS_AC_TEST_MODULE
+       ZFS_AC_KERNEL_MISC_MINOR
+       ZFS_AC_KERNEL_OBJTOOL
        ZFS_AC_KERNEL_CONFIG
+       ZFS_AC_KERNEL_DECLARE_EVENT_CLASS
+       ZFS_AC_KERNEL_CURRENT_BIO_TAIL
+       ZFS_AC_KERNEL_SUPER_USER_NS
+       ZFS_AC_KERNEL_SUBMIT_BIO
        ZFS_AC_KERNEL_BDEV_BLOCK_DEVICE_OPERATIONS
        ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID
        ZFS_AC_KERNEL_TYPE_FMODE_T
-       ZFS_AC_KERNEL_KOBJ_NAME_LEN
        ZFS_AC_KERNEL_3ARG_BLKDEV_GET
        ZFS_AC_KERNEL_BLKDEV_GET_BY_PATH
        ZFS_AC_KERNEL_OPEN_BDEV_EXCLUSIVE
@@ -17,98 +23,119 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
        ZFS_AC_KERNEL_INVALIDATE_BDEV_ARGS
        ZFS_AC_KERNEL_BDEV_LOGICAL_BLOCK_SIZE
        ZFS_AC_KERNEL_BDEV_PHYSICAL_BLOCK_SIZE
-       ZFS_AC_KERNEL_BIO_FAILFAST
+       ZFS_AC_KERNEL_BIO_BVEC_ITER
        ZFS_AC_KERNEL_BIO_FAILFAST_DTD
+       ZFS_AC_KERNEL_BIO_SET_DEV
        ZFS_AC_KERNEL_REQ_FAILFAST_MASK
+       ZFS_AC_KERNEL_REQ_OP_DISCARD
+       ZFS_AC_KERNEL_REQ_OP_SECURE_ERASE
+       ZFS_AC_KERNEL_REQ_OP_FLUSH
+       ZFS_AC_KERNEL_BIO_BI_OPF
        ZFS_AC_KERNEL_BIO_END_IO_T_ARGS
-       ZFS_AC_KERNEL_BIO_RW_SYNC
-       ZFS_AC_KERNEL_BIO_RW_SYNCIO
-       ZFS_AC_KERNEL_REQ_SYNC
-       ZFS_AC_KERNEL_BLK_END_REQUEST
+       ZFS_AC_KERNEL_BIO_BI_STATUS
+       ZFS_AC_KERNEL_BIO_RW_BARRIER
+       ZFS_AC_KERNEL_BIO_RW_DISCARD
+       ZFS_AC_KERNEL_BLK_QUEUE_BDI
+       ZFS_AC_KERNEL_BLK_QUEUE_FLAG_CLEAR
+       ZFS_AC_KERNEL_BLK_QUEUE_FLAG_SET
        ZFS_AC_KERNEL_BLK_QUEUE_FLUSH
        ZFS_AC_KERNEL_BLK_QUEUE_MAX_HW_SECTORS
        ZFS_AC_KERNEL_BLK_QUEUE_MAX_SEGMENTS
-       ZFS_AC_KERNEL_BLK_QUEUE_PHYSICAL_BLOCK_SIZE
-       ZFS_AC_KERNEL_BLK_QUEUE_IO_OPT
-       ZFS_AC_KERNEL_BLK_QUEUE_NONROT
-       ZFS_AC_KERNEL_BLK_QUEUE_DISCARD
-       ZFS_AC_KERNEL_BLK_FETCH_REQUEST
-       ZFS_AC_KERNEL_BLK_REQUEUE_REQUEST
-       ZFS_AC_KERNEL_BLK_RQ_BYTES
-       ZFS_AC_KERNEL_BLK_RQ_POS
-       ZFS_AC_KERNEL_BLK_RQ_SECTORS
+       ZFS_AC_KERNEL_BLK_QUEUE_HAVE_BIO_RW_UNPLUG
+       ZFS_AC_KERNEL_BLK_QUEUE_HAVE_BLK_PLUG
+       ZFS_AC_KERNEL_GET_DISK_AND_MODULE
        ZFS_AC_KERNEL_GET_DISK_RO
        ZFS_AC_KERNEL_GET_GENDISK
-       ZFS_AC_KERNEL_RQ_IS_SYNC
-       ZFS_AC_KERNEL_RQ_FOR_EACH_SEGMENT
+       ZFS_AC_KERNEL_HAVE_BIO_SET_OP_ATTRS
+       ZFS_AC_KERNEL_GENERIC_READLINK_GLOBAL
        ZFS_AC_KERNEL_DISCARD_GRANULARITY
        ZFS_AC_KERNEL_CONST_XATTR_HANDLER
+       ZFS_AC_KERNEL_XATTR_HANDLER_NAME
        ZFS_AC_KERNEL_XATTR_HANDLER_GET
        ZFS_AC_KERNEL_XATTR_HANDLER_SET
        ZFS_AC_KERNEL_XATTR_HANDLER_LIST
        ZFS_AC_KERNEL_INODE_OWNER_OR_CAPABLE
        ZFS_AC_KERNEL_POSIX_ACL_FROM_XATTR_USERNS
        ZFS_AC_KERNEL_POSIX_ACL_RELEASE
+       ZFS_AC_KERNEL_SET_CACHED_ACL_USABLE
        ZFS_AC_KERNEL_POSIX_ACL_CHMOD
-       ZFS_AC_KERNEL_POSIX_ACL_CACHING
        ZFS_AC_KERNEL_POSIX_ACL_EQUIV_MODE_WANTS_UMODE_T
+       ZFS_AC_KERNEL_POSIX_ACL_VALID_WITH_NS
        ZFS_AC_KERNEL_INODE_OPERATIONS_PERMISSION
        ZFS_AC_KERNEL_INODE_OPERATIONS_PERMISSION_WITH_NAMEIDATA
        ZFS_AC_KERNEL_INODE_OPERATIONS_CHECK_ACL
        ZFS_AC_KERNEL_INODE_OPERATIONS_CHECK_ACL_WITH_FLAGS
        ZFS_AC_KERNEL_INODE_OPERATIONS_GET_ACL
-       ZFS_AC_KERNEL_CURRENT_UMASK
+       ZFS_AC_KERNEL_INODE_OPERATIONS_SET_ACL
+       ZFS_AC_KERNEL_INODE_OPERATIONS_GETATTR
+       ZFS_AC_KERNEL_INODE_SET_FLAGS
+       ZFS_AC_KERNEL_INODE_SET_IVERSION
+       ZFS_AC_KERNEL_GET_ACL_HANDLE_CACHE
        ZFS_AC_KERNEL_SHOW_OPTIONS
+       ZFS_AC_KERNEL_FILE_INODE
+       ZFS_AC_KERNEL_FILE_DENTRY
        ZFS_AC_KERNEL_FSYNC
        ZFS_AC_KERNEL_EVICT_INODE
        ZFS_AC_KERNEL_DIRTY_INODE_WITH_FLAGS
        ZFS_AC_KERNEL_NR_CACHED_OBJECTS
        ZFS_AC_KERNEL_FREE_CACHED_OBJECTS
        ZFS_AC_KERNEL_FALLOCATE
+       ZFS_AC_KERNEL_AIO_FSYNC
        ZFS_AC_KERNEL_MKDIR_UMODE_T
        ZFS_AC_KERNEL_LOOKUP_NAMEIDATA
        ZFS_AC_KERNEL_CREATE_NAMEIDATA
+       ZFS_AC_KERNEL_GET_LINK
+       ZFS_AC_KERNEL_PUT_LINK
+       ZFS_AC_KERNEL_TMPFILE
        ZFS_AC_KERNEL_TRUNCATE_RANGE
        ZFS_AC_KERNEL_AUTOMOUNT
        ZFS_AC_KERNEL_ENCODE_FH_WITH_INODE
        ZFS_AC_KERNEL_COMMIT_METADATA
        ZFS_AC_KERNEL_CLEAR_INODE
+       ZFS_AC_KERNEL_SETATTR_PREPARE
        ZFS_AC_KERNEL_INSERT_INODE_LOCKED
        ZFS_AC_KERNEL_D_MAKE_ROOT
        ZFS_AC_KERNEL_D_OBTAIN_ALIAS
+       ZFS_AC_KERNEL_D_PRUNE_ALIASES
        ZFS_AC_KERNEL_D_SET_D_OP
        ZFS_AC_KERNEL_D_REVALIDATE_NAMEIDATA
        ZFS_AC_KERNEL_CONST_DENTRY_OPERATIONS
-       ZFS_AC_KERNEL_CHECK_DISK_SIZE_CHANGE
        ZFS_AC_KERNEL_TRUNCATE_SETSIZE
        ZFS_AC_KERNEL_6ARGS_SECURITY_INODE_INIT_SECURITY
        ZFS_AC_KERNEL_CALLBACK_SECURITY_INODE_INIT_SECURITY
-       ZFS_AC_KERNEL_MOUNT_NODEV
+       ZFS_AC_KERNEL_FST_MOUNT
        ZFS_AC_KERNEL_SHRINK
+       ZFS_AC_KERNEL_SHRINK_CONTROL_HAS_NID
        ZFS_AC_KERNEL_S_INSTANCES_LIST_HEAD
        ZFS_AC_KERNEL_S_D_OP
        ZFS_AC_KERNEL_BDI
-       ZFS_AC_KERNEL_BDI_SETUP_AND_REGISTER
        ZFS_AC_KERNEL_SET_NLINK
        ZFS_AC_KERNEL_ELEVATOR_CHANGE
        ZFS_AC_KERNEL_5ARG_SGET
        ZFS_AC_KERNEL_LSEEK_EXECUTE
        ZFS_AC_KERNEL_VFS_ITERATE
+       ZFS_AC_KERNEL_VFS_RW_ITERATE
+       ZFS_AC_KERNEL_GENERIC_WRITE_CHECKS
+       ZFS_AC_KERNEL_KMAP_ATOMIC_ARGS
+       ZFS_AC_KERNEL_FOLLOW_DOWN_ONE
+       ZFS_AC_KERNEL_MAKE_REQUEST_FN
+       ZFS_AC_KERNEL_GENERIC_IO_ACCT_3ARG
+       ZFS_AC_KERNEL_GENERIC_IO_ACCT_4ARG
+       ZFS_AC_KERNEL_FPU
+       ZFS_AC_KERNEL_KUID_HELPERS
+       ZFS_AC_KERNEL_MODULE_PARAM_CALL_CONST
+       ZFS_AC_KERNEL_RENAME_WANTS_FLAGS
+       ZFS_AC_KERNEL_HAVE_GENERIC_SETXATTR
+       ZFS_AC_KERNEL_CURRENT_TIME
+       ZFS_AC_KERNEL_GLOBAL_PAGE_STATE
+       ZFS_AC_KERNEL_ACL_HAS_REFCOUNT
+       ZFS_AC_KERNEL_USERNS_CAPABILITIES
 
        AS_IF([test "$LINUX_OBJ" != "$LINUX"], [
-               KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
+               KERNEL_MAKE="$KERNEL_MAKE O=$LINUX_OBJ"
        ])
-       AC_SUBST(KERNELMAKE_PARAMS)
 
-
-       dnl # -Wall -fno-strict-aliasing -Wstrict-prototypes and other
-       dnl # compiler options are added by the kernel build system.
-       KERNELCPPFLAGS="$KERNELCPPFLAGS $NO_UNUSED_BUT_SET_VARIABLE"
-       KERNELCPPFLAGS="$KERNELCPPFLAGS $NO_AGGRESSIVE_LOOP_OPTIMIZATIONS"
-       KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL"
-       KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\""
-
-       AC_SUBST(KERNELCPPFLAGS)
+       AC_SUBST(KERNEL_MAKE)
 ])
 
 dnl #
@@ -175,6 +202,7 @@ AC_DEFUN([ZFS_AC_KERNEL], [
                AS_IF([test "$kernelsrc" = "NONE"], [
                        kernsrcver=NONE
                ])
+               withlinux=yes
        ])
 
        AC_MSG_RESULT([$kernelsrc])
@@ -187,7 +215,7 @@ AC_DEFUN([ZFS_AC_KERNEL], [
 
        AC_MSG_CHECKING([kernel build directory])
        AS_IF([test -z "$kernelbuild"], [
-               AS_IF([test -e "/lib/modules/$(uname -r)/build"], [
+               AS_IF([test x$withlinux != xyes -a -e "/lib/modules/$(uname -r)/build"], [
                        kernelbuild=`readlink -f /lib/modules/$(uname -r)/build`
                ], [test -d ${kernelsrc}-obj/${target_cpu}/${target_cpu}], [
                        kernelbuild=${kernelsrc}-obj/${target_cpu}/${target_cpu}
@@ -255,7 +283,9 @@ AC_DEFUN([ZFS_AC_SPL], [
        AC_ARG_WITH([spl],
                AS_HELP_STRING([--with-spl=PATH],
                [Path to spl source]),
-               [splsrc="$withval"])
+               AS_IF([test "$withval" = "yes"],
+                       AC_MSG_ERROR([--with-spl=PATH requires a PATH]),
+                       [splsrc="$withval"]))
 
        AC_ARG_WITH([spl-obj],
                AS_HELP_STRING([--with-spl-obj=PATH],
@@ -272,13 +302,23 @@ AC_DEFUN([ZFS_AC_SPL], [
        dnl # source directory.  In order of preference:
        dnl #
        splsrc0="/var/lib/dkms/spl/${VERSION}/build"
-       splsrc1="/usr/src/spl-${VERSION}/${LINUX_VERSION}"
-       splsrc2="/usr/src/spl-${VERSION}"
-       splsrc3="../spl/"
-       splsrc4="$LINUX"
+       splsrc1="/usr/local/src/spl-${VERSION}/${LINUX_VERSION}"
+       splsrc2="/usr/local/src/spl-${VERSION}"
+       splsrc3="/usr/src/spl-${VERSION}/${LINUX_VERSION}"
+       splsrc4="/usr/src/spl-${VERSION}"
+       splsrc5="../spl/"
+       splsrc6="$LINUX"
 
        AC_MSG_CHECKING([spl source directory])
        AS_IF([test -z "${splsrc}"], [
+               [all_spl_sources="
+               ${splsrc0}
+               ${splsrc1}
+               ${splsrc2}
+               ${splsrc3}
+               ${splsrc4}
+               ${splsrc5}
+               ${splsrc6}"],
                AS_IF([ test -e "${splsrc0}/spl.release.in"], [
                        splsrc=${splsrc0}
                ], [ test -e "${splsrc1}/spl.release.in"], [
@@ -289,10 +329,15 @@ AC_DEFUN([ZFS_AC_SPL], [
                        splsrc=$(readlink -f "${splsrc3}")
                ], [ test -e "${splsrc4}/spl.release.in" ], [
                        splsrc=${splsrc4}
+               ], [ test -e "${splsrc5}/spl.release.in"], [
+                       splsrc=$(readlink -f "${splsrc5}")
+               ], [ test -e "${splsrc6}/spl.release.in" ], [
+                       splsrc=${splsrc6}
                ], [
                        splsrc="[Not found]"
                ])
        ], [
+               [all_spl_sources="$withval"],
                AS_IF([test "$splsrc" = "NONE"], [
                        splbuild=NONE
                        splsrcver=NONE
@@ -304,7 +349,10 @@ AC_DEFUN([ZFS_AC_SPL], [
                AC_MSG_ERROR([
        *** Please make sure the kmod spl devel package for your distribution
        *** is installed then try again.  If that fails you can specify the
-       *** location of the spl source with the '--with-spl=PATH' option.])
+       *** location of the spl source with the '--with-spl=PATH' option.
+       *** The spl version must match the version of ZFS you are building,
+       *** ${VERSION}.  Failed to find spl.release.in in the following:
+       $all_spl_sources])
        ])
 
        dnl #
@@ -320,12 +368,18 @@ AC_DEFUN([ZFS_AC_SPL], [
        dnl # SPL package.
        dnl #
        AC_MSG_CHECKING([spl build directory])
+
+       all_spl_config_locs="${splsrc}/${LINUX_VERSION}
+       ${splsrc}"
+
        while true; do
                AS_IF([test -z "$splbuild"], [
                        AS_IF([ test -e "${splsrc}/${LINUX_VERSION}/spl_config.h" ], [
                                splbuild="${splsrc}/${LINUX_VERSION}"
                        ], [ test -e "${splsrc}/spl_config.h" ], [
                                splbuild="${splsrc}"
+                       ], [ find -L "${splsrc}" -name spl_config.h 2> /dev/null | grep -wq spl_config.h ], [
+                               splbuild=$(find -L "${splsrc}" -name spl_config.h | sed 's,/spl_config.h,,')
                        ], [
                                splbuild="[Not found]"
                        ])
@@ -344,7 +398,9 @@ AC_DEFUN([ZFS_AC_SPL], [
        *** Please make sure the kmod spl devel <kernel> package for your
        *** distribution is installed then try again.  If that fails you
        *** can specify the location of the spl objects with the
-       *** '--with-spl-obj=PATH' option.])
+       *** '--with-spl-obj=PATH' option.  Failed to find spl_config.h in
+       *** any of the following:
+       $all_spl_config_locs])
        ])
 
        AC_MSG_CHECKING([spl source version])
@@ -417,11 +473,100 @@ AC_DEFUN([ZFS_AC_SPL], [
        AC_SUBST(SPL_SYMBOLS)
 ])
 
+dnl #
+dnl # Detect the QAT module to be built against
+dnl # QAT provides hardware acceleration for data compression:
+dnl #  https://01.org/intel-quickassist-technology
+dnl # * Download and install QAT driver from the above link
+dnl # * Start QAT driver in your system:
+dnl #  service qat_service start
+dnl # * Enable QAT in ZFS, e.g.:
+dnl #  ./configure --with-qat=<qat-driver-path>/QAT1.6
+dnl #  make
+dnl # * Set GZIP compression in ZFS dataset:
+dnl #  zfs set compression = gzip <dataset>
+dnl # Then the data written to this ZFS pool is compressed
+dnl # by QAT accelerator automatically, and de-compressed by
+dnl # QAT when read from the pool.
+dnl # * Get QAT hardware statistics by:
+dnl #  cat /proc/icp_dh895xcc_dev/qat
+dnl # * To disable QAT:
+dnl #  insmod zfs.ko zfs_qat_disable=1
+dnl #
+AC_DEFUN([ZFS_AC_QAT], [
+       AC_ARG_WITH([qat],
+               AS_HELP_STRING([--with-qat=PATH],
+               [Path to qat source]),
+               AS_IF([test "$withval" = "yes"],
+                       AC_MSG_ERROR([--with-qat=PATH requires a PATH]),
+                       [qatsrc="$withval"]))
+
+       AC_ARG_WITH([qat-obj],
+               AS_HELP_STRING([--with-qat-obj=PATH],
+               [Path to qat build objects]),
+               [qatbuild="$withval"])
+
+       AS_IF([test ! -z "${qatsrc}"], [
+               AC_MSG_CHECKING([qat source directory])
+               AC_MSG_RESULT([$qatsrc])
+               QAT_SRC="${qatsrc}/quickassist"
+               AS_IF([ test ! -e "$QAT_SRC/include/cpa.h"], [
+                       AC_MSG_ERROR([
+               *** Please make sure the qat driver package is installed
+               *** and specify the location of the qat source with the
+               *** '--with-qat=PATH' option then try again. Failed to
+               *** find cpa.h in:
+               ${QAT_SRC}/include])
+               ])
+       ])
+
+       AS_IF([test ! -z "${qatsrc}"], [
+               AC_MSG_CHECKING([qat build directory])
+               AS_IF([test -z "$qatbuild"], [
+                       qatbuild="${qatsrc}/build"
+               ])
+
+               AC_MSG_RESULT([$qatbuild])
+               QAT_OBJ=${qatbuild}
+               AS_IF([ ! test -e "$QAT_OBJ/icp_qa_al.ko" && ! test -e "$QAT_OBJ/qat_api.ko"], [
+                       AC_MSG_ERROR([
+               *** Please make sure the qat driver is installed then try again.
+               *** Failed to find icp_qa_al.ko or qat_api.ko in:
+               $QAT_OBJ])
+               ])
+
+               AC_SUBST(QAT_SRC)
+               AC_SUBST(QAT_OBJ)
+
+               AC_DEFINE(HAVE_QAT, 1,
+               [qat is enabled and existed])
+       ])
+
+       dnl #
+       dnl # Detect the name used for the QAT Module.symvers file.
+       dnl #
+       AS_IF([test ! -z "${qatsrc}"], [
+               AC_MSG_CHECKING([qat file for module symbols])
+               QAT_SYMBOLS=$QAT_SRC/lookaside/access_layer/src/Module.symvers
+
+               AS_IF([test -r $QAT_SYMBOLS], [
+                       AC_MSG_RESULT([$QAT_SYMBOLS])
+                       AC_SUBST(QAT_SYMBOLS)
+               ],[
+                       AC_MSG_ERROR([
+                       *** Please make sure the qat driver is installed then try again.
+                       *** Failed to find Module.symvers in:
+                       $QAT_SYMBOLS])
+                       ])
+               ])
+       ])
+])
+
 dnl #
 dnl # Basic toolchain sanity check.
 dnl #
-AC_DEFUN([ZFS_AC_TEST_MODULE],
-       [AC_MSG_CHECKING([whether modules can be built])
+AC_DEFUN([ZFS_AC_TEST_MODULE], [
+       AC_MSG_CHECKING([whether modules can be built])
        ZFS_LINUX_TRY_COMPILE([],[],[
                AC_MSG_RESULT([yes])
        ],[
@@ -442,15 +587,49 @@ dnl # detected at configure time and cause a build failure.  Otherwise
 dnl # modules may be successfully built that behave incorrectly.
 dnl #
 AC_DEFUN([ZFS_AC_KERNEL_CONFIG], [
-
-       AS_IF([test "$ZFS_META_LICENSE" = GPL], [
-               AC_DEFINE([HAVE_GPL_ONLY_SYMBOLS], [1],
-                       [Define to 1 if licensed under the GPL])
+       AS_IF([test "x$cross_compiling" != xyes], [
+               AC_RUN_IFELSE([
+                       AC_LANG_PROGRAM([
+                               #include "$LINUX/include/linux/license.h"
+                       ], [
+                               return !license_is_gpl_compatible("$ZFS_META_LICENSE");
+                       ])
+               ], [
+                       AC_DEFINE([ZFS_IS_GPL_COMPATIBLE], [1],
+                           [Define to 1 if GPL-only symbols can be used])
+               ], [
+               ])
        ])
 
+       ZFS_AC_KERNEL_CONFIG_THREAD_SIZE
        ZFS_AC_KERNEL_CONFIG_DEBUG_LOCK_ALLOC
 ])
 
+dnl #
+dnl # Check configured THREAD_SIZE
+dnl #
+dnl # The stack size will vary by architecture, but as of Linux 3.15 on x86_64
+dnl # the default thread stack size was increased to 16K from 8K.  Therefore,
+dnl # on newer kernels and some architectures stack usage optimizations can be
+dnl # conditionally applied to improve performance without negatively impacting
+dnl # stability.
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_CONFIG_THREAD_SIZE], [
+       AC_MSG_CHECKING([whether kernel was built with 16K or larger stacks])
+       ZFS_LINUX_TRY_COMPILE([
+               #include <linux/module.h>
+       ],[
+               #if (THREAD_SIZE < 16384)
+               #error "THREAD_SIZE is less than 16K"
+               #endif
+       ],[
+               AC_MSG_RESULT([yes])
+               AC_DEFINE(HAVE_LARGE_STACKS, 1, [kernel has large stacks])
+       ],[
+               AC_MSG_RESULT([no])
+       ])
+])
+
 dnl #
 dnl # Check CONFIG_DEBUG_LOCK_ALLOC
 dnl #
@@ -494,9 +673,18 @@ AC_DEFUN([ZFS_AC_KERNEL_CONFIG_DEBUG_LOCK_ALLOC], [
 ])
 
 dnl #
-dnl # ZFS_LINUX_CONFTEST
+dnl # ZFS_LINUX_CONFTEST_H
+dnl #
+AC_DEFUN([ZFS_LINUX_CONFTEST_H], [
+cat - <<_ACEOF >conftest.h
+$1
+_ACEOF
+])
+
+dnl #
+dnl # ZFS_LINUX_CONFTEST_C
 dnl #
-AC_DEFUN([ZFS_LINUX_CONFTEST], [
+AC_DEFUN([ZFS_LINUX_CONFTEST_C], [
 cat confdefs.h - <<_ACEOF >conftest.c
 $1
 _ACEOF
@@ -522,13 +710,14 @@ dnl #
 dnl # ZFS_LINUX_COMPILE_IFELSE / like AC_COMPILE_IFELSE
 dnl #
 AC_DEFUN([ZFS_LINUX_COMPILE_IFELSE], [
-       m4_ifvaln([$1], [ZFS_LINUX_CONFTEST([$1])])
+       m4_ifvaln([$1], [ZFS_LINUX_CONFTEST_C([$1])])
+       m4_ifvaln([$6], [ZFS_LINUX_CONFTEST_H([$6])], [ZFS_LINUX_CONFTEST_H([])])
        rm -Rf build && mkdir -p build && touch build/conftest.mod.c
        echo "obj-m := conftest.o" >build/Makefile
        modpost_flag=''
        test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage
        AS_IF(
-               [AC_TRY_COMMAND(cp conftest.c build && make [$2] -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag) >/dev/null && AC_TRY_COMMAND([$3])],
+               [AC_TRY_COMMAND(cp conftest.c conftest.h build && make [$2] -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag) >/dev/null && AC_TRY_COMMAND([$3])],
                [$4],
                [_AC_MSG_LOG_CONFTEST m4_ifvaln([$5],[$5])]
        )
@@ -550,7 +739,7 @@ dnl #
 dnl # ZFS_LINUX_CONFIG
 dnl #
 AC_DEFUN([ZFS_LINUX_CONFIG],
-       [AC_MSG_CHECKING([whether Linux was built with CONFIG_$1])
+       [AC_MSG_CHECKING([whether kernel was built with CONFIG_$1])
        ZFS_LINUX_TRY_COMPILE([
                #include <linux/module.h>
        ],[
@@ -615,3 +804,16 @@ AC_DEFUN([ZFS_LINUX_TRY_COMPILE_SYMBOL], [
                fi
        fi
 ])
+
+dnl #
+dnl # ZFS_LINUX_TRY_COMPILE_HEADER
+dnl # like ZFS_LINUX_TRY_COMPILE, except the contents conftest.h are
+dnl # provided via the fifth parameter
+dnl #
+AC_DEFUN([ZFS_LINUX_TRY_COMPILE_HEADER],
+       [ZFS_LINUX_COMPILE_IFELSE(
+       [AC_LANG_SOURCE([ZFS_LANG_PROGRAM([[$1]], [[$2]])])],
+       [modules],
+       [test -s build/conftest.o],
+       [$3], [$4], [$5])
+])