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

Commit 5eeb6335 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:
 "Still not much going on, the usual set of oops and driver fixes this
  time:

   - Fix two uapi breakage regressions in mlx5 drivers

   - Various oops fixes in hfi1, mlx4, umem, uverbs, and ipoib

   - A protocol bug fix for hfi1 preventing it from implementing the
     verbs API properly, and a compatability fix for EXEC STACK user
     programs

   - Fix missed refcounting in the 'advise_mr' patches merged this
     cycle.

   - Fix wrong use of the uABI in the hns SRQ patches merged this cycle"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  IB/uverbs: Fix OOPs in uverbs_user_mmap_disassociate
  IB/ipoib: Fix for use-after-free in ipoib_cm_tx_start
  IB/uverbs: Fix ioctl query port to consider device disassociation
  RDMA/mlx5: Fix flow creation on representors
  IB/uverbs: Fix OOPs upon device disassociation
  RDMA/umem: Add missing initialization of owning_mm
  RDMA/hns: Update the kernel header file of hns
  IB/mlx5: Fix how advise_mr() launches async work
  RDMA/device: Expose ib_device_try_get(()
  IB/hfi1: Add limit test for RC/UC send via loopback
  IB/hfi1: Remove overly conservative VM_EXEC flag check
  IB/{hfi1, qib}: Fix WC.byte_len calculation for UD_SEND_WITH_IMM
  IB/mlx4: Fix using wrong function to destroy sqp AHs under SRIOV
  RDMA/mlx5: Fix check for supported user flags when creating a QP
parents 9ace868a 7b21b69a

drivers/infiniband/core/core_priv.h

+0 −1
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ static inline int ib_mad_enforce_security(struct ib_mad_agent_private *map, 
#endif



struct ib_device *ib_device_get_by_index(u32 ifindex);

void ib_device_put(struct ib_device *device);

/* RDMA device netlink */

void nldev_init(void);

void nldev_exit(void);

drivers/infiniband/core/device.c

+10 −3
Original line number Diff line number Diff line
@@ -156,19 +156,26 @@ struct ib_device *ib_device_get_by_index(u32 index) 
	down_read(&lists_rwsem);

	device = __ib_device_get_by_index(index);

	if (device) {

		/* Do not return a device if unregistration has started. */

		if (!refcount_inc_not_zero(&device->refcount))

		if (!ib_device_try_get(device))

			device = NULL;

	}

	up_read(&lists_rwsem);

	return device;

}



/**

 * ib_device_put - Release IB device reference

 * @device: device whose reference to be released

 *

 * ib_device_put() releases reference to the IB device to allow it to be

 * unregistered and eventually free.

 */

void ib_device_put(struct ib_device *device)

{

	if (refcount_dec_and_test(&device->refcount))

		complete(&device->unreg_completion);

}

EXPORT_SYMBOL(ib_device_put);



static struct ib_device *__ib_device_get_by_name(const char *name)

{
@@ -303,7 +310,6 @@ struct ib_device *ib_alloc_device(size_t size) 
	rwlock_init(&device->client_data_lock);

	INIT_LIST_HEAD(&device->client_data_list);

	INIT_LIST_HEAD(&device->port_list);

	refcount_set(&device->refcount, 1);

	init_completion(&device->unreg_completion);



	return device;
@@ -620,6 +626,7 @@ int ib_register_device(struct ib_device *device, const char *name, 
		goto cg_cleanup;

	}



	refcount_set(&device->refcount, 1);

	device->reg_state = IB_DEV_REGISTERED;



	list_for_each_entry(client, &client_list, list)

drivers/infiniband/core/umem_odp.c

+3 −0
Original line number Diff line number Diff line
@@ -352,6 +352,8 @@ struct ib_umem_odp *ib_alloc_odp_umem(struct ib_ucontext_per_mm *per_mm, 
	umem->writable   = 1;

	umem->is_odp = 1;

	odp_data->per_mm = per_mm;

	umem->owning_mm  = per_mm->mm;

	mmgrab(umem->owning_mm);



	mutex_init(&odp_data->umem_mutex);

	init_completion(&odp_data->notifier_completion);
@@ -384,6 +386,7 @@ struct ib_umem_odp *ib_alloc_odp_umem(struct ib_ucontext_per_mm *per_mm, 
out_page_list:

	vfree(odp_data->page_list);

out_odp_data:

	mmdrop(umem->owning_mm);

	kfree(odp_data);

	return ERR_PTR(ret);

}

drivers/infiniband/core/uverbs_main.c

+16 −9
Original line number Diff line number Diff line
@@ -204,6 +204,9 @@ void ib_uverbs_release_file(struct kref *ref) 
	if (atomic_dec_and_test(&file->device->refcount))

		ib_uverbs_comp_dev(file->device);



	if (file->async_file)

		kref_put(&file->async_file->ref,

			 ib_uverbs_release_async_event_file);

	put_device(&file->device->dev);

	kfree(file);

}
@@ -964,11 +967,19 @@ void uverbs_user_mmap_disassociate(struct ib_uverbs_file *ufile) 


		/* Get an arbitrary mm pointer that hasn't been cleaned yet */

		mutex_lock(&ufile->umap_lock);

		if (!list_empty(&ufile->umaps)) {

			mm = list_first_entry(&ufile->umaps,

					      struct rdma_umap_priv, list)

				     ->vma->vm_mm;

			mmget(mm);

		while (!list_empty(&ufile->umaps)) {

			int ret;



			priv = list_first_entry(&ufile->umaps,

						struct rdma_umap_priv, list);

			mm = priv->vma->vm_mm;

			ret = mmget_not_zero(mm);

			if (!ret) {

				list_del_init(&priv->list);

				mm = NULL;

				continue;

			}

			break;

		}

		mutex_unlock(&ufile->umap_lock);

		if (!mm)
@@ -1096,10 +1107,6 @@ static int ib_uverbs_close(struct inode *inode, struct file *filp) 
	list_del_init(&file->list);

	mutex_unlock(&file->device->lists_mutex);



	if (file->async_file)

		kref_put(&file->async_file->ref,

			 ib_uverbs_release_async_event_file);



	kref_put(&file->ref, ib_uverbs_release_file);



	return 0;

drivers/infiniband/core/uverbs_std_types_device.c

+7 −1
Original line number Diff line number Diff line
@@ -168,12 +168,18 @@ void copy_port_attr_to_resp(struct ib_port_attr *attr, 
static int UVERBS_HANDLER(UVERBS_METHOD_QUERY_PORT)(

	struct uverbs_attr_bundle *attrs)

{

	struct ib_device *ib_dev = attrs->ufile->device->ib_dev;

	struct ib_device *ib_dev;

	struct ib_port_attr attr = {};

	struct ib_uverbs_query_port_resp_ex resp = {};

	struct ib_ucontext *ucontext;

	int ret;

	u8 port_num;



	ucontext = ib_uverbs_get_ucontext(attrs);

	if (IS_ERR(ucontext))

		return PTR_ERR(ucontext);

	ib_dev = ucontext->device;



	/* FIXME: Extend the UAPI_DEF_OBJ_NEEDS_FN stuff.. */

	if (!ib_dev->ops.query_port)

		return -EOPNOTSUPP;