From: Leon Romanovsky <leon@kernel.org>
To: Doug Ledford <dledford@redhat.com>, Jason Gunthorpe <jgg@mellanox.com>
Cc: Leon Romanovsky <leonro@mellanox.com>,
RDMA mailing list <linux-rdma@vger.kernel.org>,
Saeed Mahameed <saeedm@mellanox.com>,
Yishai Hadas <yishaih@mellanox.com>,
linux-netdev <netdev@vger.kernel.org>
Subject: [PATCH rdma-next v2 13/13] IB/mlx5: DEVX cleanup mdev
Date: Sun, 30 Jun 2019 19:23:34 +0300 [thread overview]
Message-ID: <20190630162334.22135-14-leon@kernel.org> (raw)
In-Reply-To: <20190630162334.22135-1-leon@kernel.org>
From: Yishai Hadas <yishaih@mellanox.com>
No need any more to hold mlx5_core_dev on the devx_object, it can be
accessed from ib_dev.
Signed-off-by: Yishai Hadas <yishaih@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
drivers/infiniband/hw/mlx5/devx.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c
index 38064f4bfdf6..cb4f0fc79176 100644
--- a/drivers/infiniband/hw/mlx5/devx.c
+++ b/drivers/infiniband/hw/mlx5/devx.c
@@ -91,7 +91,6 @@ struct devx_async_event_file {
#define MLX5_MAX_DESTROY_INBOX_SIZE_DW MLX5_ST_SZ_DW(delete_fte_in)
struct devx_obj {
- struct mlx5_core_dev *mdev;
struct mlx5_ib_dev *ib_dev;
u64 obj_id;
u32 dinlen; /* destroy inbox length */
@@ -1297,7 +1296,7 @@ static void devx_free_indirect_mkey(struct rcu_head *rcu)
*/
static void devx_cleanup_mkey(struct devx_obj *obj)
{
- struct mlx5_mkey_table *table = &obj->mdev->priv.mkey_table;
+ struct mlx5_mkey_table *table = &obj->ib_dev->mdev->priv.mkey_table;
unsigned long flags;
write_lock_irqsave(&table->lock, flags);
@@ -1350,12 +1349,12 @@ static int devx_obj_cleanup(struct ib_uobject *uobject,
devx_cleanup_mkey(obj);
if (obj->flags & DEVX_OBJ_FLAGS_DCT)
- ret = mlx5_core_destroy_dct(obj->mdev, &obj->core_dct);
+ ret = mlx5_core_destroy_dct(obj->ib_dev->mdev, &obj->core_dct);
else if (obj->flags & DEVX_OBJ_FLAGS_CQ)
- ret = mlx5_core_destroy_cq(obj->mdev, &obj->core_cq);
+ ret = mlx5_core_destroy_cq(obj->ib_dev->mdev, &obj->core_cq);
else
- ret = mlx5_cmd_exec(obj->mdev, obj->dinbox, obj->dinlen, out,
- sizeof(out));
+ ret = mlx5_cmd_exec(obj->ib_dev->mdev, obj->dinbox,
+ obj->dinlen, out, sizeof(out));
if (ib_is_destroy_retryable(ret, why, uobject))
return ret;
@@ -1466,7 +1465,6 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)(
goto obj_free;
uobj->object = obj;
- obj->mdev = dev->mdev;
INIT_LIST_HEAD(&obj->event_sub);
obj->ib_dev = dev;
devx_obj_build_destroy_cmd(cmd_in, cmd_out, obj->dinbox, &obj->dinlen,
@@ -1495,11 +1493,11 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)(
devx_cleanup_mkey(obj);
obj_destroy:
if (obj->flags & DEVX_OBJ_FLAGS_DCT)
- mlx5_core_destroy_dct(obj->mdev, &obj->core_dct);
+ mlx5_core_destroy_dct(obj->ib_dev->mdev, &obj->core_dct);
else if (obj->flags & DEVX_OBJ_FLAGS_CQ)
- mlx5_core_destroy_cq(obj->mdev, &obj->core_cq);
+ mlx5_core_destroy_cq(obj->ib_dev->mdev, &obj->core_cq);
else
- mlx5_cmd_exec(obj->mdev, obj->dinbox, obj->dinlen, out,
+ mlx5_cmd_exec(obj->ib_dev->mdev, obj->dinbox, obj->dinlen, out,
sizeof(out));
obj_free:
kfree(obj);
--
2.20.1
next prev parent reply other threads:[~2019-06-30 16:24 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-30 16:23 [PATCH rdma-next v2 00/13] DEVX asynchronous events Leon Romanovsky
2019-06-30 16:23 ` [PATCH mlx5-next v2 01/13] net/mlx5: Fix mlx5_core_destroy_cq() error flow Leon Romanovsky
2019-06-30 16:23 ` [PATCH mlx5-next v2 02/13] net/mlx5: Use event mask based on device capabilities Leon Romanovsky
2019-06-30 16:23 ` [PATCH mlx5-next v2 03/13] net/mlx5: Expose the API to register for ANY event Leon Romanovsky
2019-06-30 16:23 ` [PATCH mlx5-next v2 04/13] net/mlx5: mlx5_core_create_cq() enhancements Leon Romanovsky
2019-06-30 16:23 ` [PATCH mlx5-next v2 05/13] net/mlx5: Report a CQ error event only when a handler was set Leon Romanovsky
2019-06-30 16:23 ` [PATCH mlx5-next v2 06/13] net/mlx5: Report EQE data upon CQ completion Leon Romanovsky
2019-06-30 16:23 ` [PATCH mlx5-next v2 07/13] net/mlx5: Expose device definitions for object events Leon Romanovsky
2019-06-30 16:23 ` [PATCH rdma-next v2 08/13] IB/mlx5: Introduce MLX5_IB_OBJECT_DEVX_ASYNC_EVENT_FD Leon Romanovsky
2019-06-30 16:23 ` [PATCH rdma-next v2 09/13] IB/mlx5: Register DEVX with mlx5_core to get async events Leon Romanovsky
2019-06-30 16:23 ` [PATCH rdma-next v2 10/13] IB/mlx5: Enable subscription for device events over DEVX Leon Romanovsky
2019-07-03 20:18 ` Jason Gunthorpe
2019-06-30 16:23 ` [PATCH rdma-next v2 11/13] IB/mlx5: Implement DEVX dispatching event Leon Romanovsky
2019-06-30 16:23 ` [PATCH rdma-next v2 12/13] IB/mlx5: Add DEVX support for CQ events Leon Romanovsky
2019-06-30 16:23 ` Leon Romanovsky [this message]
2019-07-03 15:29 ` [PATCH rdma-next v2 00/13] DEVX asynchronous events Jason Gunthorpe
2019-07-03 18:04 ` Leon Romanovsky
2019-07-03 20:19 ` 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=20190630162334.22135-14-leon@kernel.org \
--to=leon@kernel.org \
--cc=dledford@redhat.com \
--cc=jgg@mellanox.com \
--cc=leonro@mellanox.com \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=saeedm@mellanox.com \
--cc=yishaih@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).