X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=config%2Flustre-build-linux.m4;h=7a4c98d34353420ea950ca69491fafe1576b3556;hp=8ce66b861f0dee7343340b132f77389259951d44;hb=85a6eebeca1e1efb5bb9c3e737ab1978f8aca741;hpb=c4daf833ffc5203ce22b67bebdd9fce4eae5baac diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4 index 8ce66b8..7a4c98d 100644 --- a/config/lustre-build-linux.m4 +++ b/config/lustre-build-linux.m4 @@ -11,14 +11,9 @@ makerule="$PWD/build" AC_CACHE_CHECK([for external module build target], lb_cv_module_target, [ lb_cv_module_target="" - MODULE_TARGET="SUBDIRS" rm -f build/conftest.i - LB_LINUX_TRY_MAKE([], [], - [$makerule LUSTRE_KERNEL_TEST=conftest.i], - [test -s build/conftest.i], - [lb_cv_module_target="SUBDIRS"],[ MODULE_TARGET="M" - makerule="$PWD/build/" + makerule="$PWD/build" LB_LINUX_TRY_MAKE([], [], [$makerule LUSTRE_KERNEL_TEST=conftest.i], [test -s build/conftest.i], @@ -29,6 +24,12 @@ AC_CACHE_CHECK([for external module build target], lb_cv_module_target, [$makerule LUSTRE_KERNEL_TEST=conftest.i], [test -s build/conftest.i], [lb_cv_module_target="M"], [ + MODULE_TARGET="M" + makerule="" + LB_LINUX_TRY_MAKE([], [], + [$makerule LUSTRE_KERNEL_TEST=conftest.i], + [test -s build/conftest.i], + [lb_cv_module_target="M58"], [ AC_MSG_ERROR([kernel module make failed; check config.log for details]) ])])]) ]) @@ -37,6 +38,9 @@ AS_IF([test -z "$lb_cv_module_target"], [test "x$lb_cv_module_target" = "xM54"], [makerule="$PWD/build" lb_cv_module_target="M"], +[test "x$lb_cv_module_target" = "xM58"], + [makerule="" + lb_cv_module_target="M"], [test "x$lb_cv_module_target" = "xM"], [makerule="_module_$PWD/build"]) MODULE_TARGET=$lb_cv_module_target @@ -88,7 +92,6 @@ AC_DEFUN([LB_LINUX_RELEASE], [ RHEL_KERNEL="no" SUSE_KERNEL="no" UBUNTU_KERNEL="no" - DEBIAN_KERNEL="no" # And if any of the above kernels has been detected yet KERNEL_FOUND="no" @@ -130,20 +133,6 @@ AC_DEFUN([LB_LINUX_RELEASE], [ ]) ]) - # Check for Debian - AS_IF([test "x$KERNEL_FOUND" = "xno"], [ - AC_CACHE_CHECK([for Debian kernel signature], lb_cv_debian_kernel_sig, [ - lb_cv_debian_kernel_sig="no" - AS_IF([grep -q "LINUX_PACKAGE_ID\s*\"\s*Debian" $LINUX_OBJ/include/generated/package.h], [ - lb_cv_debian_kernel_sig="yes" - ]) - ]) - AS_IF([test "x$lb_cv_debian_kernel_sig" = "xyes"], [ - DEBIAN_KERNEL="yes" - KERNEL_FOUND="yes" - ]) - ]) - # Check for a ELRepo -ml kernel on RHEL 7/8 AS_IF([test "x$KERNEL_FOUND" = "xno"], [ AC_CACHE_CHECK([for ELRepo -ml kernel signature on CentOS], @@ -157,28 +146,26 @@ AC_DEFUN([LB_LINUX_RELEASE], [ ]) ]) AS_IF([test "x$lb_cv_mainline_kernel_sig" = "xyes"], [ - MAINLINE_KERNEL="yes" + RHEL_KERNEL="yes" KERNEL_FOUND="yes" ]) ]) # If still no kernel was found, a warning is issued AS_IF([test "x$KERNEL_FOUND" = "xno"], [ - AC_MSG_WARN([Kernel Distro seems to be neither RedHat, SuSE, Ubuntu nor Debian]) + AC_MSG_WARN([Kernel Distro seems to be neither RedHat, SuSE nor Ubuntu]) ]) AC_MSG_CHECKING([for Linux kernel module package directory]) AC_ARG_WITH([kmp-moddir], - AC_HELP_STRING([--with-kmp-moddir=string], + AS_HELP_STRING([--with-kmp-moddir=string], [set the kmod updates or extra directory]), [KMP_MODDIR=$withval IN_KERNEL=''],[ AS_IF([test x$RHEL_KERNEL = xyes], [KMP_MODDIR="extra/kernel"], - [test x$MAINLINE_KERNEL = xyes], [KMP_MODDIR="extra/kernel"], [test x$SUSE_KERNEL = xyes], [KMP_MODDIR="updates/kernel"], [test x$UBUNTU_KERNEL = xyes], [KMP_MODDIR="updates/kernel"], - [test x$DEBIAN_KERNEL = xyes], [KMP_MODDIR="updates/kernel"], - [AC_MSG_WARN([Kernel Distro seems to be neither RedHat, SuSE, Ubuntu nor Debian])] + [AC_MSG_WARN([Kernel Distro seems to be neither RedHat, SuSE nor Ubuntu])] ) IN_KERNEL="${PACKAGE}"]) AC_MSG_RESULT($KMP_MODDIR) @@ -254,7 +241,7 @@ AC_DEFUN([LB_ARG_CANON_PATH], [ # Find paths for linux, handling kernel-source rpms # AC_DEFUN([LB_LINUX_PATH], [ -for DEFAULT_LINUX in /usr/src/linux-source-* /lib/modules/$(uname -r)/{source,build} /usr/src/linux $(find /usr/src/kernels/ -maxdepth 1 -name @<:@0-9@:>@\* | xargs -r ls -d | tail -n 1); do +for DEFAULT_LINUX in /usr/src/linux-source-* /lib/modules/$(uname -r)/{source,build} /usr/src/linux* $(find /usr/src/kernels/ -maxdepth 1 -name @<:@0-9@:>@\* | xargs -r ls -d | tail -n 1); do AS_IF([readlink -q -e $DEFAULT_LINUX >/dev/null], [break]) done if test "$DEFAULT_LINUX" = "/lib/modules/$(uname -r)/source"; then @@ -269,13 +256,12 @@ done AC_MSG_CHECKING([for Linux sources]) AC_ARG_WITH([linux], - AC_HELP_STRING([--with-linux=path], + AS_HELP_STRING([--with-linux=path], [set path to Linux source (default=/lib/modules/$(uname -r)/{source,build},/usr/src/linux)]), [LB_ARG_CANON_PATH([linux], [LINUX]) DEFAULT_LINUX_OBJ=$LINUX], [LINUX=$DEFAULT_LINUX]) AC_MSG_RESULT([$LINUX]) -AC_SUBST(LINUX) # -------- check for linux -------- LB_CHECK_FILE([$LINUX], [], @@ -284,16 +270,29 @@ LB_CHECK_FILE([$LINUX], [], # -------- linux objects (for 2.6) -- AC_MSG_CHECKING([for Linux objects]) AC_ARG_WITH([linux-obj], - AC_HELP_STRING([--with-linux-obj=path], + AS_HELP_STRING([--with-linux-obj=path], [set path to Linux objects (default=/lib/modules/$(uname -r)/build,/usr/src/linux)]), [LB_ARG_CANON_PATH([linux-obj], [LINUX_OBJ])], [LINUX_OBJ=$DEFAULT_LINUX_OBJ]) AC_MSG_RESULT([$LINUX_OBJ]) -AC_SUBST(LINUX_OBJ) +## -------- with linux should point to -common on Debian +AS_IF([test ${LINUX} == ${LINUX_OBJ} -a ${LINUX} == $(realpath ${LINUX})],[ + this_arch=$(realpath ${LINUX} | sed 's/-/\n/g' | tail -1) + linux_headers_common=$(realpath ${LINUX}|sed "s/-${this_arch}\$/-common/g") + AS_IF([test "${this_arch}" != common],[ + _cah="${linux_headers_common}/include/linux/compiler_attributes.h" + _cgh="${linux_headers_common}/include/linux/compiler-gcc.h" + AS_IF([test -f "${_cah}" -o -f "${_cgh}"],[ + AC_MSG_WARN([Setting LINUX to ${linux_headers_common} was ${LINUX}]) + LINUX=${linux_headers_common}]) + ]) + ]) +AC_SUBST(LINUX) +AC_SUBST(LINUX_OBJ) # -------- check for .config -------- AC_ARG_WITH([linux-config], - [AC_HELP_STRING([--with-linux-config=path], + [AS_HELP_STRING([--with-linux-config=path], [set path to Linux .conf (default=$LINUX_OBJ/.config)])], [LB_ARG_CANON_PATH([linux-config], [LINUX_CONFIG])], [LINUX_CONFIG=$LINUX_OBJ/.config]) @@ -313,7 +312,7 @@ LB_CHECK_FILE([/boot/kernel.h], [KERNEL_SOURCE_HEADER='/var/adm/running-kernel.h'])]) AC_ARG_WITH([kernel-source-header], - AC_HELP_STRING([--with-kernel-source-header=path], + AS_HELP_STRING([--with-kernel-source-header=path], [Use a different kernel version header.]), [LB_ARG_CANON_PATH([kernel-source-header], [KERNEL_SOURCE_HEADER])]) @@ -442,13 +441,6 @@ module support is required to build Lustre kernel modules. LB_CHECK_CONFIG([MODVERSIONS]) -LB_CHECK_CONFIG([KALLSYMS], [], [ - AC_MSG_ERROR([ - -Lustre requires that CONFIG_KALLSYMS is enabled in your kernel. -]) - ]) - # 2.6.28 LC_MODULE_LOADING ]) @@ -545,6 +537,15 @@ m4_define([LB_LANG_PROGRAM], [ #include #include + +#if defined(NEED_LOCKDEP_IS_HELD_DISCARD_CONST) \ + && defined(CONFIG_LOCKDEP) \ + && defined(lockdep_is_held) +#undef lockdep_is_held + #define lockdep_is_held(lock) \ + lock_is_held((struct lockdep_map *)&(lock)->dep_map) +#endif + $1 int main (void) @@ -572,7 +573,7 @@ AC_DEFUN([LB_LINUX_COMPILE_IFELSE], [m4_ifvaln([$1], [AC_LANG_CONFTEST([AC_LANG_SOURCE([$1])])])dnl rm -f build/conftest.o build/conftest.mod.c build/conftest.ko SUBARCH=$(echo $target_cpu | sed -e 's/powerpc.*/powerpc/' -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/' -e 's/k1om/x86/' -e 's/aarch64.*/arm64/' -e 's/armv7.*/arm/') -AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] LDFLAGS= ${LD:+LD="$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_CHECK_INCLUDE -I$LINUX/arch/$SUBARCH/include -Iinclude -Iarch/$SUBARCH/include/generated -I$LINUX/include -Iinclude2 -I$LINUX/include/uapi -Iinclude/generated -I$LINUX/arch/$SUBARCH/include/uapi -Iarch/$SUBARCH/include/generated/uapi -I$LINUX/include/uapi -Iinclude/generated/uapi ${SPL_OBJ:+-include $SPL_OBJ/spl_config.h} ${ZFS_OBJ:+-include $ZFS_OBJ/zfs_config.h} ${SPL:+-I$SPL/include } ${ZFS:+-I$ZFS -I$ZFS/include -I${SPL:-$ZFS/include/spl}} -include $CONFIG_INCLUDE" KBUILD_EXTRA_SYMBOLS=${ZFS_OBJ:+$ZFS_OBJ/Module.symvers} -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])], +AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] LDFLAGS= ${LD:+LD="$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_CHECK_INCLUDE -I$LINUX/arch/$SUBARCH/include -Iinclude -Iarch/$SUBARCH/include/generated -I$LINUX/include -Iinclude2 -I$LINUX/include/uapi -Iinclude/generated -I$LINUX/arch/$SUBARCH/include/uapi -Iarch/$SUBARCH/include/generated/uapi -I$LINUX/include/uapi -Iinclude/generated/uapi ${SPL_OBJ:+-include $SPL_OBJ/spl_config.h} ${ZFS_OBJ:+-include $ZFS_OBJ/zfs_config.h} ${SPL:+-I$SPL/include } ${ZFS:+-I$ZFS -I$ZFS/include -I$ZFS/include/os/linux/kernel -I$ZFS/include/os/linux/spl -I$ZFS/include/os/linux/zfs -I${SPL:-$ZFS/include/spl}} -include $CONFIG_INCLUDE" KBUILD_EXTRA_SYMBOLS="${ZFS_OBJ:+$ZFS_OBJ/Module.symvers} $KBUILD_EXTRA_SYMBOLS" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])], [$4], [_AC_MSG_LOG_CONFTEST m4_ifvaln([$5],[$5])dnl]) @@ -638,3 +639,182 @@ AC_CACHE_CHECK([for $1], lb_header, [ AS_VAR_IF([lb_header], [yes], [$2], [$3])[]dnl AS_VAR_POPDEF([lb_header])dnl ]) # LB_CHECK_LINUX_HEADER + +# ------------------------------------------------------------------------------ +# Support 2 stage: parallel compile then checked test results +# Heavily inspired by OpenZFS + +AC_DEFUN([LB2_LINUX_CONFTEST_C], [ +test -d ${TEST_DIR}/$2 || mkdir -p ${TEST_DIR}/$2 +cat confdefs.h - <<_EOF >${TEST_DIR}/$2/$2.c +$1 +_EOF +]) + +# +# LB2_LINUX_CONFTEST_MAKEFILE +# +# $1 - *unique* test case name +# $2 - additional build flags (ccflags) +# $3 - external kernel includes for lnet o2ib|gni +# +AC_DEFUN([LB2_LINUX_CONFTEST_MAKEFILE], [ + test -d ${TEST_DIR} || mkdir -p ${TEST_DIR} + test -d ${TEST_DIR}/$1 || mkdir -p ${TEST_DIR}/$1 + + file=${TEST_DIR}/$1/Makefile + EXT_INCLUDE="$3" + + cat - <<_EOF >$file +# Example command line to manually build source +# make modules -C $LINUX_OBJ $ARCH_UM M=${TEST_DIR}/$1 + +${LD:+LD="$LD"} +CC=$CC +ZINC=${ZFS} +SINC=${SPL} +ZOBJ=${ZFS_OBJ} +SOBJ=${SPL_OBJ} + +LINUXINCLUDE = $EXT_INCLUDE +LINUXINCLUDE += -I$LINUX/arch/$SUBARCH/include +LINUXINCLUDE += -Iinclude -Iarch/$SUBARCH/include/generated +LINUXINCLUDE += -I$LINUX/include +LINUXINCLUDE += -Iinclude2 +LINUXINCLUDE += -I$LINUX/include/uapi +LINUXINCLUDE += -Iinclude/generated +LINUXINCLUDE += -I$LINUX/arch/$SUBARCH/include/uapi +LINUXINCLUDE += -Iarch/$SUBARCH/include/generated/uapi +LINUXINCLUDE += -I$LINUX/include/uapi -Iinclude/generated/uapi +ifneq (\$(SOBJ),) +LINUXINCLUDE += -include \$(SOBJ)/spl_config.h +endif +ifneq (\$(ZOBJ),) +LINUXINCLUDE += -include \$(ZOBJ)/zfs_config.h +endif +ifneq (\$(SINC),) +LINUXINCLUDE += -I\$(SINC)/include +endif +ifneq (\$(ZINC),) +LINUXINCLUDE += -I\$(ZINC) -I\$(ZINC)/include +ifneq (\$(SINC),) +LINUXINCLUDE += -I\$(SINC) +else +LINUXINCLUDE += -I\$(ZINC)/include/spl +endif +endif +LINUXINCLUDE += -include $CONFIG_INCLUDE +KBUILD_EXTRA_SYMBOLS=${ZFS_OBJ:+$ZFS_OBJ/Module.symvers} + +ccflags-y := -Werror-implicit-function-declaration +_EOF + + # Additional custom CFLAGS as requested. + m4_ifval($2, [echo "ccflags-y += $2" >>$file], []) + + # Test case source + echo "obj-m := $1.o" >>$file + echo "obj-m += $1/" >>${TEST_DIR}/Makefile +]) + + +# +# LB2_LINUX_COMPILE +# +# $1 - build dir +# $2 - test command +# $3 - pass command +# $4 - fail command +# +# Used internally by LB2_LINUX_TEST_COMPILE +# +AC_DEFUN([LB2_LINUX_COMPILE], [ + AC_TRY_COMMAND([ + KBUILD_MODPOST_NOFINAL="yes" + make modules -k -j$TEST_JOBS -C $LINUX_OBJ $ARCH_UM + M=$1 >$1/build.log 2>&1]) + AS_IF([AC_TRY_COMMAND([$2])], [$3], [$4]) +]) + +# +# LB2_LINUX_TEST_COMPILE +# +# Perform a full compile excluding the final modpost phase. +# $1 - flavor +# $2 - dirname +# +AC_DEFUN([LB2_LINUX_TEST_COMPILE], [ + LB2_LINUX_COMPILE([$2], [test -f $2/build.log], [ + mv $2/Makefile $2/Makefile.compile.$1 + mv $2/build.log $2/build.log.$1 + ],[ + AC_MSG_ERROR([ + *** Unable to compile test source to determine kernel interfaces.]) + ]) +]) + +# +# Perform the compilation of the test cases in two phases. +# +# Phase 1) attempt to build the object files for all of the tests +# defined by the LB2_LINUX_TEST_SRC macro. +# +# Phase 2) disable all tests which failed the initial compilation. +# +# This allows us efficiently build the test cases in parallel while +# remaining resilient to build failures which are expected when +# detecting the available kernel interfaces. +# +# The maximum allowed parallelism can be controlled by setting the +# TEST_JOBS environment variable which defaults to $(nproc). +# +AC_DEFUN([LB2_LINUX_TEST_COMPILE_ALL], [ + # Phase 1 - Compilation only, final linking is skipped. + LB2_LINUX_TEST_COMPILE([$1], [${TEST_DIR}]) + + for dir in $(awk '/^obj-m/ { print [$]3 }' \ + ${TEST_DIR}/Makefile.compile.$1); do + name=${dir%/} + AS_IF([test -f ${TEST_DIR}/$name/$name.o], [ + touch ${TEST_DIR}/$name/$name.ko + ]) + done +]) + +# +# LB2_LINUX_TEST_SRC +# +# $1 - *unique* name +# $2 - global +# $3 - source +# $4 - extra cflags +# $5 - external include paths +# +# NOTICE as all of the test cases are compiled in parallel tests may not +# depend on the results other tests. +# Each test needs resolve any external dependencies at the time the program +# source is generated. +# +AC_DEFUN([LB2_LINUX_TEST_SRC], [ + LB2_LINUX_CONFTEST_C([LB_LANG_PROGRAM([[$2]], [[$3]])], [$1_pc]) + LB2_LINUX_CONFTEST_MAKEFILE([$1_pc], [$4], [$5]) +]) + +# +# LB2_LINUX_TEST_RESULT +# +# $1 - *unique* name matching the LB2_LINUX_TEST_SRC macro +# $2 - run on success (valid .ko generated) +# $3 - run on failure (unable to compile) +# +AC_DEFUN([LB2_LINUX_TEST_RESULT], [ + AS_IF([test -d ${TEST_DIR}/$1_pc], [ + AS_IF([test -f ${TEST_DIR}/$1_pc/$1_pc.ko], [$2], [$3]) + ], [ + AC_MSG_ERROR([ + *** No matching source for the "$1" test, check that + *** both the test source and result macros refer to the same name. + ]) + ]) +]) +