please pull infiniband.git
Subsystems (2)
Linus, please pull from
master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This tree is also available from kernel.org mirrors at:
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This will get a few more nicely balanced ("55 insertions(+), 55 deletions(-)") 2.6.22-rc3 fixes, mostly for IPoIB connected mode:
Michael S. Tsirkin (2):
IB/mthca: Fix handling of send CQE with error for QPs connected to SRQ IPoIB/cm: Fix performance regression on Mellanox
Roland Dreier (1):
IB/mlx4: Fix last allocated object tracking in bitmap allocator
Sean Hefty (1):
IB/cm: Fix stale connection detection
drivers/infiniband/core/cm.c | 25 ++++++----- drivers/infiniband/hw/mthca/mthca_qp.c | 6 +- drivers/infiniband/ulp/ipoib/ipoib.h | 3 +- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 74 +++++++++++++++---------------- drivers/net/mlx4/alloc.c | 2 +- 5 files changed, 55 insertions(+), 55 deletions(-)
drivers/infiniband/core/cm.c +14 -11
@@ -1297,26 +1297,29 @@ static struct cm_id_private * cm_match_req(struct cm_work *work, req_msg = (struct cm_req_msg *)work->mad_recv_wc->recv_buf.mad; -/* Check for duplicate REQ and stale connections. */ +/* Check for possible duplicate REQ. */ spin_lock_irqsave (&cm.lock, flags); timewait_info =cm_insert_remote_id (cm_id_priv->timewait_info); -if (!timewait_info) - timewait_info =cm_insert_remote_qpn (cm_id_priv->timewait_info); -if (timewait_info) { cur_cm_id_priv =cm_get_id (timewait_info->work.local_id, timewait_info->work.remote_id); -cm_cleanup_timewait (cm_id_priv->timewait_info);spin_unlock_irqrestore (&cm.lock, flags);if (cur_cm_id_priv) {cm_dup_req_handler (work, cur_cm_id_priv);cm_deref_id (cur_cm_id_priv); - }else -cm_issue_rej (work->port, work->mad_recv_wc, -IB_CM_REJ_STALE_CONN ,CM_MSG_RESPONSE_REQ , -NULL ,0 ); - listen_cm_id_priv =NULL ; - goto out; + } +return NULL ; + } + +/* Check for stale connections. */ + timewait_info =cm_insert_remote_qpn (cm_id_priv->timewait_info); +if (timewait_info) { +cm_cleanup_timewait (cm_id_priv->timewait_info); +spin_unlock_irqrestore (&cm.lock, flags); +cm_issue_rej (work->port, work->mad_recv_wc, +IB_CM_REJ_STALE_CONN ,CM_MSG_RESPONSE_REQ , +NULL ,0 ); +return NULL ; }/* Find matching listen request. */
drivers/infiniband/hw/mthca/mthca_qp.c +3 -3
@@ -2284,10 +2284,10 @@ void mthca_free_err_wqe(struct mthca_dev *dev, struct mthca_qp *qp, int is_send,struct mthca_next_seg *next;/* -* For SRQs, all WQEs generate a CQE, so we're always at the -* end of the doorbell chain. +* For SRQs, all receive WQEs generate a CQE, so we're always +* at the end of the doorbell chain. */ -if (qp->ibqp.srq) { +if (qp->ibqp.srq && !is_send) { *new_wqe =0 ;return ; }
drivers/infiniband/ulp/ipoib/ipoib.h +1 -2
@@ -156,7 +156,7 @@ struct ipoib_cm_data {* - and then invoke a Destroy QP or Reset QP. * * We use the second option and wait for a completion on the -* rx_drain_qp before destroying QPs attached to our SRQ. +* same CQ before destroying QPs attached to our SRQ. */ enum ipoib_cm_state {
@@ -199,7 +199,6 @@ struct ipoib_cm_dev_priv {struct ib_srq *srq;struct ipoib_cm_rx_buf *srq_ring;struct ib_cm_id *id; -struct ib_qp *rx_drain_qp;/* generates WR described in 10.3.1 */ struct list_head passive_ids;/* state: LIVE */ struct list_head rx_error_list;/* state: ERROR */ struct list_head rx_flush_list;/* state: FLUSH, drain not started */
drivers/infiniband/ulp/ipoib/ipoib_cm.c +36 -38
129 lines not on this page · raw message
drivers/net/mlx4/alloc.c +1 -1
@@ -51,8 +51,8 @@ u32 mlx4_bitmap_alloc(struct mlx4_bitmap *bitmap)if (obj < bitmap->max) {set_bit (obj, bitmap->table); + bitmap->last = (obj +1 ) & (bitmap->max -1 ); obj |= bitmap->top; - bitmap->last = obj +1 ; }else obj =-1 ;