Cleanup FD destroy
Subsystems (2)
cover Cleanup FD destroy
From: Leon Romanovsky <[email protected]>
v1: Added Jason's variant of first patch
v0: https://lore.kernel.org/lkml/[email protected]
Leon Romanovsky (2):
RDMA/core: Postpone uobject cleanup on failure till FD close RDMA/core: Make FD destroy callback void
drivers/infiniband/core/rdma_core.c | 50 +++++++------------ drivers/infiniband/core/uverbs_cmd.c | 5 +- drivers/infiniband/core/uverbs_std_types.c | 18 +++---- .../core/uverbs_std_types_async_fd.c | 5 +- .../core/uverbs_std_types_counters.c | 5 +- drivers/infiniband/core/uverbs_std_types_cq.c | 4 +- drivers/infiniband/core/uverbs_std_types_dm.c | 6 +-- .../core/uverbs_std_types_flow_action.c | 6 +-- drivers/infiniband/core/uverbs_std_types_qp.c | 4 +- .../infiniband/core/uverbs_std_types_srq.c | 4 +- drivers/infiniband/core/uverbs_std_types_wq.c | 4 +- drivers/infiniband/hw/mlx5/devx.c | 14 +++--- drivers/infiniband/hw/mlx5/fs.c | 6 +-- include/rdma/ib_verbs.h | 44 +--------------- include/rdma/uverbs_types.h | 4 +- 15 files changed, 54 insertions(+), 125 deletions(-)
--
2.28.0
PATCH 1/2 RDMA/core: Postpone uobject cleanup on failure till FD close
From: Leon Romanovsky <[email protected]>
The drivers were updated to allow return their destroy status, while the failure during object cleanup is allowed as long as the driver can guarantee to clean them during FD close().
--- drivers/infiniband/core/rdma_core.c | 51 +++++++------------ drivers/infiniband/core/uverbs_cmd.c | 5 +- drivers/infiniband/core/uverbs_std_types.c | 15 +++--- .../core/uverbs_std_types_counters.c | 5 +- drivers/infiniband/core/uverbs_std_types_cq.c | 4 +- drivers/infiniband/core/uverbs_std_types_dm.c | 6 +-- .../core/uverbs_std_types_flow_action.c | 6 +-- drivers/infiniband/core/uverbs_std_types_qp.c | 4 +- .../infiniband/core/uverbs_std_types_srq.c | 4 +- drivers/infiniband/core/uverbs_std_types_wq.c | 4 +- drivers/infiniband/hw/mlx5/devx.c | 4 +- drivers/infiniband/hw/mlx5/fs.c | 6 +-- include/rdma/ib_verbs.h | 44 +--------------- 13 files changed, 45 insertions(+), 113 deletions(-)
drivers/infiniband/core/rdma_core.c +17 -34
@@ -137,15 +137,9 @@ static int uverbs_destroy_uobject(struct ib_uobject *uobj, }else if (uobj->object) { ret = uobj->uapi_object->type_class->destroy_hw (uobj, reason, attrs); -if (ret) { -if (ib_is_destroy_retryable (ret, reason, uobj)) -return ret; - -/* Nothing to be done, dangle the memory and move on */ -WARN (true, -"ib_uverbs: failed to remove uobject id %d, driver err=%d" , - uobj->id, ret); - } +if (ret) +/* Nothing to be done, wait till ucontext will clean it */ +return ret; uobj->object =NULL ; }
@@ -543,12 +537,7 @@ static int __must_check destroy_hw_idr_uobject(struct ib_uobject *uobj, struct uverbs_obj_idr_type, type);int ret = idr_type->destroy_object (uobj, why, attrs); -/* -* We can only fail gracefully if the user requested to destroy the -* object or when a retry may be called upon an error. -* In the rest of the cases, just remove whatever you can. -*/ -if (ib_is_destroy_retryable (ret, why, uobj)) +if (ret)return ret;if (why ==RDMA_REMOVE_ABORT )
@@ -581,12 +570,8 @@ static int __must_check destroy_hw_fd_uobject(struct ib_uobject *uobj, {const struct uverbs_obj_fd_type *fd_type =container_of ( uobj->uapi_object->type_attrs, struct uverbs_obj_fd_type, type); -int ret = fd_type->destroy_object (uobj, why); -if (ib_is_destroy_retryable (ret, why, uobj)) -return ret; - -return 0 ; +return fd_type->destroy_object (uobj, why); }static void remove_handle_fd_uobject (struct ib_uobject *uobj)
@@ -862,11 +847,18 @@ static int __uverbs_cleanup_ufile(struct ib_uverbs_file *ufile,* racing with a lookup_get. */ WARN_ON (uverbs_try_lock_object (obj,UVERBS_LOOKUP_WRITE )); +if (reason ==RDMA_REMOVE_DRIVER_FAILURE ) + obj->object =NULL ;if (!uverbs_destroy_uobject (obj, reason, &attrs)) ret =0 ;else atomic_set (&obj->usecnt,0 ); } + +if (reason ==RDMA_REMOVE_DRIVER_FAILURE ) { +WARN_ON (!list_empty (&ufile->uobjects)); +return 0 ; + }return ret; }
@@ -888,21 +880,12 @@ void uverbs_destroy_ufile_hw(struct ib_uverbs_file *ufile,if (!ufile->ucontext) goto done; - ufile->ucontext->cleanup_retryable = true; -while (!list_empty (&ufile->uobjects)) -if (__uverbs_cleanup_ufile (ufile, reason)) { -/* -* No entry was cleaned-up successfully during this -* iteration. It is a driver bug to fail destruction. -*/ -WARN_ON (!list_empty (&ufile->uobjects)); -break ; - } - - ufile->ucontext->cleanup_retryable = false; -if (!list_empty (&ufile->uobjects)) -__uverbs_cleanup_ufile (ufile, reason); +while (!list_empty (&ufile->uobjects) && + !__uverbs_cleanup_ufile (ufile, reason)) { + } +if (WARN_ON (!list_empty (&ufile->uobjects))) +__uverbs_cleanup_ufile (ufile,RDMA_REMOVE_DRIVER_FAILURE );ufile_destroy_ucontext (ufile, reason); done:
drivers/infiniband/core/uverbs_cmd.c +2 -3
@@ -680,8 +680,7 @@ int ib_uverbs_dealloc_xrcd(struct ib_uobject *uobject, struct ib_xrcd *xrcd,return 0 ; ret =ib_dealloc_xrcd_user (xrcd, &attrs->driver_udata); - -if (ib_is_destroy_retryable (ret, why, uobject)) { +if (ret) {atomic_inc (&xrcd->usecnt);return ret; }
@@ -689,7 +688,7 @@ int ib_uverbs_dealloc_xrcd(struct ib_uobject *uobject, struct ib_xrcd *xrcd,if (inode)xrcd_table_delete (dev, inode); -return ret; +return 0 ; }static int ib_uverbs_reg_mr (struct uverbs_attr_bundle *attrs)
drivers/infiniband/core/uverbs_std_types.c +6 -9
@@ -88,7 +88,7 @@ static int uverbs_free_rwq_ind_tbl(struct ib_uobject *uobject,return -EBUSY ; ret = rwq_ind_tbl->device->ops.destroy_rwq_ind_table (rwq_ind_tbl); -if (ib_is_destroy_retryable (ret, why, uobject)) +if (ret)return ret;for (i =0 ; i < table_size; i++)
@@ -96,7 +96,7 @@ static int uverbs_free_rwq_ind_tbl(struct ib_uobject *uobject,kfree (rwq_ind_tbl);kfree (ind_tbl); -return ret; +return 0 ; } static int uverbs_free_xrcd(struct ib_uobject *uobject,
@@ -108,9 +108,8 @@ static int uverbs_free_xrcd(struct ib_uobject *uobject, container_of(uobject, struct ib_uxrcd_object, uobject);int ret; - ret =ib_destroy_usecnt (&uxrcd->refcnt, why, uobject); -if (ret) -return ret; +if (atomic_read (&uxrcd->refcnt)) +return -EBUSY ;mutex_lock (&attrs->ufile->device->xrcd_tree_mutex); ret =ib_uverbs_dealloc_xrcd (uobject, xrcd, why, attrs);
@@ -124,11 +123,9 @@ static int uverbs_free_pd(struct ib_uobject *uobject, struct uverbs_attr_bundle *attrs) {struct ib_pd *pd = uobject->object; -int ret; - ret =ib_destroy_usecnt (&pd->usecnt, why, uobject); -if (ret) -return ret; +if (atomic_read (&pd->usecnt)) +return -EBUSY ;return ib_dealloc_pd_user (pd, &attrs->driver_udata); }
drivers/infiniband/core/uverbs_std_types_counters.c +2 -3
@@ -42,9 +42,8 @@ static int uverbs_free_counters(struct ib_uobject *uobject,struct ib_counters *counters = uobject->object;int ret; - ret =ib_destroy_usecnt (&counters->usecnt, why, uobject); -if (ret) -return ret; +if (atomic_read (&counters->usecnt)) +return -EBUSY ; ret = counters->device->ops.destroy_counters (counters);if (ret)
drivers/infiniband/core/uverbs_std_types_cq.c +2 -2
@@ -46,7 +46,7 @@ static int uverbs_free_cq(struct ib_uobject *uobject,int ret; ret =ib_destroy_cq_user (cq, &attrs->driver_udata); -if (ib_is_destroy_retryable (ret, why, uobject)) +if (ret)return ret; ib_uverbs_release_ucq(
@@ -55,7 +55,7 @@ static int uverbs_free_cq(struct ib_uobject *uobject, ev_queue) :NULL , ucq); -return ret; +return 0 ; } static int UVERBS_HANDLER(UVERBS_METHOD_CQ_CREATE)(
drivers/infiniband/core/uverbs_std_types_dm.c +2 -4
@@ -39,11 +39,9 @@ static int uverbs_free_dm(struct ib_uobject *uobject, struct uverbs_attr_bundle *attrs) {struct ib_dm *dm = uobject->object; -int ret; - ret =ib_destroy_usecnt (&dm->usecnt, why, uobject); -if (ret) -return ret; +if (atomic_read (&dm->usecnt)) +return -EBUSY ;return dm->device->ops.dealloc_dm (dm, attrs); }
drivers/infiniband/core/uverbs_std_types_flow_action.c +2 -4
@@ -39,11 +39,9 @@ static int uverbs_free_flow_action(struct ib_uobject *uobject, struct uverbs_attr_bundle *attrs) {struct ib_flow_action *action = uobject->object; -int ret; - ret =ib_destroy_usecnt (&action->usecnt, why, uobject); -if (ret) -return ret; +if (atomic_read (&action->usecnt)) +return -EBUSY ;return action->device->ops.destroy_flow_action (action); }
drivers/infiniband/core/uverbs_std_types_qp.c +2 -2
@@ -32,14 +32,14 @@ static int uverbs_free_qp(struct ib_uobject *uobject, } ret =ib_destroy_qp_user (qp, &attrs->driver_udata); -if (ib_is_destroy_retryable (ret, why, uobject)) +if (ret)return ret;if (uqp->uxrcd)atomic_dec (&uqp->uxrcd->refcnt);ib_uverbs_release_uevent (&uqp->uevent); -return ret; +return 0 ; } static int check_creation_flags(enum ib_qp_type qp_type,
drivers/infiniband/core/uverbs_std_types_srq.c +2 -2
@@ -18,7 +18,7 @@ static int uverbs_free_srq(struct ib_uobject *uobject,int ret; ret =ib_destroy_srq_user (srq, &attrs->driver_udata); -if (ib_is_destroy_retryable (ret, why, uobject)) +if (ret)return ret;if (srq_type ==IB_SRQT_XRC ) {
@@ -30,7 +30,7 @@ static int uverbs_free_srq(struct ib_uobject *uobject, }ib_uverbs_release_uevent (uevent); -return ret; +return 0 ; } static int UVERBS_HANDLER(UVERBS_METHOD_SRQ_CREATE)(
drivers/infiniband/core/uverbs_std_types_wq.c +2 -2
@@ -17,11 +17,11 @@ static int uverbs_free_wq(struct ib_uobject *uobject,int ret; ret =ib_destroy_wq_user (wq, &attrs->driver_udata); -if (ib_is_destroy_retryable (ret, why, uobject)) +if (ret)return ret;ib_uverbs_release_uevent (&uwq->uevent); -return ret; +return 0 ; } static int UVERBS_HANDLER(UVERBS_METHOD_WQ_CREATE)(
drivers/infiniband/hw/mlx5/devx.c +2 -2
@@ -1308,7 +1308,7 @@ static int devx_obj_cleanup(struct ib_uobject *uobject,else ret =mlx5_cmd_exec (obj->ib_dev->mdev, obj->dinbox, obj->dinlen, out,sizeof (out)); -if (ib_is_destroy_retryable (ret, why, uobject)) +if (ret)return ret; devx_event_table = &dev->devx_event_table;
@@ -2175,7 +2175,7 @@ static int devx_umem_cleanup(struct ib_uobject *uobject,int err; err =mlx5_cmd_exec (obj->mdev, obj->dinbox, obj->dinlen, out,sizeof (out)); -if (ib_is_destroy_retryable (err, why, uobject)) +if (err)return err;ib_umem_release (obj->umem);
drivers/infiniband/hw/mlx5/fs.c +2 -4
@@ -2035,11 +2035,9 @@ static int flow_matcher_cleanup(struct ib_uobject *uobject, struct uverbs_attr_bundle *attrs) {struct mlx5_ib_flow_matcher *obj = uobject->object; -int ret; - ret =ib_destroy_usecnt (&obj->usecnt, why, uobject); -if (ret) -return ret; +if (atomic_read (&obj->usecnt)) +return -EBUSY ;kfree (obj);return 0 ;
include/rdma/ib_verbs.h +2 -42
62 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH 2/2 RDMA/core: Make FD destroy callback void
In reply to Leon RomanovskyFrom: Leon Romanovsky <[email protected]>
All FD object destroy implementations return 0, so declare this callback void.
--- drivers/infiniband/core/rdma_core.c | 3 ++- drivers/infiniband/core/uverbs_std_types.c | 3 +-- drivers/infiniband/core/uverbs_std_types_async_fd.c | 5 ++--- drivers/infiniband/hw/mlx5/devx.c | 10 ++++------ include/rdma/uverbs_types.h | 4 ++-- 5 files changed, 11 insertions(+), 14 deletions(-)
drivers/infiniband/core/rdma_core.c +2 -1
@@ -571,7 +571,8 @@ static int __must_check destroy_hw_fd_uobject(struct ib_uobject *uobj,const struct uverbs_obj_fd_type *fd_type =container_of ( uobj->uapi_object->type_attrs, struct uverbs_obj_fd_type, type); -return fd_type->destroy_object (uobj, why); + fd_type->destroy_object (uobj, why); +return 0 ; }static void remove_handle_fd_uobject (struct ib_uobject *uobj)
drivers/infiniband/core/uverbs_std_types.c +1 -2
@@ -154,7 +154,7 @@ void ib_uverbs_free_event_queue(struct ib_uverbs_event_queue *event_queue)spin_unlock_irq (&event_queue->lock); } -static int +static void uverbs_completion_event_file_destroy_uobj (struct ib_uobject *uobj,enum rdma_remove_reason why) {
@@ -163,7 +163,6 @@ uverbs_completion_event_file_destroy_uobj(struct ib_uobject *uobj, uobj);ib_uverbs_free_event_queue (&file->ev_queue); -return 0 ; }int uverbs_destroy_def_handler (struct uverbs_attr_bundle *attrs)
drivers/infiniband/core/uverbs_std_types_async_fd.c +2 -3
@@ -19,8 +19,8 @@ static int UVERBS_HANDLER(UVERBS_METHOD_ASYNC_EVENT_ALLOC)(return 0 ; } -static int uverbs_async_event_destroy_uobj (struct ib_uobject *uobj, -enum rdma_remove_reason why) +static void uverbs_async_event_destroy_uobj (struct ib_uobject *uobj, +enum rdma_remove_reason why) {struct ib_uverbs_async_event_file *event_file = container_of(uobj, struct ib_uverbs_async_event_file, uobj);
@@ -30,7 +30,6 @@ static int uverbs_async_event_destroy_uobj(struct ib_uobject *uobj,if (why ==RDMA_REMOVE_DRIVER_REMOVE )ib_uverbs_async_handler (event_file,0 ,IB_EVENT_DEVICE_FATAL ,NULL ,NULL ); -return 0 ; }int uverbs_async_event_release (struct inode *inode,struct file *filp)
drivers/infiniband/hw/mlx5/devx.c +4 -6
@@ -2588,8 +2588,8 @@ static const struct file_operations devx_async_event_fops = { .llseek = no_llseek, }; -static int devx_async_cmd_event_destroy_uobj (struct ib_uobject *uobj, -enum rdma_remove_reason why) +static void devx_async_cmd_event_destroy_uobj (struct ib_uobject *uobj, +enum rdma_remove_reason why) {struct devx_async_cmd_event_file *comp_ev_file = container_of(uobj, struct devx_async_cmd_event_file,
@@ -2611,11 +2611,10 @@ static int devx_async_cmd_event_destroy_uobj(struct ib_uobject *uobj,kvfree (entry); }spin_unlock_irq (&comp_ev_file->ev_queue.lock); -return 0 ; }; -static int devx_async_event_destroy_uobj (struct ib_uobject *uobj, -enum rdma_remove_reason why) +static void devx_async_event_destroy_uobj (struct ib_uobject *uobj, +enum rdma_remove_reason why) {struct devx_async_event_file *ev_file = container_of(uobj, struct devx_async_event_file,
@@ -2659,7 +2658,6 @@ static int devx_async_event_destroy_uobj(struct ib_uobject *uobj,mutex_unlock (&dev->devx_event_table.event_xa_lock);put_device (&dev->ib_dev.dev); -return 0 ; }; DECLARE_UVERBS_NAMED_METHOD(
include/rdma/uverbs_types.h +2 -2
@@ -138,8 +138,8 @@ struct uverbs_obj_fd_type {* because the driver is removed or the FD is closed. */ struct uverbs_obj_type type; -int (*destroy_object)(struct ib_uobject *uobj, -enum rdma_remove_reason why); +void (*destroy_object)(struct ib_uobject *uobj, +enum rdma_remove_reason why);const struct file_operations *fops;const char *name;int flags;
Signature · 1 line
2.28.0
Quoted 8 lines · Leon Romanovsky
From: Leon Romanovsky <[email protected]>
v1: Added Jason's variant of first patch
v0: https://lore.kernel.org/lkml/[email protected]Leon Romanovsky (2):
RDMA/core: Postpone uobject cleanup on failure till FD close RDMA/core: Make FD destroy callback void
Applied to for-next, thanks
Jason