From: Yuval Shaia <yuval.shaia@oracle.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 v1 05/24] IB/core: ib_uobject need HW object reference count
Date: Wed, 21 Aug 2019 17:21:06 +0300 [thread overview]
Message-ID: <20190821142125.5706-6-yuval.shaia@oracle.com> (raw)
In-Reply-To: <20190821142125.5706-1-yuval.shaia@oracle.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 7b429b2e7cf6..7e69866fc419 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -1496,6 +1496,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-08-21 14:22 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-21 14:21 [PATCH v1 00/24] Shared PD and MR Yuval Shaia
2019-08-21 14:21 ` [PATCH v1 01/24] RDMA/uverbs: uobj_get_obj_read should return the ib_uobject Yuval Shaia
2019-08-21 14:21 ` [PATCH v1 02/24] RDMA/uverbs: Delete the macro uobj_put_obj_read Yuval Shaia
2019-08-21 14:21 ` [PATCH v1 03/24] RDMA/nldev: ib_pd can be pointed by multiple ib_ucontext Yuval Shaia
2019-08-21 14:21 ` [PATCH v1 04/24] IB/{core,hw}: ib_pd should not have ib_uobject pointer Yuval Shaia
2019-08-21 14:21 ` Yuval Shaia [this message]
2019-08-21 14:53 ` [PATCH v1 05/24] IB/core: ib_uobject need HW object reference count Jason Gunthorpe
2019-08-27 16:28 ` Yuval Shaia
2019-08-27 18:18 ` Jason Gunthorpe
2019-08-21 14:21 ` [PATCH v1 06/24] IB/uverbs: Helper function to initialize ufile member of uverbs_attr_bundle Yuval Shaia
2019-08-21 14:21 ` [PATCH v1 07/24] IB/uverbs: Add context import lock/unlock helper Yuval Shaia
2019-08-21 14:57 ` Jason Gunthorpe
2019-08-21 14:21 ` [PATCH v1 08/24] IB/verbs: Prototype of HW object clone callback Yuval Shaia
2019-08-21 14:59 ` Jason Gunthorpe
2019-08-21 14:21 ` [PATCH v1 09/24] IB/core: Install clone ib_pd in device ops Yuval Shaia
2019-08-21 14:21 ` [PATCH v1 10/24] IB/mlx4: Add implementation of clone_pd callback Yuval Shaia
2019-08-21 14:59 ` Jason Gunthorpe
2019-08-21 14:21 ` [PATCH v1 11/24] IB/mlx5: " Yuval Shaia
2019-08-21 14:21 ` [PATCH v1 12/24] RDMA/rxe: " Yuval Shaia
2019-08-21 14:21 ` [PATCH v1 13/24] IB/uverbs: Add clone reference counting to ib_pd Yuval Shaia
2019-08-21 14:21 ` [PATCH v1 14/24] IB/uverbs: Add PD import verb Yuval Shaia
2019-08-21 15:00 ` Jason Gunthorpe
2019-08-21 14:21 ` [PATCH v1 15/24] IB/mlx4: Enable import from FD verb Yuval Shaia
2019-08-21 14:21 ` [PATCH v1 16/24] IB/mlx5: " Yuval Shaia
2019-08-21 14:21 ` [PATCH v1 17/24] RDMA/rxe: " Yuval Shaia
2019-08-21 14:21 ` [PATCH v1 18/24] IB/core: ib_mr should not have ib_uobject pointer Yuval Shaia
2019-08-21 14:21 ` [PATCH v1 19/24] IB/core: Install clone ib_mr in device ops Yuval Shaia
2019-08-21 14:21 ` [PATCH v1 20/24] IB/mlx4: Add implementation of clone_pd callback Yuval Shaia
2019-08-21 14:21 ` [PATCH v1 21/24] IB/mlx5: " Yuval Shaia
2019-08-21 14:21 ` [PATCH v1 22/24] RDMA/rxe: " Yuval Shaia
2019-08-21 14:21 ` [PATCH v1 23/24] IB/uverbs: Add clone reference counting to ib_mr Yuval Shaia
2019-08-21 14:21 ` [PATCH v1 24/24] IB/uverbs: Add MR import verb Yuval Shaia
2019-08-21 14:50 ` [PATCH v1 00/24] Shared PD and MR Jason Gunthorpe
2019-08-22 8:50 ` Yuval Shaia
2019-08-21 23:37 ` Ira Weiny
2019-08-22 8:41 ` Yuval Shaia
2019-08-22 14:15 ` Doug Ledford
2019-08-26 9:35 ` Yuval Shaia
2019-08-22 16:58 ` Ira Weiny
2019-08-22 17:03 ` Jason Gunthorpe
2019-08-22 20:10 ` Weiny, Ira
2019-08-23 11:57 ` Jason Gunthorpe
2019-08-23 21:33 ` Weiny, Ira
2019-08-26 10:58 ` Yuval Shaia
2019-08-26 10:29 ` Yuval Shaia
2019-08-26 12:26 ` Jason Gunthorpe
2019-08-26 9:51 ` Yuval Shaia
2019-08-26 10:04 ` Yuval Shaia
2019-08-26 10:10 ` Yuval Shaia
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=20190821142125.5706-6-yuval.shaia@oracle.com \
--to=yuval.shaia@oracle.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=srabinov7@gmail.com \
--cc=swise@opengridcomputing.com \
--cc=will@kernel.org \
--cc=willy@infradead.org \
--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