All of lore.kernel.org
 help / color / mirror / Atom feed
From: Leon Romanovsky <leon@kernel.org>
To: Doug Ledford <dledford@redhat.com>, Jason Gunthorpe <jgg@nvidia.com>
Cc: Leon Romanovsky <leonro@mellanox.com>, linux-rdma@vger.kernel.org
Subject: [PATCH rdma-next v1 01/13] RDMA/cma: Delete from restrack DB after successful destroy
Date: Sun, 30 Aug 2020 13:14:24 +0300	[thread overview]
Message-ID: <20200830101436.108487-2-leon@kernel.org> (raw)
In-Reply-To: <20200830101436.108487-1-leon@kernel.org>

From: Leon Romanovsky <leonro@mellanox.com>

Update the code to have similar destroy pattern like other IB objects.

This change create asymmetry to the rdma_id_private create flow to make
sure that memory is managed by restrack.

Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
 drivers/infiniband/core/cma.c      | 3 +--
 drivers/infiniband/core/restrack.c | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 78641858abe2..5d6b70ae7a57 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -1821,7 +1821,6 @@ static void _destroy_id(struct rdma_id_private *id_priv,
 {
 	cma_cancel_operation(id_priv, state);
 
-	rdma_restrack_del(&id_priv->res);
 	if (id_priv->cma_dev) {
 		if (rdma_cap_ib_cm(id_priv->id.device, 1)) {
 			if (id_priv->cm_id.ib)
@@ -1847,6 +1846,7 @@ static void _destroy_id(struct rdma_id_private *id_priv,
 		rdma_put_gid_attr(id_priv->id.route.addr.dev_addr.sgid_attr);
 
 	put_net(id_priv->id.route.addr.dev_addr.net);
+	rdma_restrack_del(&id_priv->res);
 	kfree(id_priv);
 }
 
@@ -3728,7 +3728,6 @@ int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr)
 
 	return 0;
 err2:
-	rdma_restrack_del(&id_priv->res);
 	if (id_priv->cma_dev)
 		cma_release_dev(id_priv);
 err1:
diff --git a/drivers/infiniband/core/restrack.c b/drivers/infiniband/core/restrack.c
index 62fbb0ae9cb4..90fc74106620 100644
--- a/drivers/infiniband/core/restrack.c
+++ b/drivers/infiniband/core/restrack.c
@@ -330,6 +330,9 @@ void rdma_restrack_del(struct rdma_restrack_entry *res)
 	rt = &dev->res[res->type];
 
 	old = xa_erase(&rt->xa, res->id);
+	if (!old &&
+	    (res->type == RDMA_RESTRACK_MR || res->type == RDMA_RESTRACK_QP))
+		return;
 	WARN_ON(old != res);
 	res->valid = false;
 
-- 
2.26.2


  reply	other threads:[~2020-08-30 10:14 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 ` Leon Romanovsky [this message]
2020-09-03 14:27   ` [PATCH rdma-next v1 01/13] RDMA/cma: Delete from restrack DB after successful destroy 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

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=20200830101436.108487-2-leon@kernel.org \
    --to=leon@kernel.org \
    --cc=dledford@redhat.com \
    --cc=jgg@nvidia.com \
    --cc=leonro@mellanox.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.