Commit 6e764bcd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma 

Pull rdma fixes from Jason Gunthorpe:
 "Several small fixes, the first three are significant:

   - mlx5 crash unloading drivers with a rare HW config

   - missing userspace reporting for the new dmabuf objects

   - random rxe failure due to missing memory zeroing

   - static checker/etc reports: missing spin lock init, null pointer
     deref on error, extra unlock on error path, memory allocation under
     spinlock, missing IRQ vector cleanup

   - kconfig typo in the new irdma driver"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  RDMA/rxe: Zero out index member of struct rxe_queue
  RDMA/efa: Free IRQ vectors on error flow
  RDMA/rxe: Fix memory allocation while in a spin lock
  RDMA/bnxt_re: Remove unpaired rtnl unlock in bnxt_re_dev_init()
  IB/hfi1: Fix possible null-pointer dereference in _extend_sdma_tx_descs()
  RDMA/irdma: Use correct kconfig symbol for AUXILIARY_BUS
  RDMA/bnxt_re: Add missing spin lock initialization
  RDMA/uverbs: Track dmabuf memory regions
  RDMA/mlx5: Fix crash when unbind multiport slave
parents d5ae8d7f cc4f596c

drivers/infiniband/core/uverbs_std_types_mr.c

+3 −0
Original line number Diff line number Diff line
@@ -249,6 +249,9 @@ static int UVERBS_HANDLER(UVERBS_METHOD_REG_DMABUF_MR)( 
	mr->uobject = uobj;

	atomic_inc(&pd->usecnt);



	rdma_restrack_new(&mr->res, RDMA_RESTRACK_MR);

	rdma_restrack_set_name(&mr->res, NULL);

	rdma_restrack_add(&mr->res);

	uobj->object = mr;



	uverbs_finalize_uobj_create(attrs, UVERBS_ATTR_REG_DMABUF_MR_HANDLE);

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+1 −0
Original line number Diff line number Diff line
@@ -1681,6 +1681,7 @@ int bnxt_re_create_srq(struct ib_srq *ib_srq, 
	if (nq)

		nq->budget++;

	atomic_inc(&rdev->srq_count);

	spin_lock_init(&srq->lock);



	return 0;

drivers/infiniband/hw/bnxt_re/main.c

+0 −1
Original line number Diff line number Diff line
@@ -1397,7 +1397,6 @@ static int bnxt_re_dev_init(struct bnxt_re_dev *rdev, u8 wqe_mode) 
	memset(&rattr, 0, sizeof(rattr));

	rc = bnxt_re_register_netdev(rdev);

	if (rc) {

		rtnl_unlock();

		ibdev_err(&rdev->ibdev,

			  "Failed to register with netedev: %#x\n", rc);

		return -EINVAL;

drivers/infiniband/hw/efa/efa_main.c

+1 −0
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ static int efa_enable_msix(struct efa_dev *dev) 
	}



	if (irq_num != msix_vecs) {

		efa_disable_msix(dev);

		dev_err(&dev->pdev->dev,

			"Allocated %d MSI-X (out of %d requested)\n",

			irq_num, msix_vecs);

drivers/infiniband/hw/hfi1/sdma.c

+4 −5
Original line number Diff line number Diff line
@@ -3055,6 +3055,7 @@ static void __sdma_process_event(struct sdma_engine *sde, 
static int _extend_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx)

{

	int i;

	struct sdma_desc *descp;



	/* Handle last descriptor */

	if (unlikely((tx->num_desc == (MAX_DESC - 1)))) {
@@ -3075,12 +3076,10 @@ static int _extend_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx) 
	if (unlikely(tx->num_desc == MAX_DESC))

		goto enomem;



	tx->descp = kmalloc_array(

			MAX_DESC,

			sizeof(struct sdma_desc),

			GFP_ATOMIC);

	if (!tx->descp)

	descp = kmalloc_array(MAX_DESC, sizeof(struct sdma_desc), GFP_ATOMIC);

	if (!descp)

		goto enomem;

	tx->descp = descp;



	/* reserve last descriptor for coalescing */

	tx->desc_limit = MAX_DESC - 1;