| Message ID | 20190828091533.3129-5-yuval.shaia@oracle.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Take out ucontext from HW objects | expand |
On Wed, Aug 28, 2019 at 12:15:32PM +0300, Yuval Shaia wrote: > 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 | 1 - > 4 files changed, 6 deletions(-) > > diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c > index d1f0c04f0ae8..54326ee25eaa 100644 > +++ b/drivers/infiniband/core/uverbs_cmd.c > @@ -761,7 +761,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 > +++ 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 > +++ 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 7b429b2e7cf6..fc4b1a0d3bf2 100644 > +++ b/include/rdma/ib_verbs.h > @@ -1775,7 +1775,6 @@ struct ib_mr { > enum ib_mr_type type; > bool need_inval; > union { > - struct ib_uobject *uobject; /* user */ > struct list_head qp_entry; /* FR */ > }; Delete the union too Jason
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c index d1f0c04f0ae8..54326ee25eaa 100644 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c @@ -761,7 +761,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 7b429b2e7cf6..fc4b1a0d3bf2 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -1775,7 +1775,6 @@ struct ib_mr { enum ib_mr_type type; bool need_inval; union { - struct ib_uobject *uobject; /* user */ struct list_head qp_entry; /* FR */ };
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 | 1 - 4 files changed, 6 deletions(-)