X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Fautoconf%2Flustre-lnet.m4;h=ca7f78588f3224ea0939e2a6ea422d4d93693334;hb=daee9d5d61fb14cf998a3444ed33152cfc27fab5;hp=216698026f250c15912a6f2d790692dcac00b3ff;hpb=3c069df3211c0866f5b3eafbac3b8161d286c5c6;p=fs%2Flustre-release.git diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4 index 2166980..ca7f785 100644 --- a/lnet/autoconf/lustre-lnet.m4 +++ b/lnet/autoconf/lustre-lnet.m4 @@ -42,45 +42,20 @@ fi ]) # -# LN_CONFIG_CDEBUG +# LN_FUNC_DEV_GET_BY_NAME_2ARG # -# whether to enable various libcfs debugs (CDEBUG, ENTRY/EXIT, LASSERT, etc.) -# -AC_DEFUN([LN_CONFIG_CDEBUG], -[ -AC_MSG_CHECKING([whether to enable CDEBUG, CWARN]) -AC_ARG_ENABLE([libcfs_cdebug], - AC_HELP_STRING([--disable-libcfs-cdebug], - [disable libcfs CDEBUG, CWARN]), - [],[enable_libcfs_cdebug='yes']) -AC_MSG_RESULT([$enable_libcfs_cdebug]) -if test x$enable_libcfs_cdebug = xyes; then - AC_DEFINE(CDEBUG_ENABLED, 1, [enable libcfs CDEBUG, CWARN]) -else - AC_DEFINE(CDEBUG_ENABLED, 0, [disable libcfs CDEBUG, CWARN]) -fi - -AC_MSG_CHECKING([whether to enable ENTRY/EXIT]) -AC_ARG_ENABLE([libcfs_trace], - AC_HELP_STRING([--disable-libcfs-trace], - [disable libcfs ENTRY/EXIT]), - [],[enable_libcfs_trace='yes']) -AC_MSG_RESULT([$enable_libcfs_trace]) -if test x$enable_libcfs_trace = xyes; 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 enable LASSERT, LASSERTF]) -AC_ARG_ENABLE([libcfs_assert], - AC_HELP_STRING([--disable-libcfs-assert], - [disable libcfs LASSERT, LASSERTF]), - [],[enable_libcfs_assert='yes']) -AC_MSG_RESULT([$enable_libcfs_assert]) -if test x$enable_libcfs_assert = xyes; then - AC_DEFINE(LIBCFS_DEBUG, 1, [enable libcfs LASSERT, LASSERTF]) -fi +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 +],[ + 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]) +]) ]) # @@ -169,30 +144,15 @@ else 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_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 @@ -312,106 +272,6 @@ 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 @@ -525,6 +385,11 @@ else -f ${O2IBPATH}/include/rdma/ib_cm.h -a \ -f ${O2IBPATH}/include/rdma/ib_verbs.h -a \ -f ${O2IBPATH}/include/rdma/ib_fmr_pool.h \); then + if test \( -d ${O2IBPATH}/kernel_patches -a \ + -f ${O2IBPATH}/Makefile \); then + AC_MSG_RESULT([no]) + AC_MSG_ERROR([you appear to be trying to use the OFED distribution's source directory (${O2IBPATH}) rather than the "development/headers" directory which is likely in ${O2IBPATH%-*}]) + fi o2ib_found=true break fi @@ -541,7 +406,8 @@ else O2IBCPPFLAGS="-I$O2IBPATH/include" EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS" EXTRA_KCFLAGS="$EXTRA_KCFLAGS $O2IBCPPFLAGS" - EXTRA_LNET_INCLUDE="$O2IBCPPFLAGS $EXTRA_LNET_INCLUDE" + EXTRA_LNET_INCLUDE="$EXTRA_LNET_INCLUDE $O2IBCPPFLAGS" + LB_LINUX_TRY_COMPILE([ #include #include @@ -576,35 +442,32 @@ else O2IBLND="" O2IBCPPFLAGS="" ]) - # we know at this point that the found OFED source is good - if test \( $ENABLEO2IB = 3 \); then - if test \( -f $O2IBPATH/Module.symvers \); then - AC_MSG_NOTICE([adding $O2IBPATH/Module.symvers to $PWD/Module.symvers]) - cat $O2IBPATH/Module.symvers >> $PWD/Module.symvers + 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_ERROR([an external source tree was specified for o2iblnd however I could not find a $O2IBPATH/Module.symvers there]) fi fi - # version checking is a hack and isn't reliable, - # we need verify it with each new ofed release - - if grep -q ib_dma_map_single \ - ${O2IBPATH}/include/rdma/ib_verbs.h; then - if grep -q comp_vector \ - ${O2IBPATH}/include/rdma/ib_verbs.h; then - IBLND_OFED_VERSION="1025" - else - IBLND_OFED_VERSION="1020" - fi - else - IBLND_OFED_VERSION="1010" - fi - - AC_DEFINE_UNQUOTED(IBLND_OFED_VERSION, $IBLND_OFED_VERSION, - [OFED version]) - + LN_CONFIG_OFED_SPEC EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save" fi fi @@ -615,313 +478,6 @@ 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" - EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="$EXTRA_KCFLAGS $OPENIBCPPFLAGS" - 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 = 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 - #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) -]) - -# -# 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 - ],[ - 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 - #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; - - 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; - - 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 @@ -956,307 +512,40 @@ AC_SUBST(RACPPFLAGS) AC_SUBST(RALND) ]) -# -# LN_STRUCT_PAGE_LIST -# -# 2.6.4 no longer has page->list -# -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]) -]) -]) -# -# 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 +# LN_CONFIG_USERSPACE # -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]) -]) -]) - -# -# LN_TYPE_GFP_T -# -# check if gfp_t is typedef-ed -# -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]) -]) -]) - -# -# LN_TYPE_CPUMASK_T -# -# same goes for cpumask_t -# -AC_DEFUN([LN_TYPE_CPUMASK_T], -[AC_MSG_CHECKING([if kernel defines cpumask_t]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - return sizeof (cpumask_t); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_CPUMASK_T, 1, [cpumask_t found]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LN_FUNC_SHOW_TASK -# -# we export show_task(), but not all kernels have it (yet) -# -AC_DEFUN([LN_FUNC_SHOW_TASK], -[LB_CHECK_SYMBOL_EXPORT([show_task], -[kernel/ksyms.c kernel/sched.c],[ -AC_DEFINE(HAVE_SHOW_TASK, 1, [show_task is exported]) -],[ -]) -]) - -# check userland __u64 type -AC_DEFUN([LN_U64_LONG_LONG], -[AC_MSG_CHECKING([u64 is long long type]) -tmp_flags="$CFLAGS" -CFLAGS="$CFLAGS -Werror" -AC_COMPILE_IFELSE([ - #include - int main(void) { - unsigned long long *data1; - __u64 *data2; - - data1 = data2; - return 0; - } -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_U64_LONG_LONG, 1, - [__u64 is long long type]) -],[ - AC_MSG_RESULT([no]) -]) -CFLAGS="$tmp_flags" -]) - -# check userland size_t type -AC_DEFUN([LN_SIZE_T_LONG], -[AC_MSG_CHECKING([size_t is unsigned long type]) -tmp_flags="$CFLAGS" -CFLAGS="$CFLAGS -Werror" -AC_COMPILE_IFELSE([ - #include - int main(void) { - unsigned long *data1; - size_t *data2; - - data1 = data2; - return 0; - } -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_SIZE_T_LONG, 1, - [size_t is long type]) -],[ - AC_MSG_RESULT([no]) -]) -CFLAGS="$tmp_flags" -]) - -AC_DEFUN([LN_SSIZE_T_LONG], -[AC_MSG_CHECKING([ssize_t is signed long type]) -tmp_flags="$CFLAGS" -CFLAGS="$CFLAGS -Werror" -AC_COMPILE_IFELSE([ - #include - int main(void) { - long *data1; - ssize_t *data2; - - data1 = data2; - return 0; - } -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_SSIZE_T_LONG, 1, - [ssize_t is long type]) -],[ - AC_MSG_RESULT([no]) -]) -CFLAGS="$tmp_flags" -]) - - -# LN_TASKLIST_LOCK -# 2.6.18 remove tasklist_lock export -AC_DEFUN([LN_TASKLIST_LOCK], -[LB_CHECK_SYMBOL_EXPORT([tasklist_lock], -[kernel/fork.c],[ -AC_DEFINE(HAVE_TASKLIST_LOCK, 1, - [tasklist_lock exported]) -],[ -]) -]) - -# 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 +# This is defined but empty because it is called from +# build/autconf/lustre-build.m4 which is shared by all branches. # -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_MSG_RESULT(yes) - AC_DEFINE(HAVE_ATOMIC_PANIC_NOTIFIER, 1, - [panic_notifier_list is atomic_notifier_head]) -],[ - AC_MSG_RESULT(NO) -]) +AC_DEFUN([LN_CONFIG_USERSPACE], +[ ]) -# 2.6.20 API change INIT_WORK use 2 args and not -# store data inside -AC_DEFUN([LN_3ARGS_INIT_WORK], -[AC_MSG_CHECKING([check INIT_WORK want 3 args]) +# See if sysctl proc_handler wants only 5 arguments (since 2.6.32) +AC_DEFUN([LN_5ARGS_SYSCTL_PROC_HANDLER], +[AC_MSG_CHECKING([if sysctl proc_handler wants 5 args]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ - struct work_struct work; + struct ctl_table *table = NULL; + int write = 1; + void __user *buffer = NULL; + size_t *lenp = NULL; + loff_t *ppos = NULL; - INIT_WORK(&work, NULL, NULL); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_3ARGS_INIT_WORK, 1, - [INIT_WORK use 3 args and store data inside]) -],[ - AC_MSG_RESULT(NO) -]) -]) + proc_handler *proc_handler; + proc_handler(table, write, buffer, lenp, ppos); -# 2.6.21 api change. 'register_sysctl_table' use only one argument, -# instead of more old which need two. -AC_DEFUN([LN_2ARGS_REGISTER_SYSCTL], -[AC_MSG_CHECKING([check register_sysctl_table want 2 args]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - return register_sysctl_table(NULL,0); ],[ AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_2ARGS_REGISTER_SYSCTL, 1, - [register_sysctl_table want 2 args]) + AC_DEFINE(HAVE_5ARGS_SYSCTL_PROC_HANDLER, 1, + [sysctl proc_handler wants 5 args]) ],[ - AC_MSG_RESULT(NO) -]) -]) - -# 2.6.21 marks kmem_cache_t deprecated and uses struct kmem_cache -# instead -AC_DEFUN([LN_KMEM_CACHE], -[AC_MSG_CHECKING([check kernel has struct kmem_cache]) -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="-Werror" -LB_LINUX_TRY_COMPILE([ - #include - typedef struct kmem_cache cache_t; -],[ - cache_t *cachep = NULL; - - kmem_cache_alloc(cachep, 0); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_KMEM_CACHE, 1, - [kernel has struct kmem_cache]) -],[ - AC_MSG_RESULT(NO) -]) -EXTRA_KCFLAGS="$tmp_flags" -]) -# 2.6.23 lost dtor argument -AC_DEFUN([LN_KMEM_CACHE_CREATE_DTOR], -[AC_MSG_CHECKING([check kmem_cache_create has dtor argument]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - kmem_cache_create(NULL, 0, 0, 0, NULL, NULL); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_KMEM_CACHE_CREATE_DTOR, 1, - [kmem_cache_create has dtor argument]) -],[ - AC_MSG_RESULT(NO) + AC_MSG_RESULT(no) ]) ]) @@ -1267,41 +556,16 @@ LB_LINUX_TRY_COMPILE([ # AC_DEFUN([LN_PROG_LINUX], [ -LN_FUNC_CPU_ONLINE -LN_TYPE_GFP_T -LN_TYPE_CPUMASK_T +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_MX - -LN_STRUCT_PAGE_LIST -LN_STRUCT_SIGHAND -LN_FUNC_SHOW_TASK -LN_U64_LONG_LONG -LN_SSIZE_T_LONG -LN_SIZE_T_LONG -# 2.6.18 -LN_TASKLIST_LOCK -# 2.6.19 -LN_KMEM_CACHE_DESTROY_INT -LN_ATOMIC_PANIC_NOTIFIER -# 2.6.20 -LN_3ARGS_INIT_WORK -# 2.6.21 -LN_2ARGS_REGISTER_SYSCTL -LN_KMEM_CACHE -# 2.6.23 -LN_KMEM_CACHE_CREATE_DTOR +# 2.6.32 +LN_5ARGS_SYSCTL_PROC_HANDLER ]) # @@ -1373,20 +637,6 @@ else 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) - # -------- enable acceptor libwrap (TCP wrappers) support? ------- AC_MSG_CHECKING([if libwrap support is requested]) AC_ARG_ENABLE([libwrap], @@ -1405,31 +655,6 @@ else fi 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 # ---------------------------------------- @@ -1479,13 +704,8 @@ LN_CONFIG_USOCKLND # 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") @@ -1505,26 +725,14 @@ 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 @@ -1533,9 +741,6 @@ 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/selftest/Makefile @@ -1545,14 +750,6 @@ 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 ])