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

Commit cc169165 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'core', 'cxgb4', 'ipath', 'iser', 'lockdep', 'mlx4', 'nes',... 

Merge branches 'core', 'cxgb4', 'ipath', 'iser', 'lockdep', 'mlx4', 'nes', 'ocrdma', 'qib' and 'raw-qp' into for-linus
parents 02daaf27 e572568f 464357a7 7d9c0de4 b6cec8aa 035b1032 784d135f 34955669 1c94283d 3987a2d3

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -3631,7 +3631,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/
@@ -5455,7 +5455,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
@@ -1218,13 +1218,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;
@@ -1236,7 +1236,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.
@@ -1246,21 +1248,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/uverbs_cmd.c

+60 −48
Original line number Diff line number Diff line
@@ -41,13 +41,18 @@ 


#include "uverbs.h"



static struct lock_class_key pd_lock_key;

static struct lock_class_key mr_lock_key;

static struct lock_class_key cq_lock_key;

static struct lock_class_key qp_lock_key;

static struct lock_class_key ah_lock_key;

static struct lock_class_key srq_lock_key;

static struct lock_class_key xrcd_lock_key;

struct uverbs_lock_class {

	struct lock_class_key	key;

	char			name[16];

};



static struct uverbs_lock_class pd_lock_class	= { .name = "PD-uobj" };

static struct uverbs_lock_class mr_lock_class	= { .name = "MR-uobj" };

static struct uverbs_lock_class cq_lock_class	= { .name = "CQ-uobj" };

static struct uverbs_lock_class qp_lock_class	= { .name = "QP-uobj" };

static struct uverbs_lock_class ah_lock_class	= { .name = "AH-uobj" };

static struct uverbs_lock_class srq_lock_class	= { .name = "SRQ-uobj" };

static struct uverbs_lock_class xrcd_lock_class = { .name = "XRCD-uobj" };



#define INIT_UDATA(udata, ibuf, obuf, ilen, olen)			\

	do {								\
@@ -83,13 +88,13 @@ static struct lock_class_key xrcd_lock_key; 
 */



static void init_uobj(struct ib_uobject *uobj, u64 user_handle,

		      struct ib_ucontext *context, struct lock_class_key *key)

		      struct ib_ucontext *context, struct uverbs_lock_class *c)

{

	uobj->user_handle = user_handle;

	uobj->context     = context;

	kref_init(&uobj->ref);

	init_rwsem(&uobj->mutex);

	lockdep_set_class(&uobj->mutex, key);

	lockdep_set_class_and_name(&uobj->mutex, &c->key, c->name);

	uobj->live        = 0;

}
@@ -522,7 +527,7 @@ ssize_t ib_uverbs_alloc_pd(struct ib_uverbs_file *file, 
	if (!uobj)

		return -ENOMEM;



	init_uobj(uobj, 0, file->ucontext, &pd_lock_key);

	init_uobj(uobj, 0, file->ucontext, &pd_lock_class);

	down_write(&uobj->mutex);



	pd = file->device->ib_dev->alloc_pd(file->device->ib_dev,
@@ -750,7 +755,7 @@ ssize_t ib_uverbs_open_xrcd(struct ib_uverbs_file *file, 
		goto err_tree_mutex_unlock;

	}



	init_uobj(&obj->uobject, 0, file->ucontext, &xrcd_lock_key);

	init_uobj(&obj->uobject, 0, file->ucontext, &xrcd_lock_class);



	down_write(&obj->uobject.mutex);
@@ -947,7 +952,7 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file, 
	if (!uobj)

		return -ENOMEM;



	init_uobj(uobj, 0, file->ucontext, &mr_lock_key);

	init_uobj(uobj, 0, file->ucontext, &mr_lock_class);

	down_write(&uobj->mutex);



	pd = idr_read_pd(cmd.pd_handle, file->ucontext);
@@ -1115,7 +1120,7 @@ ssize_t ib_uverbs_create_cq(struct ib_uverbs_file *file, 
	if (!obj)

		return -ENOMEM;



	init_uobj(&obj->uobject, cmd.user_handle, file->ucontext, &cq_lock_key);

	init_uobj(&obj->uobject, cmd.user_handle, file->ucontext, &cq_lock_class);

	down_write(&obj->uobject.mutex);



	if (cmd.comp_channel >= 0) {
@@ -1399,6 +1404,9 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof cmd))

		return -EFAULT;



	if (cmd.qp_type == IB_QPT_RAW_PACKET && !capable(CAP_NET_RAW))

		return -EPERM;



	INIT_UDATA(&udata, buf + sizeof cmd,

		   (unsigned long) cmd.response + sizeof resp,

		   in_len - sizeof cmd, out_len - sizeof resp);
@@ -1407,7 +1415,7 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file, 
	if (!obj)

		return -ENOMEM;



	init_uobj(&obj->uevent.uobject, cmd.user_handle, file->ucontext, &qp_lock_key);

	init_uobj(&obj->uevent.uobject, cmd.user_handle, file->ucontext, &qp_lock_class);

	down_write(&obj->uevent.uobject.mutex);



	if (cmd.qp_type == IB_QPT_XRC_TGT) {
@@ -1418,13 +1426,6 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file, 
		}

		device = xrcd->device;

	} else {

		pd  = idr_read_pd(cmd.pd_handle, file->ucontext);

		scq = idr_read_cq(cmd.send_cq_handle, file->ucontext, 0);

		if (!pd || !scq) {

			ret = -EINVAL;

			goto err_put;

		}



		if (cmd.qp_type == IB_QPT_XRC_INI) {

			cmd.max_recv_wr = cmd.max_recv_sge = 0;

		} else {
@@ -1435,13 +1436,24 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file, 
					goto err_put;

				}

			}

			rcq = (cmd.recv_cq_handle == cmd.send_cq_handle) ?

			       scq : idr_read_cq(cmd.recv_cq_handle, file->ucontext, 1);



			if (cmd.recv_cq_handle != cmd.send_cq_handle) {

				rcq = idr_read_cq(cmd.recv_cq_handle, file->ucontext, 0);

				if (!rcq) {

					ret = -EINVAL;

					goto err_put;

				}

			}

		}



		scq = idr_read_cq(cmd.send_cq_handle, file->ucontext, !!rcq);

		rcq = rcq ?: scq;

		pd  = idr_read_pd(cmd.pd_handle, file->ucontext);

		if (!pd || !scq) {

			ret = -EINVAL;

			goto err_put;

		}



		device = pd->device;

	}
@@ -1585,7 +1597,7 @@ ssize_t ib_uverbs_open_qp(struct ib_uverbs_file *file, 
	if (!obj)

		return -ENOMEM;



	init_uobj(&obj->uevent.uobject, cmd.user_handle, file->ucontext, &qp_lock_key);

	init_uobj(&obj->uevent.uobject, cmd.user_handle, file->ucontext, &qp_lock_class);

	down_write(&obj->uevent.uobject.mutex);



	xrcd = idr_read_xrcd(cmd.pd_handle, file->ucontext, &xrcd_uobj);
@@ -2272,7 +2284,7 @@ ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *file, 
	if (!uobj)

		return -ENOMEM;



	init_uobj(uobj, cmd.user_handle, file->ucontext, &ah_lock_key);

	init_uobj(uobj, cmd.user_handle, file->ucontext, &ah_lock_class);

	down_write(&uobj->mutex);



	pd = idr_read_pd(cmd.pd_handle, file->ucontext);
@@ -2476,32 +2488,32 @@ static int __uverbs_create_xsrq(struct ib_uverbs_file *file, 
	if (!obj)

		return -ENOMEM;



	init_uobj(&obj->uevent.uobject, cmd->user_handle, file->ucontext, &srq_lock_key);

	init_uobj(&obj->uevent.uobject, cmd->user_handle, file->ucontext, &srq_lock_class);

	down_write(&obj->uevent.uobject.mutex);



	pd  = idr_read_pd(cmd->pd_handle, file->ucontext);

	if (!pd) {

	if (cmd->srq_type == IB_SRQT_XRC) {

		attr.ext.xrc.xrcd  = idr_read_xrcd(cmd->xrcd_handle, file->ucontext, &xrcd_uobj);

		if (!attr.ext.xrc.xrcd) {

			ret = -EINVAL;

			goto err;

		}



	if (cmd->srq_type == IB_SRQT_XRC) {

		obj->uxrcd = container_of(xrcd_uobj, struct ib_uxrcd_object, uobject);

		atomic_inc(&obj->uxrcd->refcnt);



		attr.ext.xrc.cq  = idr_read_cq(cmd->cq_handle, file->ucontext, 0);

		if (!attr.ext.xrc.cq) {

			ret = -EINVAL;

			goto err_put_pd;

			goto err_put_xrcd;

		}

	}



		attr.ext.xrc.xrcd  = idr_read_xrcd(cmd->xrcd_handle, file->ucontext, &xrcd_uobj);

		if (!attr.ext.xrc.xrcd) {

	pd  = idr_read_pd(cmd->pd_handle, file->ucontext);

	if (!pd) {

		ret = -EINVAL;

		goto err_put_cq;

	}



		obj->uxrcd = container_of(xrcd_uobj, struct ib_uxrcd_object, uobject);

		atomic_inc(&obj->uxrcd->refcnt);

	}



	attr.event_handler  = ib_uverbs_srq_event_handler;

	attr.srq_context    = file;

	attr.srq_type       = cmd->srq_type;
@@ -2576,17 +2588,17 @@ static int __uverbs_create_xsrq(struct ib_uverbs_file *file, 
	ib_destroy_srq(srq);



err_put:

	if (cmd->srq_type == IB_SRQT_XRC) {

		atomic_dec(&obj->uxrcd->refcnt);

		put_uobj_read(xrcd_uobj);

	}

	put_pd_read(pd);



err_put_cq:

	if (cmd->srq_type == IB_SRQT_XRC)

		put_cq_read(attr.ext.xrc.cq);



err_put_pd:

	put_pd_read(pd);

err_put_xrcd:

	if (cmd->srq_type == IB_SRQT_XRC) {

		atomic_dec(&obj->uxrcd->refcnt);

		put_uobj_read(xrcd_uobj);

	}



err:

	put_uobj_write(&obj->uevent.uobject);