X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=config%2Fkernel.m4;h=55609cdf13d62ba971356629efa890985cb64e98;hb=ea1fdf46e2d37e9eb048f9add0fb06e77e9ee6e2;hp=63a3237ec8b76c4ce500c00bc7066a6a2d815dfe;hpb=28eb9213d89cb25438fcecb86e735cc3edc26ea4;p=zfs.git diff --git a/config/kernel.m4 b/config/kernel.m4 index 63a3237..55609cd 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -8,6 +8,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ ZFS_AC_KERNEL_BDEV_BLOCK_DEVICE_OPERATIONS 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 ZFS_AC_KERNEL_INVALIDATE_BDEV_ARGS @@ -21,25 +22,44 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ ZFS_AC_KERNEL_BIO_RW_SYNCIO ZFS_AC_KERNEL_REQ_SYNC ZFS_AC_KERNEL_BLK_END_REQUEST + 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_GET_DISK_RO + ZFS_AC_KERNEL_GET_GENDISK ZFS_AC_KERNEL_RQ_IS_SYNC ZFS_AC_KERNEL_RQ_FOR_EACH_SEGMENT ZFS_AC_KERNEL_CONST_XATTR_HANDLER ZFS_AC_KERNEL_XATTR_HANDLER_GET ZFS_AC_KERNEL_XATTR_HANDLER_SET + ZFS_AC_KERNEL_SHOW_OPTIONS ZFS_AC_KERNEL_FSYNC ZFS_AC_KERNEL_EVICT_INODE + ZFS_AC_KERNEL_NR_CACHED_OBJECTS + ZFS_AC_KERNEL_FREE_CACHED_OBJECTS + ZFS_AC_KERNEL_FALLOCATE + ZFS_AC_KERNEL_TRUNCATE_RANGE + ZFS_AC_KERNEL_CREATE_UMODE_T + ZFS_AC_KERNEL_AUTOMOUNT + ZFS_AC_KERNEL_ENCODE_FH_WITH_INODE ZFS_AC_KERNEL_INSERT_INODE_LOCKED + ZFS_AC_KERNEL_D_MAKE_ROOT ZFS_AC_KERNEL_D_OBTAIN_ALIAS 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_SHRINK ZFS_AC_KERNEL_BDI ZFS_AC_KERNEL_BDI_SETUP_AND_REGISTER ZFS_AC_KERNEL_SET_NLINK @@ -266,9 +286,9 @@ AC_DEFUN([ZFS_AC_SPL], [ fgrep -q SPL_META_VERSION $splbuild/spl_config.h], [ splsrcver=`(echo "#include "; - echo "splsrcver=SPL_META_VERSION") | + echo "splsrcver=SPL_META_VERSION-SPL_META_RELEASE") | cpp -I $splbuild | - grep "^splsrcver=" | cut -d \" -f 2` + grep "^splsrcver=" | tr -d \" | cut -d= -f2` ]) AS_IF([test -z "$splsrcver"], [ @@ -296,34 +316,75 @@ dnl # Certain kernel build options are not supported. These must be dnl # detected at configure time and cause a build failure. Otherwise dnl # modules may be successfully built that behave incorrectly. dnl # -dnl # CONFIG_PREEMPT - Preempt kernels require special handling. +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]) + ]) + + ZFS_AC_KERNEL_CONFIG_PREEMPT + ZFS_AC_KERNEL_CONFIG_DEBUG_LOCK_ALLOC +]) + dnl # -dnl # There are certain kernel build options which when enabled are -dnl # completely incompatible with non GPL kernel modules. It is best -dnl # to detect these at configure time and fail with a clear error -dnl # rather than build everything and fail during linking. +dnl # Check CONFIG_PREEMPT dnl # -dnl # CONFIG_DEBUG_LOCK_ALLOC - Maps mutex_lock() to mutex_lock_nested() +dnl # Premptible kernels will be supported in the future. But at the +dnl # moment there are a few places in the code which need to be updated +dnl # to accomidate them. Until that work occurs we should detect this +dnl # at configure time and fail with a sensible message. Otherwise, +dnl # people will be able to build successfully, however they will have +dnl # stability problems. See https://github.com/zfsonlinux/zfs/issues/83 dnl # -AC_DEFUN([ZFS_AC_KERNEL_CONFIG], [ +AC_DEFUN([ZFS_AC_KERNEL_CONFIG_PREEMPT], [ ZFS_LINUX_CONFIG([PREEMPT], AC_MSG_ERROR([ *** Kernel built with CONFIG_PREEMPT which is not supported. *** You must rebuild your kernel without this option.]), []) +]) - AS_IF([test "$ZFS_META_LICENSE" = CDDL], [ - ZFS_LINUX_CONFIG([DEBUG_LOCK_ALLOC], - AC_MSG_ERROR([ - *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is - *** incompatible with the CDDL license. You must rebuild - *** your kernel without this option.]), []) - ]) - - AS_IF([test "$ZFS_META_LICENSE" = GPL], [ - AC_DEFINE([HAVE_GPL_ONLY_SYMBOLS], [1], - [Define to 1 if licensed under the GPL]) - ]) +dnl # +dnl # Check CONFIG_DEBUG_LOCK_ALLOC +dnl # +dnl # This is typically only set for debug kernels because it comes with +dnl # a performance penalty. However, when it is set it maps the non-GPL +dnl # symbol mutex_lock() to the GPL-only mutex_lock_nested() symbol. +dnl # This will cause a failure at link time which we'd rather know about +dnl # at compile time. +dnl # +dnl # Since we plan to pursue making mutex_lock_nested() a non-GPL symbol +dnl # with the upstream community we add a check to detect this case. +dnl # +AC_DEFUN([ZFS_AC_KERNEL_CONFIG_DEBUG_LOCK_ALLOC], [ + + ZFS_LINUX_CONFIG([DEBUG_LOCK_ALLOC], [ + AC_MSG_CHECKING([whether mutex_lock() is GPL-only]) + tmp_flags="$EXTRA_KCFLAGS" + ZFS_LINUX_TRY_COMPILE([ + #include + #include + + MODULE_LICENSE("$ZFS_META_LICENSE"); + ],[ + struct mutex lock; + + mutex_init(&lock); + mutex_lock(&lock); + mutex_unlock(&lock); + ],[ + AC_MSG_RESULT(no) + ],[ + AC_MSG_RESULT(yes) + AC_MSG_ERROR([ + *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible + *** with the CDDL license and will prevent the module linking stage + *** from succeeding. You must rebuild your kernel without this + *** option enabled.]) + ]) + EXTRA_KCFLAGS="$tmp_flags" + ], []) ]) dnl #