All of lore.kernel.org
 help / color / mirror / Atom feed
From: Shamir Rabinovitch <srabinov7@gmail.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 08/25] IB/uverbs: ufile must be freed only when not used anymore
Date: Tue, 16 Jul 2019 21:11:43 +0300	[thread overview]
Message-ID: <20190716181200.4239-9-srabinov7@gmail.com> (raw)
In-Reply-To: <20190716181200.4239-1-srabinov7@gmail.com>

From: Shamir Rabinovitch <shamir.rabinovitch@oracle.com>

ufile (&ucontext) with the process who own them must not be released
when there are other ufile (&ucontext) that depens at them.

Signed-off-by: Shamir Rabinovitch <shamir.rabinovitch@oracle.com>
Signed-off-by: Shamir Rabinovitch <srabinov7@gmail.com>
---
 drivers/infiniband/core/rdma_core.c   | 29 +++++++++++++++++++++++++++
 drivers/infiniband/core/uverbs.h      | 22 ++++++++++++++++++++
 drivers/infiniband/core/uverbs_cmd.c  | 16 +++++++++++++++
 drivers/infiniband/core/uverbs_main.c |  4 ++++
 4 files changed, 71 insertions(+)

diff --git a/drivers/infiniband/core/rdma_core.c b/drivers/infiniband/core/rdma_core.c
index 651625f632d7..c81ff8e28fc6 100644
--- a/drivers/infiniband/core/rdma_core.c
+++ b/drivers/infiniband/core/rdma_core.c
@@ -841,6 +841,33 @@ static void ufile_destroy_ucontext(struct ib_uverbs_file *ufile,
 	ufile->ucontext = NULL;
 }
 
+static void __uverbs_ufile_refcount(struct ib_uverbs_file *ufile)
+{
+	int wait;
+
+	if (ufile->parent) {
+		pr_debug("%s: release parent ufile. ufile %p parent %p\n",
+			 __func__, ufile, ufile->parent);
+		if (atomic_dec_and_test(&ufile->parent->refcount))
+			complete(&ufile->parent->context_released);
+	}
+
+	if (!atomic_dec_and_test(&ufile->refcount)) {
+wait:
+		wait = wait_for_completion_interruptible_timeout(
+			&ufile->context_released, 3*HZ);
+		if (wait == -ERESTARTSYS) {
+			WARN_ONCE(1,
+			"signal while waiting for context release! ufile %p\n",
+				ufile);
+		} else if (wait == 0) {
+			pr_debug("%s: timeout while waiting for context release! ufile %p\n",
+				 __func__, ufile);
+			goto wait;
+		}
+	}
+}
+
 static int __uverbs_cleanup_ufile(struct ib_uverbs_file *ufile,
 				  enum rdma_remove_reason reason)
 {
@@ -923,6 +950,8 @@ void uverbs_destroy_ufile_hw(struct ib_uverbs_file *ufile,
 	if (!list_empty(&ufile->uobjects))
 		__uverbs_cleanup_ufile(ufile, reason);
 
+	__uverbs_ufile_refcount(ufile);
+
 	ufile_destroy_ucontext(ufile, reason);
 
 done:
diff --git a/drivers/infiniband/core/uverbs.h b/drivers/infiniband/core/uverbs.h
index cf76336cb460..c7e711188567 100644
--- a/drivers/infiniband/core/uverbs.h
+++ b/drivers/infiniband/core/uverbs.h
@@ -165,6 +165,28 @@ struct ib_uverbs_file {
 	struct xarray		idr;
 
 	struct file	       *filp;
+
+	/* context sharing support */
+
+	/*
+	 * refcount=1 : zero external context depend on this context
+	 * refcount>1 : (refcount-1) external context depend on this context
+	 */
+	atomic_t		refcount;
+
+	/*
+	 * parent =NULL : this context has not imported any objects
+	 * parent!=NULL : this context imported objects from parent context
+	 */
+	struct ib_uverbs_file  *parent;
+
+	/*
+	 * context_released completion is signalled by the last
+	 * user of this context in case of shared context.
+	 * any pre matured release of the context will be delayed
+	 * till the last user of this context is gone.
+	 */
+	struct completion	context_released;
 };
 
 struct ib_uverbs_event {
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 21f0a1a986f4..8d015587946b 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -3816,6 +3816,10 @@ static int ib_uverbs_import_lock(struct uverbs_attr_bundle *attrs,
 	struct ib_uverbs_device *fd_dev;
 	int ret = 0;
 
+	/* shared context cannot import */
+	if (atomic_read(&file->refcount) > 1)
+		return -EINVAL;
+
 	*filep = fget(fd);
 	if (!*filep)
 		return -EINVAL;
@@ -3829,6 +3833,18 @@ static int ib_uverbs_import_lock(struct uverbs_attr_bundle *attrs,
 	*ufile = (*filep)->private_data;
 	fd_dev = (*ufile)->device;
 
+	if (file->parent) {
+		/* multiple import must use same parent context! */
+		if (file->parent != *ufile) {
+			ret = -EINVAL;
+			goto file;
+		}
+	} else {
+		/* first import must update parent refcount */
+		file->parent = *ufile;
+		atomic_inc(&(*ufile)->refcount);
+	}
+
 	/* check that both files belong to same ib_device */
 	if (dev != fd_dev) {
 		ret = -EINVAL;
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index fa88a586284c..3c28034a7a9a 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -1081,6 +1081,10 @@ static int ib_uverbs_open(struct inode *inode, struct file *filp)
 		goto err;
 	}
 
+	/* shared context support */
+	atomic_set(&file->refcount, 1);
+	init_completion(&file->context_released);
+
 	file->device	 = dev;
 	kref_init(&file->ref);
 	mutex_init(&file->ucontext_lock);
-- 
2.20.1


  parent reply	other threads:[~2019-07-16 18:13 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-16 18:11 [PATCH 00/25] Shared PD and MR Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 01/25] RDMA/uverbs: uobj_get_obj_read should return the ib_uobject Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 02/25] RDMA/uverbs: Delete the macro uobj_put_obj_read Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 03/25] RDMA/nldev: ib_pd can be pointed by multiple ib_ucontext Shamir Rabinovitch
2019-07-18 16:05   ` Leon Romanovsky
2019-07-16 18:11 ` [PATCH 04/25] IB/{core,hw}: ib_pd should not have ib_uobject pointer Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 05/25] IB/core: ib_uobject need HW object reference count Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 06/25] IB/uverbs: Helper function to initialize ufile member of uverbs_attr_bundle Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 07/25] IB/uverbs: Add context import lock/unlock helper Shamir Rabinovitch
2019-07-16 18:11 ` Shamir Rabinovitch [this message]
2019-07-17 11:53   ` [PATCH 08/25] IB/uverbs: ufile must be freed only when not used anymore Jason Gunthorpe
2019-07-17 19:25     ` Shamir Rabinovitch
2019-07-17 19:33       ` Jason Gunthorpe
2019-07-17 20:31         ` Yuval Shaia
2019-07-17 20:45           ` Matthew Wilcox
2019-07-17 21:36             ` Yuval Shaia
2019-07-17 23:51               ` Ira Weiny
2019-07-18 12:17               ` Jason Gunthorpe
2019-07-18 20:45                 ` Yuval Shaia
2019-07-19 11:46                   ` Jason Gunthorpe
2019-07-16 18:11 ` [PATCH 09/25] IB/verbs: Prototype of HW object clone callback Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 10/25] IB/core: Install clone ib_pd in device ops Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 11/25] IB/mlx4: Add implementation of clone_pd callback Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 12/25] IB/mlx5: " Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 13/25] RDMA/rxe: " Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 14/25] IB/uverbs: Add clone reference counting to ib_pd Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 15/25] IB/uverbs: Add PD import verb Shamir Rabinovitch
2019-07-17 11:44   ` Jason Gunthorpe
2019-07-17 20:15     ` Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 16/25] IB/mlx4: Enable import from FD verb Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 17/25] IB/mlx5: " Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 18/25] RDMA/rxe: " Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 19/25] IB/core: ib_mr should not have ib_uobject pointer Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 20/25] IB/core: Install clone ib_mr in device ops Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 21/25] IB/mlx4: Add implementation of clone_pd callback Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 22/25] IB/mlx5: " Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 23/25] RDMA/rxe: " Shamir Rabinovitch
2019-07-16 18:11 ` [PATCH 24/25] IB/uverbs: Add clone reference counting to ib_mr Shamir Rabinovitch
2019-07-16 18:12 ` [PATCH 25/25] IB/uverbs: Add MR import verb Shamir Rabinovitch
2019-07-17  5:09 ` [PATCH 00/25] Shared PD and MR Christoph Hellwig
2019-07-17 11:09   ` Shamir Rabinovitch
2019-07-17 11:55     ` Jason Gunthorpe
2019-07-17 13:35       ` Shamir Rabinovitch
2019-07-17 23:55         ` Ira Weiny
2019-08-01  4:05           ` Yuval Shaia
2019-07-18 12:16         ` Jason Gunthorpe

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=20190716181200.4239-9-srabinov7@gmail.com \
    --to=srabinov7@gmail.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=yuval.shaia@oracle.com \
    --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 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.