X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Fautoconf%2Flustre-lnet.m4;h=c6be763715aa16d9c35704f02db9ad8565116de1;hp=4cd30ebd4bf6aeaae5c262f62781ef805bfa1063;hb=3f2844dc9333c86452c37bd7b4519729b1351371;hpb=7358bc93e63ca3eff1cde4f73d0e1d81896b1eaa

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index 4cd30eb..c6be763 100644
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -1,786 +1,1011 @@
+# LN_CONFIG_BACKOFF
 #
-# LN_CONFIG_MAX_PAYLOAD
-#
-# configure maximum payload
+# check if tunable tcp backoff is available/wanted
 #
-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])
-	        LNET_MAX_PAYLOAD_MB=$with_max_payload_mb
-		LNET_MAX_PAYLOAD="(($with_max_payload_mb)<<20)"
+AC_DEFUN([LN_CONFIG_BACKOFF], [
+AC_MSG_CHECKING([whether to enable tunable backoff TCP support])
+AC_ARG_ENABLE([backoff],
+	AC_HELP_STRING([--disable-backoff],
+		[disable socknal tunable backoff]),
+	[], [enable_backoff="yes"])
+AC_MSG_RESULT([$enable_backoff])
+AS_IF([test "x$enable_backoff" = xyes], [
+	AC_MSG_CHECKING([if Linux kernel has tunable backoff TCP support])
+	AS_IF([grep -c TCP_BACKOFF $LINUX/include/linux/tcp.h >/dev/null], [
+		AC_MSG_RESULT([yes])
+		AC_DEFINE(SOCKNAL_BACKOFF, 1, [use tunable backoff TCP])
+		AS_IF([grep rto_max $LINUX/include/linux/tcp.h | grep -q __u16 >/dev/null],
+			[AC_DEFINE(SOCKNAL_BACKOFF_MS, 1,
+				[tunable backoff TCP in ms])])
 	], [
 		AC_MSG_RESULT([no])
-		LNET_MAX_PAYLOAD="LNET_MTU"
 	])
-        AC_DEFINE_UNQUOTED(LNET_MAX_PAYLOAD, $LNET_MAX_PAYLOAD,
-			   [Max LNET payload])
-])
-
-#
-# LN_CHECK_GCC_VERSION
-#
-# Check compiler version
-#
-AC_DEFUN([LN_CHECK_GCC_VERSION],
-[AC_MSG_CHECKING([compiler version])
-PTL_CC_VERSION=`$CC --version | awk '/^gcc/{print $ 3}'`
-PTL_MIN_CC_VERSION="3.2.2"
-v2n() {
-	awk -F. '{printf "%d\n", (($ 1)*100+($ 2))*100+($ 3)}'
-}
-if test -z "$PTL_CC_VERSION" -o \
-        `echo $PTL_CC_VERSION | v2n` -ge `echo $PTL_MIN_CC_VERSION | v2n`; then
-	AC_MSG_RESULT([ok])
-else
-	AC_MSG_RESULT([Buggy compiler found])
-	AC_MSG_ERROR([Need gcc version >= $PTL_MIN_CC_VERSION])
-fi
-])
-
-#
-# LN_FUNC_DEV_GET_BY_NAME_2ARG
-#
-AC_DEFUN([LN_FUNC_DEV_GET_BY_NAME_2ARG],
-[AC_MSG_CHECKING([if dev_get_by_name has two args])
-LB_LINUX_TRY_COMPILE([
-	#include <linux/netdevice.h>
-],[
-        dev_get_by_name(NULL, NULL);
-],[
-	AC_MSG_RESULT([yes])
-	AC_DEFINE(HAVE_DEV_GET_BY_NAME_2ARG, 1, [dev_get_by_name has 2 args])
-],[
-	AC_MSG_RESULT([no])
-])
 ])
+]) # LN_CONFIG_BACKOFF
 
 #
-# LN_CONFIG_AFFINITY
-#
-# check if cpu affinity is available/wanted
+# LN_CONFIG_DLC
 #
-AC_DEFUN([LN_CONFIG_AFFINITY],
-[AC_ARG_ENABLE([affinity],
-	AC_HELP_STRING([--disable-affinity],
-		       [disable process/irq affinity]),
-	[],[enable_affinity='yes'])
-
-AC_MSG_CHECKING([for CPU affinity support])
-if test x$enable_affinity = xno ; then
-	AC_MSG_RESULT([no (by request)])
-else
-	LB_LINUX_TRY_COMPILE([
-		#include <linux/sched.h>
-	],[
-		struct task_struct t;
-		#if HAVE_CPUMASK_T
-		cpumask_t     m;
-	        #else
-	        unsigned long m;
-		#endif
-		set_cpus_allowed(&t, m);
-	],[
-		AC_DEFINE(CPU_AFFINITY, 1, [kernel has cpu affinity support])
-		AC_MSG_RESULT([yes])
-	],[
-		AC_MSG_RESULT([no (no kernel support)])
-	])
-fi
-])
-
+# Configure dlc
 #
-# LN_CONFIG_PORTALS
+# fail to build if libyaml is not installed
 #
-# configure support for Portals
-#
-AC_DEFUN([LN_CONFIG_PORTALS],
-[AC_MSG_CHECKING([for portals])
-AC_ARG_WITH([portals],
-	AC_HELP_STRING([--with-portals=path],
-                       [set path to portals]),
-        [
-		case $with_portals in
-			no)     ENABLEPORTALS=0
-				;;
-			*)	PORTALS="${with_portals}"
-				ENABLEPORTALS=1
-				;;
-		esac
-	], [
-		ENABLEPORTALS=0
+AC_DEFUN([LN_CONFIG_DLC], [
+	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])
 	])
-PTLLNDCPPFLAGS=""
-if test $ENABLEPORTALS -eq 0; then
-	AC_MSG_RESULT([no])
-elif test ! \( -f ${PORTALS}/include/portals/p30.h \); then
-        AC_MSG_RESULT([no])
-	AC_MSG_ERROR([bad --with-portals path])
-else
-        AC_MSG_RESULT([$PORTALS])
-        PTLLNDCPPFLAGS="-I${PORTALS}/include"
-fi
-AC_SUBST(PTLLNDCPPFLAGS)
-])
-
-#
-# LN_CONFIG_BACKOFF
-#
-# check if tunable tcp backoff is available/wanted
-#
-AC_DEFUN([LN_CONFIG_BACKOFF],
-[AC_MSG_CHECKING([for tunable backoff TCP support])
-AC_ARG_ENABLE([backoff],
-       AC_HELP_STRING([--disable-backoff],
-                      [disable socknal tunable backoff]),
-       [],[enable_backoff='yes'])
-if test x$enable_backoff = xno ; then
-       AC_MSG_RESULT([no (by request)])
-else
-       BOCD="`grep -c TCP_BACKOFF $LINUX/include/linux/tcp.h`"
-       if test "$BOCD" != 0 ; then
-               AC_DEFINE(SOCKNAL_BACKOFF, 1, [use tunable backoff TCP])
-               AC_MSG_RESULT(yes)
-               if grep rto_max $LINUX/include/linux/tcp.h|grep -q __u16; then
-                   AC_DEFINE(SOCKNAL_BACKOFF_MS, 1, [tunable backoff TCP in ms])
-               fi
-       else
-               AC_MSG_RESULT([no (no kernel support)])
-       fi
-fi
-])
-
-
-#
-# LN_CONFIG_PTLLND
-#
-# configure support for Portals LND
-#
-AC_DEFUN([LN_CONFIG_PTLLND],
-[
-if test -z "$ENABLEPORTALS"; then
-	LN_CONFIG_PORTALS
-fi
-
-AC_MSG_CHECKING([whether to build the kernel portals LND])
-
-PTLLND=""
-if test $ENABLEPORTALS -ne 0; then
-	AC_MSG_RESULT([yes])
-	PTLLND="ptllnd"
-else
-	AC_MSG_RESULT([no])
-fi
-AC_SUBST(PTLLND)
-])
-
-#
-# LN_CONFIG_UPTLLND
-#
-# configure support for Portals LND
-#
-AC_DEFUN([LN_CONFIG_UPTLLND],
-[
-if test -z "$ENABLEPORTALS"; then
-	LN_CONFIG_PORTALS
-fi
-
-AC_MSG_CHECKING([whether to build the userspace portals LND])
-
-UPTLLND=""
-if test $ENABLEPORTALS -ne 0; then
-	AC_MSG_RESULT([yes])
-	UPTLLND="ptllnd"
-else
-	AC_MSG_RESULT([no])
-fi
-AC_SUBST(UPTLLND)
-])
-
-#
-# LN_CONFIG_USOCKLND
-#
-# configure support for userspace TCP/IP LND
-#
-AC_DEFUN([LN_CONFIG_USOCKLND],
-[AC_MSG_CHECKING([whether to build usocklnd])
-AC_ARG_ENABLE([usocklnd],
-       	AC_HELP_STRING([--disable-usocklnd],
-                      	[disable usocklnd]),
-       	[],[enable_usocklnd='yes'])
-
-if test x$enable_usocklnd = xyes ; then
-	if test "$ENABLE_LIBPTHREAD" = "yes" ; then
-		AC_MSG_RESULT([yes])
-      		USOCKLND="usocklnd"
-	else
-		AC_MSG_RESULT([no (libpthread not present or disabled)])
-		USOCKLND=""
-	fi
-else
-	AC_MSG_RESULT([no (disabled explicitly)])
-     	USOCKLND=""
-fi
-AC_SUBST(USOCKLND)
 ])
 
 #
-# LN_CONFIG_QUADRICS
+# LN_CONFIG_O2IB
 #
-# check if quadrics support is in this kernel
+# If current OFED installed (assume with "ofed_info") and devel
+# headers are not found, error because we assume OFED infiniband
+# driver needs to be used and we must configure/build with it.
+# Current OFED headers detection mechanism allow for non-standard
+# prefix but relies on "ofed_info" command and on "%prefix/openib"
+# link (both are ok for 1.5.x and 3.x versions), and should work
+# for both source and DKMS builds.
 #
-AC_DEFUN([LN_CONFIG_QUADRICS],
-[AC_MSG_CHECKING([for QsNet sources])
-AC_ARG_WITH([qsnet],
-	AC_HELP_STRING([--with-qsnet=path],
-		       [set path to qsnet source (default=$LINUX)]),
-	[QSNET=$with_qsnet],
-	[QSNET=$LINUX])
-AC_MSG_RESULT([$QSNET])
-
-AC_MSG_CHECKING([if quadrics kernel headers are present])
-if test -d $QSNET/drivers/net/qsnet ; then
-	AC_MSG_RESULT([yes])
-	QSWLND="qswlnd"
-	AC_MSG_CHECKING([for multirail EKC])
-	if test -f $QSNET/include/elan/epcomms.h; then
-		AC_MSG_RESULT([supported])
-		QSWCPPFLAGS="-I$QSNET/include -DMULTIRAIL_EKC=1"
-	else
-		AC_MSG_RESULT([not supported])
-		AC_MSG_ERROR([Need multirail EKC])
-	fi
-
-	if test x$QSNET = x$LINUX ; then
-		LB_LINUX_CONFIG([QSNET],[],[
-			LB_LINUX_CONFIG([QSNET_MODULE],[],[
-				AC_MSG_WARN([QSNET is not enabled in this kernel; not building qswlnd.])
-				QSWLND=""
-				QSWCPPFLAGS=""
+AC_DEFUN([LN_CONFIG_O2IB], [
+AC_MSG_CHECKING([whether to use Compat RDMA])
+AC_ARG_WITH([o2ib],
+	AC_HELP_STRING([--with-o2ib=[yes|no|<path>]],
+		[build o2iblnd against path]),
+	[], [with_o2ib="yes"])
+
+case $with_o2ib in
+	yes)    AS_IF([which ofed_info 2>/dev/null], [
+			AS_IF([test x$uses_dpkg = xyes], [
+				OFED_INFO="ofed_info | awk '{print \[$]2}'"
+				LSPKG="dpkg --listfiles"
+			], [
+				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\|/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.
+If you still want to build Lustre for your OFED I/B stack, you need to install its devel headers RPM.
+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.
+					     ])
 			])
+			AS_IF([test $(echo $O2IBPATHS | wc -w) -ge 2], [
+				AC_MSG_ERROR([
+It appears that you have multiple OFED versions installed.
+If you still want to build Lustre for your OFED I/B stack, you need to install a single version with its devel headers RPM.
+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"
 		])
-	fi
-else
+		ENABLEO2IB="yes"
+		;;
+	no)     ENABLEO2IB="no"
+		;;
+	*)      O2IBPATHS=$with_o2ib
+		ENABLEO2IB="withpath"
+		OFED="yes"
+		;;
+esac
+
+AS_IF([test $ENABLEO2IB = "no"], [
 	AC_MSG_RESULT([no])
-	QSWLND=""
-	QSWCPPFLAGS=""
-fi
-AC_SUBST(QSWCPPFLAGS)
-AC_SUBST(QSWLND)
-])
-
-
-#
-# LN_CONFIG_MX
-#
-AC_DEFUN([LN_CONFIG_MX],
-[AC_MSG_CHECKING([whether to enable Myrinet MX support])
-# set default
-MXPATH="/opt/mx"
-AC_ARG_WITH([mx],
-       AC_HELP_STRING([--with-mx=path],
-                      [build mxlnd against path]),
-       [
-               case $with_mx in
-               yes)    ENABLEMX=2
-                       ;;
-               no)     ENABLEMX=0
-                       ;;
-               *)      MXPATH=$with_mx
-                       ENABLEMX=3
-                       ;;
-               esac
-       ],[
-               ENABLEMX=1
-       ])
-if test $ENABLEMX -eq 0; then
-       AC_MSG_RESULT([disabled])
-elif test ! \( -f ${MXPATH}/include/myriexpress.h -a \
-              -f ${MXPATH}/include/mx_kernel_api.h -a \
-              -f ${MXPATH}/include/mx_pin.h \); then
-       AC_MSG_RESULT([no])
-       case $ENABLEMX in
-       1) ;;
-       2) AC_MSG_ERROR([Myrinet MX kernel headers not present]);;
-       3) AC_MSG_ERROR([bad --with-mx path]);;
-       *) AC_MSG_ERROR([internal error]);;
-       esac
-else
-       MXCPPFLAGS="-I$MXPATH/include"
-       EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS"
-       EXTRA_KCFLAGS="$EXTRA_KCFLAGS $MXCPPFLAGS"
-       MXLIBS="-L$MXPATH/lib"
-       LB_LINUX_TRY_COMPILE([
-               #define MX_KERNEL 1
-               #include <mx_extensions.h>
-               #include <myriexpress.h>
-       ],[
-               mx_endpoint_t   end;
-               mx_status_t     status;
-               mx_request_t    request;
-               int             result;
-
-               mx_init();
-               mx_open_endpoint(MX_ANY_NIC, MX_ANY_ENDPOINT, 0, NULL, 0, &end);
-	       mx_register_unexp_handler(end, (mx_unexp_handler_t) NULL, NULL);
-               mx_wait_any(end, MX_INFINITE, 0LL, 0LL, &status, &result);
-               mx_iconnect(end, 0LL, 0, 0, 0, NULL, &request);
-               return 0;
-       ],[
-               AC_MSG_RESULT([yes])
-               MXLND="mxlnd"
-       ],[
-               AC_MSG_RESULT([no])
-               case $ENABLEMX in
-               1) ;;
-               2) AC_MSG_ERROR([can't compile with Myrinet MX kernel headers]);;
-               3) AC_MSG_ERROR([can't compile with Myrinet MX headers under $MXPATH]);;
-               *) AC_MSG_ERROR([internal error]);;
-               esac
-               MXLND=""
-               MXCPPFLAGS=""
-       ])
-       EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save"
-fi
-AC_SUBST(MXCPPFLAGS)
-AC_SUBST(MXLIBS)
-AC_SUBST(MXLND)
-])
-
-
-
-#
-# LN_CONFIG_O2IB
-#
-AC_DEFUN([LN_CONFIG_O2IB],[
-
-AC_MSG_CHECKING([whether to enable OpenIB gen2 support])
-# set default
-AC_ARG_WITH([o2ib],
-	AC_HELP_STRING([--with-o2ib=path],
-	               [build o2iblnd against path]),
-	[
-		case $with_o2ib in
-		yes)    O2IBPATHS="$LINUX $LINUX/drivers/infiniband"
-			ENABLEO2IB=2
-			;;
-		no)     ENABLEO2IB=0
-			;;
-		*)      O2IBPATHS=$with_o2ib
-			ENABLEO2IB=3
-			;;
-		esac
-	],[
-		O2IBPATHS="$LINUX $LINUX/drivers/infiniband"
-		ENABLEO2IB=1
-	])
-if test $ENABLEO2IB -eq 0; then
-	AC_MSG_RESULT([disabled])
-else
+	AC_DEFUN([LN_CONFIG_O2IB_SRC], [])
+	AC_DEFUN([LN_CONFIG_O2IB_RESULTS], [])
+], [
 	o2ib_found=false
 	for O2IBPATH in $O2IBPATHS; do
-		if test \( -f ${O2IBPATH}/include/rdma/rdma_cm.h -a \
+		AS_IF([test \( -f ${O2IBPATH}/include/rdma/rdma_cm.h -a \
 			   -f ${O2IBPATH}/include/rdma/ib_cm.h -a \
-			   -f ${O2IBPATH}/include/rdma/ib_verbs.h -a \
-			   -f ${O2IBPATH}/include/rdma/ib_fmr_pool.h \); then
-			if test \( -d ${O2IBPATH}/kernel_patches -a \
-				   -f ${O2IBPATH}/Makefile \); then
-				AC_MSG_RESULT([no])
-				AC_MSG_ERROR([you appear to be trying to use the OFED distribution's source directory (${O2IBPATH}) rather than the "development/headers" directory which is likely in ${O2IBPATH%-*}])
-			fi
+			   -f ${O2IBPATH}/include/rdma/ib_verbs.h \)], [
 			o2ib_found=true
 			break
- 		fi
+		])
 	done
 	if ! $o2ib_found; then
 		AC_MSG_RESULT([no])
 		case $ENABLEO2IB in
-			1) ;;
-			2) AC_MSG_ERROR([kernel OpenIB gen2 headers not present]);;
-			3) AC_MSG_ERROR([bad --with-o2ib path]);;
-			*) AC_MSG_ERROR([internal error]);;
+			"yes") AC_MSG_ERROR([no OFED nor kernel OpenIB gen2 headers present]) ;;
+			"withpath") AC_MSG_ERROR([bad --with-o2ib path]) ;;
+			*) AC_MSG_ERROR([internal error]) ;;
 		esac
 	else
-		O2IBCPPFLAGS="-I$O2IBPATH/include"
-		EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS"
-		EXTRA_KCFLAGS="$EXTRA_KCFLAGS $O2IBCPPFLAGS"
-		EXTRA_LNET_INCLUDE="$EXTRA_LNET_INCLUDE $O2IBCPPFLAGS"
-
-		LB_LINUX_TRY_COMPILE([
-		        #include <linux/version.h>
-		        #include <linux/pci.h>
+		COMPAT_AUTOCONF=""
+		compatrdma_found=false
+		if test -f ${O2IBPATH}/include/linux/compat-2.6.h; then
+			AC_MSG_RESULT([yes])
+			compatrdma_found=true
+			AC_DEFINE(HAVE_COMPAT_RDMA, 1, [compat rdma found])
+			EXTRA_OFED_CONFIG="$EXTRA_OFED_CONFIG -include ${O2IBPATH}/include/linux/compat-2.6.h"
+			if test -f "$O2IBPATH/include/linux/compat_autoconf.h"; then
+				COMPAT_AUTOCONF="$O2IBPATH/include/linux/compat_autoconf.h"
+			fi
+		else
+			AC_MSG_RESULT([no])
+		fi
+		if ! $compatrdma_found; then
+			if test -f "$O2IBPATH/config.mk"; then
+				. "$O2IBPATH/config.mk"
+			elif test -f "$O2IBPATH/ofed_patch.mk"; then
+				. "$O2IBPATH/ofed_patch.mk"
+			fi
+		elif test -z "$COMPAT_AUTOCONF"; then
+			# Depreciated checks
+			if test "x$RHEL_KERNEL" = xyes; then
+				RHEL_MAJOR=$(awk '/ RHEL_MAJOR / { print [$]3 }' $LINUX_OBJ/include/$VERSION_HDIR/version.h)
+				I=$(awk '/ RHEL_MINOR / { print [$]3 }' $LINUX_OBJ/include/$VERSION_HDIR/version.h)
+				while test "$I" -ge 0; do
+					EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_RHEL_${RHEL_MAJOR}_$I"
+					I=$(($I-1))
+				done
+			elif test "x$SUSE_KERNEL" = xyes; then
+				SP=$(grep PATCHLEVEL /etc/SuSE-release | sed -e 's/.*= *//')
+				EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_SLES_11_$SP"
+			fi
+		fi
+
+		AC_MSG_CHECKING([whether to use any OFED backport headers])
+		if test -n "$BACKPORT_INCLUDES"; then
+			AC_MSG_RESULT([yes])
+			OFED_BACKPORT_PATH="$O2IBPATH/${BACKPORT_INCLUDES/*\/kernel_addons/kernel_addons}/"
+			EXTRA_OFED_INCLUDE="-I$OFED_BACKPORT_PATH $EXTRA_OFED_INCLUDE"
+		else
+			AC_MSG_RESULT([no])
+		fi
+
+		O2IBLND=""
+		O2IBPATH=$(readlink --canonicalize $O2IBPATH)
+		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, [
+			#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 <linux/version.h>
+			#include <linux/pci.h>
 			#include <linux/gfp.h>
-		        #include <rdma/rdma_cm.h>
-		        #include <rdma/ib_cm.h>
-		        #include <rdma/ib_verbs.h>
-		        #include <rdma/ib_fmr_pool.h>
+			#include <rdma/rdma_cm.h>
+			#include <rdma/ib_cm.h>
+			#include <rdma/ib_verbs.h>
 		],[
-		        struct rdma_cm_id      *cm_idi __attribute__ ((unused));
-		        struct rdma_conn_param  conn_param __attribute__ ((unused));
-		        struct ib_device_attr   device_attr __attribute__ ((unused));
-		        struct ib_qp_attr       qp_attr __attribute__ ((unused));
-		        struct ib_pool_fmr      pool_fmr __attribute__ ((unused));
-		        enum   ib_cm_rej_reason rej_reason __attribute__ ((unused));
-
+			struct rdma_cm_id      *cm_idi __attribute__ ((unused));
+			struct rdma_conn_param  conn_param __attribute__ ((unused));
+			struct ib_device_attr   device_attr __attribute__ ((unused));
+			struct ib_qp_attr       qp_attr __attribute__ ((unused));
+			enum   ib_cm_rej_reason rej_reason __attribute__ ((unused));
 			rdma_destroy_id(NULL);
 		],[
-		        AC_MSG_RESULT([yes])
-		        O2IBLND="o2iblnd"
+			O2IBLND="o2iblnd"
 		],[
-		        AC_MSG_RESULT([no])
-		        case $ENABLEO2IB in
-		        1) ;;
-		        2) AC_MSG_ERROR([can't compile with kernel OpenIB gen2 headers]);;
-		        3) AC_MSG_ERROR([can't compile with OpenIB gen2 headers under $O2IBPATH]);;
-		        *) AC_MSG_ERROR([internal error]);;
-		        esac
-		        O2IBLND=""
-		        O2IBCPPFLAGS=""
+			case $ENABLEO2IB in
+			"yes") AC_MSG_ERROR([can't compile with OpenIB gen2 headers]) ;;
+			"withpath") AC_MSG_ERROR([can't compile with OpenIB gen2 headers under $O2IBPATH]) ;;
+			*) AC_MSG_ERROR([internal error]) ;;
+			esac
 		])
 		# we know at this point that the found OFED source is good
 		O2IB_SYMVER=""
-		if test $ENABLEO2IB -eq 3 ; 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 $ENABLEO2IB = "withpath" -o "x$OFED" = "xyes" ; then
+			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 $PWD/$SYMVERFILE])
-				# strip out the existing symbols versions first
-				if test -f $PWD/$SYMVERFILE; then
-				egrep -v $(echo $(awk '{ print $2 }' $O2IBPATH/$O2IB_SYMVER) | tr ' ' '|') $PWD/$SYMVERFILE > $PWD/$SYMVERFILE.old
-				else
-				    touch $PWD/$SYMVERFILE.old
-				fi
-				cat $PWD/$SYMVERFILE.old $O2IBPATH/$O2IB_SYMVER > $PWD/$SYMVERFILE
-				rm $PWD/$SYMVERFILE.old
+				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 specified for o2iblnd however I could not find a $O2IBPATH/Module.symvers there])
+				AC_MSG_ERROR([an external source tree was, either specified or detected, for o2iblnd however I could not find a $O2IBPATH/Module.symvers there])
 			fi
 		fi
 
-		LN_CONFIG_OFED_SPEC
-		EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save"
+		LB_CHECK_COMPILE([if Linux kernel has kthread_worker],
+		linux_kthread_worker, [
+			#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 <linux/kthread.h>
+		],[
+			struct kthread_work *kth_wrk = NULL;
+			flush_kthread_work(kth_wrk);
+		],[
+			AC_DEFINE(HAVE_KTHREAD_WORK, 1, [kthread_worker found])
+			if test -z "$COMPAT_AUTOCONF"; then
+				EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_IS_KTHREAD"
+			fi
+		])
+		EXTRA_CHECK_INCLUDE=""
 	fi
-fi
-
-AC_SUBST(EXTRA_LNET_INCLUDE)
-AC_SUBST(O2IBCPPFLAGS)
+])
+AC_SUBST(EXTRA_OFED_CONFIG)
+AC_SUBST(EXTRA_OFED_INCLUDE)
 AC_SUBST(O2IBLND)
-
-# In RHEL 6.2, rdma_create_id() takes the queue-pair type as a fourth argument
-if test $ENABLEO2IB -ne 0; then
-	AC_MSG_CHECKING([if rdma_create_id wants four args])
-	LB_LINUX_TRY_COMPILE([
+AC_SUBST(O2IBPATH)
+AC_SUBST(ENABLEO2IB)
+
+AS_IF([test $ENABLEO2IB != "no"], [
+	EXTRA_CHECK_INCLUDE="$EXTRA_OFED_CONFIG $EXTRA_OFED_INCLUDE"
+	KBUILD_EXTRA_SYMBOLS="$KBUILD_EXTRA_SYMBOLS $O2IBPATH/Module.symvers"
+
+	# In RHEL 6.2, rdma_create_id() takes the queue-pair type as a fourth argument
+	LB_CHECK_COMPILE([if 'rdma_create_id' wants four args],
+	rdma_create_id_4args, [
+		#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/rdma_cm.h>
 	],[
 		rdma_create_id(NULL, NULL, 0, 0);
 	],[
-		AC_MSG_RESULT([yes])
 		AC_DEFINE(HAVE_RDMA_CREATE_ID_4ARG, 1,
 			[rdma_create_id wants 4 args])
+	])
+
+	# 4.4 added network namespace parameter for rdma_create_id()
+	LB_CHECK_COMPILE([if 'rdma_create_id' wants five args],
+	rdma_create_id_5args, [
+		#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/rdma_cm.h>
 	],[
-		AC_MSG_RESULT([no])
+		rdma_create_id(NULL, NULL, NULL, 0, 0);
+	],[
+		AC_DEFINE(HAVE_RDMA_CREATE_ID_5ARG, 1,
+			[rdma_create_id wants 5 args])
+	])
+
+	# 4.2 introduced struct ib_cq_init_attr which is used
+	# by ib_create_cq(). Note some OFED stacks only keep
+	# their headers in sync with latest kernels but not
+	# the functionality which means for infiniband testing
+	# we need to always test functionality testings.
+	LB_CHECK_COMPILE([if 'struct ib_cq_init_attr' is used],
+	ib_cq_init_attr, [
+		#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>
+	],[
+		struct ib_cq_init_attr cq_attr;
+
+		ib_create_cq(NULL, NULL, NULL, NULL, &cq_attr);
+	],[
+		AC_DEFINE(HAVE_IB_CQ_INIT_ATTR, 1,
+			[struct ib_cq_init_attr is used by ib_create_cq])
+	])
+
+	# 4.3 removed ib_alloc_fast_reg_mr()
+	LB_CHECK_COMPILE([if 'ib_alloc_fast_reg_mr' exists],
+	ib_alloc_fast_reg_mr, [
+		#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_fast_reg_mr(NULL, 0);
+	],[
+		AC_DEFINE(HAVE_IB_ALLOC_FAST_REG_MR, 1,
+			[ib_alloc_fast_reg_mr is defined])
+	])
+
+	# 4.9 must stop using ib_get_dma_mr and the global MR
+	# We then have to use FMR/Fastreg for all RDMA.
+	LB_CHECK_COMPILE([if 'ib_get_dma_mr' exists],
+	ib_get_dma_mr, [
+		#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_get_dma_mr(NULL, 0);
+	],[
+		AC_DEFINE(HAVE_IB_GET_DMA_MR, 1,
+			[ib_get_dma_mr is defined])
+	])
+
+	# In v4.4 Linux kernel,
+	# commit e622f2f4ad2142d2a613a57fb85f8cf737935ef5
+	# split up struct ib_send_wr so that all non-trivial verbs
+	# use their own structure which embedds struct ib_send_wr.
+	LB_CHECK_COMPILE([if 'struct ib_rdma_wr' is defined],
+	ib_rdma_wr, [
+		#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>
+	],[
+		struct ib_rdma_wr *wr __attribute__ ((unused));
+
+		wr = rdma_wr(NULL);
+	],[
+		AC_DEFINE(HAVE_IB_RDMA_WR, 1,
+			[struct ib_rdma_wr is defined])
 	])
-fi
+
+	# new fast registration API introduced in 4.4
+	LB_CHECK_COMPILE([if 4arg 'ib_map_mr_sg' exists],
+	ib_map_mr_sg_4args, [
+		#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_map_mr_sg(NULL, NULL, 0, 0);
+	],[
+		AC_DEFINE(HAVE_IB_MAP_MR_SG, 1,
+			[ib_map_mr_sg exists])
+	])
+
+	# ib_map_mr_sg changes from 4 to 5 args (adding sg_offset_p)
+	# in kernel 4.7 (and RHEL 7.3)
+	LB_CHECK_COMPILE([if 5arg 'ib_map_mr_sg' exists],
+	ib_map_mr_sg_5args, [
+		#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_map_mr_sg(NULL, NULL, 0, NULL, 0);
+	],[
+		AC_DEFINE(HAVE_IB_MAP_MR_SG, 1,
+			[ib_map_mr_sg exists])
+		AC_DEFINE(HAVE_IB_MAP_MR_SG_5ARGS, 1,
+			[ib_map_mr_sg has 5 arguments])
+	])
+
+	# ib_query_device() removed in 4.5
+	LB_CHECK_COMPILE([if 'struct ib_device' has member 'attrs'],
+	ib_device.attrs, [
+		#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>
+	],[
+		struct ib_device dev;
+		struct ib_device_attr dev_attr = {};
+		dev.attrs = dev_attr;
+	],[
+		AC_DEFINE(HAVE_IB_DEVICE_ATTRS, 1,
+			[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
+		#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>
+	],[
+		(void)ib_inc_rkey(0);
+	],[
+		AC_DEFINE(HAVE_IB_INC_RKEY, 1,
+			  [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"
+
+	# 5.0
+	LN_IB_DEVICE_OPS_EXISTS
+	# 5.1
+	LN_IB_SG_DMA_ADDRESS_EXISTS
+
+	# A reason argument was added to rdma_reject() in Linux 5.8,
+	# commit 8094ba0ace7f6cd1e31ea8b151fba3594cadfa9a
+	LB_CHECK_COMPILE([if 4arg 'rdma_reject' exists],
+	rdma_reject, [
+		#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>
+		#include <rdma/ib_cm.h>
+		#include <rdma/rdma_cm.h>
+	],[
+		rdma_reject(NULL, NULL, 0, 0);
+	],[
+		AC_DEFINE(HAVE_RDMA_REJECT_4ARGS, 1,
+			[rdma_reject has 4 arguments])
+	])
+
+	# The FMR pool API was removed in Linux 5.8,
+	# commit 4e373d5417ecbb4f438a8500f0379a2fc29c2643
+	LB_CHECK_COMPILE([if FMR pools API available],
+	ib_fmr, [
+		#include <rdma/ib_verbs.h>
+	],[
+		struct ib_fmr fmr = {};
+	],[
+		AC_DEFINE(HAVE_FMR_POOL_API, 1,
+			[FMR pool API is available])
+	])
+
+	# rdma_connect_locked() was added in Linux 5.10,
+	# commit 071ba4cc559de47160761b9500b72e8fa09d923d
+	# and in MOFED-5.2-2. rdma_connect_locked() must
+	# be called instead of rdma_connect() in
+	# RDMA_CM_EVENT_ROUTE_RESOLVED handler.
+	LB_CHECK_COMPILE([if 'rdma_connect_locked' exists],
+	rdma_connect_locked, [
+		#include <rdma/rdma_cm.h>
+	],[
+		rdma_connect_locked(NULL, NULL);
+	],[
+		AC_DEFINE(HAVE_RDMA_CONNECT_LOCKED, 1,
+			[rdma_connect_locked is defined])
+	])
+
+	# ethtool_link_settings was added in Linux 4.6
+	LB_CHECK_COMPILE([if 'ethtool_link_settings' exists],
+	ethtool_link_settings, [
+		#include <linux/ethtool.h>
+	],[
+		struct ethtool_link_ksettings cmd;
+	],[
+		AC_DEFINE(HAVE_ETHTOOL_LINK_SETTINGS, 1,
+			[ethtool_link_settings is defined])
+	])
+
+	EXTRA_CHECK_INCLUDE=""
+	AC_DEFUN([LN_CONFIG_O2IB_SRC], [])
+	AC_DEFUN([LN_CONFIG_O2IB_RESULTS], [])
+]) # ENABLEO2IB != "no"
+]) # LN_CONFIG_O2IB
+
+#
+# LN_CONFIG_GNILND
+#
+# check whether to use the Gemini Network Interface lnd
+#
+AC_DEFUN([LN_CONFIG_GNILND], [
+AC_MSG_CHECKING([whether to enable GNI lnd])
+AC_ARG_ENABLE([gni],
+	AC_HELP_STRING([--enable-gni],
+		[enable GNI lnd]),
+	[], [enable_gni="no"])
+AC_MSG_RESULT([$enable_gni])
+
+AS_IF([test "x$enable_gni" = xyes], [
+	# GNICPPFLAGS was set in spec file
+	EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS"
+	EXTRA_KCFLAGS="$EXTRA_KCFLAGS $GNICPPFLAGS"
+	LB_CHECK_COMPILE([if GNI kernel headers are present],
+	GNI_header, [
+		#include <linux/types.h>
+		#include <gni_pub.h>
+	],[
+		gni_cdm_handle_t kgni_domain;
+		gni_return_t	 rc;
+		int		 rrc;
+		rc = gni_cdm_create(0, 1, 1, 0, &kgni_domain);
+		rrc = (rc == GNI_RC_SUCCESS) ? 0 : 1;
+		return rrc;
+	],[
+		GNILND="gnilnd"
+	],[
+		AC_MSG_ERROR([can't compile gnilnd with given GNICPPFLAGS: $GNICPPFLAGS])
+	])
+	# at this point, we have gnilnd basic support,
+	# now check for extra features
+	LB_CHECK_COMPILE([to use RCA in gnilnd],
+	RCA_gnilnd, [
+		#include <linux/types.h>
+		#include <gni_pub.h>
+		#include <krca_lib.h>
+	],[
+		gni_cdm_handle_t kgni_domain;
+		gni_return_t	 rc;
+		krca_ticket_t	 ticket = KRCA_NULL_TICKET;
+		int		 rrc;
+		__u32		 nid = 0, nic_addr;
+		rc = gni_cdm_create(0, 1, 1, 0, &kgni_domain);
+		rrc = (rc == GNI_RC_SUCCESS) ? 0 : 1;
+		rrc += krca_nid_to_nicaddrs(nid, 1, &nic_addr);
+		rrc += krca_register(&ticket, RCA_MAKE_SERVICE_INDEX(RCA_IO_CLASS, 9), 99, 0);
+		return rrc;
+	],[
+		GNICPPFLAGS="$GNICPPFLAGS -DGNILND_USE_RCA=1"
+	])
+	EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save"
 ])
+AC_SUBST(GNICPPFLAGS)
+AC_SUBST(GNILND)
+]) # LN_CONFIG_GNILND
 
+# LN_CONFIG_SOCK_CREATE_KERN
 #
-# LN_CONFIG_RALND
+# 4.x sock_create_kern() added a first parameter as 'struct net *'
+# instead of int.
 #
-# check whether to use the RapidArray lnd
-#
-AC_DEFUN([LN_CONFIG_RALND],
-[#### Rapid Array
-AC_MSG_CHECKING([if RapidArray kernel headers are present])
-# placeholder
-RACPPFLAGS="-I${LINUX}/drivers/xd1/include"
-EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS"
-EXTRA_KCFLAGS="$EXTRA_KCFLAGS $RACPPFLAGS"
-LB_LINUX_TRY_COMPILE([
-	#include <linux/types.h>
-	#include <rapl.h>
+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>
 ],[
-        RAP_RETURN          rc;
-	RAP_PVOID           dev_handle;
-
-        rc = RapkGetDeviceByIndex(0, NULL, &dev_handle);
+	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
 
-	return rc == RAP_SUCCESS ? 0 : 1;
+#
+# LN_CONFIG_SK_DATA_READY
+#
+# 3.15 for struct sock the *sk_data_ready() field only takes one argument now
+#
+AC_DEFUN([LN_CONFIG_SK_DATA_READY], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if 'sk_data_ready' takes only one argument],
+sk_data_ready, [
+	#include <linux/net.h>
+	#include <net/sock.h>
 ],[
-	AC_MSG_RESULT([yes])
-	RALND="ralnd"
+	((struct sock *)0)->sk_data_ready(NULL);
 ],[
-	AC_MSG_RESULT([no])
-	RALND=""
-	RACPPFLAGS=""
-])
-EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save"
-AC_SUBST(RACPPFLAGS)
-AC_SUBST(RALND)
+	AC_DEFINE(HAVE_SK_DATA_READY_ONE_ARG, 1,
+		[sk_data_ready uses only one argument])
 ])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # 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_HAVE_HYPERVISOR_IS_TYPE
+#
+# 4.14 commit 79cc74155218316b9a5d28577c7077b2adba8e58
+# x86/paravirt: Provide a way to check for hypervisors
+#
+AC_DEFUN([LN_HAVE_HYPERVISOR_IS_TYPE], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if hypervisor_is_type function is available],
+hypervisor_is_type_exists, [
+	#include <asm/hypervisor.h>
+],[
+	(void)hypervisor_is_type(X86_HYPER_NATIVE);
+],[
+	AC_DEFINE(HAVE_HYPERVISOR_IS_TYPE, 1,
+		[hypervisor_is_type function exists])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LN_HAVE_HYPERVISOR_IS_TYPE
 
 #
+# LN_HAVE_ORACLE_OFED_EXTENSIONS
+#
+# Oracle UEK 5
+#
+AC_DEFUN([LN_HAVE_ORACLE_OFED_EXTENSIONS], [
+LB_CHECK_COMPILE([if Oracle OFED Extensions are enabled],
+oracle_ofed_ext, [
+	#include <rdma/ib_fmr_pool.h>
+],[
+	struct ib_fmr_pool_param param = {
+		.relaxed           = 0
+	};
+	(void)param;
+],[
+	AC_DEFINE(HAVE_ORACLE_OFED_EXTENSIONS, 1,
+		[if Oracle OFED Extensions are enabled])
+])
+]) # LN_HAVE_ORACLE_OFED_EXTENSIONS
+
 #
-# LN_CONFIG_USERSPACE
+# LN_CONFIG_SOCK_GETNAME
 #
-# This is defined but empty because it is called from 
-# build/autconf/lustre-build.m4 which is shared by all branches.
+# 4.17 commit 9b2c45d479d0fb8647c9e83359df69162b5fbe5f getname()
+# does not take the length *int argument and returns the length
 #
-AC_DEFUN([LN_CONFIG_USERSPACE],
-[
+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
 
-# See if sysctl proc_handler wants only 5 arguments (since 2.6.32)
-AC_DEFUN([LN_5ARGS_SYSCTL_PROC_HANDLER],
-[AC_MSG_CHECKING([if sysctl proc_handler wants 5 args])
-LB_LINUX_TRY_COMPILE([
-        #include <linux/sysctl.h>
+#
+# LN_HAVE_IN_DEV_FOR_EACH_IFA_RTNL
+#
+# kernel 5.3 commit ef11db3310e272d3d8dbe8739e0770820dd20e52
+# and kernel 4.18.0-193.el8:
+# added in_dev_for_each_ifa_rtnl and in_dev_for_each_ifa_rcu
+# and removed for_ifa and endfor_ifa.
+# Use the _rntl variant as the current locking is rtnl.
+#
+AC_DEFUN([LN_HAVE_IN_DEV_FOR_EACH_IFA_RTNL], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if 'in_dev_for_each_ifa_rtnl' is defined],
+in_dev_for_each_ifa_rtnl_test, [
+	#include <linux/inetdevice.h>
 ],[
-        struct ctl_table *table = NULL;
-        int write = 1;
-        void __user *buffer = NULL;
-        size_t *lenp = NULL;
-        loff_t *ppos = NULL;
+	const struct in_ifaddr *ifa = NULL;
+	struct in_device *in_dev = NULL;
 
-        proc_handler *proc_handler = NULL;
-        proc_handler(table, write, buffer, lenp, ppos);
+	in_dev_for_each_ifa_rtnl(ifa, in_dev) {}
+],[
+	AC_DEFINE(HAVE_IN_DEV_FOR_EACH_IFA_RTNL, 1,
+		['in_dev_for_each_ifa_rtnl' is defined])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LN_HAVE_IN_DEV_FOR_EACH_IFA_RTNL
 
+#
+# 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>
 ],[
-        AC_MSG_RESULT(yes)
-        AC_DEFINE(HAVE_5ARGS_SYSCTL_PROC_HANDLER, 1,
-                  [sysctl proc_handler wants 5 args])
+	int x = offsetof(struct ib_device_ops, unmap_fmr);
+	x = x;
+	(void)x;
 ],[
-        AC_MSG_RESULT(no)
-])
+	AC_DEFINE(HAVE_IB_DEVICE_OPS, 1,
+		[if struct ib_device_ops is defined])
 ])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LN_IB_DEVICE_OPS_EXISTS
 
 #
-# 2.6.36 tcp_sendpage() first parameter is 'struct sock' instead of 'struct socket'.
+# 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_CONFIG_TCP_SENDPAGE],
-[AC_MSG_CHECKING([if tcp_sendpage first parameter is socket])
+AC_DEFUN([LN_IB_SG_DMA_ADDRESS_EXISTS], [
 tmp_flags="$EXTRA_KCFLAGS"
 EXTRA_KCFLAGS="-Werror"
-LB_LINUX_TRY_COMPILE([
-        #include <linux/net.h>
-        #include <net/tcp.h>
+LB_CHECK_COMPILE([if ib_sg_dma_address wrapper exists],
+ib_sg_dma_address_test, [
+	#include <rdma/ib_verbs.h>
 ],[
-        tcp_sendpage((struct socket*)0, NULL, 0, 0, 0);
+	u64 x = ib_sg_dma_address(NULL, NULL);
+	x = x;
+	(void)x;
 ],[
-        AC_MSG_RESULT(yes)
-        AC_DEFINE(HAVE_TCP_SENDPAGE_USE_SOCKET, 1,
-                  [tcp_sendpage use socket as first parameter])
-],[
-        AC_MSG_RESULT(no)
+	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
+# LN_USR_RDMA
 #
-# LNet linux kernel checks
 #
-AC_DEFUN([LN_PROG_LINUX],
-[
-LN_FUNC_DEV_GET_BY_NAME_2ARG
-LN_CONFIG_AFFINITY
-LN_CONFIG_BACKOFF
-LN_CONFIG_QUADRICS
-LN_CONFIG_O2IB
-LN_CONFIG_RALND
-LN_CONFIG_PTLLND
-LN_CONFIG_MX
-# 2.6.32
-LN_5ARGS_SYSCTL_PROC_HANDLER
-# 2.6.36
-LN_CONFIG_TCP_SENDPAGE
+AC_DEFUN([LN_USR_RDMA], [
+AC_MSG_CHECKING([if RDMA_PS_TCP exists])
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+	#include <rdma/rdma_user_cm.h>
+
+	int main(void) {
+		int x = (int)RDMA_PS_TCP;
+		return x;
+	}
+])],[
+	AC_DEFINE(HAVE_USRSPC_RDMA_PS_TCP, 1,
+		[RDMA_PS_TCP exists])
 ])
+]) # LN_USR_RDMA
+
+
+AC_DEFUN([LN_PROG_LINUX_SRC], [])
+AC_DEFUN([LN_PROG_LINUX_RESULTS], [])
 
 #
-# LN_PROG_DARWIN
+# LN_PROG_LINUX
 #
-# Darwin checks
+# LNet linux kernel checks
 #
-AC_DEFUN([LN_PROG_DARWIN],
-[LB_DARWIN_CHECK_FUNCS([get_preemption_level])
-])
+AC_DEFUN([LN_PROG_LINUX], [
+AC_MSG_NOTICE([LNet kernel checks
+==============================================================================])
+
+LN_CONFIG_BACKOFF
+LN_CONFIG_O2IB
+LN_CONFIG_GNILND
+# 3.10
+LN_EXPORT_KMAP_TO_PAGE
+# 3.15
+LN_CONFIG_SK_DATA_READY
+# 4.x
+LN_CONFIG_SOCK_CREATE_KERN
+# 4.14
+LN_HAVE_HYPERVISOR_IS_TYPE
+LN_HAVE_ORACLE_OFED_EXTENSIONS
+# 4.17
+LN_CONFIG_SOCK_GETNAME
+# 5.3 and 4.18.0-193.el8
+LN_HAVE_IN_DEV_FOR_EACH_IFA_RTNL
+]) # LN_PROG_LINUX
 
 #
 # LN_PATH_DEFAULTS
 #
 # default paths for installed files
 #
-AC_DEFUN([LN_PATH_DEFAULTS],
-[
-])
+AC_DEFUN([LN_PATH_DEFAULTS], [
+]) # LN_PATH_DEFAULTS
 
 #
 # LN_CONFIGURE
 #
 # other configure checks
 #
-AC_DEFUN([LN_CONFIGURE],
-[# lnet/utils/portals.c
-AC_CHECK_HEADERS([netdb.h netinet/tcp.h asm/types.h endian.h sys/ioctl.h])
-AC_CHECK_FUNCS([gethostbyname socket connect])
+AC_DEFUN([LN_CONFIGURE], [
+AC_MSG_NOTICE([LNet core checks
+==============================================================================])
 
-# lnet/utils/debug.c
-AC_CHECK_HEADERS([linux/version.h])
+# lnet/utils/lnetconfig/liblnetconfig_netlink.c
+AS_IF([test "x$enable_dist" = xno], [
+	PKG_CHECK_MODULES(LIBNL3, [libnl-genl-3.0 >= 3.1])
+])
 
-# lnet/utils/wirecheck.c
-AC_CHECK_FUNCS([strnlen])
+AC_CHECK_LIB([nl-3], [nla_get_s32], [
+	AC_DEFINE(HAVE_NLA_GET_S32, 1,
+		[libnl3 supports nla_get_s32])
+	], [
+])
 
-# --------  Check for required packages  --------------
+AC_CHECK_LIB([nl-3], [nla_get_s64], [
+	AC_DEFINE(HAVE_NLA_GET_S64, 1,
+		[libnl3 supports nla_get_s64])
+	], [
+])
 
 #
-# LC_CONFIG_READLINE
-#
-# Build with readline
+# LN_USR_NLMSGERR
 #
-AC_MSG_CHECKING([whether to enable readline support])
-AC_ARG_ENABLE(readline,
-        AC_HELP_STRING([--disable-readline],
-                        [disable readline support]),
-        [],[enable_readline='yes'])
-AC_MSG_RESULT([$enable_readline])
+AC_DEFUN([LN_USR_NLMSGERR], [
+AC_MSG_CHECKING([if 'enum nlmsgerr_attrs' exists])
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+	#include <linux/netlink.h>
 
-# -------- check for readline if enabled ----
-if test x$enable_readline = xyes ; then
-	LIBS_save="$LIBS"
-	LIBS="-lncurses $LIBS"
-	AC_CHECK_LIB([readline],[readline],[
-	LIBREADLINE="-lreadline -lncurses"
-	AC_DEFINE(HAVE_LIBREADLINE, 1, [readline library is available])
-	],[
-	LIBREADLINE=""
-	])
-	LIBS="$LIBS_save"
-else
-	LIBREADLINE=""
-fi
-AC_SUBST(LIBREADLINE)
-
-# -------- enable acceptor libwrap (TCP wrappers) support? -------
-AC_MSG_CHECKING([if libwrap support is requested])
-AC_ARG_ENABLE([libwrap],
-	AC_HELP_STRING([--enable-libwrap], [use TCP wrappers]),
-	[case "${enableval}" in
-		yes) enable_libwrap=yes ;;
-		no) enable_libwrap=no ;;
-		*) AC_MSG_ERROR(bad value ${enableval} for --enable-libwrap) ;;
-	esac],[enable_libwrap=no])
-AC_MSG_RESULT([$enable_libwrap])
-if test x$enable_libwrap = xyes ; then
-	LIBWRAP="-lwrap"
-	AC_DEFINE(HAVE_LIBWRAP, 1, [libwrap support is requested])
-else
-	LIBWRAP=""
-fi
-AC_SUBST(LIBWRAP)
-
-# ----------------------------------------
-# some tests for catamount-like systems
-# ----------------------------------------
-AC_ARG_ENABLE([sysio_init],
-	AC_HELP_STRING([--disable-sysio-init],
-		[call sysio init functions when initializing liblustre]),
-	[],[enable_sysio_init=yes])
-AC_MSG_CHECKING([whether to initialize libsysio])
-AC_MSG_RESULT([$enable_sysio_init])
-if test x$enable_sysio_init != xno ; then
-	AC_DEFINE([INIT_SYSIO], 1, [call sysio init functions])
-fi
-
-AC_ARG_ENABLE([urandom],
-	AC_HELP_STRING([--disable-urandom],
-		[disable use of /dev/urandom for liblustre]),
-	[],[enable_urandom=yes])
-AC_MSG_CHECKING([whether to use /dev/urandom for liblustre])
-AC_MSG_RESULT([$enable_urandom])
-if test x$enable_urandom != xno ; then
-	AC_DEFINE([LIBLUSTRE_USE_URANDOM], 1, [use /dev/urandom for random data])
-fi
-
-# -------- check for -lcap support ----
-if test x$enable_liblustre = xyes ; then
-	AC_CHECK_LIB([cap], [cap_get_proc],
-		[
-			CAP_LIBS="-lcap"
-			AC_DEFINE([HAVE_LIBCAP], 1, [use libcap])
-		],
-		[
-			CAP_LIBS=""
-		])
-	AC_SUBST(CAP_LIBS)
+	int main(void) {
+		int x = (int)NLMSGERR_ATTR_MAX;
+		return x;
+	}
+])],[
+	AC_DEFINE(HAVE_USRSPC_NLMSGERR, 1,
+		['enum nlmsgerr_attrs' exists])
+])
+]) # LN_USR_NLMGSERR
 
-fi
+# lnet/utils/portals.c
+AC_CHECK_HEADERS([netdb.h])
+AC_CHECK_FUNCS([gethostbyname])
 
-LN_CONFIG_MAX_PAYLOAD
-LN_CONFIG_UPTLLND
-LN_CONFIG_USOCKLND
+# lnet/utils/wirecheck.c
+AC_CHECK_FUNCS([strnlen])
+
+# --------  Check for required packages  --------------
+
+AC_MSG_CHECKING([whether to enable 'efence' debugging support])
+AC_ARG_ENABLE(efence,
+	AC_HELP_STRING([--enable-efence],
+		[use efence library]),
+	[], [enable_efence="no"])
+AC_MSG_RESULT([$enable_efence])
+
+LIBEFENCE=""
+AS_IF([test "$enable_efence" = yes], [
+	LIBEFENCE="-lefence"
+	AC_DEFINE(HAVE_LIBEFENCE, 1,
+		[libefence support is requested])
 ])
+AC_SUBST(LIBEFENCE)
+
+LN_CONFIG_DLC
+LN_USR_RDMA
+LN_USR_NLMSGERR
+]) # LN_CONFIGURE
 
 #
 # LN_CONDITIONALS
 #
-# AM_CONDITOINAL defines for lnet
+# AM_CONDITIONAL defines for lnet
 #
-AC_DEFUN([LN_CONDITIONALS],
-[AM_CONDITIONAL(BUILD_QSWLND, test x$QSWLND = "xqswlnd")
-AM_CONDITIONAL(BUILD_MXLND, test x$MXLND = "xmxlnd")
-AM_CONDITIONAL(BUILD_O2IBLND, test x$O2IBLND = "xo2iblnd")
-AM_CONDITIONAL(BUILD_RALND, test x$RALND = "xralnd")
-AM_CONDITIONAL(BUILD_PTLLND, test x$PTLLND = "xptllnd")
-AM_CONDITIONAL(BUILD_USOCKLND, test x$USOCKLND = "xusocklnd")
-])
+AC_DEFUN([LN_CONDITIONALS], [
+AM_CONDITIONAL(BUILD_O2IBLND,    test x$O2IBLND = "xo2iblnd")
+AM_CONDITIONAL(BUILD_GNILND,     test x$GNILND  = "xgnilnd")
+]) # LN_CONDITIONALS
 
 #
 # LN_CONFIG_FILES
 #
 # files that should be generated with AC_OUTPUT
 #
-AC_DEFUN([LN_CONFIG_FILES],
-[AC_CONFIG_FILES([
-lnet/Kernelenv
+AC_DEFUN([LN_CONFIG_FILES], [
+AC_CONFIG_FILES([
 lnet/Makefile
 lnet/autoMakefile
 lnet/autoconf/Makefile
 lnet/doc/Makefile
 lnet/include/Makefile
 lnet/include/lnet/Makefile
-lnet/include/lnet/linux/Makefile
+lnet/include/uapi/linux/lnet/Makefile
 lnet/klnds/Makefile
 lnet/klnds/autoMakefile
-lnet/klnds/mxlnd/autoMakefile
-lnet/klnds/mxlnd/Makefile
 lnet/klnds/o2iblnd/Makefile
 lnet/klnds/o2iblnd/autoMakefile
-lnet/klnds/qswlnd/Makefile
-lnet/klnds/qswlnd/autoMakefile
-lnet/klnds/ralnd/Makefile
-lnet/klnds/ralnd/autoMakefile
+lnet/klnds/gnilnd/Makefile
+lnet/klnds/gnilnd/autoMakefile
 lnet/klnds/socklnd/Makefile
 lnet/klnds/socklnd/autoMakefile
-lnet/klnds/ptllnd/Makefile
-lnet/klnds/ptllnd/autoMakefile
 lnet/lnet/Makefile
 lnet/lnet/autoMakefile
 lnet/selftest/Makefile
 lnet/selftest/autoMakefile
-lnet/ulnds/Makefile
-lnet/ulnds/autoMakefile
-lnet/ulnds/socklnd/Makefile
 lnet/utils/Makefile
-lnet/include/lnet/darwin/Makefile
-])
+lnet/utils/lnetconfig/Makefile
 ])
+]) # LN_CONFIG_FILES