#
-# LN_CONFIG_MAX_PAYLOAD
-#
-# configure maximum payload
-#
-AC_DEFUN([LN_CONFIG_MAX_PAYLOAD], [
-AC_MSG_CHECKING([for non-default maximum LNET payload])
-AC_ARG_WITH([max-payload-mb],
- AC_HELP_STRING([--with-max-payload-mb=MBytes],
- [set maximum lnet payload in MBytes]),
- [
- AC_MSG_RESULT([$with_max_payload_mb])
- CONFIG_LNET_MAX_PAYLOAD_MB=$with_max_payload_mb
- CONFIG_LNET_MAX_PAYLOAD="(($with_max_payload_mb)<<20)"
- ], [
- AC_MSG_RESULT([no])
- CONFIG_LNET_MAX_PAYLOAD="LNET_MTU"
- ])
-AC_DEFINE_UNQUOTED(CONFIG_LNET_MAX_PAYLOAD, $CONFIG_LNET_MAX_PAYLOAD,
- [Max LNET payload])
-]) # LN_CONFIG_MAX_PAYLOAD
-
-#
# LN_CHECK_GCC_VERSION
#
# Check compiler version
set_cpus_allowed_ptr, [
#include <linux/sched.h>
],[
- struct task_struct *t;
- #if HAVE_CPUMASK_T
- cpumask_t m;
- #else
- unsigned long m;
- #endif
+ struct task_struct *t = NULL;
+ cpumask_t m = { };
+
set_cpus_allowed_ptr(t, &m);
],[
AC_DEFINE(CPU_AFFINITY, 1,
#
# LN_CONFIG_DLC
#
-# Configure dlc if enabled
+# Configure dlc
#
-# if libyaml is set (IE libyaml installed) and enable_dlc = yes then build
-# dlc other wise (IE if libyaml is not set or enable_dlc = no) then don't
-# build dlc.
+# fail to build if libyaml is not installed
#
AC_DEFUN([LN_CONFIG_DLC], [
- AC_CHECK_LIB([yaml], [yaml_parser_initialize],[
- LIBYAML="libyaml"],[
- LIBYAML=""],[-lm])
- AC_MSG_CHECKING([whether to enable dlc])
- AC_ARG_ENABLE([dlc],
- AC_HELP_STRING([--disable-dlc],
- [disable building dlc]),
- [], [enable_dlc="yes"])
- USE_DLC=""
- AS_IF([test "x$enable_dlc" = xyes],
- [AS_IF([test "x$LIBYAML" = xlibyaml], [
- USE_DLC="yes"
- AC_MSG_RESULT([yes])
- ], [
- AC_MSG_RESULT([no (libyaml not present)])
- ])
- ], [
- AC_MSG_RESULT([no])
+ AS_IF([test "x$enable_dist" = xno], [
+ AC_CHECK_LIB([yaml], [yaml_parser_initialize],
+ [LIBYAML="libyaml"],
+ [AC_MSG_ERROR([YAML development libraries not not installed])],
+ [-lm])
])
- AC_SUBST(USE_DLC)
])
#
OFED_INFO="ofed_info"
LSPKG="rpm -ql"
])
- O2IBPATHS=$(eval $OFED_INFO | egrep -w 'mlnx-ofed-kernel-dkms|mlnx-ofa_kernel-devel|compat-rdma-devel|kernel-ib-devel|ofa_kernel-devel' | xargs $LSPKG | grep '\(/openib\|/ofa_kernel/default\)$' | head -n1)
+ O2IBPATHS=$(eval $OFED_INFO | egrep -w 'mlnx-ofed-kernel-dkms|mlnx-ofa_kernel-devel|compat-rdma-devel|kernel-ib-devel|ofa_kernel-devel' | xargs $LSPKG | grep '\(/openib\|/ofa_kernel/default\|/ofa_kernel\)$' | head -n1)
AS_IF([test -z "$O2IBPATHS"], [
AC_MSG_ERROR([
You seem to have an OFED installed but have not installed it's devel package.
Instead, if you want to build Lustre for your kernel's built-in I/B stack rather than your installed OFED stack, either remove the OFED package(s) or use --with-o2ib=no.
])
])
+ if test -e $O2IBPATHS/${LINUXRELEASE}; then
+ O2IBPATHS=$O2IBPATHS/${LINUXRELEASE}
+ elif test -e $O2IBPATHS/default; then
+ O2IBPATHS=$O2IBPATHS/default
+ fi
OFED="yes"
], [
O2IBPATHS="$LINUX $LINUX/drivers/infiniband"
O2IBLND=""
O2IBPATH=$(readlink --canonicalize $O2IBPATH)
- EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -I$O2IBPATH/include"
+ EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -I$O2IBPATH/include -I$O2IBPATH/include/uapi"
EXTRA_CHECK_INCLUDE="$EXTRA_OFED_CONFIG $EXTRA_OFED_INCLUDE"
LB_CHECK_COMPILE([whether to enable OpenIB gen2 support],
openib_gen2_support, [
# we know at this point that the found OFED source is good
O2IB_SYMVER=""
if test $ENABLEO2IB = "withpath" -o "x$OFED" = "xyes" ; then
- # OFED default rpm not handle sles10 Modules.symvers name
- for name in Module.symvers Modules.symvers; do
- if test -f $O2IBPATH/$name; then
- O2IB_SYMVER=$name;
- break;
- fi
- done
+ if test -f $O2IBPATH/Module.symvers; then
+ O2IB_SYMVER=$O2IBPATH/Module.symvers;
+ break;
+ fi
if test -n "$O2IB_SYMVER"; then
- AC_MSG_NOTICE([adding $O2IBPATH/$O2IB_SYMVER to Symbol Path])
- EXTRA_SYMBOLS="$EXTRA_SYMBOLS $O2IBPATH/$O2IB_SYMVER"
+ AC_MSG_NOTICE([adding $O2IB_SYMVER to Symbol Path])
+ EXTRA_SYMBOLS="$EXTRA_SYMBOLS $O2IB_SYMVER"
AC_SUBST(EXTRA_SYMBOLS)
else
AC_MSG_ERROR([an external source tree was, either specified or detected, for o2iblnd however I could not find a $O2IBPATH/Module.symvers there])
#endif
#include <linux/kthread.h>
],[
- struct kthread_work *kth_wrk __attribute__ ((unused));
+ struct kthread_work *kth_wrk = NULL;
flush_kthread_work(kth_wrk);
],[
AC_DEFINE(HAVE_KTHREAD_WORK, 1, [kthread_worker found])
[struct ib_device.attrs is defined])
])
+ # A flags argument was added to ib_alloc_pd() in Linux 4.9,
+ # commit ed082d36a7b2c27d1cda55fdfb28af18040c4a89
+ LB_CHECK_COMPILE([if 2arg 'ib_alloc_pd' exists],
+ ib_alloc_pd, [
+ #ifdef HAVE_COMPAT_RDMA
+ #undef PACKAGE_NAME
+ #undef PACKAGE_TARNAME
+ #undef PACKAGE_VERSION
+ #undef PACKAGE_STRING
+ #undef PACKAGE_BUGREPORT
+ #undef PACKAGE_URL
+ #include <linux/compat-2.6.h>
+ #endif
+ #include <rdma/ib_verbs.h>
+ ],[
+ ib_alloc_pd(NULL, 0);
+ ],[
+ AC_DEFINE(HAVE_IB_ALLOC_PD_2ARGS, 1,
+ [ib_alloc_pd has 2 arguments])
+ ])
+
LB_CHECK_COMPILE([if function 'ib_inc_rkey' is defined],
ib_inc_rkey, [
#ifdef HAVE_COMPAT_RDMA
[function ib_inc_rkey exist])
])
+ # In MOFED 4.6, the second and third parameters for
+ # ib_post_send() and ib_post_recv() are declared with
+ # 'const'.
+ tmp_flags="$EXTRA_KCFLAGS"
+ EXTRA_KCFLAGS="-Werror"
+ LB_CHECK_COMPILE([if 'ib_post_send() and ib_post_recv()' have const parameters],
+ ib_post_send_recv_const, [
+ #ifdef HAVE_COMPAT_RDMA
+ #undef PACKAGE_NAME
+ #undef PACKAGE_TARNAME
+ #undef PACKAGE_VERSION
+ #undef PACKAGE_STRING
+ #undef PACKAGE_BUGREPORT
+ #undef PACKAGE_URL
+ #include <linux/compat-2.6.h>
+ #endif
+ #include <rdma/ib_verbs.h>
+ ],[
+ ib_post_send(NULL, (const struct ib_send_wr *)NULL,
+ (const struct ib_send_wr **)NULL);
+ ],[
+ AC_DEFINE(HAVE_IB_POST_SEND_RECV_CONST, 1,
+ [ib_post_send and ib_post_recv have const parameters])
+ ])
+ EXTRA_KCFLAGS="$tmp_flags"
+
EXTRA_CHECK_INCLUDE=""
]) # ENABLEO2IB != "no"
]) # LN_CONFIG_O2IB
EXTRA_KCFLAGS="$tmp_flags"
]) # LN_CONFIG_TCP_SENDPAGE
+# LN_CONFIG_SOCK_CREATE_KERN
+#
+# 4.x sock_create_kern() added a first parameter as 'struct net *'
+# instead of int.
+#
+AC_DEFUN([LN_CONFIG_SOCK_CREATE_KERN], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if 'sock_create_kern' first parameter is net],
+sock_create_kern_net, [
+ #include <linux/net.h>
+ #include <net/net_namespace.h>
+],[
+ sock_create_kern((struct net*)0, 0, 0, 0, NULL);
+],[
+ AC_DEFINE(HAVE_SOCK_CREATE_KERN_USE_NET, 1,
+ [sock_create_kern use net as first parameter])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LN_CONFIG_SOCK_CREATE_KERN
+
#
# LN_CONFIG_SK_DATA_READY
#
]) # LN_CONFIG_SK_DATA_READY
#
+# LN_EXPORT_KMAP_TO_PAGE
+#
+# 3.10 Export kmap_to_page
+#
+AC_DEFUN([LN_EXPORT_KMAP_TO_PAGE], [
+LB_CHECK_EXPORT([kmap_to_page], [mm/highmem.c],
+ [AC_DEFINE(HAVE_KMAP_TO_PAGE, 1,
+ [kmap_to_page is exported by the kernel])])
+]) # LN_EXPORT_KMAP_TO_PAG
+
+#
+# LN_CONFIG_SOCK_ACCEPT
+#
+# 4.11 commit cdfbabfb2f0ce983fdaa42f20e5f7842178fc01e added a flag
+# to handle a possible lockdep condition kernel socket accept.
+#
+AC_DEFUN([LN_CONFIG_SOCK_ACCEPT], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if 'struct sock' accept function requires a bool argument],
+kern_sock_flag, [
+ #include <linux/net.h>
+],[
+ ((struct socket *)0)->ops->accept(NULL, NULL, O_NONBLOCK, false);
+],[
+ AC_DEFINE(HAVE_KERN_SOCK_ACCEPT_FLAG_ARG, 1,
+ ['struct sock' accept function requires bool argument])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LN_CONFIG_SOCK_ACCEPT
+
+#
+# LN_CONFIG_SOCK_GETNAME
+#
+# 4.17 commit 9b2c45d479d0fb8647c9e83359df69162b5fbe5f getname()
+# does not take the length *int argument and returns the length
+#
+AC_DEFUN([LN_CONFIG_SOCK_GETNAME], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if 'getname' has two args],
+kern_sock_getname_2args, [
+ #include <linux/net.h>
+],[
+ kernel_getsockname(NULL, NULL);
+],[
+ AC_DEFINE(HAVE_KERN_SOCK_GETNAME_2ARGS, 1,
+ ['getname' has two args])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LN_CONFIG_SOCK_GETNAME
+
+#
+# LN_IB_DEVICE_OPS_EXISTS
+#
+# kernel 5.0 commit 521ed0d92ab0db3edd17a5f4716b7f698f4fce61
+# RDMA/core: Introduce ib_device_ops
+# ... introduces the ib_device_ops structure that defines all the
+# InfiniBand device operations in one place ...
+#
+AC_DEFUN([LN_IB_DEVICE_OPS_EXISTS], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if struct ib_device_ops is defined],
+ib_device_ops_test, [
+ #include <rdma/ib_verbs.h>
+],[
+ int x = offsetof(struct ib_device_ops, unmap_fmr);
+ x = x;
+ (void)x;
+],[
+ AC_DEFINE(HAVE_IB_DEVICE_OPS, 1,
+ [if struct ib_device_ops is defined])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LN_IB_DEVICE_OPS_EXISTS
+
+#
+# LN_IB_SG_DMA_ADDRESS_EXISTS
+#
+# kernel 5.1 commit a163afc88556e099271a7b423295bc5176fcecce
+# IB/core: Remove ib_sg_dma_address() and ib_sg_dma_len()
+# ... when dma_ops existed (3.6) ib_sg_dma_address() was not trivial ...
+#
+AC_DEFUN([LN_IB_SG_DMA_ADDRESS_EXISTS], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if ib_sg_dma_address wrapper exists],
+ib_sg_dma_address_test, [
+ #include <rdma/ib_verbs.h>
+],[
+ u64 x = ib_sg_dma_address(NULL, NULL);
+ x = x;
+ (void)x;
+],[
+ AC_DEFINE(HAVE_IB_SG_DMA_ADDRESS, 1,
+ [if ib_sg_dma_address wrapper exists])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LN_IB_SG_DMA_ADDRESS_EXISTS
+
+#
# LN_PROG_LINUX
#
# LNet linux kernel checks
LN_CONFIG_SK_SLEEP
# 2.6.36
LN_CONFIG_TCP_SENDPAGE
+# 3.10
+LN_EXPORT_KMAP_TO_PAGE
# 3.15
LN_CONFIG_SK_DATA_READY
+# 4.x
+LN_CONFIG_SOCK_CREATE_KERN
+# 4.11
+LN_CONFIG_SOCK_ACCEPT
+# 4.17
+LN_CONFIG_SOCK_GETNAME
+# 5.0
+LN_IB_DEVICE_OPS_EXISTS
+# 5.1
+LN_IB_SG_DMA_ADDRESS_EXISTS
]) # LN_PROG_LINUX
#
])
AC_SUBST(LIBEFENCE)
-LN_CONFIG_MAX_PAYLOAD
LN_CONFIG_DLC
]) # LN_CONFIGURE
AC_DEFUN([LN_CONDITIONALS], [
AM_CONDITIONAL(BUILD_O2IBLND, test x$O2IBLND = "xo2iblnd")
AM_CONDITIONAL(BUILD_GNILND, test x$GNILND = "xgnilnd")
-AM_CONDITIONAL(BUILD_DLC, test x$USE_DLC = "xyes")
]) # LN_CONDITIONALS
#
lnet/doc/Makefile
lnet/include/Makefile
lnet/include/lnet/Makefile
+lnet/include/uapi/linux/lnet/Makefile
lnet/klnds/Makefile
lnet/klnds/autoMakefile
lnet/klnds/o2iblnd/Makefile
git://git.whamcloud.com / fs / lustre-release.git / blobdiff