Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18d3e0d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

InfiniBand/RDMA fixes for 3.3:

 - Fix a crash due to a regression (uninitialized refcnt) introduced in
   3.2 with XRC support.
 - Close race in how ucma reports events when connect fails.
 - Process vendor-specific MADs in mlx4 so that eg FDR-10 data rate works.
 - Fix regression in qib caused by over-aggressive PCIe tuning.
 - Other small fixes for hardware drivers (ipath, nes, qib).

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  RDMA/nes: Copyright update
  IB/mlx4: pass SMP vendor-specific attribute MADs to firmware
  RDMA/nes: Fix fast memory registration opcode
  RDMA/nes: Fix fast memory registration length
  RDMA/ucma: Discard all events for new connections until accepted
  IB/qib: Roll back PCIe tuning change
  IB/qib: Use GFP_ATOMIC when locks are held
  RDMA/nes: Add missing rcu_read_unlock() in nes_addr_resolve_neigh()
  RDMA/nes: Fix for sending MPA reject frame
  IB/ipath: Calling PTR_ERR() on right variable in create_file()
  RDMA/core: Fix kernel panic by always initializing qp->usecnt
parents 6d08f2c7 f36ae342

drivers/infiniband/core/ucma.c

+4 −1
Original line number Diff line number Diff line
@@ -808,9 +808,12 @@ static ssize_t ucma_accept(struct ucma_file *file, const char __user *inbuf, 
		return PTR_ERR(ctx);



	if (cmd.conn_param.valid) {

		ctx->uid = cmd.uid;

		ucma_copy_conn_param(&conn_param, &cmd.conn_param);

		mutex_lock(&file->mut);

		ret = rdma_accept(ctx->cm_id, &conn_param);

		if (!ret)

			ctx->uid = cmd.uid;

		mutex_unlock(&file->mut);

	} else

		ret = rdma_accept(ctx->cm_id, NULL);

drivers/infiniband/core/uverbs_cmd.c

+1 −0
Original line number Diff line number Diff line
@@ -1485,6 +1485,7 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file, 
		qp->event_handler = attr.event_handler;

		qp->qp_context	  = attr.qp_context;

		qp->qp_type	  = attr.qp_type;

		atomic_set(&qp->usecnt, 0);

		atomic_inc(&pd->usecnt);

		atomic_inc(&attr.send_cq->usecnt);

		if (attr.recv_cq)

drivers/infiniband/core/verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -421,6 +421,7 @@ struct ib_qp *ib_create_qp(struct ib_pd *pd, 
		qp->uobject    = NULL;

		qp->qp_type    = qp_init_attr->qp_type;



		atomic_set(&qp->usecnt, 0);

		if (qp_init_attr->qp_type == IB_QPT_XRC_TGT) {

			qp->event_handler = __ib_shared_qp_event_handler;

			qp->qp_context = qp;
@@ -430,7 +431,6 @@ struct ib_qp *ib_create_qp(struct ib_pd *pd, 
			qp->xrcd = qp_init_attr->xrcd;

			atomic_inc(&qp_init_attr->xrcd->usecnt);

			INIT_LIST_HEAD(&qp->open_list);

			atomic_set(&qp->usecnt, 0);



			real_qp = qp;

			qp = __ib_open_qp(real_qp, qp_init_attr->event_handler,

drivers/infiniband/hw/ipath/ipath_fs.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int create_file(const char *name, umode_t mode, 
		error = ipathfs_mknod(parent->d_inode, *dentry,

				      mode, fops, data);

	else

		error = PTR_ERR(dentry);

		error = PTR_ERR(*dentry);

	mutex_unlock(&parent->d_inode->i_mutex);



	return error;

drivers/infiniband/hw/mlx4/mad.c

+2 −5
Original line number Diff line number Diff line
@@ -257,12 +257,9 @@ static int ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num, 
			return IB_MAD_RESULT_SUCCESS;



		/*

		 * Don't process SMInfo queries or vendor-specific

		 * MADs -- the SMA can't handle them.

		 * Don't process SMInfo queries -- the SMA can't handle them.

		 */

		if (in_mad->mad_hdr.attr_id == IB_SMP_ATTR_SM_INFO ||

		    ((in_mad->mad_hdr.attr_id & IB_SMP_ATTR_VENDOR_MASK) ==

		     IB_SMP_ATTR_VENDOR_MASK))

		if (in_mad->mad_hdr.attr_id == IB_SMP_ATTR_SM_INFO)

			return IB_MAD_RESULT_SUCCESS;

	} else if (in_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_PERF_MGMT ||

		   in_mad->mad_hdr.mgmt_class == MLX4_IB_VENDOR_CLASS1   ||