])
#
+# 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_AFFINITY
#
# check if cpu affinity is available/wanted
# LN_CONFIG_O2IB
#
AC_DEFUN([LN_CONFIG_O2IB],[
+
+# In RHEL 6.2, rdma_create_id() takes the queue-pair type as a fourth argument
+AC_MSG_CHECKING([if rdma_create_id wants four args])
+LB_LINUX_TRY_COMPILE([
+ #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])
+],[
+ AC_MSG_RESULT([no])
+])
+
AC_MSG_CHECKING([whether to enable OpenIB gen2 support])
# set default
AC_ARG_WITH([o2ib],
struct ib_pool_fmr pool_fmr;
enum ib_cm_rej_reason rej_reason;
+ #ifdef HAVE_RDMA_CREATE_ID_4ARG
+ cm_id = rdma_create_id(NULL, NULL, RDMA_PS_TCP, 0);
+ #else
cm_id = rdma_create_id(NULL, NULL, RDMA_PS_TCP);
+ #endif
return PTR_ERR(cm_id);
],[
AC_MSG_RESULT([yes])
])
#
-# 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"
- EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS"
- EXTRA_KCFLAGS="$EXTRA_KCFLAGS $OPENIBCPPFLAGS"
- LB_LINUX_TRY_COMPILE([
- #include <ts_ib_core.h>
- #include <ts_ib_cm.h>
- #include <ts_ib_sa_client.h>
- ],[
- 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_MSG_RESULT([yes])
- OPENIBLND="openiblnd"
- ],[
- 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=""
- ])
- 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 <ts_ib_core.h>
- #include <ts_ib_cm.h>
- #include <ts_ib_sa_client.h>
- ],[
- 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)
-])
-
-#
-# 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
- ],[
- ENABLEIIB=1
- ])
-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 <linux/iba/ibt.h>
- ],[
- IBT_INTERFACE_UNION interfaces;
- FSTATUS rc;
-
- rc = IbtGetInterfaceByVersion(IBT_INTERFACE_VERSION_2,
- &interfaces);
-
- return rc == FSUCCESS ? 0 : 1;
- ],[
- AC_MSG_RESULT([yes])
- IIBLND="iiblnd"
- ],[
- 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=""
- ])
- EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save"
-fi
-AC_SUBST(IIBCPPFLAGS)
-AC_SUBST(IIBLND)
-])
-
-#
-# 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])
- 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 <linux/list.h>
- #include <asm/byteorder.h>
- #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 <vverbs.h>
- #include <ib-cm.h>
- #include <ibat.h>
- ],[
- 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;
- ],[
- 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 <linux/list.h>
- #include <asm/byteorder.h>
- #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 <vverbs.h>
- #include <ib-cm.h>
- #include <ibat.h>
- ],[
- vv_scatgat_t sg;
-
- return &sg.v_address[3] == NULL;
- ],[
- AC_MSG_RESULT([yes])
- VIBCPPFLAGS="$VIBCPPFLAGS -DIBNAL_VOIDSTAR_SGADDR=1"
- ],[
- AC_MSG_RESULT([no])
- ])
- EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save"
-fi
-AC_SUBST(VIBCPPFLAGS)
-AC_SUBST(VIBLND)
-])
-
-#
# LN_CONFIG_RALND
#
# check whether to use the RapidArray lnd
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>
+ #include <linux/sysctl.h>
],[
struct ctl_table *table = NULL;
- int write = 1;
- void __user *buffer = NULL;
- size_t *lenp = NULL;
- loff_t *ppos = NULL;
+ int write = 1;
+ void __user *buffer = NULL;
+ size_t *lenp = NULL;
+ loff_t *ppos = NULL;
- proc_handler *proc_handler;
- proc_handler(table, write, buffer, lenp, ppos);
+ proc_handler *proc_handler;
+ proc_handler(table, write, buffer, lenp, ppos);
],[
AC_MSG_RESULT(yes)
])
#
+# 2.6.36 tcp_sendpage() first parameter is 'struct sock' instead of 'struct socket'.
+#
+AC_DEFUN([LN_CONFIG_TCP_SENDPAGE],
+[AC_MSG_CHECKING([if tcp_sendpage first parameter is socket])
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_LINUX_TRY_COMPILE([
+ #include <linux/net.h>
+ #include <net/tcp.h>
+],[
+ tcp_sendpage((struct socket*)0, NULL, 0, 0, 0);
+],[
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_TCP_SENDPAGE_USE_SOCKET, 1,
+ [tcp_sendpage use socket as first parameter])
+],[
+ AC_MSG_RESULT(no)
+])
+EXTRA_KCFLAGS="$tmp_flags"
+])
+
+#
# LN_PROG_LINUX
#
# 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_OPENIB
-LN_CONFIG_CIB
-LN_CONFIG_VIB
-LN_CONFIG_IIB
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
])
#
[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_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")
lnet/klnds/autoMakefile
lnet/klnds/mxlnd/autoMakefile
lnet/klnds/mxlnd/Makefile
-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
git://git.whamcloud.com / fs / lustre-release.git / blobdiff