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

Commit 70a3a06d 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 

Pull infiniband update from Roland Dreier:
 "Main batch of InfiniBand/RDMA changes for 3.9:

   - SRP error handling fixes from Bart Van Assche

   - Implementation of memory windows for mlx4 from Shani Michaeli

   - Lots of cxgb4 HW driver fixes from Vipul Pandya

   - Make iSER work for virtual functions, other fixes from Or Gerlitz

   - Fix for bug in qib HW driver from Mike Marciniszyn

   - IPoIB fixes from me, Itai Garbi, Shlomo Pongratz, Yan Burman

   - Various cleanups and warning fixes from Julia Lawall, Paul Bolle,
     Wei Yongjun"

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (41 commits)
  IB/mlx4: Advertise MW support
  IB/mlx4: Support memory window binding
  mlx4: Implement memory windows allocation and deallocation
  mlx4_core: Enable memory windows in {INIT, QUERY}_HCA
  mlx4_core: Disable memory windows for virtual functions
  IPoIB: Free ipoib neigh on path record failure so path rec queries are retried
  IB/srp: Fail I/O requests if the transport is offline
  IB/srp: Avoid endless SCSI error handling loop
  IB/srp: Avoid sending a task management function needlessly
  IB/srp: Track connection state properly
  IB/mlx4: Remove redundant NULL check before kfree
  IB/mlx4: Fix compiler warning about uninitialized 'vlan' variable
  IB/mlx4: Convert is_xxx variables in build_mlx_header() to bool
  IB/iser: Enable iser when FMRs are not supported
  IB/iser: Avoid error prints on EAGAIN registration failures
  IB/iser: Use proper define for the commands per LUN value advertised to SCSI ML
  IB/uverbs: Implement memory windows support in uverbs
  IB/core: Add "type 2" memory windows support
  mlx4_core: Propagate MR deregistration failures to caller
  mlx4_core: Rename MPT-related functions to have mpt_ prefix
  ...
parents f6c0ffa8 ef4e359d

drivers/infiniband/core/uverbs.h

+2 −0
Original line number Diff line number Diff line
@@ -188,6 +188,8 @@ IB_UVERBS_DECLARE_CMD(alloc_pd); 
IB_UVERBS_DECLARE_CMD(dealloc_pd);

IB_UVERBS_DECLARE_CMD(reg_mr);

IB_UVERBS_DECLARE_CMD(dereg_mr);

IB_UVERBS_DECLARE_CMD(alloc_mw);

IB_UVERBS_DECLARE_CMD(dealloc_mw);

IB_UVERBS_DECLARE_CMD(create_comp_channel);

IB_UVERBS_DECLARE_CMD(create_cq);

IB_UVERBS_DECLARE_CMD(resize_cq);

drivers/infiniband/core/uverbs_cmd.c

+121 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ struct uverbs_lock_class { 


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 mw_lock_class	= { .name = "MW-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" };
@@ -1049,6 +1050,126 @@ ssize_t ib_uverbs_dereg_mr(struct ib_uverbs_file *file, 
	return in_len;

}



ssize_t ib_uverbs_alloc_mw(struct ib_uverbs_file *file,

			 const char __user *buf, int in_len,

			 int out_len)

{

	struct ib_uverbs_alloc_mw      cmd;

	struct ib_uverbs_alloc_mw_resp resp;

	struct ib_uobject             *uobj;

	struct ib_pd                  *pd;

	struct ib_mw                  *mw;

	int                            ret;



	if (out_len < sizeof(resp))

		return -ENOSPC;



	if (copy_from_user(&cmd, buf, sizeof(cmd)))

		return -EFAULT;



	uobj = kmalloc(sizeof(*uobj), GFP_KERNEL);

	if (!uobj)

		return -ENOMEM;



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

	down_write(&uobj->mutex);



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

	if (!pd) {

		ret = -EINVAL;

		goto err_free;

	}



	mw = pd->device->alloc_mw(pd, cmd.mw_type);

	if (IS_ERR(mw)) {

		ret = PTR_ERR(mw);

		goto err_put;

	}



	mw->device  = pd->device;

	mw->pd      = pd;

	mw->uobject = uobj;

	atomic_inc(&pd->usecnt);



	uobj->object = mw;

	ret = idr_add_uobj(&ib_uverbs_mw_idr, uobj);

	if (ret)

		goto err_unalloc;



	memset(&resp, 0, sizeof(resp));

	resp.rkey      = mw->rkey;

	resp.mw_handle = uobj->id;



	if (copy_to_user((void __user *)(unsigned long)cmd.response,

			 &resp, sizeof(resp))) {

		ret = -EFAULT;

		goto err_copy;

	}



	put_pd_read(pd);



	mutex_lock(&file->mutex);

	list_add_tail(&uobj->list, &file->ucontext->mw_list);

	mutex_unlock(&file->mutex);



	uobj->live = 1;



	up_write(&uobj->mutex);



	return in_len;



err_copy:

	idr_remove_uobj(&ib_uverbs_mw_idr, uobj);



err_unalloc:

	ib_dealloc_mw(mw);



err_put:

	put_pd_read(pd);



err_free:

	put_uobj_write(uobj);

	return ret;

}



ssize_t ib_uverbs_dealloc_mw(struct ib_uverbs_file *file,

			   const char __user *buf, int in_len,

			   int out_len)

{

	struct ib_uverbs_dealloc_mw cmd;

	struct ib_mw               *mw;

	struct ib_uobject	   *uobj;

	int                         ret = -EINVAL;



	if (copy_from_user(&cmd, buf, sizeof(cmd)))

		return -EFAULT;



	uobj = idr_write_uobj(&ib_uverbs_mw_idr, cmd.mw_handle, file->ucontext);

	if (!uobj)

		return -EINVAL;



	mw = uobj->object;



	ret = ib_dealloc_mw(mw);

	if (!ret)

		uobj->live = 0;



	put_uobj_write(uobj);



	if (ret)

		return ret;



	idr_remove_uobj(&ib_uverbs_mw_idr, uobj);



	mutex_lock(&file->mutex);

	list_del(&uobj->list);

	mutex_unlock(&file->mutex);



	put_uobj(uobj);



	return in_len;

}



ssize_t ib_uverbs_create_comp_channel(struct ib_uverbs_file *file,

				      const char __user *buf, int in_len,

				      int out_len)

drivers/infiniband/core/uverbs_main.c

+11 −2
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ static ssize_t (*uverbs_cmd_table[])(struct ib_uverbs_file *file, 
	[IB_USER_VERBS_CMD_DEALLOC_PD]		= ib_uverbs_dealloc_pd,

	[IB_USER_VERBS_CMD_REG_MR]		= ib_uverbs_reg_mr,

	[IB_USER_VERBS_CMD_DEREG_MR]		= ib_uverbs_dereg_mr,

	[IB_USER_VERBS_CMD_ALLOC_MW]		= ib_uverbs_alloc_mw,

	[IB_USER_VERBS_CMD_DEALLOC_MW]		= ib_uverbs_dealloc_mw,

	[IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL] = ib_uverbs_create_comp_channel,

	[IB_USER_VERBS_CMD_CREATE_CQ]		= ib_uverbs_create_cq,

	[IB_USER_VERBS_CMD_RESIZE_CQ]		= ib_uverbs_resize_cq,
@@ -201,6 +203,15 @@ static int ib_uverbs_cleanup_ucontext(struct ib_uverbs_file *file, 
		kfree(uobj);

	}



	/* Remove MWs before QPs, in order to support type 2A MWs. */

	list_for_each_entry_safe(uobj, tmp, &context->mw_list, list) {

		struct ib_mw *mw = uobj->object;



		idr_remove_uobj(&ib_uverbs_mw_idr, uobj);

		ib_dealloc_mw(mw);

		kfree(uobj);

	}



	list_for_each_entry_safe(uobj, tmp, &context->qp_list, list) {

		struct ib_qp *qp = uobj->object;

		struct ib_uqp_object *uqp =
@@ -240,8 +251,6 @@ static int ib_uverbs_cleanup_ucontext(struct ib_uverbs_file *file, 
		kfree(uevent);

	}



	/* XXX Free MWs */



	list_for_each_entry_safe(uobj, tmp, &context->mr_list, list) {

		struct ib_mr *mr = uobj->object;

drivers/infiniband/core/verbs.c

+3 −2
Original line number Diff line number Diff line
@@ -1099,18 +1099,19 @@ EXPORT_SYMBOL(ib_free_fast_reg_page_list); 


/* Memory windows */



struct ib_mw *ib_alloc_mw(struct ib_pd *pd)

struct ib_mw *ib_alloc_mw(struct ib_pd *pd, enum ib_mw_type type)

{

	struct ib_mw *mw;



	if (!pd->device->alloc_mw)

		return ERR_PTR(-ENOSYS);



	mw = pd->device->alloc_mw(pd);

	mw = pd->device->alloc_mw(pd, type);

	if (!IS_ERR(mw)) {

		mw->device  = pd->device;

		mw->pd      = pd;

		mw->uobject = NULL;

		mw->type    = type;

		atomic_inc(&pd->usecnt);

	}

drivers/infiniband/hw/amso1100/c2.c

+1 −12
Original line number Diff line number Diff line
@@ -1238,15 +1238,4 @@ static struct pci_driver c2_pci_driver = { 
	.remove = c2_remove,

};



static int __init c2_init_module(void)

{

	return pci_register_driver(&c2_pci_driver);

}



static void __exit c2_exit_module(void)

{

	pci_unregister_driver(&c2_pci_driver);

}



module_init(c2_init_module);

module_exit(c2_exit_module);
 
module_pci_driver(c2_pci_driver);