InfiniBand updates for 2.6.17
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
The pull will get the following changes:
Dotan Barak:
IB/mthca: Check that sgid_index and path_mtu are valid in modify_qp
Jack Morgenstein:
IB/mthca: Check that SRQ WQE size does not exceed device's max value IB/mthca: Check SRQ limit in modify SRQ operation IB/mthca: Fix uninitialized variable in mthca_alloc_qp()
Leonid Arsh:
IPoIB: Pass correct pointer when flushing child interfaces
IPoIB: Fix network interface "RUNNING" status
IPoIB: P_Key change event handling
Roland Dreier:
IB/srp: Use a fake scatterlist for non-SG SCSI commands IB/mthca: Fix indentation
IB/mthca: Fix modify QP error path
drivers/infiniband/hw/mthca/mthca_qp.c | 61 ++++++++---- drivers/infiniband/hw/mthca/mthca_srq.c | 6 + drivers/infiniband/ulp/ipoib/ipoib.h | 15 ++- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 44 ++++++--- drivers/infiniband/ulp/ipoib/ipoib_main.c | 5 + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 6 + drivers/infiniband/ulp/srp/ib_srp.c | 143 +++++++++++++--------------- drivers/infiniband/ulp/srp/ib_srp.h | 7 + 8 files changed, 169 insertions(+), 118 deletions(-)
drivers/infiniband/hw/mthca/mthca_qp.c +41 -20
@@ -483,13 +483,20 @@ out:return err; } -static void mthca_path_set (struct ib_ah_attr *ah,struct mthca_qp_path *path) +static int mthca_path_set (struct mthca_dev *dev,struct ib_ah_attr *ah, +struct mthca_qp_path *path) { path->g_mylmc = ah->src_path_bits &0x7f ; path->rlid =cpu_to_be16 (ah->dlid); path->static_rate = !!ah->static_rate;if (ah->ah_flags &IB_AH_GRH ) { +if (ah->grh.sgid_index >= dev->limits.gid_table_len) { +mthca_dbg (dev,"sgid_index (%u) too large. max is %d\n" , + ah->grh.sgid_index, dev->limits.gid_table_len-1 ); +return -1 ; + } + path->g_mylmc |=1 <<7 ; path->mgid_index = ah->grh.sgid_index; path->hop_limit = ah->grh.hop_limit;
@@ -500,6 +507,8 @@ static void mthca_path_set(struct ib_ah_memcpy (path->rgid, ah->grh.dgid.raw,16 ); }else path->sl_tclass_flowlabel =cpu_to_be32 (ah->sl <<28 ); + +return 0 ; }int mthca_modify_qp (struct ib_qp *ibqp,struct ib_qp_attr *attr,int attr_mask)
@@ -592,8 +601,14 @@ int mthca_modify_qp(struct ib_qp *ibqp,if (qp->transport ==MLX || qp->transport ==UD ) qp_context->mtu_msgmax = (IB_MTU_2048 <<5 ) |11 ; -else if (attr_mask &IB_QP_PATH_MTU ) +else if (attr_mask &IB_QP_PATH_MTU ) { +if (attr->path_mtu <IB_MTU_256 || attr->path_mtu >IB_MTU_2048 ) { +mthca_dbg (dev,"path MTU (%u) is invalid\n" , + attr->path_mtu); +return -EINVAL ; + } qp_context->mtu_msgmax = (attr->path_mtu <<5 ) |31 ; + }if (mthca_is_memfree (dev)) {if (qp->rq.max)
@@ -642,7 +657,9 @@ int mthca_modify_qp(struct ib_qp *ibqp, }if (attr_mask &IB_QP_AV ) { -mthca_path_set (&attr->ah_attr, &qp_context->pri_path); +if (mthca_path_set (dev, &attr->ah_attr, &qp_context->pri_path)) +return -EINVAL ; + qp_param->opt_param_mask |=cpu_to_be32 (MTHCA_QP_OPTPAR_PRIMARY_ADDR_PATH ); }
@@ -664,7 +681,9 @@ int mthca_modify_qp(struct ib_qp *ibqp,return -EINVAL ; } -mthca_path_set (&attr->alt_ah_attr, &qp_context->alt_path); +if (mthca_path_set (dev, &attr->alt_ah_attr, &qp_context->alt_path)) +return -EINVAL ; + qp_context->alt_path.port_pkey |=cpu_to_be32 (attr->alt_pkey_index | attr->alt_port_num <<24 ); qp_context->alt_path.ackto = attr->alt_timeout <<3 ;
@@ -758,21 +777,20 @@ int mthca_modify_qp(struct ib_qp *ibqp, err =mthca_MODIFY_QP (dev, cur_state, new_state, qp->qpn,0 , mailbox, sqd_event, &status); +if (err) + goto out;if (status) {mthca_warn (dev,"modify QP %d->%d returned status %02x.\n" , cur_state, new_state, status); err = -EINVAL ; + goto out; } -if (!err) { - qp->state = new_state; -if (attr_mask &IB_QP_ACCESS_FLAGS ) - qp->atomic_rd_en = attr->qp_access_flags; -if (attr_mask &IB_QP_MAX_DEST_RD_ATOMIC ) - qp->resp_depth = attr->max_dest_rd_atomic; - } - -mthca_free_mailbox (dev, mailbox); + qp->state = new_state; +if (attr_mask &IB_QP_ACCESS_FLAGS ) + qp->atomic_rd_en = attr->qp_access_flags; +if (attr_mask &IB_QP_MAX_DEST_RD_ATOMIC ) + qp->resp_depth = attr->max_dest_rd_atomic;if (is_sqp (dev, qp))store_attrs (to_msqp (qp), attr, attr_mask);
@@ -797,7 +815,7 @@ int mthca_modify_qp(struct ib_qp *ibqp,* If we moved a kernel QP to RESET, clean up all old CQ * entries and reinitialize the QP. */ -if (!err && new_state ==IB_QPS_RESET && !qp->ibqp.uobject) { +if (new_state ==IB_QPS_RESET && !qp->ibqp.uobject) {mthca_cq_clean (dev,to_mcq (qp->ibqp.send_cq)->cqn, qp->qpn, qp->ibqp.srq ?to_msrq (qp->ibqp.srq) :NULL );if (qp->ibqp.send_cq != qp->ibqp.recv_cq)
@@ -816,6 +834,8 @@ int mthca_modify_qp(struct ib_qp *ibqp, } } +out: +mthca_free_mailbox (dev, mailbox);return err; }
@@ -1177,10 +1197,6 @@ int mthca_alloc_qp(struct mthca_dev *dev {int err; - err =mthca_set_qp_size (dev, cap, pd, qp); -if (err) -return err; -switch (type) {case IB_QPT_RC : qp->transport =RC ;break ;case IB_QPT_UC : qp->transport =UC ;break ;
@@ -1188,6 +1204,10 @@ int mthca_alloc_qp(struct mthca_dev *devdefault :return -EINVAL ; } + err =mthca_set_qp_size (dev, cap, pd, qp); +if (err) +return err; + qp->qpn =mthca_alloc (&dev->qp_table.alloc);if (qp->qpn ==-1 )return -ENOMEM ;
@@ -1220,6 +1240,7 @@ int mthca_alloc_sqp(struct mthca_dev *deu32 mqpn = qpn *2 + dev->qp_table.sqp_start + port -1 ;int err; + sqp->qp.transport =MLX ; err =mthca_set_qp_size (dev, cap, pd, &sqp->qp);if (err)return err;
@@ -1980,8 +2001,8 @@ int mthca_arbel_post_send(struct ib_qp *wmb (); ((struct mthca_next_seg *) prev_wqe)->ee_nds =cpu_to_be32 (MTHCA_NEXT_DBD | size | - ((wr->send_flags &IB_SEND_FENCE ) ? -MTHCA_NEXT_FENCE :0 )); + ((wr->send_flags &IB_SEND_FENCE ) ? +MTHCA_NEXT_FENCE :0 ));if (!size0) { size0 = size;
drivers/infiniband/hw/mthca/mthca_srq.c +6 -0
@@ -205,6 +205,10 @@ int mthca_alloc_srq(struct mthca_dev *de ds =max (64UL ,roundup_pow_of_two (sizeof (struct mthca_next_seg ) + srq->max_gs *sizeof (struct mthca_data_seg ))); + +if (ds > dev->limits.max_desc_sz) +return -EINVAL ; + srq->wqe_shift =long_log2 (ds); srq->srqn =mthca_alloc (&dev->srq_table.alloc);
@@ -354,6 +358,8 @@ int mthca_modify_srq(struct ib_srq *ibsrreturn -EINVAL ;if (attr_mask &IB_SRQ_LIMIT ) { +if (attr->srq_limit > srq->max) +return -EINVAL ; ret =mthca_ARM_SRQ (dev, srq->srqn, attr->srq_limit, &status);if (ret)return ret;
drivers/infiniband/ulp/ipoib/ipoib.h +8 -7
@@ -72,13 +72,14 @@ enum {IPOIB_MAX_MCAST_QUEUE =3 ,IPOIB_FLAG_OPER_UP =0 , -IPOIB_FLAG_ADMIN_UP =1 , -IPOIB_PKEY_ASSIGNED =2 , -IPOIB_PKEY_STOP =3 , -IPOIB_FLAG_SUBINTERFACE =4 , -IPOIB_MCAST_RUN =5 , -IPOIB_STOP_REAPER =6 , -IPOIB_MCAST_STARTED =7 , +IPOIB_FLAG_INITIALIZED =1 , +IPOIB_FLAG_ADMIN_UP =2 , +IPOIB_PKEY_ASSIGNED =3 , +IPOIB_PKEY_STOP =4 , +IPOIB_FLAG_SUBINTERFACE =5 , +IPOIB_MCAST_RUN =6 , +IPOIB_STOP_REAPER =7 , +IPOIB_MCAST_STARTED =8 , IPOIB_MAX_BACKOFF_SECONDS = 16,
drivers/infiniband/ulp/ipoib/ipoib_ib.c +31 -13
82 lines not on this page · raw message
drivers/infiniband/ulp/ipoib/ipoib_main.c +5 -0
@@ -736,6 +736,11 @@ static void ipoib_set_mcast_list(struct {struct ipoib_dev_priv *priv =netdev_priv (dev); +if (!test_bit (IPOIB_FLAG_OPER_UP , &priv->flags)) { +ipoib_dbg (priv,"IPOIB_FLAG_OPER_UP not set" ); +return ; + } +queue_work (ipoib_workqueue, &priv->restart_task); }
drivers/infiniband/ulp/ipoib/ipoib_verbs.c +4 -2
@@ -251,10 +251,12 @@ void ipoib_event(struct ib_event_handlerstruct ipoib_dev_priv *priv = container_of(handler, struct ipoib_dev_priv, event_handler); -if (record->event ==IB_EVENT_PORT_ACTIVE || +if (record->event ==IB_EVENT_PORT_ERR || + record->event ==IB_EVENT_PKEY_CHANGE || + record->event ==IB_EVENT_PORT_ACTIVE || record->event ==IB_EVENT_LID_CHANGE || record->event ==IB_EVENT_SM_CHANGE ) { -ipoib_dbg (priv,"Port active event\n" ); +ipoib_dbg (priv,"Port state change event\n" );queue_work (ipoib_workqueue, &priv->flush_task); } }
drivers/infiniband/ulp/srp/ib_srp.c +68 -75
185 lines not on this page · raw message
drivers/infiniband/ulp/srp/ib_srp.h +6 -1
@@ -38,6 +38,7 @@#include <linux/types.h> #include <linux/list.h> #include <linux/mutex.h> +#include <linux/scatterlist.h> #include <scsi/scsi_host.h> #include <scsi/scsi_cmnd.h>
@@ -94,7 +95,11 @@ struct srp_request {struct scsi_cmnd *scmnd;struct srp_iu *cmd;struct srp_iu *tsk_mgmt; -DECLARE_PCI_UNMAP_ADDR (direct_mapping) +/* +* Fake scatterlist used when scmnd->use_sg==0. Can be killed +* when the SCSI midlayer no longer generates non-SG commands. +*/ +struct scatterlist fake_sg;struct completion done;short next;u8 cmd_done;