X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Fautoconf%2Flustre-lnet.m4;h=8d81e1c9e97c244d1fc967e7036e2bd4256acc8c;hp=c569683f6a4d2fca71874e67eb6ec406da5d7098;hb=8293925e6fe9aeaee3af26cc1780f8e0b9661d0f;hpb=c3340096066b4c90a8b244ecbb5a2cf0101028d9 diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4 index c569683..8d81e1c 100644 --- a/lnet/autoconf/lustre-lnet.m4 +++ b/lnet/autoconf/lustre-lnet.m4 @@ -3,1159 +3,630 @@ # # 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]), - [ + 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)" + 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 # -# LC_CONFIG_CDEBUG +# LN_FUNC_DEV_GET_BY_NAME_2ARG # -# whether to enable various libcfs debugs (CDEBUG, ENTRY/EXIT, LASSERT, etc.) -# -AC_DEFUN([LC_CONFIG_CDEBUG], -[ -AC_MSG_CHECKING([whether to disable CDEBUG, CWARN, etc.]) -AC_ARG_ENABLE([libcfs_cdebug], - AC_HELP_STRING([--disable-libcfs-cdebug], - [disable libcfs CDEBUG, CWARN]), - [],[disable_libcfs_cdebug='no']) -AC_MSG_RESULT([$disable_libcfs_cdebug]) -if test x$disable_libcfs_cdebug != xno; then - AC_DEFINE(CDEBUG_ENABLED, 0, [disable libcfs CDEBUG, CWARN]) -else - AC_DEFINE(CDEBUG_ENABLED, 1, [enable libcfs CDEBUG, CWARN]) -fi - -AC_MSG_CHECKING([whether to enable ENTRY/EXIT]) -AC_ARG_ENABLE([libcfs_trace], - AC_HELP_STRING([--enable-libcfs-trace], - [enable libcfs ENTRY/EXIT]), - [],[enable_libcfs_trace='no']) -AC_MSG_RESULT([$enable_libcfs_trace]) -if test x$enable_libcfs_trace != xno; then - AC_DEFINE(CDEBUG_ENTRY_EXIT, 1, [enable libcfs ENTRY/EXIT]) -else - AC_DEFINE(CDEBUG_ENTRY_EXIT, 0, [disable libcfs ENTRY/EXIT]) -fi - -AC_MSG_CHECKING([whether to disable LASSERT, LASSERTF]) -AC_ARG_ENABLE([libcfs_assert], - AC_HELP_STRING([--disable-libcfs-assert], - [disable libcfs LASSERT, LASSERTF]), - [],[disable_libcfs_assert='no']) -AC_MSG_RESULT([$disable_libcfs_assert]) -if test x$disable_libcfs_assert = xno; then - AC_DEFINE(LIBCFS_DEBUG, 1, [enable libcfs LASSERT, LASSERTF]) -fi +AC_DEFUN([LN_FUNC_DEV_GET_BY_NAME_2ARG], [ +LB_CHECK_COMPILE([if 'dev_get_by_name' has two args], +dev_get_by_name_2args, [ + #include +],[ + dev_get_by_name(NULL, NULL); +],[ + AC_DEFINE(HAVE_DEV_GET_BY_NAME_2ARG, 1, + [dev_get_by_name has 2 args]) ]) - +]) # LN_FUNC_DEV_GET_BY_NAME_2ARG + # # 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; - #endif - set_cpus_allowed(&t, m); - ],[ - AC_DEFINE(CPU_AFFINITY, 1, [kernel has cpu affinity support]) - AC_MSG_RESULT([yes]) + #else + unsigned long m; + #endif + set_cpus_allowed_ptr(t, &m); ],[ - 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) - else - AC_MSG_RESULT([no (no kernel support)]) - fi -fi -]) - -# -# LN_CONFIG_PANIC_DUMPLOG -# -# check if tunable panic_dumplog is wanted -# -AC_DEFUN([LN_CONFIG_PANIC_DUMPLOG], -[AC_MSG_CHECKING([for tunable panic_dumplog support]) -AC_ARG_ENABLE([panic_dumplog], - AC_HELP_STRING([--enable-panic_dumplog], - [enable panic_dumplog]), - [],[enable_panic_dumplog='no']) -if test x$enable_panic_dumplog = xyes ; then - AC_DEFINE(LNET_DUMP_ON_PANIC, 1, [use dumplog on panic]) - AC_MSG_RESULT([yes (by request)]) -else - AC_MSG_RESULT([no]) -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) + 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]) + ]) ]) +]) # LN_CONFIG_BACKOFF # # LN_CONFIG_USOCKLND # # configure support for userspace TCP/IP LND # -AC_DEFUN([LN_CONFIG_USOCKLND], -[AC_MSG_CHECKING([whether to build usocklnd]) +AC_DEFUN([LN_CONFIG_USOCKLND], [ +AC_MSG_CHECKING([whether to enable 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-usocklnd], + [disable usocklnd]), + [], [enable_usocklnd="yes"]) +AC_MSG_RESULT([$enable_usocklnd]) +USOCKLND="" +AS_IF([test "x$enable_usocklnd" = xyes], [ + AC_MSG_CHECKING([whether to build usocklnd]) + AS_IF([test "$ENABLE_LIBPTHREAD" = yes], [ AC_MSG_RESULT([yes]) - USOCKLND="usocklnd" - else + USOCKLND="usocklnd" + ], [ AC_MSG_RESULT([no (libpthread not present or disabled)]) - USOCKLND="" - fi -else - AC_MSG_RESULT([no (disabled explicitly)]) - USOCKLND="" -fi -AC_SUBST(USOCKLND) + ]) ]) +AC_SUBST(USOCKLND) +]) # LN_CONFIG_USOCKLND # # LN_CONFIG_QUADRICS # # check if quadrics support is in this kernel # -AC_DEFUN([LN_CONFIG_QUADRICS], -[AC_MSG_CHECKING([for QsNet sources]) +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]) + [set path to qsnet source (default=$LINUX)]), + [QSNET=$with_qsnet], [QSNET=$LINUX]) AC_MSG_RESULT([$QSNET]) +QSWLND="" +QSWCPPFLAGS="" AC_MSG_CHECKING([if quadrics kernel headers are present]) -if test -d $QSNET/drivers/net/qsnet ; then +AS_IF([test -d $QSNET/drivers/net/qsnet], [ AC_MSG_RESULT([yes]) QSWLND="qswlnd" AC_MSG_CHECKING([for multirail EKC]) - if test -f $QSNET/include/elan/epcomms.h; then + AS_IF([test -f $QSNET/include/elan/epcomms.h], [ AC_MSG_RESULT([supported]) + QSNET=$(readlink --canonicalize $QSNET) 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],[],[ + AS_IF([test x$QSNET = x$LINUX], [ + LB_CHECK_CONFIG([QSNET], [], [ + LB_CHECK_CONFIG([QSNET_MODULE], [], [ AC_MSG_WARN([QSNET is not enabled in this kernel; not building qswlnd.]) QSWLND="" QSWCPPFLAGS="" ]) ]) - 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) ]) - +AC_SUBST(QSWLND) +AC_SUBST(QSWCPPFLAGS) +]) # LN_CONFIG_QUADRICS # # LN_CONFIG_MX # -AC_DEFUN([LN_CONFIG_MX], -[AC_MSG_CHECKING([whether to enable Myrinet MX support]) +AC_DEFUN([LN_CONFIG_MX], [ # set default MXPATH="/opt/mx" +AC_MSG_CHECKING([whether to enable Myrinet MX support]) 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) -]) - - - -# -# LN_CONFIG_O2IB -# -AC_DEFUN([LN_CONFIG_O2IB],[ -AC_MSG_CHECKING([whether to enable OpenIB gen2 support]) -# set default -O2IBPATH="$LINUX/drivers/infiniband" -AC_ARG_WITH([o2ib], - AC_HELP_STRING([--with-o2ib=path], - [build o2iblnd against path]), + AC_HELP_STRING([--with-mx=path], + [build mxlnd against path]), [ - case $with_o2ib in - yes) ENABLEO2IB=2 - ;; - no) ENABLEO2IB=0 - ;; - *) O2IBPATH=$with_o2ib - ENABLEO2IB=3 - ;; + case $with_mx in + yes) ENABLEMX=2 ;; + no) ENABLEMX=0 ;; + *) ENABLEMX=3; MXPATH=$with_mx ;; esac ],[ - ENABLEO2IB=1 + ENABLEMX=1 ]) -if test $ENABLEO2IB -eq 0; then +AS_IF([test $ENABLEMX -eq 0], [ AC_MSG_RESULT([disabled]) -elif 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 +], [test ! \( -f ${MXPATH}/include/myriexpress.h -a \ + -f ${MXPATH}/include/mx_kernel_api.h -a \ + -f ${MXPATH}/include/mx_pin.h \)], [ AC_MSG_RESULT([no]) - case $ENABLEO2IB in + case $ENABLEMX 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]);; + 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 - O2IBCPPFLAGS="-I$O2IBPATH/include" - EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="$EXTRA_KCFLAGS $O2IBCPPFLAGS" - LB_LINUX_TRY_COMPILE([ - #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; - - cm_id = rdma_create_id(NULL, NULL, RDMA_PS_TCP); - return PTR_ERR(cm_id); - ],[ - AC_MSG_RESULT([yes]) - 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="" - ]) - EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save" -fi -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 - ],[ - 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" +], [ + AC_MSG_RESULT([check]) + MXPATH=$(readlink --canonicalize $MXPATH) + MXCPPFLAGS="-I$MXPATH/include" + MXLIBS="-L$MXPATH/lib" EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="$EXTRA_KCFLAGS $OPENIBCPPFLAGS" - LB_LINUX_TRY_COMPILE([ - #include - #include - #include + EXTRA_KCFLAGS="$EXTRA_KCFLAGS $MXCPPFLAGS" + LB_CHECK_COMPILE([if have Myrinet MX support], + myrinet_mx_support, [ + #define MX_KERNEL 1 + #include + #include ],[ - 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; + 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]) - OPENIBLND="openiblnd" + MXLND="mxlnd" ],[ - AC_MSG_RESULT([no]) - case $ENABLEOPENIB in + case $ENABLEMX 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]);; + 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 - OPENIBLND="" - OPENIBCPPFLAGS="" + MXCPPFLAGS="" + MXLIBS="" + MXLND="" ]) 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 - ],[ - AC_MSG_RESULT([no]) - ]) -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 - ],[ - 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; - ],[ - CIBLND="ciblnd" - ],[ - AC_MSG_ERROR([can't compile ciblnd with given path]) - CIBCPPFLAGS="" - ]) - EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save" -fi -AC_SUBST(CIBCPPFLAGS) -AC_SUBST(CIBLND) ]) +AC_SUBST(MXCPPFLAGS) +AC_SUBST(MXLIBS) +AC_SUBST(MXLND) +]) # LN_CONFIG_MX # -# LN_CONFIG_IIB -# -# check for infinicon infiniband support +# LN_CONFIG_O2IB # -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]), +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_iib in - yes) ENABLEIIB=2 + case $with_o2ib in + yes) O2IBPATHS="$LINUX $LINUX/drivers/infiniband" + ENABLEO2IB=2 ;; - no) ENABLEIIB=0 + no) ENABLEO2IB=0 ;; - *) IIBPATH="${with_iib}/include" - ENABLEIIB=3 + *) O2IBPATHS=$with_o2ib + ENABLEO2IB=3 ;; esac ],[ - ENABLEIIB=1 + O2IBPATHS="$LINUX $LINUX/drivers/infiniband" + ENABLEO2IB=1 ]) -if test $ENABLEIIB -eq 0; then - AC_MSG_RESULT([disabled]) -elif test ! \( -f ${IIBPATH}/linux/iba/ibt.h \); then +AS_IF([test $ENABLEO2IB -eq 0], [ 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 - ],[ - IBT_INTERFACE_UNION interfaces; - FSTATUS rc; - - rc = IbtGetInterfaceByVersion(IBT_INTERFACE_VERSION_2, - &interfaces); +], [ + o2ib_found=false + for O2IBPATH in $O2IBPATHS; do + 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 \)], [ + AS_IF([test \( -d ${O2IBPATH}/kernel_patches -a \ + -f ${O2IBPATH}/Makefile \)], [ + AC_MSG_RESULT([no]) + AC_MSG_ERROR([ - return rc == FSUCCESS ? 0 : 1; - ],[ - AC_MSG_RESULT([yes]) - IIBLND="iiblnd" - ],[ +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%-*} +]) + ]) + o2ib_found=true + break + ]) + done + if ! $o2ib_found; then 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]);; + 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]) ;; esac - IIBLND="" - IIBCPPFLAGS="" - ]) - EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save" -fi -AC_SUBST(IIBCPPFLAGS) -AC_SUBST(IIBLND) -]) + else + 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]) + 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 + else + if test "x$RHEL_KERNEL" = xyes; then + case "$RHEL_KERNEL_VERSION" in + 2.6.32-358*) + EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_RHEL_6_4" ;; + 2.6.32-431*) + EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_RHEL_6_5" ;; + esac + 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 -# -# LN_CONFIG_VIB -# -# check for Voltaire infiniband support -# -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]) + O2IBLND="" + O2IBPATH=$(readlink --canonicalize $O2IBPATH) + EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -I$O2IBPATH/include" + LB_CHECK_COMPILE([whether to enable OpenIB gen2 support], + openib_gen2_support, [ + #include + #include + #include + #ifdef HAVE_COMPAT_RDMA + #include + #endif + #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); + ],[ + O2IBLND="o2iblnd" + ],[ + 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 + ]) + # 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 -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 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" - 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 - ],[ - 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; + AC_MSG_ERROR([an external source tree was specified for o2iblnd however I could not find a $O2IBPATH/Module.symvers there]) + fi + fi - 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; - ],[ - VIBLND="viblnd" - ],[ - AC_MSG_ERROR([can't compile viblnd with given path]) - ]) - 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 - ],[ - vv_scatgat_t sg; + LN_CONFIG_OFED_SPEC + fi +]) +AC_SUBST(EXTRA_OFED_INCLUDE) +AC_SUBST(O2IBLND) - return &sg.v_address[3] == NULL; +# In RHEL 6.2, rdma_create_id() takes the queue-pair type as a fourth argument +AS_IF([test $ENABLEO2IB -ne 0], [ + LB_CHECK_COMPILE([if 'rdma_create_id' wants four args], + rdma_create_id_4args, [ + #ifdef HAVE_COMPAT_RDMA + #include + #endif + #include ],[ - AC_MSG_RESULT([yes]) - VIBCPPFLAGS="$VIBCPPFLAGS -DIBNAL_VOIDSTAR_SGADDR=1" + rdma_create_id(NULL, NULL, 0, 0); ],[ - AC_MSG_RESULT([no]) + AC_DEFINE(HAVE_RDMA_CREATE_ID_4ARG, 1, + [rdma_create_id wants 4 args]) ]) - EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save" -fi -AC_SUBST(VIBCPPFLAGS) -AC_SUBST(VIBLND) ]) +]) # LN_CONFIG_O2IB # # LN_CONFIG_RALND # # check whether to use the RapidArray lnd # -AC_DEFUN([LN_CONFIG_RALND], -[#### Rapid Array -AC_MSG_CHECKING([if RapidArray kernel headers are present]) -# placeholder +AC_DEFUN([LN_CONFIG_RALND], [ +RALND="" RACPPFLAGS="-I${LINUX}/drivers/xd1/include" EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS" EXTRA_KCFLAGS="$EXTRA_KCFLAGS $RACPPFLAGS" -LB_LINUX_TRY_COMPILE([ +LB_CHECK_COMPILE([if 'RapidArray' kernel headers are present], +RapkGetDeviceByIndex, [ #include #include ],[ - RAP_RETURN rc; - RAP_PVOID dev_handle; - - rc = RapkGetDeviceByIndex(0, NULL, &dev_handle); - + RAP_RETURN rc; + RAP_PVOID dev_handle; + rc = RapkGetDeviceByIndex(0, NULL, &dev_handle); return rc == RAP_SUCCESS ? 0 : 1; ],[ - AC_MSG_RESULT([yes]) RALND="ralnd" ],[ - AC_MSG_RESULT([no]) - RALND="" RACPPFLAGS="" ]) EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save" AC_SUBST(RACPPFLAGS) AC_SUBST(RALND) -]) +]) # LN_CONFIG_RALND # -# LN_STRUCT_PAGE_LIST +# LN_CONFIG_GNILND # -# 2.6.4 no longer has page->list +# check whether to use the Gemini Network Interface lnd # -AC_DEFUN([LN_STRUCT_PAGE_LIST], -[AC_MSG_CHECKING([if struct page has a list field]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct page page; - &page.list; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_PAGE_LIST, 1, [struct page has a list field]) -],[ - AC_MSG_RESULT([no]) -]) -]) +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]) -# -# LN_STRUCT_SIGHAND -# -# red hat 2.4 adds sighand to struct task_struct -# -AC_DEFUN([LN_STRUCT_SIGHAND], -[AC_MSG_CHECKING([if task_struct has a sighand field]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct task_struct p; - p.sighand = NULL; -],[ - AC_DEFINE(CONFIG_RH_2_4_20, 1, [this kernel contains Red Hat 2.4.20 patches]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LN_FUNC_CPU_ONLINE -# -# cpu_online is different in rh 2.4, vanilla 2.4, and 2.6 -# -AC_DEFUN([LN_FUNC_CPU_ONLINE], -[AC_MSG_CHECKING([if kernel defines cpu_online()]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - cpu_online(0); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_CPU_ONLINE, 1, [cpu_online found]) -],[ - AC_MSG_RESULT([no]) -]) +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 + #include + ],[ + 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 + #include + #include + ],[ + 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" + GNILNDRCA="gnilndrca" + ]) + EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save" ]) +AC_SUBST(GNICPPFLAGS) +AC_SUBST(GNILNDRCA) +AC_SUBST(GNILND) +]) # LN_CONFIG_GNILND # -# LN_TYPE_GFP_T +# LN_CONFIG_USERSPACE # -# check if gfp_t is typedef-ed +# This is defined but empty because it is called from +# build/autconf/lustre-build.m4 which is shared by all branches. # -AC_DEFUN([LN_TYPE_GFP_T], -[AC_MSG_CHECKING([if kernel defines gfp_t]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - return sizeof(gfp_t); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_GFP_T, 1, [gfp_t found]) -],[ - AC_MSG_RESULT([no]) -]) -]) +AC_DEFUN([LN_CONFIG_USERSPACE], [ +]) # LN_CONFIG_USERSPACE # -# LN_TYPE_CPUMASK_T +# LN_CONFIG_TCP_SENDPAGE # -# same goes for cpumask_t +# 2.6.36 tcp_sendpage() first parameter is 'struct sock' instead of 'struct socket'. # -AC_DEFUN([LN_TYPE_CPUMASK_T], -[AC_MSG_CHECKING([if kernel defines cpumask_t]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - return sizeof (cpumask_t); +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]) - AC_DEFINE(HAVE_CPUMASK_T, 1, [cpumask_t found]) + tcp_sendpage((struct socket*)0, NULL, 0, 0, 0); ],[ - AC_MSG_RESULT([no]) -]) + AC_DEFINE(HAVE_TCP_SENDPAGE_USE_SOCKET, 1, + [tcp_sendpage use socket as first parameter]) ]) +EXTRA_KCFLAGS="$tmp_flags" +]) # LN_CONFIG_TCP_SENDPAGE # -# LN_FUNC_SHOW_TASK -# -# we export show_task(), but not all kernels have it (yet) +# LN_CONFIG_SK_DATA_READY # -AC_DEFUN([LN_FUNC_SHOW_TASK], -[AC_MSG_CHECKING([if kernel exports show_task]) -have_show_task=0 -for file in ksyms sched ; do - if grep -q "EXPORT_SYMBOL(show_task)" \ - "$LINUX/kernel/$file.c" 2>/dev/null ; then - have_show_task=1 - break - fi -done -if test x$have_show_task = x1 ; then - AC_DEFINE(HAVE_SHOW_TASK, 1, [show_task is exported]) - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi -]) - -# LN_TASKLIST_LOCK -# 2.6.18 remove tasklist_lock export -AC_DEFUN([LN_TASKLIST_LOCK], -[AC_MSG_CHECKING([kernel export tasklist_lock]) - if grep -q "EXPORT_SYMBOL(tasklist_lock)" \ - "$LINUX/kernel/fork.c" 2>/dev/null ; then - AC_DEFINE(HAVE_TASKLIST_LOCK, 1, - [tasklist_lock exported]) - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi -]) - -# 2.6.19 API changes -# kmem_cache_destroy(cachep) return void instead of -# int -AC_DEFUN([LN_KMEM_CACHE_DESTROY_INT], -[AC_MSG_CHECKING([kmem_cache_destroy(cachep) return int]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - int i = kmem_cache_destroy(NULL); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_KMEM_CACHE_DESTROY_INT, 1, - [kmem_cache_destroy(cachep) return int]) -],[ - AC_MSG_RESULT(NO) -]) -]) - -#2.6.19 API change -#panic_notifier_list use atomic_notifier operations +# 2.6.36 tcp_sendpage() first parameter is 'struct sock' instead of 'struct socket'. # -AC_DEFUN([LN_ATOMIC_PANIC_NOTIFIER], -[AC_MSG_CHECKING([panic_notifier_list is atomic]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - struct atomic_notifier_head panic_notifier_list; +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 ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_ATOMIC_PANIC_NOTIFIER, 1, - [panic_notifier_list is atomic_notifier_head]) + ((struct sock *)0)->sk_data_ready(NULL); ],[ - AC_MSG_RESULT(NO) -]) + 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], -[ -LC_CONFIG_CDEBUG -LN_FUNC_CPU_ONLINE -LN_TYPE_GFP_T -LN_TYPE_CPUMASK_T +AC_DEFUN([LN_PROG_LINUX], [ +AC_MSG_NOTICE([LNet kernel checks +==============================================================================]) + +LN_FUNC_DEV_GET_BY_NAME_2ARG LN_CONFIG_AFFINITY LN_CONFIG_BACKOFF -LN_CONFIG_PANIC_DUMPLOG 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_GNILND LN_CONFIG_MX - -LN_STRUCT_PAGE_LIST -LN_STRUCT_SIGHAND -LN_FUNC_SHOW_TASK -# 2.6.18 -LN_TASKLIST_LOCK -# 2.6.19 -LN_KMEM_CACHE_DESTROY_INT -LN_ATOMIC_PANIC_NOTIFIER -]) +# 2.6.36 +LN_CONFIG_TCP_SENDPAGE +# 3.15 +LN_CONFIG_SK_DATA_READY +]) # LN_PROG_LINUX # # LN_PROG_DARWIN # # Darwin checks # -AC_DEFUN([LN_PROG_DARWIN], -[LB_DARWIN_CHECK_FUNCS([get_preemption_level]) -]) +AC_DEFUN([LN_PROG_DARWIN], [ +LB_DARWIN_CHECK_FUNCS([get_preemption_level]) +]) # LN_PROG_DARWIN # # 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_DEFUN([LN_CONFIGURE], [ +AC_MSG_NOTICE([LNet core checks +==============================================================================]) + +# 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]) # 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/wirecheck.c AC_CHECK_FUNCS([strnlen]) @@ -1168,207 +639,97 @@ AC_CHECK_FUNCS([strnlen]) # AC_MSG_CHECKING([whether to enable readline support]) AC_ARG_ENABLE(readline, - AC_HELP_STRING([--disable-readline], - [disable readline support]), - [],[enable_readline='yes']) + 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) -AC_MSG_CHECKING([if efence debugging support is requested]) -AC_ARG_ENABLE(efence, - AC_HELP_STRING([--enable-efence], - [use efence library]), - [],[enable_efence='no']) -AC_MSG_RESULT([$enable_efence]) -if test "$enable_efence" = "yes" ; then - LIBEFENCE="-lefence" - AC_DEFINE(HAVE_LIBEFENCE, 1, [libefence support is requested]) -else - LIBEFENCE="" -fi -AC_SUBST(LIBEFENCE) +LIBREADLINE="" +AS_IF([test "x$enable_readline" = xyes], [ + AC_CHECK_LIB([readline], [readline], [ + LIBREADLINE="-lreadline" + AC_DEFINE(HAVE_LIBREADLINE, 1, + [readline library is available])]) +]) +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 ;; + yes) enable_libwrap="yes" ;; + no) enable_libwrap="no" ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-libwrap) ;; - esac],[enable_libwrap=no]) + esac], [enable_libwrap="no"]) AC_MSG_RESULT([$enable_libwrap]) -if test x$enable_libwrap = xyes ; then +LIBWRAP="" +AS_IF([test "x$enable_libwrap" = xyes], [ LIBWRAP="-lwrap" - AC_DEFINE(HAVE_LIBWRAP, 1, [libwrap support is requested]) -else - LIBWRAP="" -fi + AC_DEFINE(HAVE_LIBWRAP, 1, + [libwrap support is requested]) +]) AC_SUBST(LIBWRAP) -# -------- check for -lpthread support ---- -AC_MSG_CHECKING([whether to use libpthread for lnet library]) -AC_ARG_ENABLE([libpthread], - AC_HELP_STRING([--disable-libpthread], - [disable libpthread]), - [],[enable_libpthread=yes]) -if test "$enable_libpthread" = "yes" ; then - AC_CHECK_LIB([pthread], [pthread_create], - [ENABLE_LIBPTHREAD="yes"], - [ENABLE_LIBPTHREAD="no"]) - if test "$ENABLE_LIBPTHREAD" = "yes" ; then - AC_MSG_RESULT([$ENABLE_LIBPTHREAD]) - PTHREAD_LIBS="-lpthread" - AC_DEFINE([HAVE_LIBPTHREAD], 1, [use libpthread]) - else - PTHREAD_LIBS="" - AC_MSG_RESULT([no libpthread is found]) - fi - AC_SUBST(PTHREAD_LIBS) -else - AC_MSG_RESULT([no (disabled explicitly)]) - ENABLE_LIBPTHREAD="no" -fi -AC_SUBST(ENABLE_LIBPTHREAD) - -# ---------------------------------------- -# 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 - LN_CONFIG_MAX_PAYLOAD -LN_CONFIG_UPTLLND LN_CONFIG_USOCKLND -]) +]) # LN_CONFIGURE # # LN_CONDITIONALS # # AM_CONDITOINAL 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_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_GNILND, test x$GNILND = "xgnilnd") +AM_CONDITIONAL(BUILD_GNILND_RCA, test x$GNILNDRCA = "xgnilndrca") +AM_CONDITIONAL(BUILD_USOCKLND, test x$USOCKLND = "xusocklnd") +]) # LN_CONDITIONALS # # LN_CONFIG_FILES # # files that should be generated with AC_OUTPUT # -AC_DEFUN([LN_CONFIG_FILES], -[AC_CONFIG_FILES([ +AC_DEFUN([LN_CONFIG_FILES], [ +AC_CONFIG_FILES([ lnet/Kernelenv lnet/Makefile lnet/autoMakefile lnet/autoconf/Makefile lnet/doc/Makefile lnet/include/Makefile -lnet/include/libcfs/Makefile -lnet/include/libcfs/linux/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/libcfs/Makefile -lnet/libcfs/autoMakefile -lnet/libcfs/linux/Makefile lnet/lnet/Makefile lnet/lnet/autoMakefile -lnet/tests/Makefile -lnet/tests/autoMakefile +lnet/selftest/Makefile +lnet/selftest/autoMakefile lnet/ulnds/Makefile lnet/ulnds/autoMakefile lnet/ulnds/socklnd/Makefile -lnet/ulnds/ptllnd/Makefile lnet/utils/Makefile -]) -case $lb_target_os in - darwin) - AC_CONFIG_FILES([ -lnet/include/libcfs/darwin/Makefile lnet/include/lnet/darwin/Makefile -lnet/libcfs/darwin/Makefile -]) - ;; -esac ]) +]) # LN_CONFIG_FILES