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
Subject: [PATCH v1 18/24] IB/core: ib_mr should not have ib_uobject pointer
Date: Wed, 21 Aug 2019 17:21:19 +0300 [thread overview]
Message-ID: <20190821142125.5706-19-yuval.shaia@oracle.com> (raw)
In-Reply-To: <20190821142125.5706-1-yuval.shaia@oracle.com>
As a preparation step to shared MR, where ib_mr object will be pointed
by one or more ib_uobjects, remove ib_uobject pointer from ib_mr struct.
Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
---
drivers/infiniband/core/uverbs_cmd.c | 1 -
drivers/infiniband/core/uverbs_std_types_mr.c | 1 -
drivers/infiniband/core/verbs.c | 3 ---
include/rdma/ib_verbs.h | 3 ++-
4 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 08f39adb3a9d..25eab9dc9cad 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -765,7 +765,6 @@ static int ib_uverbs_reg_mr(struct uverbs_attr_bundle *attrs)
mr->type = IB_MR_TYPE_USER;
mr->dm = NULL;
mr->sig_attrs = NULL;
- mr->uobject = uobj;
atomic_inc(&pd->usecnt);
mr->res.type = RDMA_RESTRACK_MR;
rdma_restrack_uadd(&mr->res);
diff --git a/drivers/infiniband/core/uverbs_std_types_mr.c b/drivers/infiniband/core/uverbs_std_types_mr.c
index c1286a52dc84..5219af8960a3 100644
--- a/drivers/infiniband/core/uverbs_std_types_mr.c
+++ b/drivers/infiniband/core/uverbs_std_types_mr.c
@@ -130,7 +130,6 @@ static int UVERBS_HANDLER(UVERBS_METHOD_DM_MR_REG)(
mr->pd = pd;
mr->type = IB_MR_TYPE_DM;
mr->dm = dm;
- mr->uobject = uobj;
atomic_inc(&pd->usecnt);
atomic_inc(&dm->usecnt);
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 1d0215c1a504..a7722d54869e 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -299,7 +299,6 @@ struct ib_pd *__ib_alloc_pd(struct ib_device *device, unsigned int flags,
mr->device = pd->device;
mr->pd = pd;
mr->type = IB_MR_TYPE_DMA;
- mr->uobject = NULL;
mr->need_inval = false;
pd->__internal_mr = mr;
@@ -2035,7 +2034,6 @@ struct ib_mr *ib_alloc_mr_user(struct ib_pd *pd, enum ib_mr_type mr_type,
mr->device = pd->device;
mr->pd = pd;
mr->dm = NULL;
- mr->uobject = NULL;
atomic_inc(&pd->usecnt);
mr->need_inval = false;
mr->res.type = RDMA_RESTRACK_MR;
@@ -2088,7 +2086,6 @@ struct ib_mr *ib_alloc_mr_integrity(struct ib_pd *pd,
mr->device = pd->device;
mr->pd = pd;
mr->dm = NULL;
- mr->uobject = NULL;
atomic_inc(&pd->usecnt);
mr->need_inval = false;
mr->res.type = RDMA_RESTRACK_MR;
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index e3ce38aa89b6..877932305ea7 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -1785,7 +1785,6 @@ struct ib_mr {
enum ib_mr_type type;
bool need_inval;
union {
- struct ib_uobject *uobject; /* user */
struct list_head qp_entry; /* FR */
};
@@ -2592,6 +2591,7 @@ struct ib_device_ops {
/* Object sharing callbacks */
clone_callback(ib_pd);
+ clone_callback(ib_mr);
DECLARE_RDMA_OBJ_SIZE(ib_ah);
DECLARE_RDMA_OBJ_SIZE(ib_cq);
@@ -2610,6 +2610,7 @@ static inline int trivial_clone_##ib_type(struct ib_udata *udata, \
/* Shared IB HW object support */
trivial_clone_callback(ib_pd);
+trivial_clone_callback(ib_mr);
struct ib_core_device {
/* device must be the first element in structure until,
--
2.20.1
next prev parent reply other threads:[~2019-08-21 14:23 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 ` [PATCH v1 05/24] IB/core: ib_uobject need HW object reference count Yuval Shaia
2019-08-21 14:53 ` 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 ` Yuval Shaia [this message]
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-19-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=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;
as well as URLs for NNTP newsgroup(s).