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 2.6.22-rc2 fixes:
Eli Cohen (1):
IB/mlx4: Initialize send queue entry ownership bits
Michael S. Tsirkin (2):
IPoIB/cm: Fix timeout check in ipoib_cm_dev_stop() IPoIB/cm: Drain cq in ipoib_cm_dev_stop()
Roland Dreier (1):
IB/mlx4: Don't allocate RQ doorbell if using SRQ
Stefan Roscher (1):
IB/ehca: Fix number of send WRs reported for new QP
drivers/infiniband/hw/ehca/hcp_if.c | 2 +- drivers/infiniband/hw/mlx4/qp.c | 59 +++++++++++++++++++----------- drivers/infiniband/ulp/ipoib/ipoib.h | 1 + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 3 +- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 31 ++++++++++------ 5 files changed, 60 insertions(+), 36 deletions(-)
drivers/infiniband/hw/ehca/hcp_if.c +1 -1
@@ -331,7 +331,7 @@ u64 hipz_h_alloc_resource_qp(const struct ipz_adapter_handle adapter_handle, 0); qp->ipz_qp_handle.handle = outs[0 ]; qp->real_qp_num = (u32 )outs[1 ]; - parms->act_nr_send_sges = + parms->act_nr_send_wqes = (u16 )EHCA_BMASK_GET (H_ALL_RES_QP_ACT_OUTST_SEND_WR , outs[2 ]); parms->act_nr_recv_wqes = (u16 )EHCA_BMASK_GET (H_ALL_RES_QP_ACT_OUTST_RECV_WR , outs[2 ]);
drivers/infiniband/hw/mlx4/qp.c +37 -22
125 lines not on this page · raw message
drivers/infiniband/ulp/ipoib/ipoib.h +1 -0
@@ -429,6 +429,7 @@ int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey);void ipoib_pkey_poll (struct work_struct *work);int ipoib_pkey_dev_delay_open (struct net_device *dev); +void ipoib_drain_cq (struct net_device *dev);#ifdef CONFIG_INFINIBAND_IPOIB_CM
drivers/infiniband/ulp/ipoib/ipoib_cm.c +2 -1
@@ -713,7 +713,7 @@ void ipoib_cm_dev_stop(struct net_device *dev)while (!list_empty (&priv->cm.rx_error_list) || !list_empty (&priv->cm.rx_flush_list) || !list_empty (&priv->cm.rx_drain_list)) { -if (!time_after (jiffies, begin +5 *HZ )) { +if (time_after (jiffies, begin +5 *HZ )) {ipoib_warn (priv,"RX drain timing out\n" );/*
@@ -726,6 +726,7 @@ void ipoib_cm_dev_stop(struct net_device *dev) }spin_unlock_irq (&priv->lock);msleep (1 ); +ipoib_drain_cq (dev);spin_lock_irq (&priv->lock); }
drivers/infiniband/ulp/ipoib/ipoib_ib.c +19 -12
@@ -550,13 +550,30 @@ static int recvs_pending(struct net_device *dev)return pending; } +void ipoib_drain_cq (struct net_device *dev) +{ +struct ipoib_dev_priv *priv =netdev_priv (dev); +int i, n; +do { + n =ib_poll_cq (priv->cq,IPOIB_NUM_WC , priv->ibwc); +for (i =0 ; i < n; ++i) { +if (priv->ibwc[i].wr_id &IPOIB_CM_OP_SRQ ) +ipoib_cm_handle_rx_wc (dev, priv->ibwc + i); +else if (priv->ibwc[i].wr_id &IPOIB_OP_RECV ) +ipoib_ib_handle_rx_wc (dev, priv->ibwc + i); +else +ipoib_ib_handle_tx_wc (dev, priv->ibwc + i); + } + }while (n ==IPOIB_NUM_WC ); +} +int ipoib_ib_dev_stop (struct net_device *dev,int flush) {struct ipoib_dev_priv *priv =netdev_priv (dev);struct ib_qp_attr qp_attr;unsigned long begin;struct ipoib_tx_buf *tx_req; -int i, n; +int i;clear_bit (IPOIB_FLAG_INITIALIZED , &priv->flags);netif_poll_disable (dev);
@@ -611,17 +628,7 @@ int ipoib_ib_dev_stop(struct net_device *dev, int flush) goto timeout; } -do { - n =ib_poll_cq (priv->cq,IPOIB_NUM_WC , priv->ibwc); -for (i =0 ; i < n; ++i) { -if (priv->ibwc[i].wr_id &IPOIB_CM_OP_SRQ ) -ipoib_cm_handle_rx_wc (dev, priv->ibwc + i); -else if (priv->ibwc[i].wr_id &IPOIB_OP_RECV ) -ipoib_ib_handle_rx_wc (dev, priv->ibwc + i); -else -ipoib_ib_handle_tx_wc (dev, priv->ibwc + i); - } - }while (n ==IPOIB_NUM_WC ); +ipoib_drain_cq (dev);msleep (1 ); }