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 fixes for crashes/deadlocks as a well as a few other small, safe fixes:
Jack Morgenstein (1):
IB/mlx4: Correct max_srq_wr returned from mlx4_ib_query_device()
Michael S. Tsirkin (2):
IPoIB/cm: Initialize RX before moving QP to RTR IPoIB/cm: Fix interoperability when MTU doesn't match
Roland Dreier (2):
IB/umem: Fix possible hang on process exit IPoIB/cm: Remove dead definition of struct ipoib_cm_id
drivers/infiniband/core/umem.c | 16 ++++++----- drivers/infiniband/hw/mlx4/main.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 42 ++++++++++++++---------------- 3 files changed, 30 insertions(+), 30 deletions(-)
drivers/infiniband/core/umem.c +9 -7
@@ -225,13 +225,15 @@ void ib_umem_release(struct ib_umem *umem)* up here and not be able to take the mmap_sem. In that case * we defer the vm_locked accounting to the system workqueue. */ -if (context->closing && !down_write_trylock (&mm->mmap_sem)) { -INIT_WORK (&umem->work, ib_umem_account); - umem->mm = mm; - umem->diff = diff; - -schedule_work (&umem->work); -return ; +if (context->closing) { +if (!down_write_trylock (&mm->mmap_sem)) { +INIT_WORK (&umem->work, ib_umem_account); + umem->mm = mm; + umem->diff = diff; + +schedule_work (&umem->work); +return ; + } }else down_write (&mm->mmap_sem);
drivers/infiniband/hw/mlx4/main.c +1 -1
@@ -120,7 +120,7 @@ static int mlx4_ib_query_device(struct ib_device *ibdev, props->max_qp_init_rd_atom = dev->dev->caps.max_qp_init_rdma; props->max_res_rd_atom = props->max_qp_rd_atom * props->max_qp; props->max_srq = dev->dev->caps.num_srqs - dev->dev->caps.reserved_srqs; - props->max_srq_wr = dev->dev->caps.max_srq_wqes; + props->max_srq_wr = dev->dev->caps.max_srq_wqes -1 ; props->max_srq_sge = dev->dev->caps.max_srq_sge; props->local_ca_ack_delay = dev->dev->caps.local_ca_ack_delay; props->atomic_cap = dev->dev->caps.flags & MLX4_DEV_CAP_FLAG_ATOMIC ?
drivers/infiniband/ulp/ipoib/ipoib_cm.c +20 -22
72 lines not on this page · raw message