please pull infiniband.git
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 pull some small fixes for 2.6.24:
Erez Zilber (1):
IB/iser: Add missing counter increment in iser_data_buf_aligned_len()
Jack Morgenstein (1):
mlx4_core: Fix state check in mlx4_qp_modify()
Joachim Fenkes (1):
IB/ehca: Fix static rate regression
Ralph Campbell (4):
IB/ipath: Fix offset returned to ibv_resize_cq() IB/ipath: Fix error path in QP creation
IB/ipath: Fix offset returned to ibv_modify_srq() IB/ipath: Normalize error return codes for posting work requests
drivers/infiniband/hw/ehca/ehca_qp.c | 4 +- drivers/infiniband/hw/ipath/ipath_cq.c | 19 +++++++++--- drivers/infiniband/hw/ipath/ipath_qp.c | 15 ++++++---- drivers/infiniband/hw/ipath/ipath_srq.c | 44 +++++++++++++++++------------ drivers/infiniband/hw/ipath/ipath_verbs.c | 8 +++-- drivers/infiniband/ulp/iser/iser_memory.c | 6 ++- drivers/net/mlx4/qp.c | 2 +- 7 files changed, 61 insertions(+), 37 deletions(-)
drivers/infiniband/hw/ehca/ehca_qp.c +2 -2
@@ -1203,7 +1203,7 @@ static int internal_modify_qp(struct ib_qp *ibqp, mqpcb->service_level = attr->ah_attr.sl; update_mask |=EHCA_BMASK_SET (MQPCB_MASK_SERVICE_LEVEL ,1 ); -if (ehca_calc_ipd (shca, my_qp->init_attr.port_num, +if (ehca_calc_ipd (shca, mqpcb->prim_phys_port, attr->ah_attr.static_rate, &mqpcb->max_static_rate)) { ret = -EINVAL ;
@@ -1302,7 +1302,7 @@ static int internal_modify_qp(struct ib_qp *ibqp, mqpcb->source_path_bits_al = attr->alt_ah_attr.src_path_bits; mqpcb->service_level_al = attr->alt_ah_attr.sl; -if (ehca_calc_ipd (shca, my_qp->init_attr.port_num, +if (ehca_calc_ipd (shca, mqpcb->alt_phys_port, attr->alt_ah_attr.static_rate, &mqpcb->max_static_rate_al)) { ret = -EINVAL ;
drivers/infiniband/hw/ipath/ipath_cq.c +14 -5
@@ -395,12 +395,9 @@ int ipath_resize_cq(struct ib_cq *ibcq, int cqe, struct ib_udata *udata) goto bail; } -/* -* Return the address of the WC as the offset to mmap. -* See ipath_mmap() for details. -*/ +/* Check that we can write the offset to mmap. */ if (udata && udata->outlen >=sizeof (__u64)) { -__u64 offset = (__u64 ) wc; +__u64 offset =0 ; ret =ib_copy_to_udata (udata, &offset,sizeof (offset));if (ret)
@@ -450,6 +447,18 @@ int ipath_resize_cq(struct ib_cq *ibcq, int cqe, struct ib_udata *udata)struct ipath_mmap_info *ip = cq->ip;ipath_update_mmap_info (dev, ip, sz, wc); + +/* +* Return the offset to mmap. +* See ipath_mmap() for details. +*/ +if (udata && udata->outlen >=sizeof (__u64)) { + ret =ib_copy_to_udata (udata, &ip->offset, +sizeof (ip->offset)); +if (ret) + goto bail; + } +spin_lock_irq (&dev->pending_lock);if (list_empty (&ip->pending_mmaps))list_add (&ip->pending_mmaps, &dev->pending_mmaps);
drivers/infiniband/hw/ipath/ipath_qp.c +9 -6
@@ -835,7 +835,8 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd, init_attr->qp_type);if (err) { ret =ERR_PTR (err); - goto bail_rwq; +vfree (qp->r_rq.wq); + goto bail_qp; } qp->ip =NULL ;ipath_reset_qp (qp);
@@ -863,7 +864,7 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd, sizeof(offset));if (err) { ret =ERR_PTR (err); - goto bail_rwq; + goto bail_ip; } }else { u32 s = sizeof(struct ipath_rwq) +
@@ -875,7 +876,7 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd, qp->r_rq.wq);if (!qp->ip) { ret =ERR_PTR (-ENOMEM ); - goto bail_rwq; + goto bail_ip; } err = ib_copy_to_udata(udata, &(qp->ip->offset),
@@ -907,9 +908,11 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd, goto bail; bail_ip: -kfree (qp->ip); -bail_rwq: -vfree (qp->r_rq.wq); +if (qp->ip) +kref_put (&qp->ip->ref, ipath_release_mmap_info); +else +vfree (qp->r_rq.wq); +ipath_free_qp (&dev->qp_table, qp); bail_qp:kfree (qp); bail_swq:
drivers/infiniband/hw/ipath/ipath_srq.c +26 -18
94 lines not on this page · raw message
drivers/infiniband/hw/ipath/ipath_verbs.c +5 -3
@@ -302,8 +302,10 @@ static int ipath_post_one_send(struct ipath_qp *qp, struct ib_send_wr *wr) next = qp->s_head +1 ;if (next >= qp->s_size) next =0 ; -if (next == qp->s_last) - goto bail_inval; +if (next == qp->s_last) { + ret = -ENOMEM ; + goto bail; + } wqe =get_swqe_ptr (qp, qp->s_head); wqe->wr = *wr;
@@ -404,7 +406,7 @@ static int ipath_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,if ((unsigned ) wr->num_sge > qp->r_rq.max_sge) { *bad_wr = wr; - ret = -ENOMEM ; + ret = -EINVAL ; goto bail; }
drivers/infiniband/ulp/iser/iser_memory.c +4 -2
@@ -310,13 +310,15 @@ static unsigned int iser_data_buf_aligned_len(struct iser_data_buf *data,if (i +1 < data->dma_nents) { next_addr =ib_sg_dma_address (ibdev,sg_next (sg));/* are i, i+1 fragments of the same page? */ -if (end_addr == next_addr) +if (end_addr == next_addr) { + cnt++;continue ; -else if (!IS_4K_ALIGNED (end_addr)) { + }else if (!IS_4K_ALIGNED (end_addr)) { ret_len = cnt +1 ;break ; } } + cnt++; }if (i == data->dma_nents) ret_len = cnt;/* loop ended */
drivers/net/mlx4/qp.c +1 -1
@@ -113,7 +113,7 @@ int mlx4_qp_modify(struct mlx4_dev *dev, struct mlx4_mtt *mtt,struct mlx4_cmd_mailbox *mailbox;int ret =0 ; -if (cur_state >=MLX4_QP_NUM_STATE || cur_state >=MLX4_QP_NUM_STATE || +if (cur_state >=MLX4_QP_NUM_STATE || new_state >=MLX4_QP_NUM_STATE || !op[cur_state][new_state])return -EINVAL ;
Quoted 8 lines · Roland Dreier
Linus, please pull from
master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
Jack Morgenstein (1):
mlx4_core: Fix state check inmlx4_qp_modify()
MUST also enter the patch I send yesterday:
[PATCH] ipoib: fix kernel Oops resulting from xmit when priv->broadcast is NULL.
(critical bug fix -- will get kernel Oopses whenever ports on the network go down!). (patch given again below)
- Jack
======================================================================================================================
IPoIB: Fix kernel Oops resulting from xmit following dev_down.
If a port goes down, ipoib_ib_dev_down is invoked -- which flushed the mcasts (clearing priv->broadcast) and clearing the path record cache. If ipoib_start_xmit is then invoked (before the port is upped), a kernel Oops results from attempting to access priv->broadcast.
Returning NULL if priv->broadcast is NULL is a harmless way of bypassing the problem -- the offending packet is simply discarded "without prejudice".
drivers/infiniband/ulp/ipoib/ipoib_main.c +3 -0
@@ -460,6 +460,9 @@ static struct ipoib_path *path_rec_create(struct net_device *dev, void *gid)struct ipoib_dev_priv *priv =netdev_priv (dev);struct ipoib_path *path; +if (!priv->broadcast) +return NULL ; + path =kzalloc (sizeof *path,GFP_ATOMIC );if (!path)return NULL ;