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 07/25] IB/uverbs: Add context import lock/unlock helper
Date: Tue, 16 Jul 2019 21:11:42 +0300 [thread overview]
Message-ID: <20190716181200.4239-8-srabinov7@gmail.com> (raw)
In-Reply-To: <20190716181200.4239-1-srabinov7@gmail.com>
From: Shamir Rabinovitch <shamir.rabinovitch@oracle.com>
The lock/unlock helpers will be used in every import verb.
Signed-off-by: Shamir Rabinovitch <shamir.rabinovitch@oracle.com>
Signed-off-by: Shamir Rabinovitch <srabinov7@gmail.com>
---
drivers/infiniband/core/uverbs.h | 2 +
drivers/infiniband/core/uverbs_cmd.c | 73 +++++++++++++++++++++++++++
drivers/infiniband/core/uverbs_main.c | 1 +
3 files changed, 76 insertions(+)
diff --git a/drivers/infiniband/core/uverbs.h b/drivers/infiniband/core/uverbs.h
index 1e5aeb39f774..cf76336cb460 100644
--- a/drivers/infiniband/core/uverbs.h
+++ b/drivers/infiniband/core/uverbs.h
@@ -163,6 +163,8 @@ struct ib_uverbs_file {
struct page *disassociate_page;
struct xarray idr;
+
+ struct file *filp;
};
struct ib_uverbs_event {
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 4f42f9732dca..21f0a1a986f4 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -43,6 +43,7 @@
#include <rdma/uverbs_types.h>
#include <rdma/uverbs_std_types.h>
+#include <rdma/uverbs_ioctl.h>
#include "rdma_core.h"
#include "uverbs.h"
@@ -3791,6 +3792,78 @@ static void uverbs_init_attrs_ufile(struct uverbs_attr_bundle *attrs_bundle,
};
}
+/* ib_uverbs_import_lock - Function which gathers code that is
+ * common in the import verbs.
+ *
+ * This function guarntee that both source and destination files are
+ * protected from race with vfs close. The current file is protected
+ * from such race because verb is executed in a system-call context.
+ * The other file is protected by 'fget'. This function also ensures
+ * that ib_uobject identified by the type & handle is locked for read.
+ *
+ * Callers of this helper must also call ib_uverbs_import_unlock
+ * to undo any locking performed by this helper.
+ */
+static int ib_uverbs_import_lock(struct uverbs_attr_bundle *attrs,
+ int fd, u16 type, u32 handle,
+ struct ib_uobject **uobj,
+ struct file **filep,
+ struct ib_uverbs_file **ufile)
+{
+ struct ib_uverbs_file *file = attrs->ufile;
+ struct ib_uverbs_device *dev = file->device;
+ struct uverbs_attr_bundle fd_attrs;
+ struct ib_uverbs_device *fd_dev;
+ int ret = 0;
+
+ *filep = fget(fd);
+ if (!*filep)
+ return -EINVAL;
+
+ /* check uverbs ops exist */
+ if ((*filep)->f_op != file->filp->f_op) {
+ ret = -EINVAL;
+ goto file;
+ }
+
+ *ufile = (*filep)->private_data;
+ fd_dev = (*ufile)->device;
+
+ /* check that both files belong to same ib_device */
+ if (dev != fd_dev) {
+ ret = -EINVAL;
+ goto file;
+ }
+
+ uverbs_init_attrs_ufile(&fd_attrs, *ufile);
+
+ *uobj = uobj_get_read(type, handle, &fd_attrs);
+ if (IS_ERR(*uobj)) {
+ ret = -EINVAL;
+ goto file;
+ }
+
+ /* verify ib_object is shareable */
+ if (!(*uobj)->refcnt) {
+ ret = -EINVAL;
+ goto uobj;
+ }
+
+ return 0;
+uobj:
+ uobj_put_read(*uobj);
+file:
+ fput(*filep);
+ return ret;
+}
+
+static void ib_uverbs_import_unlock(struct ib_uobject *uobj,
+ struct file *filep)
+{
+ uobj_put_read(uobj);
+ fput(filep);
+}
+
/*
* Describe the input structs for write(). Some write methods have an input
* only struct, most have an input and output. If the struct has an output then
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index 11c13c1381cf..fa88a586284c 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -1091,6 +1091,7 @@ static int ib_uverbs_open(struct inode *inode, struct file *filp)
mutex_init(&file->umap_lock);
INIT_LIST_HEAD(&file->umaps);
+ file->filp = filp;
filp->private_data = file;
list_add_tail(&file->list, &dev->uverbs_file_list);
mutex_unlock(&dev->lists_mutex);
--
2.20.1
next prev 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 ` Shamir Rabinovitch [this message]
2019-07-16 18:11 ` [PATCH 08/25] IB/uverbs: ufile must be freed only when not used anymore Shamir Rabinovitch
2019-07-17 11:53 ` 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-8-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 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).