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

Commit 22fa27fb authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

IB/uverbs: Fix locking around struct ib_uverbs_file ucontext 



We have a parallel unlocked reader and writer with ib_uverbs_get_context()
vs everything else, and nothing guarantees this works properly.

Audit and fix all of the places that access ucontext to use one of the
following locking schemes:
- Call ib_uverbs_get_ucontext() under SRCU and check for failure
- Access the ucontext through an struct ib_uobject context member
  while holding a READ or WRITE lock on the uobject.
  This value cannot be NULL and has no race.
- Hold the ucontext_lock and check for ufile->ucontext !NULL

This also re-implements ib_uverbs_get_ucontext() in a way that is safe
against concurrent ib_uverbs_get_context() and disassociation.

As a side effect, every access to ucontext in the commands is via
ib_uverbs_get_context() with an error check, or via the uobject, so there
is no longer any need for the core code to check ucontext on every command
call. These checks are also removed.

Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent c36ee46d

drivers/infiniband/core/rdma_core.c

+10 −4
Original line number Diff line number Diff line
@@ -154,8 +154,14 @@ int __uobj_perform_destroy(const struct uverbs_obj_type *type, u32 id, 
static struct ib_uobject *alloc_uobj(struct ib_uverbs_file *ufile,

				     const struct uverbs_obj_type *type)

{

	struct ib_uobject *uobj = kzalloc(type->obj_size, GFP_KERNEL);

	struct ib_uobject *uobj;

	struct ib_ucontext *ucontext;



	ucontext = ib_uverbs_get_ucontext(ufile);

	if (IS_ERR(ucontext))

		return ERR_CAST(ucontext);



	uobj = kzalloc(type->obj_size, GFP_KERNEL);

	if (!uobj)

		return ERR_PTR(-ENOMEM);

	/*
@@ -163,7 +169,7 @@ static struct ib_uobject *alloc_uobj(struct ib_uverbs_file *ufile, 
	 * The object is added to the list in the commit stage.

	 */

	uobj->ufile = ufile;

	uobj->context = ufile->ucontext;

	uobj->context = ucontext;

	INIT_LIST_HEAD(&uobj->list);

	uobj->type = type;

	/*
@@ -309,7 +315,7 @@ static struct ib_uobject *alloc_begin_idr_uobject(const struct uverbs_obj_type * 
	if (ret)

		goto uobj_put;



	ret = ib_rdmacg_try_charge(&uobj->cg_obj, ufile->ucontext->device,

	ret = ib_rdmacg_try_charge(&uobj->cg_obj, uobj->context->device,

				   RDMACG_RESOURCE_HCA_OBJECT);

	if (ret)

		goto idr_remove;
@@ -761,7 +767,7 @@ static void ufile_destroy_ucontext(struct ib_uverbs_file *ufile, 
	 * FIXME: Drivers are not permitted to fail dealloc_ucontext, remove

	 * the error return.

	 */

	ret = ucontext->device->dealloc_ucontext(ufile->ucontext);

	ret = ucontext->device->dealloc_ucontext(ucontext);

	WARN_ON(ret);



	ufile->ucontext = NULL;

drivers/infiniband/core/uverbs.h

+4 −1
Original line number Diff line number Diff line
@@ -137,8 +137,11 @@ struct ib_uverbs_completion_event_file { 
struct ib_uverbs_file {

	struct kref				ref;

	struct ib_uverbs_device		       *device;

	/* Protects writing to ucontext */

	struct mutex				ucontext_lock;

	/*

	 * ucontext must be accessed via ib_uverbs_get_ucontext() or with

	 * ucontext_lock held

	 */

	struct ib_ucontext		       *ucontext;

	struct ib_event_handler			event_handler;

	struct ib_uverbs_async_event_file       *async_file;

drivers/infiniband/core/uverbs_cmd.c

+9 −5
Original line number Diff line number Diff line
@@ -146,10 +146,14 @@ ssize_t ib_uverbs_get_context(struct ib_uverbs_file *file, 
		goto err_file;

	}



	file->ucontext = ucontext;



	fd_install(resp.async_fd, filp);



	/*

	 * Make sure that ib_uverbs_get_ucontext() sees the pointer update

	 * only after all writes to setup the ucontext have completed

	 */

	smp_store_release(&file->ucontext, ucontext);



	mutex_unlock(&file->ucontext_lock);



	return in_len;
@@ -350,7 +354,7 @@ ssize_t ib_uverbs_alloc_pd(struct ib_uverbs_file *file, 
	if (IS_ERR(uobj))

		return PTR_ERR(uobj);



	pd = ib_dev->alloc_pd(ib_dev, file->ucontext, &udata);

	pd = ib_dev->alloc_pd(ib_dev, uobj->context, &udata);

	if (IS_ERR(pd)) {

		ret = PTR_ERR(pd);

		goto err;
@@ -538,7 +542,7 @@ ssize_t ib_uverbs_open_xrcd(struct ib_uverbs_file *file, 
	}



	if (!xrcd) {

		xrcd = ib_dev->alloc_xrcd(ib_dev, file->ucontext, &udata);

		xrcd = ib_dev->alloc_xrcd(ib_dev, obj->uobject.context, &udata);

		if (IS_ERR(xrcd)) {

			ret = PTR_ERR(xrcd);

			goto err;
@@ -1004,7 +1008,7 @@ static struct ib_ucq_object *create_cq(struct ib_uverbs_file *file, 
	if (cmd_sz > offsetof(typeof(*cmd), flags) + sizeof(cmd->flags))

		attr.flags = cmd->flags;



	cq = ib_dev->create_cq(ib_dev, &attr, file->ucontext, uhw);

	cq = ib_dev->create_cq(ib_dev, &attr, obj->uobject.context, uhw);

	if (IS_ERR(cq)) {

		ret = PTR_ERR(cq);

		goto err_file;

drivers/infiniband/core/uverbs_ioctl.c

+1 −4
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static int uverbs_process_attr(struct ib_uverbs_file *ufile, 
		if (uattr->attr_data.reserved)

			return -EINVAL;



		if (uattr->len != 0 || !ufile->ucontext)

		if (uattr->len != 0)

			return -EINVAL;



		o_attr = &e->obj_attr;
@@ -373,9 +373,6 @@ static long ib_uverbs_cmd_verbs(struct ib_device *ib_dev, 
	if (!method_spec)

		return -EPROTONOSUPPORT;



	if ((method_spec->flags & UVERBS_ACTION_FLAG_CREATE_ROOT) ^ !file->ucontext)

		return -EINVAL;



	ctx_size = sizeof(*ctx) +

		   sizeof(struct uverbs_attr_bundle) +

		   sizeof(struct uverbs_attr_bundle_hash) * method_spec->num_buckets +

drivers/infiniband/core/uverbs_main.c

+24 −14
Original line number Diff line number Diff line
@@ -136,9 +136,27 @@ static int (*uverbs_ex_cmd_table[])(struct ib_uverbs_file *file, 
static void ib_uverbs_add_one(struct ib_device *device);

static void ib_uverbs_remove_one(struct ib_device *device, void *client_data);



/*

 * Must be called with the ufile->device->disassociate_srcu held, and the lock

 * must be held until use of the ucontext is finished.

 */

struct ib_ucontext *ib_uverbs_get_ucontext(struct ib_uverbs_file *ufile)

{

	return ufile->ucontext;

	/*

	 * We do not hold the hw_destroy_rwsem lock for this flow, instead

	 * srcu is used. It does not matter if someone races this with

	 * get_context, we get NULL or valid ucontext.

	 */

	struct ib_ucontext *ucontext = smp_load_acquire(&ufile->ucontext);



	if (!srcu_dereference(ufile->device->ib_dev,

			      &ufile->device->disassociate_srcu))

		return ERR_PTR(-EIO);



	if (!ucontext)

		return ERR_PTR(-EINVAL);



	return ucontext;

}

EXPORT_SYMBOL(ib_uverbs_get_ucontext);
@@ -729,10 +747,6 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, 
	if (ret)

		return ret;



	if (!file->ucontext &&

	    (command != IB_USER_VERBS_CMD_GET_CONTEXT || extended))

		return -EINVAL;



	if (extended) {

		if (count < (sizeof(hdr) + sizeof(ex_hdr)))

			return -EINVAL;
@@ -791,22 +805,18 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, 
static int ib_uverbs_mmap(struct file *filp, struct vm_area_struct *vma)

{

	struct ib_uverbs_file *file = filp->private_data;

	struct ib_device *ib_dev;

	struct ib_ucontext *ucontext;

	int ret = 0;

	int srcu_key;



	srcu_key = srcu_read_lock(&file->device->disassociate_srcu);

	ib_dev = srcu_dereference(file->device->ib_dev,

				  &file->device->disassociate_srcu);

	if (!ib_dev) {

		ret = -EIO;

	ucontext = ib_uverbs_get_ucontext(file);

	if (IS_ERR(ucontext)) {

		ret = PTR_ERR(ucontext);

		goto out;

	}



	if (!file->ucontext)

		ret = -ENODEV;

	else

		ret = ib_dev->mmap(file->ucontext, vma);

	ret = ucontext->device->mmap(ucontext, vma);

out:

	srcu_read_unlock(&file->device->disassociate_srcu, srcu_key);

	return ret;