X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Fautoconf%2Flustre-lnet.m4;h=a1fdb5e266a22e79a4d3ae21f58e36c593ef774a;hp=15c98afcb43a765ff05a1e5b008bc3865cb67fd3;hb=76adbed805e71995d521d1a26e1e3d93f3dfd7b7;hpb=62ef9c949753efb9535fa5b1eb2eb38ec663917f diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4 index 15c98af..a1fdb5e 100644 --- a/lnet/autoconf/lustre-lnet.m4 +++ b/lnet/autoconf/lustre-lnet.m4 @@ -3,526 +3,295 @@ # # configure maximum payload # -AC_DEFUN([LN_CONFIG_MAX_PAYLOAD], -[AC_MSG_CHECKING([for non-default maximum LNET 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]), - [ + [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)" + CONFIG_LNET_MAX_PAYLOAD_MB=$with_max_payload_mb + CONFIG_LNET_MAX_PAYLOAD="(($with_max_payload_mb)<<20)" ], [ AC_MSG_RESULT([no]) - LNET_MAX_PAYLOAD="LNET_MTU" + CONFIG_LNET_MAX_PAYLOAD="LNET_MTU" ]) - AC_DEFINE_UNQUOTED(LNET_MAX_PAYLOAD, $LNET_MAX_PAYLOAD, - [Max LNET payload]) -]) +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 # -AC_DEFUN([LN_CHECK_GCC_VERSION], -[AC_MSG_CHECKING([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 + $(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_CHECK_GCC_VERSION # # LN_CONFIG_AFFINITY # # check if cpu affinity is available/wanted # -AC_DEFUN([LN_CONFIG_AFFINITY], -[AC_ARG_ENABLE([affinity], +AC_DEFUN([LN_CONFIG_AFFINITY], [ +AC_MSG_CHECKING([whether to enable CPU affinity support]) +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([ + [disable process/irq affinity]), + [], [enable_affinity="yes"]) +AC_MSG_RESULT([$enable_affinity]) +AS_IF([test "x$enable_affinity" = xyes], [ + LB_CHECK_COMPILE([if Linux kernel has cpu affinity support], + set_cpus_allowed_ptr, [ #include ],[ - struct task_struct t; + struct task_struct *t; #if HAVE_CPUMASK_T cpumask_t m; - #else - unsigned long m; + #else + unsigned long m; #endif - set_cpus_allowed(&t, m); + set_cpus_allowed_ptr(t, &m); ],[ - AC_DEFINE(CPU_AFFINITY, 1, [kernel has cpu affinity support]) - AC_MSG_RESULT([yes]) - ],[ - AC_MSG_RESULT([no (no kernel support)]) + AC_DEFINE(CPU_AFFINITY, 1, + [kernel has cpu affinity support]) ]) -fi -]) - -# -# LN_CONFIG_PORTALS -# -# 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 - ]) -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_AFFINITY # # 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_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']) -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_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]) - 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) + 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]) + ]) ]) - -# -# LN_CONFIG_QUADRICS -# -# check if quadrics support is in this kernel -# -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="" - ]) +]) # LN_CONFIG_BACKOFF + +# +# LN_CONFIG_DLC +# +# Configure dlc if enabled +# +# 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. +# +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)]) ]) - fi -else - AC_MSG_RESULT([no]) - QSWLND="" - QSWCPPFLAGS="" -fi -AC_SUBST(QSWCPPFLAGS) -AC_SUBST(QSWLND) -]) - -# -# LN_CONFIG_GM -# -# check if GM support is available -# -AC_DEFUN([LN_CONFIG_GM],[ -AC_MSG_CHECKING([whether to enable GM support]) -AC_ARG_WITH([gm], - AC_HELP_STRING([--with-gm=path-to-gm-source-tree], - [build gmlnd against path]), - [ - case $with_gm in - no) ENABLE_GM=0 - ;; - *) ENABLE_GM=1 - GM_SRC="$with_gm" - ;; - esac - ],[ - ENABLE_GM=0 - ]) -AC_ARG_WITH([gm-install], - AC_HELP_STRING([--with-gm-install=path-to-gm-install-tree], - [say where GM has been installed]), - [ - GM_INSTALL=$with_gm_install - ],[ - GM_INSTALL="/opt/gm" - ]) -if test $ENABLE_GM -eq 0; then - AC_MSG_RESULT([no]) -else - AC_MSG_RESULT([yes]) - - GMLND="gmlnd" - GMCPPFLAGS="-I$GM_SRC/include -I$GM_SRC/drivers -I$GM_SRC/drivers/linux/gm" - - if test -f $GM_INSTALL/lib/libgm.a -o \ - -f $GM_INSTALL/lib64/libgm.a; then - GMLIBS="-L$GM_INSTALL/lib -L$GM_INSTALL/lib64" - else - AC_MSG_ERROR([Cant find GM libraries under $GM_INSTALL]) - fi - - EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="$GMCPPFLAGS -DGM_KERNEL $EXTRA_KCFLAGS" - - AC_MSG_CHECKING([that code using GM compiles with given path]) - LB_LINUX_TRY_COMPILE([ - #define GM_STRONG_TYPES 1 - #ifdef VERSION - #undef VERSION - #endif - #include "gm.h" - #include "gm_internal.h" - ],[ - struct gm_port *port = NULL; - gm_recv_event_t *rxevent = gm_blocking_receive_no_spin(port); - return 0; - ],[ - AC_MSG_RESULT([yes]) - ],[ + ], [ AC_MSG_RESULT([no]) - AC_MSG_ERROR([Bad --with-gm path]) - ]) - - AC_MSG_CHECKING([that GM has gm_register_memory_ex_phys()]) - LB_LINUX_TRY_COMPILE([ - #define GM_STRONG_TYPES 1 - #ifdef VERSION - #undef VERSION - #endif - #include "gm.h" - #include "gm_internal.h" - ],[ - gm_status_t gmrc; - struct gm_port *port = NULL; - gm_u64_t phys = 0; - gm_up_t pvma = 0; - - gmrc = gm_register_memory_ex_phys(port, phys, 100, pvma); - return 0; - ],[ - AC_MSG_RESULT([yes]) - ],[ - AC_MSG_RESULT([no. -Please patch the GM sources as follows... - cd $GM_SRC - patch -p0 < $PWD/lnet/klnds/gmlnd/gm-reg-phys.patch -...then rebuild and re-install them]) - AC_MSG_ERROR([Can't build GM without gm_register_memory_ex_phys()]) - ]) - - EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save" -fi -AC_SUBST(GMCPPFLAGS) -AC_SUBST(GMLIBS) -AC_SUBST(GMLND) -]) - - -# -# 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 - #include - ],[ - 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) + ]) + AC_SUBST(USE_DLC) ]) - - # # LN_CONFIG_O2IB # -AC_DEFUN([LN_CONFIG_O2IB],[ -AC_MSG_CHECKING([whether to enable OpenIB gen2 support]) -# set default +# 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_O2IB], [ +AC_MSG_CHECKING([whether to use Compat RDMA]) 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_HELP_STRING([--with-o2ib=[yes|no|]], + [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\)$' | 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. + ]) + ]) + OFED="yes" + ], [ + O2IBPATHS="$LINUX $LINUX/drivers/infiniband" + ]) + ENABLEO2IB="yes" + ;; + no) ENABLEO2IB="no" + ;; + *) O2IBPATHS=$with_o2ib + ENABLEO2IB="withpath" + OFED="yes" + ;; +esac + +AS_IF([test $ENABLEO2IB = "no"], [ + AC_MSG_RESULT([no]) +], [ 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 + -f ${O2IBPATH}/include/rdma/ib_fmr_pool.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" + 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 - LB_LINUX_TRY_COMPILE([ - #include - #include - #if !HAVE_GFP_T - typedef int gfp_t; - #endif - #include - #include - #include - #include - ],[ - struct rdma_cm_id *cm_id; - struct rdma_conn_param conn_param; - struct ib_device_attr device_attr; - struct ib_qp_attr qp_attr; - struct ib_pool_fmr pool_fmr; - enum ib_cm_rej_reason rej_reason; + 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 - cm_id = rdma_create_id(NULL, NULL, RDMA_PS_TCP); - return PTR_ERR(cm_id); + O2IBLND="" + O2IBPATH=$(readlink --canonicalize $O2IBPATH) + EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -I$O2IBPATH/include" + 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 + #endif + #include + #include + #include + #include + #include + #include + #include + ],[ + 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)); + 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 + 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 @@ -531,609 +300,469 @@ else fi done 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 $O2IBPATH/$O2IB_SYMVER to Symbol Path]) + EXTRA_SYMBOLS="$EXTRA_SYMBOLS $O2IBPATH/$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 + #endif + #include + ],[ + struct kthread_work *kth_wrk __attribute__ ((unused)); + 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(O2IBLND) ]) - -# -# LN_CONFIG_OPENIB -# -# check for OpenIB in the kernel -AC_DEFUN([LN_CONFIG_OPENIB],[ -AC_MSG_CHECKING([whether to enable OpenIB support]) -# set default -OPENIBPATH="$LINUX/drivers/infiniband" -AC_ARG_WITH([openib], - AC_HELP_STRING([--with-openib=path], - [build openiblnd against path]), - [ - case $with_openib in - yes) ENABLEOPENIB=2 - ;; - no) ENABLEOPENIB=0 - ;; - *) OPENIBPATH="$with_openib" - ENABLEOPENIB=3 - ;; - esac +AC_SUBST(EXTRA_OFED_CONFIG) +AC_SUBST(EXTRA_OFED_INCLUDE) +AC_SUBST(O2IBLND) +AC_SUBST(O2IBPATH) +AC_SUBST(ENABLEO2IB) + +AS_IF([test $ENABLEO2IB != "no"], [ + EXTRA_CHECK_INCLUDE="$EXTRA_OFED_CONFIG $EXTRA_OFED_INCLUDE" + + # 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 + #endif + #include ],[ - ENABLEOPENIB=1 - ]) -if test $ENABLEOPENIB -eq 0; then - AC_MSG_RESULT([disabled]) -elif test ! \( -f ${OPENIBPATH}/include/ts_ib_core.h -a \ - -f ${OPENIBPATH}/include/ts_ib_cm.h -a \ - -f ${OPENIBPATH}/include/ts_ib_sa_client.h \); then - AC_MSG_RESULT([no]) - case $ENABLEOPENIB in - 1) ;; - 2) AC_MSG_ERROR([kernel OpenIB headers not present]);; - 3) AC_MSG_ERROR([bad --with-openib path]);; - *) AC_MSG_ERROR([internal error]);; - esac -else - case $ENABLEOPENIB in - 1|2) OPENIBCPPFLAGS="-I$OPENIBPATH/include -DIN_TREE_BUILD";; - 3) OPENIBCPPFLAGS="-I$OPENIBPATH/include";; - *) AC_MSG_RESULT([no]) - AC_MSG_ERROR([internal error]);; - esac - OPENIBCPPFLAGS="$OPENIBCPPFLAGS -DIB_NTXRXPARAMS=4" - EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="$EXTRA_KCFLAGS $OPENIBCPPFLAGS" - LB_LINUX_TRY_COMPILE([ - #include - #include - #include + rdma_create_id(NULL, NULL, 0, 0); ],[ - struct ib_device_properties dev_props; - struct ib_cm_active_param cm_active_params; - tTS_IB_CLIENT_QUERY_TID tid; - int enum1 = IB_QP_ATTRIBUTE_STATE; - int enum2 = IB_ACCESS_LOCAL_WRITE; - int enum3 = IB_CQ_CALLBACK_INTERRUPT; - int enum4 = IB_CQ_PROVIDER_REARM; - return 0; + 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 + #endif + #include ],[ - AC_MSG_RESULT([yes]) - OPENIBLND="openiblnd" + rdma_create_id(NULL, NULL, NULL, 0, 0); ],[ - AC_MSG_RESULT([no]) - case $ENABLEOPENIB in - 1) ;; - 2) AC_MSG_ERROR([can't compile with kernel OpenIB headers]);; - 3) AC_MSG_ERROR([can't compile with OpenIB headers under $OPENIBPATH]);; - *) AC_MSG_ERROR([internal error]);; - esac - OPENIBLND="" - OPENIBCPPFLAGS="" + AC_DEFINE(HAVE_RDMA_CREATE_ID_5ARG, 1, + [rdma_create_id wants 5 args]) ]) - EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save" -fi -AC_SUBST(OPENIBCPPFLAGS) -AC_SUBST(OPENIBLND) -]) -# -# LN_CONFIG_CIBLND -# -AC_DEFUN([LN_CONFIG_CIB],[ -AC_MSG_CHECKING([whether to enable Cisco/TopSpin IB support]) -# set default -CIBPATH="" -CIBLND="" -AC_ARG_WITH([cib], - AC_HELP_STRING([--with-cib=path], - [build ciblnd against path]), - [ - case $with_cib in - no) AC_MSG_RESULT([no]);; - *) CIBPATH="$with_cib" - if test -d "$CIBPATH"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([No directory $CIBPATH]) - fi;; - esac + # 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 + #endif + #include ],[ - AC_MSG_RESULT([no]) + 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]) ]) -if test -n "$CIBPATH"; then - CIBCPPFLAGS="-I${CIBPATH}/ib/ts_api_ng/include -I${CIBPATH}/all/kernel_services/include -DUSING_TSAPI" - CIBCPPFLAGS="$CIBCPPFLAGS -DIB_NTXRXPARAMS=3" - EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="$EXTRA_KCFLAGS $CIBCPPFLAGS" - LB_LINUX_TRY_COMPILE([ - #include - #include - #include + + # 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 + #endif + #include ],[ - struct ib_device_properties dev_props; - struct ib_cm_active_param cm_active_params; - tTS_IB_CLIENT_QUERY_TID tid; - int enum1 = TS_IB_QP_ATTRIBUTE_STATE; - int enum2 = TS_IB_ACCESS_LOCAL_WRITE; - int enum3 = TS_IB_CQ_CALLBACK_INTERRUPT; - int enum4 = TS_IB_CQ_PROVIDER_REARM; - return 0; + ib_alloc_fast_reg_mr(NULL, 0); ],[ - CIBLND="ciblnd" + AC_DEFINE(HAVE_IB_ALLOC_FAST_REG_MR, 1, + [ib_alloc_fast_reg_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 + #endif + #include ],[ - AC_MSG_ERROR([can't compile ciblnd with given path]) - CIBCPPFLAGS="" + struct ib_rdma_wr *wr __attribute__ ((unused)); + + wr = rdma_wr(NULL); + ],[ + AC_DEFINE(HAVE_IB_RDMA_WR, 1, + [struct ib_rdma_wr is defined]) ]) - EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save" -fi -AC_SUBST(CIBCPPFLAGS) -AC_SUBST(CIBLND) -]) -# -# LN_CONFIG_IIB -# -# check for infinicon infiniband support -# -AC_DEFUN([LN_CONFIG_IIB],[ -AC_MSG_CHECKING([whether to enable Infinicon support]) -# set default -IIBPATH="/usr/include" -AC_ARG_WITH([iib], - AC_HELP_STRING([--with-iib=path], - [build iiblnd against path]), - [ - case $with_iib in - yes) ENABLEIIB=2 - ;; - no) ENABLEIIB=0 - ;; - *) IIBPATH="${with_iib}/include" - ENABLEIIB=3 - ;; - esac + # 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 + #endif + #include ],[ - ENABLEIIB=1 + ib_map_mr_sg(NULL, NULL, 0, 0); + ],[ + AC_DEFINE(HAVE_IB_MAP_MR_SG, 1, + [ib_map_mr_sg exists]) ]) -if test $ENABLEIIB -eq 0; then - AC_MSG_RESULT([disabled]) -elif test ! \( -f ${IIBPATH}/linux/iba/ibt.h \); then - AC_MSG_RESULT([no]) - case $ENABLEIIB in - 1) ;; - 2) AC_MSG_ERROR([default Infinicon headers not present]);; - 3) AC_MSG_ERROR([bad --with-iib path]);; - *) AC_MSG_ERROR([internal error]);; - esac -else - IIBCPPFLAGS="-I$IIBPATH" - if test $IIBPATH != "/usr/include"; then - # we need /usr/include come what may - IIBCPPFLAGS="$IIBCPPFLAGS -I/usr/include" - fi - EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="$EXTRA_KCFLAGS $IIBCPPFLAGS" - LB_LINUX_TRY_COMPILE([ - #include + + # 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 + #endif + #include + ],[ + ib_map_mr_sg(NULL, NULL, 0, NULL, 0); ],[ - IBT_INTERFACE_UNION interfaces; - FSTATUS rc; + 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]) + ]) - rc = IbtGetInterfaceByVersion(IBT_INTERFACE_VERSION_2, - &interfaces); + # 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 + #endif + #include + ],[ + 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]) + ]) - return rc == FSUCCESS ? 0 : 1; + 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 + #endif + #include ],[ - AC_MSG_RESULT([yes]) - IIBLND="iiblnd" + (void)ib_inc_rkey(0); ],[ - AC_MSG_RESULT([no]) - case $ENABLEIIB in - 1) ;; - 2) AC_MSG_ERROR([can't compile with default Infinicon headers]);; - 3) AC_MSG_ERROR([can't compile with Infinicon headers under $IIBPATH]);; - *) AC_MSG_ERROR([internal error]);; - esac - IIBLND="" - IIBCPPFLAGS="" + AC_DEFINE(HAVE_IB_INC_RKEY, 1, + [function ib_inc_rkey exist]) ]) - EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save" -fi -AC_SUBST(IIBCPPFLAGS) -AC_SUBST(IIBLND) -]) + + EXTRA_CHECK_INCLUDE="" +]) # ENABLEO2IB != "no" +]) # LN_CONFIG_O2IB # -# LN_CONFIG_VIB +# LN_CONFIG_GNILND # -# check for Voltaire infiniband support +# check whether to use the Gemini Network Interface lnd # -AC_DEFUN([LN_CONFIG_VIB], -[AC_MSG_CHECKING([whether to enable Voltaire IB support]) -VIBPATH="" -AC_ARG_WITH([vib], - AC_HELP_STRING([--with-vib=path], - [build viblnd against path]), - [ - case $with_vib in - no) AC_MSG_RESULT([no]);; - *) VIBPATH="${with_vib}/src/nvigor/ib-code" - if test -d "$with_vib" -a -d "$VIBPATH"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([No directory $VIBPATH]) - fi;; - esac - ],[ - AC_MSG_RESULT([no]) - ]) -if test -z "$VIBPATH"; then - VIBLND="" -else - VIBCPPFLAGS="-I${VIBPATH}/include -I${VIBPATH}/cm" +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 $VIBCPPFLAGS" - LB_LINUX_TRY_COMPILE([ - #include - #include - #ifdef __BIG_ENDIAN - # define CPU_BE 1 - # define CPU_LE 0 - #endif - #ifdef __LITTLE_ENDIAN - # define CPU_BE 0 - # define CPU_LE 1 - #endif - #include - #include - #include + EXTRA_KCFLAGS="$EXTRA_KCFLAGS $GNICPPFLAGS" + LB_CHECK_COMPILE([if GNI kernel headers are present], + GNI_header, [ + #include + #include ],[ - vv_hca_h_t kib_hca; - vv_return_t vvrc; - cm_cep_handle_t cep; - ibat_arp_data_t arp_data; - ibat_stat_t ibatrc; - - vvrc = vv_hca_open("ANY_HCA", NULL, &kib_hca); - cep = cm_create_cep(cm_cep_transp_rc); - ibatrc = ibat_get_ib_data((uint32_t)0, (uint32_t)0, - ibat_paths_primary, &arp_data, - (ibat_get_ib_data_reply_fn_t)NULL, - NULL, 0); - return 0; + 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; ],[ - VIBLND="viblnd" + GNILND="gnilnd" ],[ - AC_MSG_ERROR([can't compile viblnd with given path]) + AC_MSG_ERROR([can't compile gnilnd with given GNICPPFLAGS: $GNICPPFLAGS]) ]) - EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save" -fi -if test -n "$VIBLND"; then - EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="$EXTRA_KCFLAGS $VIBCPPFLAGS" - AC_MSG_CHECKING([if Voltaire still uses void * sg addresses]) - LB_LINUX_TRY_COMPILE([ - #include - #include - #ifdef __BIG_ENDIAN - # define CPU_BE 1 - # define CPU_LE 0 - #endif - #ifdef __LITTLE_ENDIAN - # define CPU_BE 0 - # define CPU_LE 1 - #endif - #include - #include - #include + # at this point, we have gnilnd basic support, + # now check for extra features + LB_CHECK_COMPILE([to use RCA in gnilnd], + RCA_gnilnd, [ + #include + #include + #include ],[ - vv_scatgat_t sg; - - return &sg.v_address[3] == NULL; - ],[ - AC_MSG_RESULT([yes]) - VIBCPPFLAGS="$VIBCPPFLAGS -DIBNAL_VOIDSTAR_SGADDR=1" + 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; ],[ - AC_MSG_RESULT([no]) + GNICPPFLAGS="$GNICPPFLAGS -DGNILND_USE_RCA=1" ]) EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save" -fi -AC_SUBST(VIBCPPFLAGS) -AC_SUBST(VIBLND) ]) +AC_SUBST(GNICPPFLAGS) +AC_SUBST(GNILND) +]) # LN_CONFIG_GNILND # -# LN_CONFIG_RALND +# LN_CONFIG_SK_SLEEP # -# check whether to use the RapidArray lnd +# 2.6.35 kernel has sk_sleep function # -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 - #include +AC_DEFUN([LN_CONFIG_SK_SLEEP], [ +LB_CHECK_COMPILE([if Linux kernel has 'sk_sleep'], +sk_sleep, [ + #include ],[ - RAP_RETURN rc; - RAP_PVOID dev_handle; - - rc = RapkGetDeviceByIndex(0, NULL, &dev_handle); + sk_sleep(NULL); +],[ + AC_DEFINE(HAVE_SK_SLEEP, 1, + [kernel has sk_sleep]) +]) +]) # LN_CONFIG_SK_SLEEP - return rc == RAP_SUCCESS ? 0 : 1; +# +# LN_CONFIG_TCP_SENDPAGE +# +# 2.6.36 tcp_sendpage() first parameter is 'struct sock' +# instead of 'struct socket'. +# +AC_DEFUN([LN_CONFIG_TCP_SENDPAGE], [ +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_CHECK_COMPILE([if 'tcp_sendpage' first parameter is socket], +tcp_sendpage_socket, [ + #include + #include ],[ - AC_MSG_RESULT([yes]) - RALND="ralnd" + tcp_sendpage((struct socket*)0, NULL, 0, 0, 0); ],[ - AC_MSG_RESULT([no]) - RALND="" - RACPPFLAGS="" -]) -EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save" -AC_SUBST(RACPPFLAGS) -AC_SUBST(RALND) + AC_DEFINE(HAVE_TCP_SENDPAGE_USE_SOCKET, 1, + [tcp_sendpage use socket as first parameter]) ]) - - +EXTRA_KCFLAGS="$tmp_flags" +]) # LN_CONFIG_TCP_SENDPAGE # +# LN_CONFIG_SK_DATA_READY # -# LN_CONFIG_USERSPACE +# 3.15 for struct sock the *sk_data_ready() field only takes one argument now # -# This is defined but empty because it is called from -# build/autconf/lustre-build.m4 which is shared by all branches. -# -AC_DEFUN([LN_CONFIG_USERSPACE], -[ +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 + #include +],[ + ((struct sock *)0)->sk_data_ready(NULL); +],[ + 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_PROG_LINUX # # LNet linux kernel checks # -AC_DEFUN([LN_PROG_LINUX], -[ +AC_DEFUN([LN_PROG_LINUX], [ +AC_MSG_NOTICE([LNet kernel checks +==============================================================================]) + LN_CONFIG_AFFINITY LN_CONFIG_BACKOFF -LN_CONFIG_QUADRICS -LN_CONFIG_GM -LN_CONFIG_OPENIB -LN_CONFIG_CIB -LN_CONFIG_VIB -LN_CONFIG_IIB LN_CONFIG_O2IB -LN_CONFIG_RALND -LN_CONFIG_PTLLND -LN_CONFIG_MX -]) - -# -# LN_PROG_DARWIN -# -# Darwin checks -# -AC_DEFUN([LN_PROG_DARWIN], -[LB_DARWIN_CHECK_FUNCS([get_preemption_level]) -]) +LN_CONFIG_GNILND +# 2.6.35 +LN_CONFIG_SK_SLEEP +# 2.6.36 +LN_CONFIG_TCP_SENDPAGE +# 3.15 +LN_CONFIG_SK_DATA_READY +]) # 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]) - -AC_CHECK_TYPE([spinlock_t], - [AC_DEFINE(HAVE_SPINLOCK_T, 1, [spinlock_t is defined])], - [], - [#include ]) +# lnet/utils/portals.c +AC_CHECK_HEADERS([netdb.h]) +AC_CHECK_FUNCS([gethostbyname]) # lnet/utils/wirecheck.c AC_CHECK_FUNCS([strnlen]) # -------- Check for required packages -------------- -# -# LC_CONFIG_READLINE -# -# Build with readline -# -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]) - -# -------- 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) - -fi +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_MAX_PAYLOAD -LN_CONFIG_UPTLLND -LN_CONFIG_USOCKLND -]) +LN_CONFIG_DLC +]) # 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_GMLND, test x$GMLND = "xgmlnd") -AM_CONDITIONAL(BUILD_MXLND, test x$MXLND = "xmxlnd") -AM_CONDITIONAL(BUILD_O2IBLND, test x$O2IBLND = "xo2iblnd") -AM_CONDITIONAL(BUILD_OPENIBLND, test x$OPENIBLND = "xopeniblnd") -AM_CONDITIONAL(BUILD_CIBLND, test x$CIBLND = "xciblnd") -AM_CONDITIONAL(BUILD_IIBLND, test x$IIBLND = "xiiblnd") -AM_CONDITIONAL(BUILD_VIBLND, test x$VIBLND = "xviblnd") -AM_CONDITIONAL(BUILD_RALND, test x$RALND = "xralnd") -AM_CONDITIONAL(BUILD_PTLLND, test x$PTLLND = "xptllnd") -AM_CONDITIONAL(BUILD_UPTLLND, test x$UPTLLND = "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") +AM_CONDITIONAL(BUILD_DLC, test x$USE_DLC = "xyes") +]) # 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/klnds/Makefile lnet/klnds/autoMakefile -lnet/klnds/gmlnd/Makefile -lnet/klnds/mxlnd/autoMakefile -lnet/klnds/mxlnd/Makefile -lnet/klnds/gmlnd/autoMakefile -lnet/klnds/openiblnd/Makefile -lnet/klnds/openiblnd/autoMakefile lnet/klnds/o2iblnd/Makefile lnet/klnds/o2iblnd/autoMakefile -lnet/klnds/ciblnd/Makefile -lnet/klnds/ciblnd/autoMakefile -lnet/klnds/iiblnd/Makefile -lnet/klnds/iiblnd/autoMakefile -lnet/klnds/viblnd/Makefile -lnet/klnds/viblnd/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/ulnds/ptllnd/Makefile lnet/utils/Makefile +lnet/utils/lnetconfig/Makefile ]) -case $lb_target_os in - darwin) - AC_CONFIG_FILES([ -lnet/include/lnet/darwin/Makefile -]) - ;; -esac -]) +]) # LN_CONFIG_FILES