path: root/drivers/infiniband/core/uverbs_ioctl.c
diff options
authorJason Gunthorpe <jgg@mellanox.com>2018-07-25 21:40:14 -0600
committerJason Gunthorpe <jgg@mellanox.com>2018-08-01 14:55:48 -0600
commit7452a3c745a2e7eb70d09dc5bb870759b1f26c91 (patch)
tree6299209a46563a69fba8408baf3184f0e0d8df91 /drivers/infiniband/core/uverbs_ioctl.c
parentIB/uverbs: Convert 'bool exclusive' into an enum (diff)
IB/uverbs: Allow RDMA_REMOVE_DESTROY to work concurrently with disassociate
After all the recent structural changes this is now straightfoward, hoist the hw_destroy_rwsem up out of rdma_destroy_explicit and wrap it around the uobject write lock as well as the destroy. This is necessary as obtaining a write lock concurrently with uverbs_destroy_ufile_hw() will cause malfunction. After this change none of the destroy callbacks require the disassociate_srcu lock to be correct. This requires introducing a new lookup mode, UVERBS_LOOKUP_DESTROY as the IOCTL interface needs to hold an unlocked kref until all command verification is completed. Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'drivers/infiniband/core/uverbs_ioctl.c')
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/infiniband/core/uverbs_ioctl.c b/drivers/infiniband/core/uverbs_ioctl.c
index 404acfcdbeb2..f3776f909ca5 100644
--- a/drivers/infiniband/core/uverbs_ioctl.c
+++ b/drivers/infiniband/core/uverbs_ioctl.c
@@ -349,13 +349,18 @@ static int uverbs_handle_method(struct ib_uverbs_attr __user *uattr_ptr,
* not get to manipulate the HW objects.
if (destroy_attr) {
- ret = rdma_explicit_destroy(destroy_attr->uobject);
+ ret = uobj_destroy(destroy_attr->uobject);
if (ret)
goto cleanup;
ret = method_spec->handler(ibdev, ufile, attr_bundle);
+ if (destroy_attr) {
+ uobj_put_destroy(destroy_attr->uobject);
+ destroy_attr->uobject = NULL;
+ }
finalize_ret = uverbs_finalize_attrs(attr_bundle,