From: Shamir Rabinovitch <srabinov7@gmail.com>
To: dledford@redhat.com, jgg@ziepe.ca, leon@kernel.org,
monis@mellanox.com, parav@mellanox.com, danielj@mellanox.com,
kamalheib1@gmail.com, markz@mellanox.com,
swise@opengridcomputing.com, shamir.rabinovitch@oracle.com,
johannes.berg@intel.com, willy@infradead.org,
michaelgur@mellanox.com, markb@mellanox.com,
yuval.shaia@oracle.com, dan.carpenter@oracle.com,
bvanassche@acm.org, maxg@mellanox.com, israelr@mellanox.com,
galpress@amazon.com, denisd@mellanox.com, yuvalav@mellanox.com,
dennis.dalessandro@intel.com, will@kernel.org,
ereza@mellanox.com, jgg@mellanox.com, linux-rdma@vger.kernel.org
Cc: Shamir Rabinovitch <srabinov7@gmail.com>
Subject: [PATCH 05/25] IB/core: ib_uobject need HW object reference count
Date: Tue, 16 Jul 2019 21:11:40 +0300 [thread overview]
Message-ID: <20190716181200.4239-6-srabinov7@gmail.com> (raw)
In-Reply-To: <20190716181200.4239-1-srabinov7@gmail.com>
From: Shamir Rabinovitch <shamir.rabinovitch@oracle.com>
This new refcnt will points to the refcnt member of the HW object and will
behaves as expected by refcnt, i.e. will be increased and decreased as a
result of usage changes and will destroy the object when reaches to zero.
For a non-shared object refcnt will remain NULL.
Signed-off-by: Shamir Rabinovitch <shamir.rabinovitch@oracle.com>
Signed-off-by: Shamir Rabinovitch <srabinov7@gmail.com>
---
drivers/infiniband/core/rdma_core.c | 23 +++++++++++++++++++++--
include/rdma/ib_verbs.h | 7 +++++++
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/drivers/infiniband/core/rdma_core.c b/drivers/infiniband/core/rdma_core.c
index ccf4d069c25c..651625f632d7 100644
--- a/drivers/infiniband/core/rdma_core.c
+++ b/drivers/infiniband/core/rdma_core.c
@@ -516,7 +516,26 @@ static int __must_check destroy_hw_idr_uobject(struct ib_uobject *uobj,
const struct uverbs_obj_idr_type *idr_type =
container_of(uobj->uapi_object->type_attrs,
struct uverbs_obj_idr_type, type);
- int ret = idr_type->destroy_object(uobj, why, attrs);
+ static DEFINE_MUTEX(lock);
+ int ret, count;
+
+ mutex_lock(&lock);
+
+ if (uobj->refcnt) {
+ count = atomic_dec_return(uobj->refcnt);
+ WARN_ON(count < 0); /* use after free! */
+ if (count) {
+ mutex_unlock(&lock);
+ goto skip;
+ }
+ }
+
+ ret = idr_type->destroy_object(uobj, why, attrs);
+
+ if (ret)
+ atomic_inc(uobj->refcnt);
+
+ mutex_unlock(&lock);
/*
* We can only fail gracefully if the user requested to destroy the
@@ -525,7 +544,7 @@ static int __must_check destroy_hw_idr_uobject(struct ib_uobject *uobj,
*/
if (ib_is_destroy_retryable(ret, why, uobj))
return ret;
-
+skip:
if (why == RDMA_REMOVE_ABORT)
return 0;
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 0900952d9b1f..d19c0394b05a 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -1444,6 +1444,13 @@ struct ib_uobject {
struct rcu_head rcu; /* kfree_rcu() overhead */
const struct uverbs_api_object *uapi_object;
+
+ /*
+ * ib_X HW object sharing support
+ * - NULL for HW objects that are not shareable
+ * - Pointer to ib_X reference counter for shareable HW objects
+ */
+ atomic_t *refcnt; /* ib_X object ref count */
};
struct ib_udata {
--
2.20.1
next prev parent reply other threads:[~2019-07-16 18:13 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-16 18:11 [PATCH 00/25] Shared PD and MR Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 01/25] RDMA/uverbs: uobj_get_obj_read should return the ib_uobject Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 02/25] RDMA/uverbs: Delete the macro uobj_put_obj_read Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 03/25] RDMA/nldev: ib_pd can be pointed by multiple ib_ucontext Shamir Rabinovitch
2019-07-18 16:05 ` Leon Romanovsky
2019-07-16 18:11 ` [PATCH 04/25] IB/{core,hw}: ib_pd should not have ib_uobject pointer Shamir Rabinovitch
2019-07-16 18:11 ` Shamir Rabinovitch [this message]
2019-07-16 18:11 ` [PATCH 06/25] IB/uverbs: Helper function to initialize ufile member of uverbs_attr_bundle Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 07/25] IB/uverbs: Add context import lock/unlock helper Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 08/25] IB/uverbs: ufile must be freed only when not used anymore Shamir Rabinovitch
2019-07-17 11:53 ` Jason Gunthorpe
2019-07-17 19:25 ` Shamir Rabinovitch
2019-07-17 19:33 ` Jason Gunthorpe
2019-07-17 20:31 ` Yuval Shaia
2019-07-17 20:45 ` Matthew Wilcox
2019-07-17 21:36 ` Yuval Shaia
2019-07-17 23:51 ` Ira Weiny
2019-07-18 12:17 ` Jason Gunthorpe
2019-07-18 20:45 ` Yuval Shaia
2019-07-19 11:46 ` Jason Gunthorpe
2019-07-16 18:11 ` [PATCH 09/25] IB/verbs: Prototype of HW object clone callback Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 10/25] IB/core: Install clone ib_pd in device ops Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 11/25] IB/mlx4: Add implementation of clone_pd callback Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 12/25] IB/mlx5: " Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 13/25] RDMA/rxe: " Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 14/25] IB/uverbs: Add clone reference counting to ib_pd Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 15/25] IB/uverbs: Add PD import verb Shamir Rabinovitch
2019-07-17 11:44 ` Jason Gunthorpe
2019-07-17 20:15 ` Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 16/25] IB/mlx4: Enable import from FD verb Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 17/25] IB/mlx5: " Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 18/25] RDMA/rxe: " Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 19/25] IB/core: ib_mr should not have ib_uobject pointer Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 20/25] IB/core: Install clone ib_mr in device ops Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 21/25] IB/mlx4: Add implementation of clone_pd callback Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 22/25] IB/mlx5: " Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 23/25] RDMA/rxe: " Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 24/25] IB/uverbs: Add clone reference counting to ib_mr Shamir Rabinovitch
2019-07-16 18:12 ` [PATCH 25/25] IB/uverbs: Add MR import verb Shamir Rabinovitch
2019-07-17 5:09 ` [PATCH 00/25] Shared PD and MR Christoph Hellwig
2019-07-17 11:09 ` Shamir Rabinovitch
2019-07-17 11:55 ` Jason Gunthorpe
2019-07-17 13:35 ` Shamir Rabinovitch
2019-07-17 23:55 ` Ira Weiny
2019-08-01 4:05 ` Yuval Shaia
2019-07-18 12:16 ` Jason Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190716181200.4239-6-srabinov7@gmail.com \
--to=srabinov7@gmail.com \
--cc=bvanassche@acm.org \
--cc=dan.carpenter@oracle.com \
--cc=danielj@mellanox.com \
--cc=denisd@mellanox.com \
--cc=dennis.dalessandro@intel.com \
--cc=dledford@redhat.com \
--cc=ereza@mellanox.com \
--cc=galpress@amazon.com \
--cc=israelr@mellanox.com \
--cc=jgg@mellanox.com \
--cc=jgg@ziepe.ca \
--cc=johannes.berg@intel.com \
--cc=kamalheib1@gmail.com \
--cc=leon@kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=markb@mellanox.com \
--cc=markz@mellanox.com \
--cc=maxg@mellanox.com \
--cc=michaelgur@mellanox.com \
--cc=monis@mellanox.com \
--cc=parav@mellanox.com \
--cc=shamir.rabinovitch@oracle.com \
--cc=swise@opengridcomputing.com \
--cc=will@kernel.org \
--cc=willy@infradead.org \
--cc=yuval.shaia@oracle.com \
--cc=yuvalav@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).