From 12edeeddba0151dfbc328a9733bc40c800faacca Mon Sep 17 00:00:00 2001 From: brian Date: Fri, 8 May 2009 18:53:57 +0000 Subject: [PATCH] b=18289 i=sheng.yang i=yibin.wang Allow the o2iblnd build to defer to using the kernel vendor's provided OFED stack. Change RHEL4 and RHEL5 to use the OFED stacks provided by their kernel. --- build/lbuild | 19 +++-- build/lmake | 4 ++ lnet/klnds/o2iblnd/o2iblnd.h | 10 +-- lnet/klnds/o2iblnd/o2iblnd_cb.c | 84 +++++++++++----------- lustre/ChangeLog | 8 +++ .../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 ++++++++- .../kernel-2.6.9-2.6-rhel4-i686-smp.config | 26 ++++++- .../kernel-2.6.9-2.6-rhel4-i686.config | 26 ++++++- .../kernel-2.6.9-2.6-rhel4-ia64-smp.config | 26 ++++++- .../kernel-2.6.9-2.6-rhel4-ia64.config | 26 ++++++- .../kernel-2.6.9-2.6-rhel4-x86_64-smp.config | 26 ++++++- .../kernel-2.6.9-2.6-rhel4-x86_64.config | 26 ++++++- lustre/kernel_patches/targets/2.6-rhel4.target.in | 2 +- lustre/kernel_patches/targets/2.6-rhel5.target.in | 8 ++- 21 files changed, 453 insertions(+), 98 deletions(-) diff --git a/build/lbuild b/build/lbuild index 02a2b80..2d008a0 100755 --- a/build/lbuild +++ b/build/lbuild @@ -439,7 +439,7 @@ load_target() fi fi fi - if [ -n "$OFED_VERSION" ] && \ + if [ -n "$OFED_VERSION" -a "$OFED_VERSION" != "inkernel" ] && \ [ ! -r "$KERNELTREE/../OFED-${OFED_VERSION}.tgz" ] ; then if (( $DOWNLOAD )) ; then local location="http://downloads.lustre.org/public/OFED/" @@ -967,7 +967,7 @@ store_for_reuse() dstdir="${dstdir%.rpm}" [ -d "$dstdir" ] && rm -rf "$dstdir" mv "${builddir}" "$dstdir" || return 255 - if [ -n "$OFED_VERSION" ]; then + if [ -n "$OFED_VERSION" -a "$OFED_VERSION" != "inkernel" ]; then # move the OFED kernel-ib-devel tree as well mv "${builddir%/*}/kernel-ib-devel/usr/src/ofa_kernel" "${dstdir%/*}" || return 255 fi @@ -990,7 +990,7 @@ store_for_reuse() else [ -f "RPMS/${TARGET_ARCH}/${kernelrpmname}" ] && cp -f "RPMS/${TARGET_ARCH}/${kernelrpmname}" "${REUSEBUILD}/${TIMESTAMP}/" fi - if [ -n "$OFED_VERSION" ]; then + if [ -n "$OFED_VERSION" -a "$OFED_VERSION" != "inkernel" ]; then # store kernel-ib RPMs local rpmname for rpmname in "kernel-ib" "kernel-ib-devel"; do @@ -1359,7 +1359,7 @@ patchless_build_sequence() [ -d SOURCES ] || mkdir SOURCES # first build kernel-ib - if [ -n "$OFED_VERSION" ]; then + if [ -n "$OFED_VERSION" -a "$OFED_VERSION" != "inkernel" ]; then $rpmfound && build_kernel_ib fi ( $rpmfound ) && build_lustre && buildsuccess=true && find_linux_source_rpm @@ -1494,7 +1494,8 @@ build_sequence_reuse() local reusedkernelsourcerpm= local reusedkernelibrpm= [ -d "$curdir" ] || continue - [ -n "$OFED_VERSION" -a ! -d "${curdir%/*}/ofa_kernel" ] && continue + [ -n "$OFED_VERSION" -a "$OFED_VERSION" != "inkernel" -a + ! -d "${curdir%/*}/ofa_kernel" ] && continue local reusedkernelprefix="kernel-lustre-" ( $PATCHLESS ) && reusedkernelprefix= [ -f ${curdir}/../${reusedkernelprefix}${REUSEDKERNELMASK}.rpm ] && \ @@ -1502,7 +1503,7 @@ build_sequence_reuse() reusedkernelprefix="kernel-lustre-source-" [ -f ${curdir}/../${reusedkernelprefix}${REUSEDKERNELMASKnew}.rpm ] && \ reusedkernelsourcerpm=$(ls ${curdir}/../${reusedkernelprefix}${REUSEDKERNELMASKnew}.rpm | head -1 ) - if [ -n "$OFED_VERSION" ]; then + if [ -n "$OFED_VERSION" -a "$OFED_VERSION" != "inkernel" ]; then gen_lustre_version reusedkernelprefix="kernel-ib-" [ -f ${curdir}/../${reusedkernelprefix}${OFED_VERSION}-${LUSTRE_EXTRA_VERSION}.${TARGET_ARCH}.rpm ] && \ @@ -1516,10 +1517,14 @@ build_sequence_reuse() continue fi if [ -n "$OFED_VERSION" ]; then + if [ "$OFED_VERSION" != "inkernel" ]; then if ! ( $NORPM ) && [ ! -f "$reusedkernelibrpm" -o ! -f "$reusedkernelibdevelrpm"]; then #kernel-ib{,-devel} rpm not found. Build all continue fi CONFIGURE_FLAGS="--with-o2ib=${curdir%/*}/ofa_kernel ${CONFIGURE_FLAGS}" + else + CONFIGURE_FLAGS="--with-o2ib=yes ${CONFIGURE_FLAGS}" + fi fi LINUX="$curdir" build_lustre || continue @@ -1700,7 +1705,7 @@ unpack_lustre load_target EXTRA_VERSION_DELIMITER=${EXTRA_VERSION_DELIMITER:-"-"} -if [ -n "$OFED_VERSION" ]; then +if [ -n "$OFED_VERSION" -a "$OFED_VERSION" != "inkernel" ]; then unpack_ofed fi diff --git a/build/lmake b/build/lmake index b917687..c9b22ea 100755 --- a/build/lmake +++ b/build/lmake @@ -874,7 +874,11 @@ depend_kernel build_kernel if [ -n "$OFED_VERSION" ]; then + if [ "$OFED_VERSION" = "inkernel" ]; then + CONFIGURE_FLAGS="--with-o2ib=yes ${CONFIGURE_FLAGS}" + else build_kernel_ib + fi fi configure_lustre diff --git a/lnet/klnds/o2iblnd/o2iblnd.h b/lnet/klnds/o2iblnd/o2iblnd.h index 74ae887..6348323 100644 --- a/lnet/klnds/o2iblnd/o2iblnd.h +++ b/lnet/klnds/o2iblnd/o2iblnd.h @@ -158,7 +158,7 @@ typedef struct struct page *ibp_pages[0]; } kib_pages_t; -typedef struct +typedef struct { struct list_head ibd_list; /* chain on kib_devs */ __u32 ibd_ifip; /* IPoIB interface IP */ @@ -259,7 +259,7 @@ typedef struct kib_rdma_frag_t rd_frags[0]; /* buffer frags */ } WIRE_ATTR kib_rdma_desc_t; #endif - + typedef struct { lnet_hdr_t ibprm_hdr; /* portals header */ @@ -386,7 +386,7 @@ typedef struct kib_tx /* transmit message */ int tx_nfrags; /* # entries in... */ struct scatterlist *tx_frags; /* dma_map_sg descriptor */ int tx_dmadir; /* dma direction */ -#endif +#endif } kib_tx_t; typedef struct kib_connvars @@ -606,10 +606,10 @@ kiblnd_rd_size (kib_rdma_desc_t *rd) { int i; int size; - + for (i = size = 0; i < rd->rd_nfrags; i++) size += rd->rd_frags[i].rf_nob; - + return size; } #endif diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c index 7bef169..d516aab 100644 --- a/lnet/klnds/o2iblnd/o2iblnd_cb.c +++ b/lnet/klnds/o2iblnd/o2iblnd_cb.c @@ -46,34 +46,34 @@ kiblnd_msgtype2str(int type) switch (type) { case IBLND_MSG_CONNREQ: return "CONNREQ"; - + case IBLND_MSG_CONNACK: return "CONNACK"; - + case IBLND_MSG_NOOP: return "NOOP"; - + case IBLND_MSG_IMMEDIATE: return "IMMEDIATE"; - + case IBLND_MSG_PUT_REQ: return "PUT_REQ"; - + case IBLND_MSG_PUT_NAK: return "PUT_NAK"; - + case IBLND_MSG_PUT_ACK: return "PUT_ACK"; - + case IBLND_MSG_PUT_DONE: return "PUT_DONE"; - + case IBLND_MSG_GET_REQ: return "GET_REQ"; - + case IBLND_MSG_GET_DONE: return "GET_DONE"; - + default: return "???"; } @@ -146,7 +146,7 @@ void kiblnd_txlist_done (lnet_ni_t *ni, struct list_head *txlist, int status) { kib_tx_t *tx; - + while (!list_empty (txlist)) { tx = list_entry (txlist->next, kib_tx_t, tx_list); @@ -205,7 +205,7 @@ kiblnd_drop_rx (kib_rx_t *rx) { kib_conn_t *conn = rx->rx_conn; unsigned long flags; - + spin_lock_irqsave(&kiblnd_data.kib_sched_lock, flags); LASSERT (conn->ibc_nrx > 0); conn->ibc_nrx--; @@ -607,7 +607,7 @@ kiblnd_kvaddr_to_page (unsigned long vaddr) int kiblnd_setup_rd_iov(lnet_ni_t *ni, kib_tx_t *tx, kib_rdma_desc_t *rd, unsigned int niov, struct iovec *iov, int offset, int nob) - + { struct scatterlist *sg; int i; @@ -655,7 +655,7 @@ kiblnd_setup_rd_iov(lnet_ni_t *ni, kib_tx_t *tx, kib_rdma_desc_t *rd, } nob -= fragnob; } while (nob > 0); - + /* If rd is not tx_rd, it's going to get sent to a peer and I'm the * RDMA sink */ tx->tx_nfrags = sg - tx->tx_frags; @@ -673,7 +673,7 @@ kiblnd_setup_rd_iov(lnet_ni_t *ni, kib_tx_t *tx, kib_rdma_desc_t *rd, rd->rd_frags[i].rf_addr = kiblnd_sg_dma_address( net->ibn_dev->ibd_cmid->device, &tx->tx_frags[i]); } - + return 0; } @@ -709,7 +709,7 @@ kiblnd_setup_rd_kiov (lnet_ni_t *ni, kib_tx_t *tx, kib_rdma_desc_t *rd, sg_set_page(sg, kiov->kiov_page, fragnob, kiov->kiov_offset + offset); sg++; - + offset = 0; kiov++; nkiov--; @@ -736,7 +736,7 @@ kiblnd_setup_rd_kiov (lnet_ni_t *ni, kib_tx_t *tx, kib_rdma_desc_t *rd, i, rd->rd_frags[i].rf_addr, rd->rd_frags[i].rf_nob); #endif } - + return 0; } #else @@ -938,7 +938,7 @@ kiblnd_check_sends (kib_conn_t *conn) /* nothing to send right now */ break; } - + LASSERT (tx->tx_queued); /* We rely on this for QP sizing */ LASSERT (tx->tx_nwrq > 0 && @@ -1009,12 +1009,12 @@ kiblnd_check_sends (kib_conn_t *conn) #if 0 { int i; - + for (i = 0; i < tx->tx_nwrq - 1; i++) { LASSERT (tx->tx_wrq[i].opcode == IB_WR_RDMA_WRITE); LASSERT (tx->tx_wrq[i].next == &tx->tx_wrq[i+1]); LASSERT (tx->tx_wrq[i].sg_list == &tx->tx_sge[i]); - + CDEBUG(D_WARNING, "WORK[%d]: RDMA "LPX64 " for %d k %x -> "LPX64" k %x\n", i, tx->tx_wrq[i].sg_list->addr, @@ -1023,11 +1023,11 @@ kiblnd_check_sends (kib_conn_t *conn) tx->tx_wrq[i].wr.rdma.remote_addr, tx->tx_wrq[i].wr.rdma.rkey); } - + LASSERT (tx->tx_wrq[i].opcode == IB_WR_SEND); LASSERT (tx->tx_wrq[i].next == NULL); LASSERT (tx->tx_wrq[i].sg_list == &tx->tx_sge[i]); - + CDEBUG(D_WARNING, "WORK[%d]: SEND "LPX64" for %d k %x\n", i, tx->tx_wrq[i].sg_list->addr, tx->tx_wrq[i].sg_list->length, @@ -1219,7 +1219,7 @@ kiblnd_init_rdma (lnet_ni_t *ni, kib_tx_t *tx, int type, rc = -EPROTO; break; } - + if (dstidx == dstrd->rd_nfrags) { CERROR("Dst buffer exhausted: %d frags\n", dstidx); rc = -EPROTO; @@ -1264,7 +1264,7 @@ kiblnd_init_rdma (lnet_ni_t *ni, kib_tx_t *tx, int type, srcfrag++; srcidx++; } - + if (wrknob < dstfrag->rf_nob) { dstfrag->rf_nob -= wrknob; dstfrag->rf_addr += wrknob; @@ -1441,9 +1441,9 @@ kiblnd_launch_tx (lnet_ni_t *ni, kib_tx_t *tx, lnet_nid_t nid) } else { conn = kiblnd_get_conn_locked(peer); kiblnd_conn_addref(conn); /* 1 ref for me... */ - + write_unlock_irqrestore(g_lock, flags); - + kiblnd_queue_tx(tx, conn); kiblnd_conn_decref(conn); /* ...to here */ } @@ -1477,7 +1477,7 @@ kiblnd_launch_tx (lnet_ni_t *ni, kib_tx_t *tx, lnet_nid_t nid) kiblnd_conn_addref(conn); /* 1 ref for me... */ write_unlock_irqrestore(g_lock, flags); - + kiblnd_queue_tx(tx, conn); kiblnd_conn_decref(conn); /* ...to here */ } @@ -1719,7 +1719,7 @@ kiblnd_reply (lnet_ni_t *ni, kib_rx_t *rx, lnet_msg_t *lntmsg) libcfs_nid2str(target.nid), rc); goto failed_1; } - + if (nob == 0) { /* No RDMA: local completion may happen now! */ lnet_finalize(ni, lntmsg, 0); @@ -2306,7 +2306,7 @@ kiblnd_passive_connect (struct rdma_cm_id *cmid, void *priv, int priv_nob) goto failed; } - + /* assume 'nid' is a new peer; create */ rc = kiblnd_create_peer(ni, &peer, nid); if (rc != 0) { @@ -2415,7 +2415,7 @@ kiblnd_reconnect (kib_conn_t *conn, char *why) kib_peer_t *peer = conn->ibc_peer; int retry = 0; unsigned long flags; - + LASSERT (conn->ibc_state == IBLND_CONN_ACTIVE_CONNECT); LASSERT (peer->ibp_connecting > 0); /* 'conn' at least */ @@ -2429,7 +2429,7 @@ kiblnd_reconnect (kib_conn_t *conn, char *why) retry = 1; peer->ibp_connecting++; } - + write_unlock_irqrestore(&kiblnd_data.kib_global_lock, flags); if (retry) { @@ -2468,19 +2468,19 @@ kiblnd_rejected (kib_conn_t *conn, int reason, void *priv, int priv_nob) libcfs_nid2str(peer->ibp_nid)); break; } - + if (rej->ibr_version != IBLND_MSG_VERSION) { CERROR("%s rejected: o2iblnd version %d error\n", libcfs_nid2str(peer->ibp_nid), rej->ibr_version); break; } - + switch (rej->ibr_why) { case IBLND_REJECT_CONN_RACE: kiblnd_reconnect(conn, "conn race"); break; - + case IBLND_REJECT_NO_RESOURCES: CERROR("%s rejected: o2iblnd no resources\n", libcfs_nid2str(peer->ibp_nid)); @@ -2621,7 +2621,7 @@ kiblnd_active_connect (struct rdma_cm_id *cmid) msg->ibm_u.connparams.ibcp_max_frags = IBLND_MAX_RDMA_FRAGS; msg->ibm_u.connparams.ibcp_max_msg_size = IBLND_MSG_SIZE; kiblnd_pack_msg(peer->ibp_ni, msg, 0, peer->ibp_nid, 0); - + memset(&cp, 0, sizeof(cp)); cp.private_data = msg; cp.private_data_len = msg->ibm_nob; @@ -2633,7 +2633,7 @@ kiblnd_active_connect (struct rdma_cm_id *cmid) LASSERT(cmid->context == (void *)conn); LASSERT(conn->ibc_cmid == cmid); - + rc = rdma_connect(cmid, &cp); if (rc != 0) { CERROR("Can't connect to %s: %d\n", @@ -2663,7 +2663,7 @@ kiblnd_cm_callback(struct rdma_cm_id *cmid, struct rdma_cm_event *event) KIBLND_CONN_PARAM_LEN(event)); CDEBUG(D_NET, "connreq: %d\n", rc); return rc; - + case RDMA_CM_EVENT_ADDR_ERROR: peer = (kib_peer_t *)cmid->context; CDEBUG(D_NETERROR, "%s: ADDR ERROR %d\n", @@ -2716,7 +2716,7 @@ kiblnd_cm_callback(struct rdma_cm_id *cmid, struct rdma_cm_event *event) kiblnd_peer_connect_failed(peer, 1, event->status); kiblnd_peer_decref(peer); return event->status; /* rc != 0 destroys cmid */ - + case RDMA_CM_EVENT_UNREACHABLE: conn = (kib_conn_t *)cmid->context; LASSERT(conn->ibc_state == IBLND_CONN_ACTIVE_CONNECT || @@ -3027,7 +3027,7 @@ kiblnd_qp_event(struct ib_event *event, void *arg) CDEBUG(D_NET, "%s established\n", libcfs_nid2str(conn->ibc_peer->ibp_nid)); return; - + default: CERROR("%s: Async QP event type %d\n", libcfs_nid2str(conn->ibc_peer->ibp_nid), event->event); @@ -3074,7 +3074,7 @@ kiblnd_cq_completion (struct ib_cq *cq, void *arg) * and this CQ is about to be destroyed so I NOOP. */ kib_conn_t *conn = (kib_conn_t *)arg; unsigned long flags; - + LASSERT (cq == conn->ibc_cq); spin_lock_irqsave(&kiblnd_data.kib_sched_lock, flags); @@ -3144,7 +3144,7 @@ kiblnd_scheduler(void *arg) LASSERT(conn->ibc_scheduled); list_del(&conn->ibc_sched_list); conn->ibc_ready = 0; - + spin_unlock_irqrestore(&kiblnd_data.kib_sched_lock, flags); @@ -3189,7 +3189,7 @@ kiblnd_scheduler(void *arg) } else { conn->ibc_scheduled = 0; } - + if (rc != 0) { spin_unlock_irqrestore(&kiblnd_data.kib_sched_lock, flags); diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 150e2542..d23d3f7 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -37,6 +37,14 @@ TBD Sun Microsystems, Inc. information, please refer to bugzilla 17630. Severity : enhancement +Bugzilla : 18289 +Description: allow the use of the kernel provided OFED stack +Details : This patch allows for lbuild to use the OFED stack provided + by the kernel vendor. + For the RHEL4 and RHEL5 kernels, we enable the kernel supplied + OFED stack. + +Severity : enhancement Bugzilla : 18775 Descriptoin: improve lctl set/get_param Details : handle the bad options, support more than one arguments, 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 ceb6da3..6af2baf 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 @@ -1450,7 +1450,7 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1459,7 +1459,8 @@ CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y # # Token Ring devices @@ -2661,7 +2662,32 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_INFINIBAND is not set +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 # # 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 903bc6c..467117c 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 @@ -1439,7 +1439,7 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1448,7 +1448,8 @@ CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y # # Token Ring devices @@ -2654,7 +2655,32 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_INFINIBAND is not set +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 # # 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 125e389..beb4f67a 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 @@ -1215,7 +1215,7 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1224,7 +1224,8 @@ CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y # # Token Ring devices @@ -2337,7 +2338,33 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_INFINIBAND is not set +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 # # 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 852a070..485afd8 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 @@ -1209,7 +1209,7 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1218,7 +1218,8 @@ CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y # # Token Ring devices @@ -2334,7 +2335,33 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_INFINIBAND is not set +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 # # 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 d8a493c..34e56ed 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,7 +1405,8 @@ CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y # # Token Ring devices @@ -2686,7 +2687,34 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_INFINIBAND is not set +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 # # 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 d8a493c..34e56ed 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,7 +1405,8 @@ CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y # # Token Ring devices @@ -2686,7 +2687,34 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_INFINIBAND is not set +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 # # 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 d97b3e3..d39a453 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 @@ -1376,7 +1376,7 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1385,7 +1385,8 @@ CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y # # Token Ring devices @@ -2557,7 +2558,33 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_INFINIBAND is not set +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 # # 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 abde45b..b1785f3 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 @@ -1356,7 +1356,7 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1365,7 +1365,8 @@ CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y # # Token Ring devices @@ -2541,7 +2542,33 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_INFINIBAND is not set +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 # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config index df54dfe..3f41bec 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config @@ -541,7 +541,7 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m # # SCSI low-level drivers @@ -1156,7 +1156,7 @@ CONFIG_QLA3XXX=m # CONFIG_IXGB=m CONFIG_IXGB_NAPI=y -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_NETXEN_NIC=m @@ -2168,7 +2168,27 @@ CONFIG_USB_SPEEDTOUCH=m # # InfiniBand support # -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +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_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_SDP=m +# CONFIG_INFINIBAND_SDP_DEBUG is not set +CONFIG_INFINIBAND_VNIC=m +# CONFIG_INFINIBAND_VNIC_DEBUG is not set +CONFIG_INFINIBAND_VNIC_STATS=y +CONFIG_INFINIBAND_MADEYE=m # # EDAC - error detection and reporting (RAS) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config index 28f4a24..e0f9600 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config @@ -527,7 +527,7 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m # # SCSI low-level drivers @@ -1144,7 +1144,7 @@ CONFIG_QLA3XXX=m # CONFIG_IXGB=m CONFIG_IXGB_NAPI=y -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_NETXEN_NIC=m @@ -2176,7 +2176,27 @@ CONFIG_USB_SPEEDTOUCH=m # # InfiniBand support # -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +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_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_SDP=m +# CONFIG_INFINIBAND_SDP_DEBUG is not set +CONFIG_INFINIBAND_VNIC=m +# CONFIG_INFINIBAND_VNIC_DEBUG is not set +CONFIG_INFINIBAND_VNIC_STATS=y +CONFIG_INFINIBAND_MADEYE=m # # EDAC - error detection and reporting (RAS) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64-smp.config index c1fe7ac..8475bd9 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64-smp.config @@ -312,7 +312,7 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m # # SCSI low-level drivers @@ -873,7 +873,7 @@ CONFIG_QLA3XXX=m # CONFIG_IXGB=m CONFIG_IXGB_NAPI=y -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_NETXEN_NIC=m @@ -1751,7 +1751,27 @@ CONFIG_USB_SPEEDTOUCH=m # # InfiniBand support # -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +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_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_SDP=m +# CONFIG_INFINIBAND_SDP_DEBUG is not set +CONFIG_INFINIBAND_VNIC=m +# CONFIG_INFINIBAND_VNIC_DEBUG is not set +CONFIG_INFINIBAND_VNIC_STATS=y +CONFIG_INFINIBAND_MADEYE=m # # EDAC - error detection and reporting (RAS) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64.config index 4584cf4..fa8b502 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64.config @@ -312,7 +312,7 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m # # SCSI low-level drivers @@ -873,7 +873,7 @@ CONFIG_QLA3XXX=m # CONFIG_IXGB=m CONFIG_IXGB_NAPI=y -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_NETXEN_NIC=m @@ -1751,7 +1751,27 @@ CONFIG_USB_SPEEDTOUCH=m # # InfiniBand support # -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +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_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_SDP=m +# CONFIG_INFINIBAND_SDP_DEBUG is not set +CONFIG_INFINIBAND_VNIC=m +# CONFIG_INFINIBAND_VNIC_DEBUG is not set +CONFIG_INFINIBAND_VNIC_STATS=y +CONFIG_INFINIBAND_MADEYE=m # # EDAC - error detection and reporting (RAS) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config index 5df3558..12f98e1 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config @@ -445,7 +445,7 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m # # SCSI low-level drivers @@ -1010,7 +1010,7 @@ CONFIG_QLA3XXX=m # CONFIG_IXGB=m CONFIG_IXGB_NAPI=y -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_NETXEN_NIC=m @@ -1922,7 +1922,27 @@ CONFIG_USB_SPEEDTOUCH=m # # InfiniBand support # -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +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_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_SDP=m +# CONFIG_INFINIBAND_SDP_DEBUG is not set +CONFIG_INFINIBAND_VNIC=m +# CONFIG_INFINIBAND_VNIC_DEBUG is not set +CONFIG_INFINIBAND_VNIC_STATS=y +CONFIG_INFINIBAND_MADEYE=m # # EDAC - error detection and reporting (RAS) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config index e1ee70c..b2be8e1 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config @@ -445,7 +445,7 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m # # SCSI low-level drivers @@ -1010,7 +1010,7 @@ CONFIG_QLA3XXX=m # CONFIG_IXGB=m CONFIG_IXGB_NAPI=y -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_NETXEN_NIC=m @@ -1922,7 +1922,27 @@ CONFIG_USB_SPEEDTOUCH=m # # InfiniBand support # -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +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_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_SDP=m +# CONFIG_INFINIBAND_SDP_DEBUG is not set +CONFIG_INFINIBAND_VNIC=m +# CONFIG_INFINIBAND_VNIC_DEBUG is not set +CONFIG_INFINIBAND_VNIC_STATS=y +CONFIG_INFINIBAND_MADEYE=m # # EDAC - error detection and reporting (RAS) diff --git a/lustre/kernel_patches/targets/2.6-rhel4.target.in b/lustre/kernel_patches/targets/2.6-rhel4.target.in index 7d27ba6..2a009e9 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=inkernel 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 660b7a6..1754579 100644 --- a/lustre/kernel_patches/targets/2.6-rhel5.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel5.target.in @@ -9,14 +9,16 @@ RHBUILD=1 LINUX26=1 LUSTRE_VERSION=@VERSION@ -OFED_VERSION=1.3.1 +OFED_VERSION=inkernel BASE_ARCHS="i686 x86_64 ia64 ppc64" BIGMEM_ARCHS="" BOOT_ARCHS="" JENSEN_ARCHS="" -SMP_ARCHS="i686 x86_64 ia64 ppc64" -UP_ARCHS="" +#SMP_ARCHS="i686 x86_64 ia64 ppc64" +SMP_ARCHS="" +#UP_ARCHS="" +UP_ARCHS="i686 x86_64 ia64 ppc64" for cc in gcc ; do if which $cc >/dev/null 2>/dev/null ; then -- 1.8.3.1