From: Leon Romanovsky <leon@kernel.org>
To: Jason Gunthorpe <jgg@nvidia.com>
Cc: Doug Ledford <dledford@redhat.com>, linux-rdma@vger.kernel.org
Subject: Re: [PATCH rdma-next v1 13/13] RDMA/restrack: Drop valid restrack field as source of ambiguity
Date: Sun, 6 Sep 2020 18:24:33 +0300 [thread overview]
Message-ID: <20200906152433.GJ55261@unreal> (raw)
In-Reply-To: <20200906142815.GC9166@nvidia.com>
On Sun, Sep 06, 2020 at 11:28:15AM -0300, Jason Gunthorpe wrote:
> On Sun, Sep 06, 2020 at 05:24:00PM +0300, Leon Romanovsky wrote:
> > On Thu, Sep 03, 2020 at 01:21:48PM -0300, Jason Gunthorpe wrote:
> > > On Sun, Aug 30, 2020 at 01:14:36PM +0300, Leon Romanovsky wrote:
> > > > From: Leon Romanovsky <leonro@mellanox.com>
> > > >
> > > > The valid field was needed to distinguish between supported/not
> > > > supported QPs, after the create_qp was changed to support all types,
> > > > that field can be dropped and the code simplified a little bit.
> > > >
> > > > Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> > > > drivers/infiniband/core/restrack.c | 29 ++++++++---------------------
> > > > include/rdma/restrack.h | 9 ---------
> > > > 2 files changed, 8 insertions(+), 30 deletions(-)
> > > >
> > > > diff --git a/drivers/infiniband/core/restrack.c b/drivers/infiniband/core/restrack.c
> > > > index 4caaa6312105..fb5345c8bd89 100644
> > > > +++ b/drivers/infiniband/core/restrack.c
> > > > @@ -143,7 +143,7 @@ static struct ib_device *res_to_dev(struct rdma_restrack_entry *res)
> > > > return container_of(res, struct rdma_counter, res)->device;
> > > > default:
> > > > WARN_ONCE(true, "Wrong resource tracking type %u\n", res->type);
> > > > - return NULL;
> > > > + return ERR_PTR(-EINVAL);
> > > > }
> > > > }
> > > >
> > > > @@ -223,7 +223,7 @@ int __must_check rdma_restrack_add(struct rdma_restrack_entry *res)
> > > > struct rdma_restrack_root *rt;
> > > > int ret = 0;
> > > >
> > > > - if (!dev)
> > > > + if (IS_ERR_OR_NULL(dev))
> > > > return -ENODEV;
> > > >
> > > > if (res->no_track)
> > > > @@ -261,10 +261,7 @@ int __must_check rdma_restrack_add(struct rdma_restrack_entry *res)
> > > > }
> > > >
> > > > out:
> > > > - if (ret)
> > > > - return ret;
> > > > - res->valid = true;
> > > > - return 0;
> > > > + return ret;
> > > > }
> > > > EXPORT_SYMBOL(rdma_restrack_add);
> > > >
> > > > @@ -323,25 +320,16 @@ EXPORT_SYMBOL(rdma_restrack_put);
> > > > */
> > > > void rdma_restrack_del(struct rdma_restrack_entry *res)
> > > > {
> > > > + struct ib_device *dev = res_to_dev(res);
> > > > struct rdma_restrack_entry *old;
> > > > struct rdma_restrack_root *rt;
> > > > - struct ib_device *dev;
> > > >
> > > > - if (!res->valid) {
> > > > - if (res->task) {
> > > > - put_task_struct(res->task);
> > > > - res->task = NULL;
> > > > - }
> > > > - return;
> > > > - }
> > > > -
> > > > - if (res->no_track)
> > > > + WARN_ONCE(!dev && res->type != RDMA_RESTRACK_CM_ID,
> > > > + "IB device should be set for restrack type %s",
> > > > + type2str(res->type));
> > > > + if (res->no_track || IS_ERR_OR_NULL(dev))
> > > > goto out;
> > > >
> > > > - dev = res_to_dev(res);
> > > > - if (WARN_ON(!dev))
> > > > - return;
> > > > -
> > > > rt = &dev->res[res->type];
> > > > old = xa_erase(&rt->xa, res->id);
> > >
> > > How does this work without valid?
> > >
> > > xa_alloc is called in rdma_restrack_add() and previously it was safe
> > > to call res_track_del() on unadded things.
> > >
> > > Now there are problems, like __ib_alloc_cq_user() does calls
> > > restrack_del without doing restrack_ad()
> >
> > Maybe I missed it, but I don't see it in the code.
>
> Look at the error unwinding
After this series I will call to rdma_restrack_put() and not to rdma_restrack_del().
in error unwind.
Thanks
>
> Jason
prev parent reply other threads:[~2020-09-06 15:25 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-30 10:14 [PATCH rdma-next v1 00/13] Track memory allocation with restrack DB help Leon Romanovsky
2020-08-30 10:14 ` [PATCH rdma-next v1 01/13] RDMA/cma: Delete from restrack DB after successful destroy Leon Romanovsky
2020-09-03 14:27 ` Jason Gunthorpe
2020-09-06 14:28 ` Leon Romanovsky
2020-08-30 10:14 ` [PATCH rdma-next v1 02/13] RDMA/mlx5: Don't call to restrack recursively Leon Romanovsky
2020-08-30 10:14 ` [PATCH rdma-next v1 03/13] RDMA/restrack: Count references to the verbs objects Leon Romanovsky
2020-08-30 10:14 ` [PATCH rdma-next v1 04/13] RDMA/restrack: Simplify restrack tracking in kernel flows Leon Romanovsky
2020-08-30 10:14 ` [PATCH rdma-next v1 05/13] RDMA/restrack: Improve readability in task name management Leon Romanovsky
2020-08-30 10:14 ` [PATCH rdma-next v1 06/13] RDMA/cma: Be strict with attaching to CMA device Leon Romanovsky
2020-08-30 10:14 ` [PATCH rdma-next v1 07/13] RDMA/core: Allow drivers to disable restrack DB Leon Romanovsky
2020-09-03 14:02 ` Jason Gunthorpe
2020-09-06 14:25 ` Leon Romanovsky
2020-08-30 10:14 ` [PATCH rdma-next v1 08/13] RDMA/counter: Combine allocation and bind logic Leon Romanovsky
2020-08-30 10:14 ` [PATCH rdma-next v1 09/13] RDMA/restrack: Store all special QPs in restrack DB Leon Romanovsky
2020-08-30 10:14 ` [PATCH rdma-next v1 10/13] RDMA/restrack: Make restrack DB mandatory for IB objects Leon Romanovsky
2020-08-30 10:14 ` [PATCH rdma-next v1 11/13] RDMA/restrack: Support all QP types Leon Romanovsky
2020-08-30 10:14 ` [PATCH rdma-next v1 12/13] RDMA/core: Track device memory MRs Leon Romanovsky
2020-08-30 10:14 ` [PATCH rdma-next v1 13/13] RDMA/restrack: Drop valid restrack field as source of ambiguity Leon Romanovsky
2020-09-03 16:21 ` Jason Gunthorpe
2020-09-06 14:24 ` Leon Romanovsky
2020-09-06 14:28 ` Jason Gunthorpe
2020-09-06 15:24 ` Leon Romanovsky [this message]
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=20200906152433.GJ55261@unreal \
--to=leon@kernel.org \
--cc=dledford@redhat.com \
--cc=jgg@nvidia.com \
--cc=linux-rdma@vger.kernel.org \
/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).