X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=config%2Fkernel.m4;h=55609cdf13d62ba971356629efa890985cb64e98;hb=ea1fdf46e2d37e9eb048f9add0fb06e77e9ee6e2;hp=c73284062f9c6f204c6eb08592a0c13ea1a9b393;hpb=f4af6bb783b0b7f2a6075cb1c74c225db8a157b2;p=zfs.git

diff --git a/config/kernel.m4 b/config/kernel.m4
index c732840..55609cd 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -8,6 +8,8 @@ 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
 	ZFS_AC_KERNEL_BDEV_LOGICAL_BLOCK_SIZE
@@ -16,25 +18,61 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
 	ZFS_AC_KERNEL_BIO_FAILFAST_DTD
 	ZFS_AC_KERNEL_REQ_FAILFAST_MASK
 	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_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
-
-	if test "$LINUX_OBJ" != "$LINUX"; then
+	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
+
+	AS_IF([test "$LINUX_OBJ" != "$LINUX"], [
 		KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
-	fi
+	])
 	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 -DHAVE_SPL -D_KERNEL"
 	KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\""
 
@@ -47,15 +85,23 @@ dnl #
 AC_DEFUN([ZFS_AC_MODULE_SYMVERS], [
 	modpost=$LINUX/scripts/Makefile.modpost
 	AC_MSG_CHECKING([kernel file name for module symbols])
-	if test -f "$modpost"; then
-		if grep -q Modules.symvers $modpost; then
+	AS_IF([test -f "$modpost"], [
+		AS_IF([grep -q Modules.symvers $modpost], [
 			LINUX_SYMBOLS=Modules.symvers
-		else
+		], [
 			LINUX_SYMBOLS=Module.symvers
-		fi
-	else
+		])
+
+		AS_IF([test ! -f "$LINUX_OBJ/$LINUX_SYMBOLS"], [
+			AC_MSG_ERROR([
+	*** Please make sure the kernel devel package for your distribution
+	*** is installed.  If your building with a custom kernel make sure the
+	*** kernel is configured, built, and the '--with-linux=PATH' configure
+	*** option refers to the location of the kernel source.])
+		])
+	], [
 		LINUX_SYMBOLS=NONE
-	fi
+	])
 	AC_MSG_RESULT($LINUX_SYMBOLS)
 	AC_SUBST(LINUX_SYMBOLS)
 ])
@@ -75,72 +121,77 @@ AC_DEFUN([ZFS_AC_KERNEL], [
 		[kernelbuild="$withval"])
 
 	AC_MSG_CHECKING([kernel source directory])
-	if test -z "$kernelsrc"; then
-		headersdir="/lib/modules/$(uname -r)/build"
-		if test -e "$headersdir"; then
+	AS_IF([test -z "$kernelsrc"], [
+		AS_IF([test -e "/lib/modules/$(uname -r)/source"], [
+			headersdir="/lib/modules/$(uname -r)/source"
+			sourcelink=$(readlink -f "$headersdir")
+		], [test -e "/lib/modules/$(uname -r)/build"], [
+			headersdir="/lib/modules/$(uname -r)/build"
 			sourcelink=$(readlink -f "$headersdir")
-		else
+		], [
 			sourcelink=$(ls -1d /usr/src/kernels/* \
-				     /usr/src/linux-* \
+			             /usr/src/linux-* \
 			             2>/dev/null | grep -v obj | tail -1)
-		fi
+		])
 
-		if test -n "$sourcelink" && test -e ${sourcelink}; then
+		AS_IF([test -n "$sourcelink" && test -e ${sourcelink}], [
 			kernelsrc=`readlink -f ${sourcelink}`
-		else
+		], [
 			AC_MSG_RESULT([Not found])
 			AC_MSG_ERROR([
 	*** Please make sure the kernel devel package for your distribution
 	*** is installed then try again.  If that fails you can specify the
 	*** location of the kernel source with the '--with-linux=PATH' option.])
-		fi
-	else
-		if test "$kernelsrc" = "NONE"; then
+		])
+	], [
+		AS_IF([test "$kernelsrc" = "NONE"], [
 			kernsrcver=NONE
-		fi
-	fi
+		])
+	])
 
 	AC_MSG_RESULT([$kernelsrc])
 	AC_MSG_CHECKING([kernel build directory])
-	if test -z "$kernelbuild"; then
-		if test -d ${kernelsrc}-obj/${target_cpu}/${target_cpu}; then
+	AS_IF([test -z "$kernelbuild"], [
+		AS_IF([test -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}
-		elif test -d ${kernelsrc}-obj/${target_cpu}/default; then
+		], [test -d ${kernelsrc}-obj/${target_cpu}/default], [
 		        kernelbuild=${kernelsrc}-obj/${target_cpu}/default
-		elif test -d `dirname ${kernelsrc}`/build-${target_cpu}; then
+		], [test -d `dirname ${kernelsrc}`/build-${target_cpu}], [
 			kernelbuild=`dirname ${kernelsrc}`/build-${target_cpu}
-		else
+		], [
 			kernelbuild=${kernelsrc}
-		fi
-	fi
+		])
+	])
 	AC_MSG_RESULT([$kernelbuild])
 
 	AC_MSG_CHECKING([kernel source version])
 	utsrelease1=$kernelbuild/include/linux/version.h
 	utsrelease2=$kernelbuild/include/linux/utsrelease.h
 	utsrelease3=$kernelbuild/include/generated/utsrelease.h
-	if test -r $utsrelease1 && fgrep -q UTS_RELEASE $utsrelease1; then
+	AS_IF([test -r $utsrelease1 && fgrep -q UTS_RELEASE $utsrelease1], [
 		utsrelease=linux/version.h
-	elif test -r $utsrelease2 && fgrep -q UTS_RELEASE $utsrelease2; then
+	], [test -r $utsrelease2 && fgrep -q UTS_RELEASE $utsrelease2], [
 		utsrelease=linux/utsrelease.h
-	elif test -r $utsrelease3 && fgrep -q UTS_RELEASE $utsrelease3; then
+	], [test -r $utsrelease3 && fgrep -q UTS_RELEASE $utsrelease3], [
 		utsrelease=generated/utsrelease.h
-	fi
+	])
 
-	if test "$utsrelease"; then
+	AS_IF([test "$utsrelease"], [
 		kernsrcver=`(echo "#include <$utsrelease>";
 		             echo "kernsrcver=UTS_RELEASE") |
 		             cpp -I $kernelbuild/include |
 		             grep "^kernsrcver=" | cut -d \" -f 2`
 
-		if test -z "$kernsrcver"; then
+		AS_IF([test -z "$kernsrcver"], [
 			AC_MSG_RESULT([Not found])
 			AC_MSG_ERROR([*** Cannot determine kernel version.])
-		fi
-	else
+		])
+	], [
 		AC_MSG_RESULT([Not found])
 		AC_MSG_ERROR([*** Cannot find UTS_RELEASE definition.])
-	fi
+	])
 
 	AC_MSG_RESULT([$kernsrcver])
 
@@ -167,17 +218,17 @@ dnl # detect symbols exported by the SPL at configure time.
 dnl #
 AC_DEFUN([ZFS_AC_SPL_MODULE_SYMVERS], [
 	AC_MSG_CHECKING([spl file name for module symbols])
-	if test -r $SPL_OBJ/Module.symvers; then
+	AS_IF([test -r $SPL_OBJ/Module.symvers], [
 		SPL_SYMBOLS=Module.symvers
-	elif test -r $SPL_OBJ/Modules.symvers; then
+	], [test -r $SPL_OBJ/Modules.symvers], [
 		SPL_SYMBOLS=Modules.symvers
-	elif test -r $SPL_OBJ/module/Module.symvers; then
+	], [test -r $SPL_OBJ/module/Module.symvers], [
 		SPL_SYMBOLS=Module.symvers
-	elif test -r $SPL_OBJ/module/Modules.symvers; then
+	], [test -r $SPL_OBJ/module/Modules.symvers], [
 		SPL_SYMBOLS=Modules.symvers
-	else
+	], [
 		SPL_SYMBOLS=$LINUX_SYMBOLS
-	fi
+	])
 
 	AC_MSG_RESULT([$SPL_SYMBOLS])
 	AC_SUBST(SPL_SYMBOLS)
@@ -199,53 +250,53 @@ AC_DEFUN([ZFS_AC_SPL], [
 
 
 	AC_MSG_CHECKING([spl source directory])
-	if test -z "$splsrc"; then
+	AS_IF([test -z "$splsrc"], [
 		sourcelink=`ls -1d /usr/src/spl-*/${LINUX_VERSION} \
 		            2>/dev/null | tail -1`
 
-		if test -z "$sourcelink" || test ! -e $sourcelink; then
+		AS_IF([test -z "$sourcelink" || test ! -e $sourcelink], [
 			sourcelink=../spl
-		fi
+		])
 
-		if test -e $sourcelink; then
+		AS_IF([test -e $sourcelink], [
 			splsrc=`readlink -f ${sourcelink}`
-		else
+		], [
 			AC_MSG_RESULT([Not found])
 			AC_MSG_ERROR([
 	*** Please make sure the 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.])
-		fi
-	else
-		if test "$splsrc" = "NONE"; then
+		])
+	], [
+		AS_IF([test "$splsrc" = "NONE"], [
 			splbuild=NONE
 			splsrcver=NONE
-		fi
-	fi
+		])
+	])
 
 	AC_MSG_RESULT([$splsrc])
 	AC_MSG_CHECKING([spl build directory])
-	if test -z "$splbuild"; then
+	AS_IF([test -z "$splbuild"], [
 		splbuild=${splsrc}
-	fi
+	])
 	AC_MSG_RESULT([$splbuild])
 
 	AC_MSG_CHECKING([spl source version])
-	if test -r $splbuild/spl_config.h &&
-		fgrep -q SPL_META_VERSION $splbuild/spl_config.h; then
+	AS_IF([test -r $splbuild/spl_config.h &&
+		fgrep -q SPL_META_VERSION $splbuild/spl_config.h], [
 
 		splsrcver=`(echo "#include <spl_config.h>";
-		            echo "splsrcver=SPL_META_VERSION") |
+		            echo "splsrcver=SPL_META_VERSION-SPL_META_RELEASE") |
 		            cpp -I $splbuild |
-		            grep "^splsrcver=" | cut -d \" -f 2`
-	fi
+		            grep "^splsrcver=" | tr -d \" | cut -d= -f2`
+	])
 
-	if test -z "$splsrcver"; then
+	AS_IF([test -z "$splsrcver"], [
 		AC_MSG_RESULT([Not found])
 		AC_MSG_ERROR([
-		*** Cannot determine the version of the spl source.
-		*** Please prepare the spl source before running this script])
-	fi
+	*** Cannot determine the version of the spl source.
+	*** Please prepare the spl source before running this script])
+	])
 
 	AC_MSG_RESULT([$splsrcver])
 
@@ -261,27 +312,79 @@ AC_DEFUN([ZFS_AC_SPL], [
 ])
 
 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 #
-dnl # CONFIG_DEBUG_LOCK_ALLOC - Maps mutex_lock() to mutex_lock_nested()
+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 #
 AC_DEFUN([ZFS_AC_KERNEL_CONFIG], [
 
-	if test "$ZFS_META_LICENSE" = CDDL; then
-		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.]), [])
-	fi
-
-	if test "$ZFS_META_LICENSE" = GPL; then
+	AS_IF([test "$ZFS_META_LICENSE" = GPL], [
 		AC_DEFINE([HAVE_GPL_ONLY_SYMBOLS], [1],
 			[Define to 1 if licensed under the GPL])
-	fi
+	])
+
+	ZFS_AC_KERNEL_CONFIG_PREEMPT
+	ZFS_AC_KERNEL_CONFIG_DEBUG_LOCK_ALLOC
+])
+
+dnl #
+dnl # Check CONFIG_PREEMPT
+dnl #
+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_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.]), [])
+])
+
+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 <linux/module.h>
+			#include <linux/mutex.h>
+
+			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 #
@@ -341,9 +444,7 @@ dnl #
 AC_DEFUN([ZFS_LINUX_CONFIG],
 	[AC_MSG_CHECKING([whether Linux was built with CONFIG_$1])
 	ZFS_LINUX_TRY_COMPILE([
-		#ifndef AUTOCONF_INCLUDED
-		#include <linux/config.h>
-		#endif
+		#include <linux/module.h>
 	],[
 		#ifndef CONFIG_$1
 		#error CONFIG_$1 not #defined
@@ -366,25 +467,25 @@ AC_DEFUN([ZFS_CHECK_SYMBOL_EXPORT],
 	grep -q -E '[[[:space:]]]$1[[[:space:]]]' \
 		$LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null
 	rc=$?
-	if test $rc -ne 0; then
+	AS_IF([test $rc -ne 0], [
 		export=0
 		for file in $2; do
 			grep -q -E "EXPORT_SYMBOL.*($1)" "$LINUX/$file" 2>/dev/null
 			rc=$?
-		        if test $rc -eq 0; then
-		                export=1
-		                break;
-		        fi
+			AS_IF([test $rc -eq 0], [
+				export=1
+				break;
+			])
 		done
-		if test $export -eq 0; then
+		AS_IF([test $export -eq 0], [
 			AC_MSG_RESULT([no])
 			$4
-		else
+		], [
 			AC_MSG_RESULT([yes])
 			$3
-		fi
-	else
+		])
+	], [
 		AC_MSG_RESULT([yes])
 		$3
-	fi
+	])
 ])