From e6dc805fcf8eb0ebc926851e38fd17c704cd31d4 Mon Sep 17 00:00:00 2001 From: brian Date: Wed, 6 May 2009 15:58:37 +0000 Subject: [PATCH] b=17671 i=zhen.liang i=sheng.yang OFED 1.4.1 (RC4 for the moment). This includes RHEL5, which disables it's current "inkernel" specification and reverts it's kernel configs accordingly. --- build/autoconf/lustre-build-linux.m4 | 98 ++++++++++++++++++++++ build/lbuild | 2 +- build/lmake | 8 +- lnet/autoconf/lustre-lnet.m4 | 10 ++- lustre/autoconf/lustre-core.m4 | 24 ++++++ lustre/include/linux/lustre_compat25.h | 22 +++-- .../kernel-2.6.18-2.6-rhel5-i686-smp.config | 32 +------ .../kernel-2.6.18-2.6-rhel5-i686.config | 32 +------ .../kernel-2.6.18-2.6-rhel5-ia64-smp.config | 33 +------- .../kernel-2.6.18-2.6-rhel5-ia64.config | 33 +------- .../kernel-2.6.18-2.6-rhel5-ppc64-smp.config | 32 +------ .../kernel-2.6.18-2.6-rhel5-ppc64.config | 32 +------ .../kernel-2.6.18-2.6-rhel5-x86_64-smp.config | 33 +------- .../kernel-2.6.18-2.6-rhel5-x86_64.config | 33 +------- lustre/kernel_patches/targets/2.6-rhel4.target.in | 2 +- lustre/kernel_patches/targets/2.6-rhel5.target.in | 2 +- lustre/kernel_patches/targets/2.6-sles10.target.in | 2 +- 17 files changed, 174 insertions(+), 256 deletions(-) diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4 index 6409bfc..d42d1b2 100644 --- a/build/autoconf/lustre-build-linux.m4 +++ b/build/autoconf/lustre-build-linux.m4 @@ -453,6 +453,72 @@ fi ]) # +# LB_CONFIG_OFED_BACKPORTS +# +# include any OFED backport headers in all compile commands +# NOTE: this does only include the backport paths, not the OFED headers +# adding the OFED headers is done in the lnet portion +AC_DEFUN([LB_CONFIG_OFED_BACKPORTS], +[AC_MSG_CHECKING([whether to use any OFED backport headers]) +# set default +AC_ARG_WITH([o2ib], + AC_HELP_STRING([--with-o2ib=path], + [build o2iblnd against path]), + [ + case $with_o2ib in + yes) O2IBPATHS="$LINUX $LINUX/drivers/infiniband" + ENABLEO2IB=2 + ;; + no) ENABLEO2IB=0 + ;; + *) O2IBPATHS=$with_o2ib + ENABLEO2IB=3 + ;; + esac + ],[ + O2IBPATHS="$LINUX $LINUX/drivers/infiniband" + ENABLEO2IB=1 + ]) +if test $ENABLEO2IB -eq 0; then + AC_MSG_RESULT([no]) +else + o2ib_found=false + for O2IBPATH in $O2IBPATHS; do + 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 + 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]);; + esac + else + if test -f $O2IBPATH/config.mk; then + . $O2IBPATH/config.mk + elif test -f $O2IBPATH/ofed_patch.mk; then + . $O2IBPATH/ofed_patch.mk + fi + if test -n "$BACKPORT_INCLUDES"; then + OFED_BACKPORT_PATH=`echo $BACKPORT_INCLUDES | sed "s#.*/src/ofa_kernel/#$O2IBPATH/#"` + EXTRA_LNET_INCLUDE="-I$OFED_BACKPORT_PATH $EXTRA_LNET_INCLUDE" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + fi +fi +]) + + +# # LB_PROG_LINUX # # linux tests @@ -487,6 +553,10 @@ LB_LINUX_CONFIG([KMOD],[],[ #LB_LINUX_CONFIG_BIG_STACK +# it's ugly to be doing anything with OFED outside of the lnet module, but +# this has to be done here so that the backports path is set before all of +# the LN_PROG_LINUX checks are done +LB_CONFIG_OFED_BACKPORTS ]) # @@ -535,3 +605,31 @@ else $3 fi ]) + +# +# Like AC_CHECK_HEADER but checks for a kernel-space header +# +m4_define([LB_CHECK_LINUX_HEADER], +[AS_VAR_PUSHDEF([ac_Header], [ac_cv_header_$1])dnl +AC_CACHE_CHECK([for $1], ac_Header, + [LB_LINUX_COMPILE_IFELSE([LB_LANG_PROGRAM([@%:@include <$1>])], + [modules], + [test -s build/conftest.o], + [AS_VAR_SET(ac_Header, [yes])], + [AS_VAR_SET(ac_Header, [no])])]) +AS_IF([test AS_VAR_GET(ac_Header) = yes], [$2], [$3])[]dnl +AS_VAR_POPDEF([ac_Header])dnl +]) + +# +# Like AC_CHECK_HEADERS but for kernel space headers +# +AC_DEFUN([LB_CHECK_LINUX_HEADERS], +[AH_CHECK_HEADERS([$1])dnl +for ac_header in $1 +do +LB_CHECK_LINUX_HEADER($ac_header, + [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$ac_header)) $2], + [$3])dnl +done +]) diff --git a/build/lbuild b/build/lbuild index 7736a90..e21290f 100755 --- a/build/lbuild +++ b/build/lbuild @@ -1294,7 +1294,7 @@ build_kernel_ib() --define "KVERSION ${LINUXRELEASE}" \ --define "$K_SRC ${LINUXOBJ:-${LINUX}}" \ --define "LIB_MOD_DIR /lib/modules/${LINUXRELEASE}/updates" \ - --define "configure_options --without-quilt --with-core-mod --with-user_mad-mod --with-user_access-mod --with-addr_trans-mod --with-srp-target-mod --with-core-mod --with-mthca-mod --with-mlx4-mod --with-cxgb3-mod --with-nes-mod --with-ipoib-mod --with-sdp-mod --with-srp-mod --without-srp-target-mod --with-rds-mod --with-iser-mod --with-qlgc_vnic-mod --with-madeye-mod $configure_options" ${TOPDIR}/OFED/SRPMS/ofa_kernel-${OFED_VERSION}-ofed${OFED_VERSION}.src.rpm + --define "configure_options --without-quilt --with-core-mod --with-user_mad-mod --with-user_access-mod --with-addr_trans-mod --with-srp-target-mod --with-core-mod --with-mthca-mod --with-mlx4-mod --with-cxgb3-mod --with-nes-mod --with-ipoib-mod --with-sdp-mod --with-srp-mod --without-srp-target-mod --with-rds-mod --with-iser-mod --with-qlgc_vnic-mod --with-madeye-mod $configure_options" ${TOPDIR}/OFED/SRPMS/ofa_kernel-*.src.rpm if [ ${PIPESTATUS[0]} != 0 ]; then fatal 1 "Error building kernel-ib" diff --git a/build/lmake b/build/lmake index 09ef37d..f0cc5dd 100755 --- a/build/lmake +++ b/build/lmake @@ -401,11 +401,11 @@ depend_kernel() if [ -n "${TARGET_CONFIG}" ]; then extra_version="${extra_version}${TARGET_DELIMITER}${TARGET_CONFIG}" fi - perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = ${extra_version}/" Makefile + sed -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = ${extra_version}/" Makefile echo "Making depend in $PWD..." $MAKE "$MAKE_CC" mrproper || fatal 1 "Error running make mrproper" rm -f rpm-release - # remove localversion-* files to avoid kernel release string + # remove localversion-* files to avoid kernel release string # srewing up by the top-level Makefile rm -f localversion-* cp "$CONFIG_FILE" .config @@ -525,7 +525,7 @@ build_kernel_ib() --define "KVERSION ${FULL_VERSION}" \ --define "$K_SRC $PWD/linux" \ --define "LIB_MOD_DIR /lib/modules/${FULL_VERSION}" \ - --define "configure_options --without-quilt --with-core-mod --with-user_mad-mod --with-user_access-mod --with-addr_trans-mod --with-srp-target-mod --with-core-mod --with-mthca-mod --with-mlx4-mod --with-cxgb3-mod --with-nes-mod --with-ipoib-mod --with-sdp-mod --with-srp-mod --without-srp-target-mod --with-rds-mod --with-iser-mod --with-qlgc_vnic-mod --with-madeye-mod $configure_options" $(lbuild_topdir)/OFED/SRPMS/ofa_kernel-${OFED_VERSION}-ofed${OFED_VERSION}.src.rpm + --define "configure_options --without-quilt --with-core-mod --with-user_mad-mod --with-user_access-mod --with-addr_trans-mod --with-srp-target-mod --with-core-mod --with-mthca-mod --with-mlx4-mod --with-cxgb3-mod --with-nes-mod --with-ipoib-mod --with-sdp-mod --with-srp-mod --without-srp-target-mod --with-rds-mod --with-iser-mod --with-qlgc_vnic-mod --with-madeye-mod $configure_options" $(lbuild_topdir)/OFED/SRPMS/ofa_kernel-*.src.rpm if [ ${PIPESTATUS[0]} != 0 ]; then fatal 1 "Error building kernel-ib" @@ -535,7 +535,7 @@ build_kernel_ib() rm -rf kernel-ib-devel mkdir kernel-ib-devel cd kernel-ib-devel - local rpm=$(ls $(lbuild_topdir)/RPMS/*/kernel-ib-devel-${OFED_VERSION}-${FULL_VERSION//-/_}.*.rpm) + local rpm=$(ls $(lbuild_topdir)/RPMS/*/kernel-ib-devel-*-${FULL_VERSION//-/_}.*.rpm) rpm2cpio -itv < $rpm | cpio -id CONFIGURE_FLAGS="--with-o2ib=$(pwd)/usr/src/ofa_kernel ${CONFIGURE_FLAGS}" popd >/dev/null diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4 index b7c02e7..041c432 100644 --- a/lnet/autoconf/lustre-lnet.m4 +++ b/lnet/autoconf/lustre-lnet.m4 @@ -546,7 +546,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 @@ -594,13 +595,19 @@ else if test -n $O2IB_SYMVER ; then AC_MSG_NOTICE([adding $O2IBPATH/Module.symvers 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 + AC_MSG_CHECKING([for ib_dma_map_single support]) LB_LINUX_TRY_COMPILE([ #include #include @@ -619,6 +626,7 @@ else AC_MSG_RESULT(NO) ]) + AC_MSG_CHECKING([for OFED completion vector]) LB_LINUX_TRY_COMPILE([ #include #include diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 25817ee..f7ba2aa 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -1390,6 +1390,29 @@ AC_DEFUN([LC_HAVE_SYSCTL_VFS_CACHE_PRESSURE], ]) ]) +# vfs_symlink seems to have started out with 3 args until 2.6.7 where a +# "mode" argument was added, but then again, in some later version it was +# removed +AC_DEFUN([LC_4ARGS_VFS_SYMLINK], +[AC_MSG_CHECKING([if vfs_symlink wants 4 args]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct inode *dir; + struct dentry *dentry; + const char *oldname = NULL; + int mode = 0; + + vfs_symlink(dir, dentry, oldname, mode); +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_4ARGS_VFS_SYMLINK, 1, + [vfs_symlink wants 4 args]) +],[ + AC_MSG_RESULT(no) +]) +]) + # # LC_PROG_LINUX # @@ -1450,6 +1473,7 @@ AC_DEFUN([LC_PROG_LINUX], LC_FUNC_RCU LC_PERCPU_COUNTER LC_QUOTA64 + LC_4ARGS_VFS_SYMLINK # does the kernel have VFS intent patches? LC_VFS_INTENT_PATCHES diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h index 751e762..da46feb 100644 --- a/lustre/include/linux/lustre_compat25.h +++ b/lustre/include/linux/lustre_compat25.h @@ -262,23 +262,27 @@ static inline int mapping_has_pages(struct address_space *mapping) #define KIOBUF_GET_BLOCKS(k) ((k)->blocks) #endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,7)) -#define ll_set_dflags(dentry, flags) do { dentry->d_vfs_flags |= flags; } while(0) +#ifdef HAVE_SECURITY_PLUG +#define ll_vfs_symlink(dir, dentry, mnt, path, mode) \ + vfs_symlink(dir, dentry, mnt, path, mode) +#else +#ifdef HAVE_4ARGS_VFS_SYMLINK +#define ll_vfs_symlink(dir, dentry, mnt, path, mode) \ + vfs_symlink(dir, dentry, path, mode) +#else #define ll_vfs_symlink(dir, dentry, mnt, path, mode) \ vfs_symlink(dir, dentry, path) +#endif +#endif + +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,7)) +#define ll_set_dflags(dentry, flags) do { dentry->d_vfs_flags |= flags; } while(0) #else #define ll_set_dflags(dentry, flags) do { \ spin_lock(&dentry->d_lock); \ dentry->d_flags |= flags; \ spin_unlock(&dentry->d_lock); \ } while(0) -#ifdef HAVE_SECURITY_PLUG -#define ll_vfs_symlink(dir, dentry, mnt, path, mode) \ - vfs_symlink(dir, dentry, mnt, path, mode) -#else -#define ll_vfs_symlink(dir, dentry, mnt, path, mode) \ - vfs_symlink(dir, dentry, path, mode) -#endif #endif #ifndef container_of diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686-smp.config index 11f535b..97328b8 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686-smp.config @@ -1497,7 +1497,7 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T3=m +# CONFIG_CHELSIO_T3 is not set CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1508,8 +1508,7 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -2747,32 +2746,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -CONFIG_INFINIBAND_AMSO1100=m -# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set -CONFIG_INFINIBAND_CXGB3=m -# CONFIG_INFINIBAND_CXGB3_DEBUG is not set -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_MLX4_INFINIBAND=m -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_SDP=m -# CONFIG_INFINIBAND_SDP_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC_STATS=y -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config index 94d8693..bf957e6bd 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config @@ -1486,7 +1486,7 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T3=m +# CONFIG_CHELSIO_T3 is not set CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1497,8 +1497,7 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -2740,32 +2739,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -CONFIG_INFINIBAND_AMSO1100=m -# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set -CONFIG_INFINIBAND_CXGB3=m -# CONFIG_INFINIBAND_CXGB3_DEBUG is not set -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_MLX4_INFINIBAND=m -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_SDP=m -# CONFIG_INFINIBAND_SDP_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC_STATS=y -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64-smp.config index 8a6643e..a272203 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64-smp.config @@ -1251,7 +1251,7 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T3=m +# CONFIG_CHELSIO_T3 is not set CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1262,8 +1262,7 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -2410,33 +2409,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -CONFIG_INFINIBAND_IPATH=m -CONFIG_INFINIBAND_AMSO1100=m -# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set -CONFIG_INFINIBAND_CXGB3=m -# CONFIG_INFINIBAND_CXGB3_DEBUG is not set -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_MLX4_INFINIBAND=m -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_SDP=m -# CONFIG_INFINIBAND_SDP_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC_STATS=y -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64.config index 6f7ef09..ae98769 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64.config @@ -1245,7 +1245,7 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T3=m +# CONFIG_CHELSIO_T3 is not set CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1256,8 +1256,7 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -2407,33 +2406,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -CONFIG_INFINIBAND_IPATH=m -CONFIG_INFINIBAND_AMSO1100=m -# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set -CONFIG_INFINIBAND_CXGB3=m -# CONFIG_INFINIBAND_CXGB3_DEBUG is not set -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_MLX4_INFINIBAND=m -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_SDP=m -# CONFIG_INFINIBAND_SDP_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC_STATS=y -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ppc64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ppc64-smp.config index 34e56ed..d8a493c 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ppc64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ppc64-smp.config @@ -1405,8 +1405,7 @@ CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m CONFIG_BNX2X=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -2687,34 +2686,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -CONFIG_INFINIBAND_IPATH=m -CONFIG_INFINIBAND_EHCA=m -CONFIG_INFINIBAND_AMSO1100=m -# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set -CONFIG_INFINIBAND_CXGB3=m -# CONFIG_INFINIBAND_CXGB3_DEBUG is not set -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_MLX4_INFINIBAND=m -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_SDP=m -# CONFIG_INFINIBAND_SDP_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC_STATS=y -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ppc64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ppc64.config index 34e56ed..d8a493c 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ppc64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ppc64.config @@ -1405,8 +1405,7 @@ CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m CONFIG_BNX2X=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -2687,34 +2686,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -CONFIG_INFINIBAND_IPATH=m -CONFIG_INFINIBAND_EHCA=m -CONFIG_INFINIBAND_AMSO1100=m -# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set -CONFIG_INFINIBAND_CXGB3=m -# CONFIG_INFINIBAND_CXGB3_DEBUG is not set -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_MLX4_INFINIBAND=m -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_SDP=m -# CONFIG_INFINIBAND_SDP_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC_STATS=y -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config index aef7183..1989337 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config @@ -1420,7 +1420,7 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T3=m +# CONFIG_CHELSIO_T3 is not set CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1431,8 +1431,7 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -2648,33 +2647,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -CONFIG_INFINIBAND_IPATH=m -CONFIG_INFINIBAND_AMSO1100=m -# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set -CONFIG_INFINIBAND_CXGB3=m -# CONFIG_INFINIBAND_CXGB3_DEBUG is not set -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_MLX4_INFINIBAND=m -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_SDP=m -# CONFIG_INFINIBAND_SDP_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC_STATS=y -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config index 7e8fc59..91e5d32 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config @@ -1407,7 +1407,7 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T3=m +# CONFIG_CHELSIO_T3 is not set CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1418,8 +1418,7 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -2630,33 +2629,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -CONFIG_INFINIBAND_IPATH=m -CONFIG_INFINIBAND_AMSO1100=m -# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set -CONFIG_INFINIBAND_CXGB3=m -# CONFIG_INFINIBAND_CXGB3_DEBUG is not set -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_MLX4_INFINIBAND=m -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_SDP=m -# CONFIG_INFINIBAND_SDP_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC_STATS=y -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) diff --git a/lustre/kernel_patches/targets/2.6-rhel4.target.in b/lustre/kernel_patches/targets/2.6-rhel4.target.in index 7d27ba6..1b4cb80 100644 --- a/lustre/kernel_patches/targets/2.6-rhel4.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel4.target.in @@ -9,7 +9,7 @@ RHBUILD=1 LINUX26=1 LUSTRE_VERSION=@VERSION@ -OFED_VERSION=1.3 +OFED_VERSION=1.4.1-rc4 BASE_ARCHS="i686 x86_64 ia64" BIGMEM_ARCHS="" diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in index 724b67c..1a6c819 100644 --- a/lustre/kernel_patches/targets/2.6-rhel5.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel5.target.in @@ -9,7 +9,7 @@ RHBUILD=1 LINUX26=1 LUSTRE_VERSION=@VERSION@ -OFED_VERSION=inkernel +OFED_VERSION=1.4.1-rc4 BASE_ARCHS="i686 x86_64 ia64 ppc64" BIGMEM_ARCHS="" diff --git a/lustre/kernel_patches/targets/2.6-sles10.target.in b/lustre/kernel_patches/targets/2.6-sles10.target.in index bfa8365..ab6acd4 100644 --- a/lustre/kernel_patches/targets/2.6-sles10.target.in +++ b/lustre/kernel_patches/targets/2.6-sles10.target.in @@ -19,7 +19,7 @@ LINUX26=1 # No /boot/Kerntypes* in SLES10 SUSEBUILD=0 -OFED_VERSION=1.3.1 +OFED_VERSION=1.4.1-rc4 BASE_ARCHS="i686 ppc x86_64 ia64 ppc64" BIGMEM_ARCHS="" -- 1.8.3.1