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

Commit c23ddf78 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull InfiniBand/RDMA changes from Roland Dreier:
 - Add ocrdma hardware driver for Emulex IB-over-Ethernet adapters
 - Add generic and mlx4 support for "raw" QPs: allow suitably privileged
   applications to send and receive arbitrary packets directly to/from
   the hardware
 - Add "doorbell drop" handling to the cxgb4 driver
 - A fairly large batch of qib hardware driver changes
 - A few fixes for lockdep-detected issues
 - A few other miscellaneous fixes and cleanups

Fix up trivial conflict in drivers/net/ethernet/emulex/benet/be.h.

* tag 'rdma-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (53 commits)
  RDMA/cxgb4: Include vmalloc.h for vmalloc and vfree
  IB/mlx4: Fix mlx4_ib_add() error flow
  IB/core: Fix IB_SA_COMP_MASK macro
  IB/iser: Fix error flow in iser ep connection establishment
  IB/mlx4: Increase the number of vectors (EQs) available for ULPs
  RDMA/cxgb4: Add query_qp support
  RDMA/cxgb4: Remove kfifo usage
  RDMA/cxgb4: Use vmalloc() for debugfs QP dump
  RDMA/cxgb4: DB Drop Recovery for RDMA and LLD queues
  RDMA/cxgb4: Disable interrupts in c4iw_ev_dispatch()
  RDMA/cxgb4: Add DB Overflow Avoidance
  RDMA/cxgb4: Add debugfs RDMA memory stats
  cxgb4: DB Drop Recovery for RDMA and LLD queues
  cxgb4: Common platform specific changes for DB Drop Recovery
  cxgb4: Detect DB FULL events and notify RDMA ULD
  RDMA/cxgb4: Drop peer_abort when no endpoint found
  RDMA/cxgb4: Always wake up waiters in c4iw_peer_abort_intr()
  mlx4_core: Change bitmap allocator to work in round-robin fashion
  RDMA/nes: Don't call event handler if pointer is NULL
  RDMA/nes: Fix for the ORD value of the connecting peer
  ...
parents da4f58ff cc169165

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -3629,7 +3629,7 @@ S: Maintained 
F:	drivers/net/ethernet/icplus/ipg.*



IPATH DRIVER

M:	Mike Marciniszyn <infinipath@qlogic.com>

M:	Mike Marciniszyn <infinipath@intel.com>

L:	linux-rdma@vger.kernel.org

S:	Maintained

F:	drivers/infiniband/hw/ipath/
@@ -5448,7 +5448,7 @@ L: rtc-linux@googlegroups.com 
S:	Maintained



QIB DRIVER

M:	Mike Marciniszyn <infinipath@qlogic.com>

M:	Mike Marciniszyn <infinipath@intel.com>

L:	linux-rdma@vger.kernel.org

S:	Supported

F:	drivers/infiniband/hw/qib/

drivers/infiniband/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ source "drivers/infiniband/hw/cxgb3/Kconfig" 
source "drivers/infiniband/hw/cxgb4/Kconfig"

source "drivers/infiniband/hw/mlx4/Kconfig"

source "drivers/infiniband/hw/nes/Kconfig"

source "drivers/infiniband/hw/ocrdma/Kconfig"



source "drivers/infiniband/ulp/ipoib/Kconfig"

drivers/infiniband/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ obj-$(CONFIG_INFINIBAND_CXGB3) += hw/cxgb3/ 
obj-$(CONFIG_INFINIBAND_CXGB4)		+= hw/cxgb4/

obj-$(CONFIG_MLX4_INFINIBAND)		+= hw/mlx4/

obj-$(CONFIG_INFINIBAND_NES)		+= hw/nes/

obj-$(CONFIG_INFINIBAND_OCRDMA)		+= hw/ocrdma/

obj-$(CONFIG_INFINIBAND_IPOIB)		+= ulp/ipoib/

obj-$(CONFIG_INFINIBAND_SRP)		+= ulp/srp/

obj-$(CONFIG_INFINIBAND_SRPT)		+= ulp/srpt/

drivers/infiniband/core/cma.c

+22 −20
Original line number Diff line number Diff line
@@ -1219,13 +1219,13 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event) 
	}

	if (!conn_id) {

		ret = -ENOMEM;

		goto out;

		goto err1;

	}



	mutex_lock_nested(&conn_id->handler_mutex, SINGLE_DEPTH_NESTING);

	ret = cma_acquire_dev(conn_id);

	if (ret)

		goto release_conn_id;

		goto err2;



	conn_id->cm_id.ib = cm_id;

	cm_id->context = conn_id;
@@ -1237,7 +1237,9 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event) 
	 */

	atomic_inc(&conn_id->refcount);

	ret = conn_id->id.event_handler(&conn_id->id, &event);

	if (!ret) {

	if (ret)

		goto err3;



	/*

	 * Acquire mutex to prevent user executing rdma_destroy_id()

	 * while we're accessing the cm_id.
@@ -1247,21 +1249,21 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event) 
		ib_send_cm_mra(cm_id, CMA_CM_MRA_SETTING, NULL, 0);

	mutex_unlock(&lock);

	mutex_unlock(&conn_id->handler_mutex);

	mutex_unlock(&listen_id->handler_mutex);

	cma_deref_id(conn_id);

		goto out;

	}

	cma_deref_id(conn_id);

	return 0;



err3:

	cma_deref_id(conn_id);

	/* Destroy the CM ID by returning a non-zero value. */

	conn_id->cm_id.ib = NULL;



release_conn_id:

err2:

	cma_exch(conn_id, RDMA_CM_DESTROYING);

	mutex_unlock(&conn_id->handler_mutex);

	rdma_destroy_id(&conn_id->id);



out:

err1:

	mutex_unlock(&listen_id->handler_mutex);

	if (conn_id)

		rdma_destroy_id(&conn_id->id);

	return ret;

}

drivers/infiniband/core/umem.c

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ void ib_umem_release(struct ib_umem *umem) 
	} else

		down_write(&mm->mmap_sem);



	current->mm->locked_vm -= diff;

	current->mm->pinned_vm -= diff;

	up_write(&mm->mmap_sem);

	mmput(mm);

	kfree(umem);