mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH rdma-next 00/11] RDMA/mlx5: Preparation for SD support
@ 2026-11-17 14:01 Edward Srouji
  2026-11-17 14:01 ` [PATCH rdma-next 01/11] RDMA/mlx5: Enforce dev/mdev naming for device pointers Edward Srouji
                   ` (10 more replies)
  0 siblings, 11 replies; 12+ messages in thread
From: Edward Srouji @ 2026-11-17 14:01 UTC (permalink / raw)
  To: Leon Romanovsky, Jason Gunthorpe, Sabrina Dubroca
  Cc: linux-rdma, linux-kernel, netdev, Edward Srouji,
	Akiva Goldberger, Michael Gur

This series prepares mlx5_ib for Socket Direct (SD), where one IB device
spans several core devices, one per PCIe function. Today the driver
assumes a single core device per IB device and reaches it through
dev->mdev all over the code.

Instead, each call site now finds its core device through the resource
it works on: QPs, SRQs, AHs and MWs through their PD, and DEVX objects,
UARs and mmaps through their ucontext. A CQ and an MR store the core
device they were created on, since they cannot always reach their owner
when they need it. The SD series can then change where a resource lives
in the resolvers, without touching the call sites.

The resolvers follow one naming scheme: <resource>_to_mdev() returns a
core device and <resource>_to_dev() an IB device. Where several resource
types are accepted, a _Generic() dispatches to per-type helpers, which
are prefixed with '__' and are not meant to be called directly.

State kept once per IB device, such as the ODP page-fault EQ, delay drop
and local loopback, stays on dev->mdev. The SD series decides how each
of them works across core devices.

This series only changes how each call site finds its core device. With
one core device per IB device every resolver returns dev->mdev, so the
behaviour is unchanged. Pre-existing issues in the touched code are
intentionally left alone so that each patch stays a mechanical
conversion.

Patches 1-2:  name device pointers consistently, dev for the IB device
              and mdev for the core device.
Patches 3-7:  resolve the core device through the PD.
Patches 8-11: resolve the core device through the ucontext, and keep it
              on the CQ.

Signed-off-by: Edward Srouji <edwards@nvidia.com>
---
Akiva Goldberger (11):
      RDMA/mlx5: Enforce dev/mdev naming for device pointers
      RDMA/mlx5: Rename to_mdev() helpers that return an IB device
      RDMA/mlx5: Select the PD and SRQ core device through the PD
      RDMA/mlx5: Select the core device through PD for QP commands
      RDMA/mlx5: Cache the MR core device and resolve the MW's via its PD
      RDMA/mlx5: Select the AH core device through their PD
      RDMA/mlx5: Select the QP core device through its PD
      RDMA/mlx5: Resolve core device from ucontext for DEVX resources
      RDMA/mlx5: Cache the CQ core device and resolve it via cq_to_mdev()
      RDMA/mlx5: Resolve the bfreg UAR-index core device from the ucontext
      RDMA/mlx5: Resolve UAR and mmap core devices via the ucontext

 drivers/infiniband/hw/mlx5/ah.c        |  20 +-
 drivers/infiniband/hw/mlx5/cmd.c       |  52 +--
 drivers/infiniband/hw/mlx5/cmd.h       |  26 +-
 drivers/infiniband/hw/mlx5/counters.c  |  32 +-
 drivers/infiniband/hw/mlx5/cq.c        | 120 +++----
 drivers/infiniband/hw/mlx5/devx.c      | 159 ++++-----
 drivers/infiniband/hw/mlx5/devx.h      |  10 +-
 drivers/infiniband/hw/mlx5/dm.c        |  74 +++--
 drivers/infiniband/hw/mlx5/dmah.c      |  10 +-
 drivers/infiniband/hw/mlx5/fs.c        |  32 +-
 drivers/infiniband/hw/mlx5/gsi.c       |  27 +-
 drivers/infiniband/hw/mlx5/ib_rep.c    |  48 +--
 drivers/infiniband/hw/mlx5/ib_virt.c   |  12 +-
 drivers/infiniband/hw/mlx5/macsec.c    |  10 +-
 drivers/infiniband/hw/mlx5/mad.c       |  18 +-
 drivers/infiniband/hw/mlx5/main.c      | 270 +++++++--------
 drivers/infiniband/hw/mlx5/mlx5_ib.h   | 151 +++++++--
 drivers/infiniband/hw/mlx5/mr.c        | 228 +++++++------
 drivers/infiniband/hw/mlx5/odp.c       |  64 ++--
 drivers/infiniband/hw/mlx5/qos.c       |  13 +-
 drivers/infiniband/hw/mlx5/qp.c        | 580 +++++++++++++++++----------------
 drivers/infiniband/hw/mlx5/qp.h        |  34 +-
 drivers/infiniband/hw/mlx5/qpc.c       | 109 ++++---
 drivers/infiniband/hw/mlx5/restrack.c  |  15 +-
 drivers/infiniband/hw/mlx5/srq.c       |  50 +--
 drivers/infiniband/hw/mlx5/srq.h       |   4 +-
 drivers/infiniband/hw/mlx5/srq_cmd.c   | 124 ++++---
 drivers/infiniband/hw/mlx5/std_types.c |  10 +-
 drivers/infiniband/hw/mlx5/umr.c       | 133 ++++----
 drivers/infiniband/hw/mlx5/umr.h       |  22 +-
 drivers/infiniband/hw/mlx5/wr.c        |  15 +-
 31 files changed, 1330 insertions(+), 1142 deletions(-)
---
base-commit: 36d1eca030a37baa00a56bf34962f36263181918
change-id: 20261117-mlx5-sd-prep-571490a1fad3

Best regards,
-- 
Edward Srouji <edwards@nvidia.com>


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH rdma-next 01/11] RDMA/mlx5: Enforce dev/mdev naming for device pointers
  2026-11-17 14:01 [PATCH rdma-next 00/11] RDMA/mlx5: Preparation for SD support Edward Srouji
@ 2026-11-17 14:01 ` Edward Srouji
  2026-11-17 14:01 ` [PATCH rdma-next 02/11] RDMA/mlx5: Rename to_mdev() helpers that return an IB device Edward Srouji
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Edward Srouji @ 2026-11-17 14:01 UTC (permalink / raw)
  To: Leon Romanovsky, Jason Gunthorpe, Sabrina Dubroca
  Cc: linux-rdma, linux-kernel, netdev, Edward Srouji,
	Akiva Goldberger, Michael Gur

From: Akiva Goldberger <agoldberger@nvidia.com>

The driver mixes two conventions for its two device handles: a struct
mlx5_ib_dev is usually called "dev" and a struct mlx5_core_dev "mdev",
but a number of functions and structs use the opposite name - a core
device called "dev", or an IB device called "mdev". The inconsistent
naming convention makes it easy to grab the wrong handle.

Rename variables, parameters and struct fields so that "dev" refers to
struct mlx5_ib_dev pointer exclusively and "mdev" refers to struct
mlx5_core_dev exclusively. This includes two struct fields: struct
mlx5_dm's core device becomes "mdev" and struct devx_async_data's IB
device becomes "dev". References to either device handle that utilize a
different but obviously specific name (ibdev, core_dev, cur_owner, mdm,
...) are left untouched.

The following commit will apply this naming convention to existing
helpers that return either of the device handles.

Pure rename; no functional change.

Signed-off-by: Akiva Goldberger <agoldberger@nvidia.com>
Reviewed-by: Michael Gur <michaelgur@nvidia.com>
Signed-off-by: Edward Srouji <edwards@nvidia.com>
---
 drivers/infiniband/hw/mlx5/cmd.c      | 52 ++++++++++++++---------------
 drivers/infiniband/hw/mlx5/cmd.h      | 26 +++++++--------
 drivers/infiniband/hw/mlx5/devx.c     | 32 +++++++++---------
 drivers/infiniband/hw/mlx5/dm.c       | 63 ++++++++++++++++++-----------------
 drivers/infiniband/hw/mlx5/fs.c       | 18 +++++-----
 drivers/infiniband/hw/mlx5/ib_rep.c   | 45 +++++++++++++------------
 drivers/infiniband/hw/mlx5/mad.c      |  4 +--
 drivers/infiniband/hw/mlx5/main.c     | 10 +++---
 drivers/infiniband/hw/mlx5/mlx5_ib.h  |  2 +-
 drivers/infiniband/hw/mlx5/mr.c       |  4 +--
 drivers/infiniband/hw/mlx5/odp.c      | 10 +++---
 drivers/infiniband/hw/mlx5/qp.c       | 24 ++++++-------
 drivers/infiniband/hw/mlx5/qpc.c      |  2 +-
 drivers/infiniband/hw/mlx5/restrack.c |  3 +-
 14 files changed, 149 insertions(+), 146 deletions(-)

diff --git a/drivers/infiniband/hw/mlx5/cmd.c b/drivers/infiniband/hw/mlx5/cmd.c
index 895b62cc528df6e73f64acd46aea34d56e23c608..40bbb11fb5a23a358af0d46e06181fc56356f22c 100644
--- a/drivers/infiniband/hw/mlx5/cmd.c
+++ b/drivers/infiniband/hw/mlx5/cmd.c
@@ -42,7 +42,7 @@ int mlx5r_cmd_query_special_mkeys(struct mlx5_ib_dev *dev)
 	return 0;
 }
 
-int mlx5_cmd_query_cong_params(struct mlx5_core_dev *dev, int cong_point,
+int mlx5_cmd_query_cong_params(struct mlx5_core_dev *mdev, int cong_point,
 			       void *out)
 {
 	u32 in[MLX5_ST_SZ_DW(query_cong_params_in)] = {};
@@ -51,40 +51,40 @@ int mlx5_cmd_query_cong_params(struct mlx5_core_dev *dev, int cong_point,
 		 MLX5_CMD_OP_QUERY_CONG_PARAMS);
 	MLX5_SET(query_cong_params_in, in, cong_protocol, cong_point);
 
-	return mlx5_cmd_exec_inout(dev, query_cong_params, in, out);
+	return mlx5_cmd_exec_inout(mdev, query_cong_params, in, out);
 }
 
-void mlx5_cmd_destroy_tir(struct mlx5_core_dev *dev, u32 tirn, u16 uid)
+void mlx5_cmd_destroy_tir(struct mlx5_core_dev *mdev, u32 tirn, u16 uid)
 {
 	u32 in[MLX5_ST_SZ_DW(destroy_tir_in)] = {};
 
 	MLX5_SET(destroy_tir_in, in, opcode, MLX5_CMD_OP_DESTROY_TIR);
 	MLX5_SET(destroy_tir_in, in, tirn, tirn);
 	MLX5_SET(destroy_tir_in, in, uid, uid);
-	mlx5_cmd_exec_in(dev, destroy_tir, in);
+	mlx5_cmd_exec_in(mdev, destroy_tir, in);
 }
 
-void mlx5_cmd_destroy_tis(struct mlx5_core_dev *dev, u32 tisn, u16 uid)
+void mlx5_cmd_destroy_tis(struct mlx5_core_dev *mdev, u32 tisn, u16 uid)
 {
 	u32 in[MLX5_ST_SZ_DW(destroy_tis_in)] = {};
 
 	MLX5_SET(destroy_tis_in, in, opcode, MLX5_CMD_OP_DESTROY_TIS);
 	MLX5_SET(destroy_tis_in, in, tisn, tisn);
 	MLX5_SET(destroy_tis_in, in, uid, uid);
-	mlx5_cmd_exec_in(dev, destroy_tis, in);
+	mlx5_cmd_exec_in(mdev, destroy_tis, in);
 }
 
-int mlx5_cmd_destroy_rqt(struct mlx5_core_dev *dev, u32 rqtn, u16 uid)
+int mlx5_cmd_destroy_rqt(struct mlx5_core_dev *mdev, u32 rqtn, u16 uid)
 {
 	u32 in[MLX5_ST_SZ_DW(destroy_rqt_in)] = {};
 
 	MLX5_SET(destroy_rqt_in, in, opcode, MLX5_CMD_OP_DESTROY_RQT);
 	MLX5_SET(destroy_rqt_in, in, rqtn, rqtn);
 	MLX5_SET(destroy_rqt_in, in, uid, uid);
-	return mlx5_cmd_exec_in(dev, destroy_rqt, in);
+	return mlx5_cmd_exec_in(mdev, destroy_rqt, in);
 }
 
-int mlx5_cmd_alloc_transport_domain(struct mlx5_core_dev *dev, u32 *tdn,
+int mlx5_cmd_alloc_transport_domain(struct mlx5_core_dev *mdev, u32 *tdn,
 				    u16 uid)
 {
 	u32 in[MLX5_ST_SZ_DW(alloc_transport_domain_in)] = {};
@@ -95,7 +95,7 @@ int mlx5_cmd_alloc_transport_domain(struct mlx5_core_dev *dev, u32 *tdn,
 		 MLX5_CMD_OP_ALLOC_TRANSPORT_DOMAIN);
 	MLX5_SET(alloc_transport_domain_in, in, uid, uid);
 
-	err = mlx5_cmd_exec_inout(dev, alloc_transport_domain, in, out);
+	err = mlx5_cmd_exec_inout(mdev, alloc_transport_domain, in, out);
 	if (!err)
 		*tdn = MLX5_GET(alloc_transport_domain_out, out,
 				transport_domain);
@@ -103,7 +103,7 @@ int mlx5_cmd_alloc_transport_domain(struct mlx5_core_dev *dev, u32 *tdn,
 	return err;
 }
 
-void mlx5_cmd_dealloc_transport_domain(struct mlx5_core_dev *dev, u32 tdn,
+void mlx5_cmd_dealloc_transport_domain(struct mlx5_core_dev *mdev, u32 tdn,
 				       u16 uid)
 {
 	u32 in[MLX5_ST_SZ_DW(dealloc_transport_domain_in)] = {};
@@ -112,20 +112,20 @@ void mlx5_cmd_dealloc_transport_domain(struct mlx5_core_dev *dev, u32 tdn,
 		 MLX5_CMD_OP_DEALLOC_TRANSPORT_DOMAIN);
 	MLX5_SET(dealloc_transport_domain_in, in, uid, uid);
 	MLX5_SET(dealloc_transport_domain_in, in, transport_domain, tdn);
-	mlx5_cmd_exec_in(dev, dealloc_transport_domain, in);
+	mlx5_cmd_exec_in(mdev, dealloc_transport_domain, in);
 }
 
-int mlx5_cmd_dealloc_pd(struct mlx5_core_dev *dev, u32 pdn, u16 uid)
+int mlx5_cmd_dealloc_pd(struct mlx5_core_dev *mdev, u32 pdn, u16 uid)
 {
 	u32 in[MLX5_ST_SZ_DW(dealloc_pd_in)] = {};
 
 	MLX5_SET(dealloc_pd_in, in, opcode, MLX5_CMD_OP_DEALLOC_PD);
 	MLX5_SET(dealloc_pd_in, in, pd, pdn);
 	MLX5_SET(dealloc_pd_in, in, uid, uid);
-	return mlx5_cmd_exec_in(dev, dealloc_pd, in);
+	return mlx5_cmd_exec_in(mdev, dealloc_pd, in);
 }
 
-int mlx5_cmd_attach_mcg(struct mlx5_core_dev *dev, union ib_gid *mgid,
+int mlx5_cmd_attach_mcg(struct mlx5_core_dev *mdev, union ib_gid *mgid,
 			u32 qpn, u16 uid)
 {
 	u32 in[MLX5_ST_SZ_DW(attach_to_mcg_in)] = {};
@@ -136,10 +136,10 @@ int mlx5_cmd_attach_mcg(struct mlx5_core_dev *dev, union ib_gid *mgid,
 	MLX5_SET(attach_to_mcg_in, in, uid, uid);
 	gid = MLX5_ADDR_OF(attach_to_mcg_in, in, multicast_gid);
 	memcpy(gid, mgid, sizeof(*mgid));
-	return mlx5_cmd_exec_in(dev, attach_to_mcg, in);
+	return mlx5_cmd_exec_in(mdev, attach_to_mcg, in);
 }
 
-int mlx5_cmd_detach_mcg(struct mlx5_core_dev *dev, union ib_gid *mgid,
+int mlx5_cmd_detach_mcg(struct mlx5_core_dev *mdev, union ib_gid *mgid,
 			u32 qpn, u16 uid)
 {
 	u32 in[MLX5_ST_SZ_DW(detach_from_mcg_in)] = {};
@@ -150,10 +150,10 @@ int mlx5_cmd_detach_mcg(struct mlx5_core_dev *dev, union ib_gid *mgid,
 	MLX5_SET(detach_from_mcg_in, in, uid, uid);
 	gid = MLX5_ADDR_OF(detach_from_mcg_in, in, multicast_gid);
 	memcpy(gid, mgid, sizeof(*mgid));
-	return mlx5_cmd_exec_in(dev, detach_from_mcg, in);
+	return mlx5_cmd_exec_in(mdev, detach_from_mcg, in);
 }
 
-int mlx5_cmd_xrcd_alloc(struct mlx5_core_dev *dev, u32 *xrcdn, u16 uid)
+int mlx5_cmd_xrcd_alloc(struct mlx5_core_dev *mdev, u32 *xrcdn, u16 uid)
 {
 	u32 out[MLX5_ST_SZ_DW(alloc_xrcd_out)] = {};
 	u32 in[MLX5_ST_SZ_DW(alloc_xrcd_in)] = {};
@@ -161,20 +161,20 @@ int mlx5_cmd_xrcd_alloc(struct mlx5_core_dev *dev, u32 *xrcdn, u16 uid)
 
 	MLX5_SET(alloc_xrcd_in, in, opcode, MLX5_CMD_OP_ALLOC_XRCD);
 	MLX5_SET(alloc_xrcd_in, in, uid, uid);
-	err = mlx5_cmd_exec_inout(dev, alloc_xrcd, in, out);
+	err = mlx5_cmd_exec_inout(mdev, alloc_xrcd, in, out);
 	if (!err)
 		*xrcdn = MLX5_GET(alloc_xrcd_out, out, xrcd);
 	return err;
 }
 
-int mlx5_cmd_xrcd_dealloc(struct mlx5_core_dev *dev, u32 xrcdn, u16 uid)
+int mlx5_cmd_xrcd_dealloc(struct mlx5_core_dev *mdev, u32 xrcdn, u16 uid)
 {
 	u32 in[MLX5_ST_SZ_DW(dealloc_xrcd_in)] = {};
 
 	MLX5_SET(dealloc_xrcd_in, in, opcode, MLX5_CMD_OP_DEALLOC_XRCD);
 	MLX5_SET(dealloc_xrcd_in, in, xrcd, xrcdn);
 	MLX5_SET(dealloc_xrcd_in, in, uid, uid);
-	return mlx5_cmd_exec_in(dev, dealloc_xrcd, in);
+	return mlx5_cmd_exec_in(mdev, dealloc_xrcd, in);
 }
 
 int mlx5_cmd_mad_ifc(struct mlx5_ib_dev *dev, const void *inb, void *outb,
@@ -220,7 +220,7 @@ int mlx5_cmd_mad_ifc(struct mlx5_ib_dev *dev, const void *inb, void *outb,
 	return err;
 }
 
-int mlx5_cmd_uar_alloc(struct mlx5_core_dev *dev, u32 *uarn, u16 uid)
+int mlx5_cmd_uar_alloc(struct mlx5_core_dev *mdev, u32 *uarn, u16 uid)
 {
 	u32 out[MLX5_ST_SZ_DW(alloc_uar_out)] = {};
 	u32 in[MLX5_ST_SZ_DW(alloc_uar_in)] = {};
@@ -228,7 +228,7 @@ int mlx5_cmd_uar_alloc(struct mlx5_core_dev *dev, u32 *uarn, u16 uid)
 
 	MLX5_SET(alloc_uar_in, in, opcode, MLX5_CMD_OP_ALLOC_UAR);
 	MLX5_SET(alloc_uar_in, in, uid, uid);
-	err = mlx5_cmd_exec_inout(dev, alloc_uar, in, out);
+	err = mlx5_cmd_exec_inout(mdev, alloc_uar, in, out);
 	if (err)
 		return err;
 
@@ -236,12 +236,12 @@ int mlx5_cmd_uar_alloc(struct mlx5_core_dev *dev, u32 *uarn, u16 uid)
 	return 0;
 }
 
-int mlx5_cmd_uar_dealloc(struct mlx5_core_dev *dev, u32 uarn, u16 uid)
+int mlx5_cmd_uar_dealloc(struct mlx5_core_dev *mdev, u32 uarn, u16 uid)
 {
 	u32 in[MLX5_ST_SZ_DW(dealloc_uar_in)] = {};
 
 	MLX5_SET(dealloc_uar_in, in, opcode, MLX5_CMD_OP_DEALLOC_UAR);
 	MLX5_SET(dealloc_uar_in, in, uar, uarn);
 	MLX5_SET(dealloc_uar_in, in, uid, uid);
-	return mlx5_cmd_exec_in(dev, dealloc_uar, in);
+	return mlx5_cmd_exec_in(mdev, dealloc_uar, in);
 }
diff --git a/drivers/infiniband/hw/mlx5/cmd.h b/drivers/infiniband/hw/mlx5/cmd.h
index e5cd31270443d8f8e7801247d1dad5e8982fd42a..32507443abf3ab46b56d50d4b6a6fa28312e2cf5 100644
--- a/drivers/infiniband/hw/mlx5/cmd.h
+++ b/drivers/infiniband/hw/mlx5/cmd.h
@@ -38,24 +38,24 @@
 #include <linux/mlx5/driver.h>
 
 int mlx5r_cmd_query_special_mkeys(struct mlx5_ib_dev *dev);
-int mlx5_cmd_query_cong_params(struct mlx5_core_dev *dev, int cong_point,
+int mlx5_cmd_query_cong_params(struct mlx5_core_dev *mdev, int cong_point,
 			       void *out);
-int mlx5_cmd_dealloc_pd(struct mlx5_core_dev *dev, u32 pdn, u16 uid);
-void mlx5_cmd_destroy_tir(struct mlx5_core_dev *dev, u32 tirn, u16 uid);
-void mlx5_cmd_destroy_tis(struct mlx5_core_dev *dev, u32 tisn, u16 uid);
-int mlx5_cmd_destroy_rqt(struct mlx5_core_dev *dev, u32 rqtn, u16 uid);
-int mlx5_cmd_alloc_transport_domain(struct mlx5_core_dev *dev, u32 *tdn,
+int mlx5_cmd_dealloc_pd(struct mlx5_core_dev *mdev, u32 pdn, u16 uid);
+void mlx5_cmd_destroy_tir(struct mlx5_core_dev *mdev, u32 tirn, u16 uid);
+void mlx5_cmd_destroy_tis(struct mlx5_core_dev *mdev, u32 tisn, u16 uid);
+int mlx5_cmd_destroy_rqt(struct mlx5_core_dev *mdev, u32 rqtn, u16 uid);
+int mlx5_cmd_alloc_transport_domain(struct mlx5_core_dev *mdev, u32 *tdn,
 				    u16 uid);
-void mlx5_cmd_dealloc_transport_domain(struct mlx5_core_dev *dev, u32 tdn,
+void mlx5_cmd_dealloc_transport_domain(struct mlx5_core_dev *mdev, u32 tdn,
 				       u16 uid);
-int mlx5_cmd_attach_mcg(struct mlx5_core_dev *dev, union ib_gid *mgid,
+int mlx5_cmd_attach_mcg(struct mlx5_core_dev *mdev, union ib_gid *mgid,
 			u32 qpn, u16 uid);
-int mlx5_cmd_detach_mcg(struct mlx5_core_dev *dev, union ib_gid *mgid,
+int mlx5_cmd_detach_mcg(struct mlx5_core_dev *mdev, union ib_gid *mgid,
 			u32 qpn, u16 uid);
-int mlx5_cmd_xrcd_alloc(struct mlx5_core_dev *dev, u32 *xrcdn, u16 uid);
-int mlx5_cmd_xrcd_dealloc(struct mlx5_core_dev *dev, u32 xrcdn, u16 uid);
+int mlx5_cmd_xrcd_alloc(struct mlx5_core_dev *mdev, u32 *xrcdn, u16 uid);
+int mlx5_cmd_xrcd_dealloc(struct mlx5_core_dev *mdev, u32 xrcdn, u16 uid);
 int mlx5_cmd_mad_ifc(struct mlx5_ib_dev *dev, const void *inb, void *outb,
 		     u16 opmod, u8 port);
-int mlx5_cmd_uar_alloc(struct mlx5_core_dev *dev, u32 *uarn, u16 uid);
-int mlx5_cmd_uar_dealloc(struct mlx5_core_dev *dev, u32 uarn, u16 uid);
+int mlx5_cmd_uar_alloc(struct mlx5_core_dev *mdev, u32 *uarn, u16 uid);
+int mlx5_cmd_uar_dealloc(struct mlx5_core_dev *mdev, u32 uarn, u16 uid);
 #endif /* MLX5_IB_CMD_H */
diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c
index fc6f793dcc6584e6a22b40c57e2df8f24579eb14..7e84dd15ac1f987af3f74563bcd1b30f15a385ca 100644
--- a/drivers/infiniband/hw/mlx5/devx.c
+++ b/drivers/infiniband/hw/mlx5/devx.c
@@ -44,7 +44,7 @@ struct mlx5_async_cmd {
 };
 
 struct devx_async_data {
-	struct mlx5_ib_dev *mdev;
+	struct mlx5_ib_dev *dev;
 	struct list_head list;
 	struct devx_async_cmd_event_file *ev_file;
 	struct mlx5_async_work cb_work;
@@ -1652,7 +1652,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_MODIFY)(
 							  MLX5_IB_ATTR_DEVX_OBJ_MODIFY_HANDLE);
 	struct mlx5_ib_ucontext *c = rdma_udata_to_drv_context(
 		&attrs->driver_udata, struct mlx5_ib_ucontext, ibucontext);
-	struct mlx5_ib_dev *mdev = to_mdev(c->ibucontext.device);
+	struct mlx5_ib_dev *dev = to_mdev(c->ibucontext.device);
 	void *cmd_out;
 	int err, err2;
 	int uid;
@@ -1677,7 +1677,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_MODIFY)(
 	MLX5_SET(general_obj_in_cmd_hdr, cmd_in, uid, uid);
 	devx_set_umem_valid(cmd_in);
 
-	err = mlx5_cmd_do(mdev->mdev, cmd_in,
+	err = mlx5_cmd_do(dev->mdev, cmd_in,
 			  uverbs_attr_get_len(attrs, MLX5_IB_ATTR_DEVX_OBJ_MODIFY_CMD_IN),
 			  cmd_out, cmd_out_len);
 	if (err && err != -EREMOTEIO)
@@ -1702,7 +1702,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_QUERY)(
 	void *cmd_out;
 	int err, err2;
 	int uid;
-	struct mlx5_ib_dev *mdev = to_mdev(c->ibucontext.device);
+	struct mlx5_ib_dev *dev = to_mdev(c->ibucontext.device);
 
 	if (MLX5_GET(general_obj_in_cmd_hdr, cmd_in, vhca_tunnel_id))
 		return -EINVAL;
@@ -1722,7 +1722,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_QUERY)(
 		return PTR_ERR(cmd_out);
 
 	MLX5_SET(general_obj_in_cmd_hdr, cmd_in, uid, uid);
-	err = mlx5_cmd_do(mdev->mdev, cmd_in,
+	err = mlx5_cmd_do(dev->mdev, cmd_in,
 			  uverbs_attr_get_len(attrs, MLX5_IB_ATTR_DEVX_OBJ_QUERY_CMD_IN),
 			  cmd_out, cmd_out_len);
 	if (err && err != -EREMOTEIO)
@@ -1764,12 +1764,12 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_ASYNC_CMD_FD_ALLOC)(
 
 	struct ib_uobject *uobj = uverbs_attr_get_uobject(
 		attrs, MLX5_IB_ATTR_DEVX_ASYNC_CMD_FD_ALLOC_HANDLE);
-	struct mlx5_ib_dev *mdev = mlx5_udata_to_mdev(&attrs->driver_udata);
+	struct mlx5_ib_dev *dev = mlx5_udata_to_mdev(&attrs->driver_udata);
 
 	ev_file = container_of(uobj, struct devx_async_cmd_event_file,
 			       uobj);
 	devx_init_event_queue(&ev_file->ev_queue);
-	mlx5_cmd_init_async_ctx(mdev->mdev, &ev_file->async_ctx);
+	mlx5_cmd_init_async_ctx(dev->mdev, &ev_file->async_ctx);
 	return 0;
 }
 
@@ -1841,7 +1841,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_ASYNC_QUERY)(
 	struct ib_uobject *fd_uobj;
 	int err;
 	int uid;
-	struct mlx5_ib_dev *mdev = to_mdev(c->ibucontext.device);
+	struct mlx5_ib_dev *dev = to_mdev(c->ibucontext.device);
 	struct devx_async_cmd_event_file *ev_file;
 	struct devx_async_data *async_data;
 
@@ -1890,7 +1890,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_ASYNC_QUERY)(
 		goto free_async;
 
 	async_data->cmd_out_len = cmd_out_len;
-	async_data->mdev = mdev;
+	async_data->dev = dev;
 	async_data->ev_file = ev_file;
 
 	MLX5_SET(general_obj_in_cmd_hdr, cmd_in, uid, uid);
@@ -2021,7 +2021,7 @@ static bool is_valid_events_legacy(int num_events, u16 *event_type_num_list,
 }
 
 #define MAX_SUPP_EVENT_NUM 255
-static bool is_valid_events(struct mlx5_core_dev *dev,
+static bool is_valid_events(struct mlx5_core_dev *mdev,
 			    int num_events, u16 *event_type_num_list,
 			    struct devx_obj *obj)
 {
@@ -2031,10 +2031,10 @@ static bool is_valid_events(struct mlx5_core_dev *dev,
 	int mask_bit;
 	int i;
 
-	if (MLX5_CAP_GEN(dev, event_cap)) {
-		aff_events = MLX5_CAP_DEV_EVENT(dev,
+	if (MLX5_CAP_GEN(mdev, event_cap)) {
+		aff_events = MLX5_CAP_DEV_EVENT(mdev,
 						user_affiliated_events);
-		unaff_events = MLX5_CAP_DEV_EVENT(dev,
+		unaff_events = MLX5_CAP_DEV_EVENT(mdev,
 						  user_unaffiliated_events);
 	} else {
 		return is_valid_events_legacy(num_events, event_type_num_list,
@@ -2465,17 +2465,17 @@ static int devx_umem_cleanup(struct ib_uobject *uobject,
 	return 0;
 }
 
-static bool is_unaffiliated_event(struct mlx5_core_dev *dev,
+static bool is_unaffiliated_event(struct mlx5_core_dev *mdev,
 				  unsigned long event_type)
 {
 	__be64 *unaff_events;
 	int mask_entry;
 	int mask_bit;
 
-	if (!MLX5_CAP_GEN(dev, event_cap))
+	if (!MLX5_CAP_GEN(mdev, event_cap))
 		return is_legacy_unaffiliated_event_num(event_type);
 
-	unaff_events = MLX5_CAP_DEV_EVENT(dev,
+	unaff_events = MLX5_CAP_DEV_EVENT(mdev,
 					  user_unaffiliated_events);
 	WARN_ON(event_type > MAX_SUPP_EVENT_NUM);
 
diff --git a/drivers/infiniband/hw/mlx5/dm.c b/drivers/infiniband/hw/mlx5/dm.c
index 7a6fe4fea3e2c2e067959ce951f188c07ec5f264..a67e8e5099e9a3ef21e120f982b3b4fd833b60e5 100644
--- a/drivers/infiniband/hw/mlx5/dm.c
+++ b/drivers/infiniband/hw/mlx5/dm.c
@@ -12,11 +12,12 @@
 static int mlx5_cmd_alloc_memic(struct mlx5_dm *dm, phys_addr_t *addr,
 				u64 length, u32 alignment)
 {
-	struct mlx5_core_dev *dev = dm->dev;
-	u64 num_memic_hw_pages = MLX5_CAP_DEV_MEM(dev, memic_bar_size)
+	struct mlx5_core_dev *mdev = dm->mdev;
+	u64 num_memic_hw_pages = MLX5_CAP_DEV_MEM(mdev, memic_bar_size)
 					>> PAGE_SHIFT;
-	u64 hw_start_addr = MLX5_CAP64_DEV_MEM(dev, memic_bar_start_addr);
-	u32 max_alignment = MLX5_CAP_DEV_MEM(dev, log_max_memic_addr_alignment);
+	u64 hw_start_addr = MLX5_CAP64_DEV_MEM(mdev, memic_bar_start_addr);
+	u32 max_alignment =
+		MLX5_CAP_DEV_MEM(mdev, log_max_memic_addr_alignment);
 	u32 num_pages = DIV_ROUND_UP(length, PAGE_SIZE);
 	u32 out[MLX5_ST_SZ_DW(alloc_memic_out)] = {};
 	u32 in[MLX5_ST_SZ_DW(alloc_memic_in)] = {};
@@ -60,7 +61,7 @@ static int mlx5_cmd_alloc_memic(struct mlx5_dm *dm, phys_addr_t *addr,
 		MLX5_SET64(alloc_memic_in, in, range_start_addr,
 			   hw_start_addr + (page_idx * PAGE_SIZE));
 
-		ret = mlx5_cmd_exec_inout(dev, alloc_memic, in, out);
+		ret = mlx5_cmd_exec_inout(mdev, alloc_memic, in, out);
 		if (ret) {
 			spin_lock(&dm->lock);
 			bitmap_clear(dm->memic_alloc_pages,
@@ -75,7 +76,7 @@ static int mlx5_cmd_alloc_memic(struct mlx5_dm *dm, phys_addr_t *addr,
 			return ret;
 		}
 
-		*addr = dev->bar_addr +
+		*addr = mdev->bar_addr +
 			MLX5_GET64(alloc_memic_out, out, memic_start_addr);
 
 		return 0;
@@ -87,21 +88,21 @@ static int mlx5_cmd_alloc_memic(struct mlx5_dm *dm, phys_addr_t *addr,
 void mlx5_cmd_dealloc_memic(struct mlx5_dm *dm, phys_addr_t addr,
 			    u64 length)
 {
-	struct mlx5_core_dev *dev = dm->dev;
-	u64 hw_start_addr = MLX5_CAP64_DEV_MEM(dev, memic_bar_start_addr);
+	struct mlx5_core_dev *mdev = dm->mdev;
+	u64 hw_start_addr = MLX5_CAP64_DEV_MEM(mdev, memic_bar_start_addr);
 	u32 num_pages = DIV_ROUND_UP(length, PAGE_SIZE);
 	u32 in[MLX5_ST_SZ_DW(dealloc_memic_in)] = {};
 	u64 start_page_idx;
 	int err;
 
-	addr -= dev->bar_addr;
+	addr -= mdev->bar_addr;
 	start_page_idx = (addr - hw_start_addr) >> PAGE_SHIFT;
 
 	MLX5_SET(dealloc_memic_in, in, opcode, MLX5_CMD_OP_DEALLOC_MEMIC);
 	MLX5_SET64(dealloc_memic_in, in, memic_start_addr, addr);
 	MLX5_SET(dealloc_memic_in, in, memic_size, length);
 
-	err =  mlx5_cmd_exec_in(dev, dealloc_memic, in);
+	err =  mlx5_cmd_exec_in(mdev, dealloc_memic, in);
 	if (err)
 		return;
 
@@ -115,14 +116,15 @@ void mlx5_cmd_dealloc_memic_op(struct mlx5_dm *dm, phys_addr_t addr,
 			       u8 operation)
 {
 	u32 in[MLX5_ST_SZ_DW(modify_memic_in)] = {};
-	struct mlx5_core_dev *dev = dm->dev;
+	struct mlx5_core_dev *mdev = dm->mdev;
 
 	MLX5_SET(modify_memic_in, in, opcode, MLX5_CMD_OP_MODIFY_MEMIC);
 	MLX5_SET(modify_memic_in, in, op_mod, MLX5_MODIFY_MEMIC_OP_MOD_DEALLOC);
 	MLX5_SET(modify_memic_in, in, memic_operation_type, operation);
-	MLX5_SET64(modify_memic_in, in, memic_start_addr, addr - dev->bar_addr);
+	MLX5_SET64(modify_memic_in, in, memic_start_addr,
+		   addr - mdev->bar_addr);
 
-	mlx5_cmd_exec_in(dev, modify_memic, in);
+	mlx5_cmd_exec_in(mdev, modify_memic, in);
 }
 
 static int mlx5_cmd_alloc_memic_op(struct mlx5_dm *dm, phys_addr_t addr,
@@ -130,19 +132,20 @@ static int mlx5_cmd_alloc_memic_op(struct mlx5_dm *dm, phys_addr_t addr,
 {
 	u32 out[MLX5_ST_SZ_DW(modify_memic_out)] = {};
 	u32 in[MLX5_ST_SZ_DW(modify_memic_in)] = {};
-	struct mlx5_core_dev *dev = dm->dev;
+	struct mlx5_core_dev *mdev = dm->mdev;
 	int err;
 
 	MLX5_SET(modify_memic_in, in, opcode, MLX5_CMD_OP_MODIFY_MEMIC);
 	MLX5_SET(modify_memic_in, in, op_mod, MLX5_MODIFY_MEMIC_OP_MOD_ALLOC);
 	MLX5_SET(modify_memic_in, in, memic_operation_type, operation);
-	MLX5_SET64(modify_memic_in, in, memic_start_addr, addr - dev->bar_addr);
+	MLX5_SET64(modify_memic_in, in, memic_start_addr,
+		   addr - mdev->bar_addr);
 
-	err = mlx5_cmd_exec_inout(dev, modify_memic, in, out);
+	err = mlx5_cmd_exec_inout(mdev, modify_memic, in, out);
 	if (err)
 		return err;
 
-	*op_addr = dev->bar_addr +
+	*op_addr = mdev->bar_addr +
 		   MLX5_GET64(modify_memic_out, out, memic_operation_addr);
 	return 0;
 }
@@ -282,7 +285,7 @@ static struct ib_dm *handle_alloc_dm_memic(struct ib_ucontext *ctx,
 	int err;
 	u64 address;
 
-	if (!dm_db || !MLX5_CAP_DEV_MEM(dm_db->dev, memic))
+	if (!dm_db || !MLX5_CAP_DEV_MEM(dm_db->mdev, memic))
 		return ERR_PTR(-EOPNOTSUPP);
 
 	dm = kzalloc_obj(*dm);
@@ -354,7 +357,7 @@ static struct ib_dm *handle_alloc_dm_sw_icm(struct ib_ucontext *ctx,
 					    struct uverbs_attr_bundle *attrs,
 					    int type)
 {
-	struct mlx5_core_dev *dev = to_mdev(ctx->device)->mdev;
+	struct mlx5_core_dev *mdev = to_mdev(ctx->device)->mdev;
 	enum mlx5_sw_icm_type icm_type;
 	struct mlx5_ib_dm_icm *dm;
 	u64 act_size;
@@ -367,15 +370,15 @@ static struct ib_dm *handle_alloc_dm_sw_icm(struct ib_ucontext *ctx,
 	case MLX5_IB_UAPI_DM_TYPE_STEERING_SW_ICM:
 	case MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_SW_ICM:
 	case MLX5_IB_UAPI_DM_TYPE_ENCAP_SW_ICM:
-		if (!(MLX5_CAP_FLOWTABLE_NIC_RX(dev, sw_owner) ||
-		      MLX5_CAP_FLOWTABLE_NIC_TX(dev, sw_owner) ||
-		      MLX5_CAP_FLOWTABLE_NIC_RX(dev, sw_owner_v2) ||
-		      MLX5_CAP_FLOWTABLE_NIC_TX(dev, sw_owner_v2)))
+		if (!(MLX5_CAP_FLOWTABLE_NIC_RX(mdev, sw_owner) ||
+		      MLX5_CAP_FLOWTABLE_NIC_TX(mdev, sw_owner) ||
+		      MLX5_CAP_FLOWTABLE_NIC_RX(mdev, sw_owner_v2) ||
+		      MLX5_CAP_FLOWTABLE_NIC_TX(mdev, sw_owner_v2)))
 			return ERR_PTR(-EOPNOTSUPP);
 		break;
 	case MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_PATTERN_SW_ICM:
-		if (!MLX5_CAP_FLOWTABLE_NIC_RX(dev, sw_owner_v2) ||
-		    !MLX5_CAP_FLOWTABLE_NIC_TX(dev, sw_owner_v2))
+		if (!MLX5_CAP_FLOWTABLE_NIC_RX(mdev, sw_owner_v2) ||
+		    !MLX5_CAP_FLOWTABLE_NIC_TX(mdev, sw_owner_v2))
 			return ERR_PTR(-EOPNOTSUPP);
 		break;
 	default:
@@ -392,13 +395,13 @@ static struct ib_dm *handle_alloc_dm_sw_icm(struct ib_ucontext *ctx,
 	/* Allocation size must a multiple of the basic block size
 	 * and a power of 2.
 	 */
-	act_size = round_up(attr->length, MLX5_SW_ICM_BLOCK_SIZE(dev));
+	act_size = round_up(attr->length, MLX5_SW_ICM_BLOCK_SIZE(mdev));
 	act_size = roundup_pow_of_two(act_size);
 
 	dm->base.size = act_size;
 	icm_type = get_icm_type(type);
 
-	err = mlx5_dm_sw_icm_alloc(dev, icm_type, act_size, attr->alignment,
+	err = mlx5_dm_sw_icm_alloc(mdev, icm_type, act_size, attr->alignment,
 				   to_mucontext(ctx)->devx_uid,
 				   &dm->base.dev_addr, &dm->obj_id);
 	if (err)
@@ -407,7 +410,7 @@ static struct ib_dm *handle_alloc_dm_sw_icm(struct ib_ucontext *ctx,
 	err = uverbs_copy_to(attrs, MLX5_IB_ATTR_ALLOC_DM_RESP_START_OFFSET,
 			     &dm->base.dev_addr, sizeof(dm->base.dev_addr));
 	if (err) {
-		mlx5_dm_sw_icm_dealloc(dev, icm_type, dm->base.size,
+		mlx5_dm_sw_icm_dealloc(mdev, icm_type, dm->base.size,
 				       to_mucontext(ctx)->devx_uid,
 				       dm->base.dev_addr, dm->obj_id);
 		goto free;
@@ -471,10 +474,10 @@ static int mlx5_dm_icm_dealloc(struct mlx5_ib_ucontext *ctx,
 			       struct mlx5_ib_dm_icm *dm)
 {
 	enum mlx5_sw_icm_type type = get_icm_type(dm->base.type);
-	struct mlx5_core_dev *dev = to_mdev(dm->base.ibdm.device)->mdev;
+	struct mlx5_core_dev *mdev = to_mdev(dm->base.ibdm.device)->mdev;
 	int err;
 
-	err = mlx5_dm_sw_icm_dealloc(dev, type, dm->base.size, ctx->devx_uid,
+	err = mlx5_dm_sw_icm_dealloc(mdev, type, dm->base.size, ctx->devx_uid,
 				     dm->base.dev_addr, dm->obj_id);
 	if (!err)
 		kfree(dm);
diff --git a/drivers/infiniband/hw/mlx5/fs.c b/drivers/infiniband/hw/mlx5/fs.c
index bc2c15c7172baf3ee726e6b1a9bf794e4c982a35..63cc78c99498eac9b11afa0b5c6ad5ea549708b4 100644
--- a/drivers/infiniband/hw/mlx5/fs.c
+++ b/drivers/infiniband/hw/mlx5/fs.c
@@ -3114,14 +3114,14 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_FLOW_ACTION_CREATE_MODIFY_HEADER)(
 {
 	struct ib_uobject *uobj = uverbs_attr_get_uobject(
 		attrs, MLX5_IB_ATTR_CREATE_MODIFY_HEADER_HANDLE);
-	struct mlx5_ib_dev *mdev = mlx5_udata_to_mdev(&attrs->driver_udata);
+	struct mlx5_ib_dev *dev = mlx5_udata_to_mdev(&attrs->driver_udata);
 	enum mlx5_ib_uapi_flow_table_type ft_type;
 	struct ib_flow_action *action;
 	int num_actions;
 	void *in;
 	int ret;
 
-	if (!mlx5_ib_modify_header_supported(mdev))
+	if (!mlx5_ib_modify_header_supported(dev))
 		return -EOPNOTSUPP;
 
 	in = uverbs_attr_get_alloced_ptr(attrs,
@@ -3137,11 +3137,11 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_FLOW_ACTION_CREATE_MODIFY_HEADER)(
 			       MLX5_IB_ATTR_CREATE_MODIFY_HEADER_FT_TYPE);
 	if (ret)
 		return ret;
-	action = mlx5_ib_create_modify_header(mdev, ft_type, num_actions, in);
+	action = mlx5_ib_create_modify_header(dev, ft_type, num_actions, in);
 	if (IS_ERR(action))
 		return PTR_ERR(action);
 
-	uverbs_flow_action_fill_action(action, uobj, &mdev->ib_dev,
+	uverbs_flow_action_fill_action(action, uobj, &dev->ib_dev,
 				       IB_FLOW_ACTION_UNSPECIFIED);
 
 	return 0;
@@ -3240,7 +3240,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_FLOW_ACTION_CREATE_PACKET_REFORMAT)(
 {
 	struct ib_uobject *uobj = uverbs_attr_get_uobject(attrs,
 		MLX5_IB_ATTR_CREATE_PACKET_REFORMAT_HANDLE);
-	struct mlx5_ib_dev *mdev = mlx5_udata_to_mdev(&attrs->driver_udata);
+	struct mlx5_ib_dev *dev = mlx5_udata_to_mdev(&attrs->driver_udata);
 	enum mlx5_ib_uapi_flow_action_packet_reformat_type dv_prt;
 	enum mlx5_ib_uapi_flow_table_type ft_type;
 	struct mlx5_ib_flow_action *maction;
@@ -3256,7 +3256,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_FLOW_ACTION_CREATE_PACKET_REFORMAT)(
 	if (ret)
 		return ret;
 
-	if (!mlx5_ib_flow_action_packet_reformat_valid(mdev, dv_prt, ft_type))
+	if (!mlx5_ib_flow_action_packet_reformat_valid(dev, dv_prt, ft_type))
 		return -EOPNOTSUPP;
 
 	maction = kzalloc_obj(*maction);
@@ -3267,7 +3267,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_FLOW_ACTION_CREATE_PACKET_REFORMAT)(
 	    MLX5_IB_UAPI_FLOW_ACTION_PACKET_REFORMAT_TYPE_L2_TUNNEL_TO_L2) {
 		maction->flow_action_raw.sub_type =
 			MLX5_IB_FLOW_ACTION_DECAP;
-		maction->flow_action_raw.dev = mdev;
+		maction->flow_action_raw.dev = dev;
 	} else {
 		void *in;
 		int len;
@@ -3282,13 +3282,13 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_FLOW_ACTION_CREATE_PACKET_REFORMAT)(
 		len = uverbs_attr_get_len(attrs,
 			MLX5_IB_ATTR_CREATE_PACKET_REFORMAT_DATA_BUF);
 
-		ret = mlx5_ib_flow_action_create_packet_reformat_ctx(mdev,
+		ret = mlx5_ib_flow_action_create_packet_reformat_ctx(dev,
 			maction, ft_type, dv_prt, in, len);
 		if (ret)
 			goto free_maction;
 	}
 
-	uverbs_flow_action_fill_action(&maction->ib_action, uobj, &mdev->ib_dev,
+	uverbs_flow_action_fill_action(&maction->ib_action, uobj, &dev->ib_dev,
 				       IB_FLOW_ACTION_UNSPECIFIED);
 	return 0;
 
diff --git a/drivers/infiniband/hw/mlx5/ib_rep.c b/drivers/infiniband/hw/mlx5/ib_rep.c
index 65d8767d1830c630f5aa2a2a693110e2c9bc9e48..b6bfc85c0c5703d1e7384a50caa2c46fbab8059e 100644
--- a/drivers/infiniband/hw/mlx5/ib_rep.c
+++ b/drivers/infiniband/hw/mlx5/ib_rep.c
@@ -9,7 +9,7 @@
 #include "srq.h"
 
 static int
-mlx5_ib_set_vport_rep(struct mlx5_core_dev *dev,
+mlx5_ib_set_vport_rep(struct mlx5_core_dev *mdev,
 		      struct mlx5_core_dev *rep_dev,
 		      struct mlx5_eswitch_rep *rep,
 		      int vport_index)
@@ -18,7 +18,7 @@ mlx5_ib_set_vport_rep(struct mlx5_core_dev *dev,
 	struct net_device *ndev;
 	int ret;
 
-	ibdev = mlx5_eswitch_uplink_get_proto_dev(dev->priv.eswitch, REP_IB);
+	ibdev = mlx5_eswitch_uplink_get_proto_dev(mdev->priv.eswitch, REP_IB);
 	if (!ibdev)
 		return -EINVAL;
 
@@ -33,7 +33,7 @@ mlx5_ib_set_vport_rep(struct mlx5_core_dev *dev,
 	/* Only Vports that are not native to the LAG master eswitch need to add
 	 * demux rule.
 	 */
-	if (mlx5_eswitch_get_total_vports(dev) > vport_index)
+	if (mlx5_eswitch_get_total_vports(mdev) > vport_index)
 		return 0;
 
 	return mlx5_lag_demux_rule_add(rep_dev, rep->vport, vport_index);
@@ -41,12 +41,12 @@ mlx5_ib_set_vport_rep(struct mlx5_core_dev *dev,
 
 static void mlx5_ib_register_peer_vport_reps(struct mlx5_core_dev *mdev);
 
-static void mlx5_ib_num_ports_update(struct mlx5_core_dev *dev, u32 *num_ports)
+static void mlx5_ib_num_ports_update(struct mlx5_core_dev *mdev, u32 *num_ports)
 {
 	struct mlx5_core_dev *peer_dev;
 	int i;
 
-	mlx5_lag_for_each_peer_mdev(dev, peer_dev, i) {
+	mlx5_lag_for_each_peer_mdev(mdev, peer_dev, i) {
 		u32 peer_num_ports = mlx5_eswitch_get_total_vports(peer_dev);
 
 		if (mlx5_lag_is_mpesw(peer_dev))
@@ -86,27 +86,27 @@ static int mlx5_ib_set_owner_transport(struct mlx5_core_dev *cur_owner,
 	return 0;
 }
 
-static void mlx5_ib_release_transport(struct mlx5_core_dev *dev)
+static void mlx5_ib_release_transport(struct mlx5_core_dev *mdev)
 {
 	struct mlx5_core_dev *peer_dev;
 	int i, ret;
 
-	mlx5_lag_for_each_peer_mdev(dev, peer_dev, i) {
+	mlx5_lag_for_each_peer_mdev(mdev, peer_dev, i) {
 		ret = mlx5_ib_set_owner_transport(peer_dev, peer_dev);
 		WARN_ON_ONCE(ret);
 	}
 }
 
-static int mlx5_ib_take_transport(struct mlx5_core_dev *dev)
+static int mlx5_ib_take_transport(struct mlx5_core_dev *mdev)
 {
 	struct mlx5_core_dev *peer_dev;
 	int ret;
 	int i;
 
-	mlx5_lag_for_each_peer_mdev(dev, peer_dev, i) {
-		ret = mlx5_ib_set_owner_transport(peer_dev, dev);
+	mlx5_lag_for_each_peer_mdev(mdev, peer_dev, i) {
+		ret = mlx5_ib_set_owner_transport(peer_dev, mdev);
 		if (ret) {
-			mlx5_ib_release_transport(dev);
+			mlx5_ib_release_transport(mdev);
 			return ret;
 		}
 	}
@@ -115,10 +115,10 @@ static int mlx5_ib_take_transport(struct mlx5_core_dev *dev)
 }
 
 static int
-mlx5_ib_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep)
+mlx5_ib_vport_rep_load(struct mlx5_core_dev *mdev, struct mlx5_eswitch_rep *rep)
 {
-	u32 num_ports = mlx5_eswitch_get_total_vports(dev);
-	struct mlx5_core_dev *lag_master = dev;
+	u32 num_ports = mlx5_eswitch_get_total_vports(mdev);
+	struct mlx5_core_dev *lag_master = mdev;
 	const struct mlx5_ib_profile *profile;
 	struct mlx5_core_dev *peer_dev;
 	struct mlx5_ib_dev *ibdev;
@@ -129,16 +129,16 @@ mlx5_ib_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep)
 
 	vport_index = rep->vport_index;
 
-	if (mlx5_lag_is_shared_fdb(dev)) {
-		if (mlx5_lag_is_master(dev)) {
-			mlx5_ib_num_ports_update(dev, &num_ports);
+	if (mlx5_lag_is_shared_fdb(mdev)) {
+		if (mlx5_lag_is_master(mdev)) {
+			mlx5_ib_num_ports_update(mdev, &num_ports);
 		} else {
 			if (rep->vport == MLX5_VPORT_UPLINK) {
-				if (!mlx5_lag_is_mpesw(dev))
+				if (!mlx5_lag_is_mpesw(mdev))
 					return 0;
 				new_uplink = true;
 			}
-			mlx5_lag_for_each_peer_mdev(dev, peer_dev, i) {
+			mlx5_lag_for_each_peer_mdev(mdev, peer_dev, i) {
 				u32 peer_n_ports = mlx5_eswitch_get_total_vports(peer_dev);
 
 				if (mlx5_lag_is_master(peer_dev))
@@ -148,7 +148,7 @@ mlx5_ib_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep)
 					peer_n_ports--;
 
 				if (mlx5_lag_get_dev_seq(peer_dev) <
-				    mlx5_lag_get_dev_seq(dev))
+				    mlx5_lag_get_dev_seq(mdev))
 					vport_index += peer_n_ports;
 			}
 		}
@@ -157,9 +157,10 @@ mlx5_ib_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep)
 	if (rep->vport == MLX5_VPORT_UPLINK && !new_uplink)
 		profile = &raw_eth_profile;
 	else
-		return mlx5_ib_set_vport_rep(lag_master, dev, rep, vport_index);
+		return mlx5_ib_set_vport_rep(lag_master, mdev, rep,
+					     vport_index);
 
-	if (mlx5_lag_is_shared_fdb(dev)) {
+	if (mlx5_lag_is_shared_fdb(mdev)) {
 		ret = mlx5_ib_take_transport(lag_master);
 		if (ret)
 			return ret;
diff --git a/drivers/infiniband/hw/mlx5/mad.c b/drivers/infiniband/hw/mlx5/mad.c
index 8925331855ff58f0eebc69efa76a0bf09b62ced2..7fe6285359612b6cb92562b2ab8be459b4aeace4 100644
--- a/drivers/infiniband/hw/mlx5/mad.c
+++ b/drivers/infiniband/hw/mlx5/mad.c
@@ -178,7 +178,7 @@ static void pma_cnt_ext_assign_ppcnt(struct ib_pma_portcounters_ext *cnt_ext,
 		cpu_to_be64(MLX5_GET_EXT_CNTR(port_multicast_rcv_pkts));
 }
 
-static int query_ib_ppcnt(struct mlx5_core_dev *dev, u8 port_num, u8 plane_num,
+static int query_ib_ppcnt(struct mlx5_core_dev *mdev, u8 port_num, u8 plane_num,
 			  void *out, size_t sz, bool ext)
 {
 	u32 *in;
@@ -199,7 +199,7 @@ static int query_ib_ppcnt(struct mlx5_core_dev *dev, u8 port_num, u8 plane_num,
 	else
 		MLX5_SET(ppcnt_reg, in, grp,
 			 MLX5_INFINIBAND_PORT_COUNTERS_GROUP);
-	err = mlx5_core_access_reg(dev, in, sz, out,
+	err = mlx5_core_access_reg(mdev, in, sz, out,
 				   sz, MLX5_REG_PPCNT, 0, 0);
 
 	kvfree(in);
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 65455aedd559b6291831492e92a68b24a6bd361e..1ecd79929f8cf446f924bb1ff377bb243a5bfe03 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -2825,10 +2825,10 @@ static int mlx5_ib_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)
 
 static int mlx5_ib_dealloc_pd(struct ib_pd *pd, struct ib_udata *udata)
 {
-	struct mlx5_ib_dev *mdev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_mdev(pd->device);
 	struct mlx5_ib_pd *mpd = to_mpd(pd);
 
-	return mlx5_cmd_dealloc_pd(mdev->mdev, mpd->pdn, mpd->uid);
+	return mlx5_cmd_dealloc_pd(dev->mdev, mpd->pdn, mpd->uid);
 }
 
 static int mlx5_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
@@ -4483,7 +4483,7 @@ static int mlx5_ib_stage_init_init(struct mlx5_ib_dev *dev)
 	atomic_set(&dev->mkey_var, 0);
 
 	spin_lock_init(&dev->dm.lock);
-	dev->dm.dev = mdev;
+	dev->dm.mdev = mdev;
 	err = mlx5_ib_data_direct_init(dev);
 	if (err)
 		goto err_mp;
@@ -5261,10 +5261,10 @@ static struct ib_device *mlx5_ib_add_sub_dev(struct ib_device *parent,
 
 static void mlx5_ib_del_sub_dev(struct ib_device *sub_dev)
 {
-	struct mlx5_ib_dev *mdev = to_mdev(sub_dev);
+	struct mlx5_ib_dev *dev = to_mdev(sub_dev);
 
 	to_mdev(sub_dev->parent)->smi_dev = NULL;
-	__mlx5_ib_remove(mdev, mdev->profile, MLX5_IB_STAGE_MAX);
+	__mlx5_ib_remove(dev, dev->profile, MLX5_IB_STAGE_MAX);
 }
 
 static int mlx5r_mp_probe(struct auxiliary_device *adev,
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index 4a6ee14ffd7d1deaa82754cda088b2c67c7575d1..3f5a465ff34719c391aac73254149b6b8622274e 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -983,7 +983,7 @@ struct mlx5_ib_flow_action {
 };
 
 struct mlx5_dm {
-	struct mlx5_core_dev *dev;
+	struct mlx5_core_dev *mdev;
 	/* This lock is used to protect the access to the shared
 	 * allocation map when concurrent requests by different
 	 * processes are handled.
diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c
index 176f87ba062cd1f2dc8ca20f2a4018cb8df361b6..54303a3ef99d341ac6757d1792a053575994f3ab 100644
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@ -704,7 +704,7 @@ struct ib_mr *mlx5_ib_reg_dm_mr(struct ib_pd *pd, struct ib_dm *dm,
 				struct uverbs_attr_bundle *attrs)
 {
 	struct mlx5_ib_dm *mdm = to_mdm(dm);
-	struct mlx5_core_dev *dev = to_mdev(dm->device)->mdev;
+	struct mlx5_core_dev *mdev = to_mdev(dm->device)->mdev;
 	u64 start_addr = mdm->dev_addr + attr->offset;
 	int mode;
 
@@ -714,7 +714,7 @@ struct ib_mr *mlx5_ib_reg_dm_mr(struct ib_pd *pd, struct ib_dm *dm,
 			return ERR_PTR(-EINVAL);
 
 		mode = MLX5_MKC_ACCESS_MODE_MEMIC;
-		start_addr -= pci_resource_start(dev->pdev, 0);
+		start_addr -= pci_resource_start(mdev->pdev, 0);
 		break;
 	case MLX5_IB_UAPI_DM_TYPE_STEERING_SW_ICM:
 	case MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_SW_ICM:
diff --git a/drivers/infiniband/hw/mlx5/odp.c b/drivers/infiniband/hw/mlx5/odp.c
index 9c91e76029d4ac371dc9c1adc3c7c4783275aff1..0b1b63d36e4bcd7622147a1e31dbaaf4915e7c69 100644
--- a/drivers/infiniband/hw/mlx5/odp.c
+++ b/drivers/infiniband/hw/mlx5/odp.c
@@ -107,14 +107,14 @@ static u8 mlx5_imr_ksm_page_shift;
 static void populate_ksm(struct mlx5_ksm *pksm, size_t idx, size_t nentries,
 			struct mlx5_ib_mr *imr, int flags)
 {
-	struct mlx5_core_dev *dev = mr_to_mdev(imr)->mdev;
+	struct mlx5_core_dev *mdev = mr_to_mdev(imr)->mdev;
 	struct mlx5_ksm *end = pksm + nentries;
-	u64 step = MLX5_CAP_ODP(dev, mem_page_fault) ? mlx5_imr_mtt_size : 0;
-	__be32 key = MLX5_CAP_ODP(dev, mem_page_fault) ?
+	u64 step = MLX5_CAP_ODP(mdev, mem_page_fault) ? mlx5_imr_mtt_size : 0;
+	__be32 key = MLX5_CAP_ODP(mdev, mem_page_fault) ?
 			     cpu_to_be32(imr->null_mmkey.key) :
 			     mr_to_mdev(imr)->mkeys.null_mkey;
-	u64 va =
-		MLX5_CAP_ODP(dev, mem_page_fault) ? idx * mlx5_imr_mtt_size : 0;
+	u64 va = MLX5_CAP_ODP(mdev, mem_page_fault) ?
+			     idx * mlx5_imr_mtt_size : 0;
 
 	if (flags & MLX5_IB_UPD_XLT_ZAP) {
 		for (; pksm != end; pksm++, idx++, va += step) {
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 627dd17804c985cc9b9c20c7200cdb0edc625cbf..e4f18f7567d67e80b0a07157204caa4da193bf9b 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -3517,7 +3517,7 @@ int mlx5r_ib_rate(struct mlx5_ib_dev *dev, u8 rate)
 	return ib_to_mlx5_rate_map(rate);
 }
 
-static int modify_raw_packet_eth_prio(struct mlx5_core_dev *dev,
+static int modify_raw_packet_eth_prio(struct mlx5_core_dev *mdev,
 				      struct mlx5_ib_sq *sq, u8 sl,
 				      struct ib_pd *pd)
 {
@@ -3537,14 +3537,14 @@ static int modify_raw_packet_eth_prio(struct mlx5_core_dev *dev,
 	tisc = MLX5_ADDR_OF(modify_tis_in, in, ctx);
 	MLX5_SET(tisc, tisc, prio, ((sl & 0x7) << 1));
 
-	err = mlx5_core_modify_tis(dev, sq->tisn, in);
+	err = mlx5_core_modify_tis(mdev, sq->tisn, in);
 
 	kvfree(in);
 
 	return err;
 }
 
-static int modify_raw_packet_tx_affinity(struct mlx5_core_dev *dev,
+static int modify_raw_packet_tx_affinity(struct mlx5_core_dev *mdev,
 					 struct mlx5_ib_sq *sq, u8 tx_affinity,
 					 struct ib_pd *pd)
 {
@@ -3564,7 +3564,7 @@ static int modify_raw_packet_tx_affinity(struct mlx5_core_dev *dev,
 	tisc = MLX5_ADDR_OF(modify_tis_in, in, ctx);
 	MLX5_SET(tisc, tisc, lag_tx_port_affinity, tx_affinity);
 
-	err = mlx5_core_modify_tis(dev, sq->tisn, in);
+	err = mlx5_core_modify_tis(mdev, sq->tisn, in);
 
 	kvfree(in);
 
@@ -3969,27 +3969,27 @@ static int qp_rl_prepare(struct mlx5_ib_dev *dev,
 	return 0;
 }
 
-static void qp_rl_rollback(struct mlx5_core_dev *dev,
+static void qp_rl_rollback(struct mlx5_core_dev *mdev,
 			   struct mlx5_rate_limit_ctx *ctx)
 {
 	if (ctx->rl_desired_index)
-		mlx5_rl_remove_rate(dev, &ctx->rl_desired);
+		mlx5_rl_remove_rate(mdev, &ctx->rl_desired);
 }
 
-static void qp_rl_commit(struct mlx5_core_dev *dev,
+static void qp_rl_commit(struct mlx5_core_dev *mdev,
 			 struct mlx5_ib_qp *qp,
 			 struct mlx5_rate_limit_ctx *ctx,
 			 enum ib_qp_state new_state)
 {
 	if (ctx->rl_changed) {
 		if (ctx->rl_old.rate)
-			mlx5_rl_remove_rate(dev, &ctx->rl_old);
+			mlx5_rl_remove_rate(mdev, &ctx->rl_old);
 		qp->rl = ctx->rl_desired;
 	}
 
 	if (new_state == IB_QPS_RESET || new_state == IB_QPS_ERR) {
 		if (qp->rl.rate)
-			mlx5_rl_remove_rate(dev, &qp->rl);
+			mlx5_rl_remove_rate(mdev, &qp->rl);
 		memset(&qp->rl, 0, sizeof(qp->rl));
 		memset(&qp->rl_desired, 0, sizeof(qp->rl_desired));
 		return;
@@ -3999,7 +3999,7 @@ static void qp_rl_commit(struct mlx5_core_dev *dev,
 }
 
 static int modify_raw_packet_qp_sq(
-	struct mlx5_core_dev *dev, struct mlx5_ib_sq *sq, int new_state,
+	struct mlx5_core_dev *mdev, struct mlx5_ib_sq *sq, int new_state,
 	const struct mlx5_modify_raw_qp_param *raw_qp_param, struct ib_pd *pd)
 {
 	const struct mlx5_rate_limit_ctx *rl_ctx = &raw_qp_param->rl_ctx;
@@ -4032,12 +4032,12 @@ static int modify_raw_packet_qp_sq(
 		}
 	}
 
-	err = mlx5_core_modify_sq(dev, sq->base.mqp.qpn, in);
+	err = mlx5_core_modify_sq(mdev, sq->base.mqp.qpn, in);
 	if (err)
 		goto out;
 
 	if (new_state != MLX5_SQC_STATE_RDY) {
-		mlx5_rl_remove_rate(dev, &ibqp->rl);
+		mlx5_rl_remove_rate(mdev, &ibqp->rl);
 		memset(&ibqp->rl, 0, sizeof(ibqp->rl));
 		memset(&ibqp->rl_desired, 0, sizeof(ibqp->rl_desired));
 	}
diff --git a/drivers/infiniband/hw/mlx5/qpc.c b/drivers/infiniband/hw/mlx5/qpc.c
index ce2ef8828c09573b1e1edffabfe16d579f8cd195..a1b15c0346d34e9b969a2b60298b78930d8769d6 100644
--- a/drivers/infiniband/hw/mlx5/qpc.c
+++ b/drivers/infiniband/hw/mlx5/qpc.c
@@ -417,7 +417,7 @@ static int get_ece_from_mbox(void *out, u16 opcode)
 	return ece;
 }
 
-static int modify_qp_mbox_alloc(struct mlx5_core_dev *dev, u16 opcode, int qpn,
+static int modify_qp_mbox_alloc(struct mlx5_core_dev *mdev, u16 opcode, int qpn,
 				u32 opt_param_mask, void *qpc,
 				struct mbox_info *mbox, u16 uid, u32 ece)
 {
diff --git a/drivers/infiniband/hw/mlx5/restrack.c b/drivers/infiniband/hw/mlx5/restrack.c
index 00a9bcb2603f0b094bcef8a4ffe6564699a85769..8a68b083b1b610215441438ab7bce189b97eba0f 100644
--- a/drivers/infiniband/hw/mlx5/restrack.c
+++ b/drivers/infiniband/hw/mlx5/restrack.c
@@ -12,10 +12,9 @@
 
 #define MAX_DUMP_SIZE 1024
 
-static int dump_rsc(struct mlx5_core_dev *dev, enum mlx5_sgmt_type type,
+static int dump_rsc(struct mlx5_core_dev *mdev, enum mlx5_sgmt_type type,
 		    int index, void *data, int *data_len)
 {
-	struct mlx5_core_dev *mdev = dev;
 	struct mlx5_rsc_dump_cmd *cmd;
 	struct mlx5_rsc_key key = {};
 	struct page *page;

-- 
2.49.0


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH rdma-next 02/11] RDMA/mlx5: Rename to_mdev() helpers that return an IB device
  2026-11-17 14:01 [PATCH rdma-next 00/11] RDMA/mlx5: Preparation for SD support Edward Srouji
  2026-11-17 14:01 ` [PATCH rdma-next 01/11] RDMA/mlx5: Enforce dev/mdev naming for device pointers Edward Srouji
@ 2026-11-17 14:01 ` Edward Srouji
  2026-11-17 14:01 ` [PATCH rdma-next 03/11] RDMA/mlx5: Select the PD and SRQ core device through the PD Edward Srouji
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Edward Srouji @ 2026-11-17 14:01 UTC (permalink / raw)
  To: Leon Romanovsky, Jason Gunthorpe, Sabrina Dubroca
  Cc: linux-rdma, linux-kernel, netdev, Edward Srouji,
	Akiva Goldberger, Michael Gur

From: Akiva Goldberger <agoldberger@nvidia.com>

to_mdev(), mr_to_mdev() and mlx5_udata_to_mdev() all return a
struct mlx5_ib_dev, but their "mdev" name reads as a struct mlx5_core_dev
under the driver's dev/mdev convention, where mdev is the core device.
This is a constant source of confusion.

Rename them to say what they return: an mlx5_ib_dev is "dev", so the
generic ib_device converter becomes to_dev() and the object-specific
wrappers become mr_to_dev() and udata_to_dev(). The udata helper also
drops its mlx5_ prefix, so every resolver is named after the resource it
takes.

Pure rename; no functional change.

Signed-off-by: Akiva Goldberger <agoldberger@nvidia.com>
Reviewed-by: Michael Gur <michaelgur@nvidia.com>
Signed-off-by: Edward Srouji <edwards@nvidia.com>
---
 drivers/infiniband/hw/mlx5/ah.c        |  2 +-
 drivers/infiniband/hw/mlx5/counters.c  | 32 +++++++-------
 drivers/infiniband/hw/mlx5/cq.c        | 26 +++++------
 drivers/infiniband/hw/mlx5/devx.c      | 32 +++++++-------
 drivers/infiniband/hw/mlx5/dm.c        | 12 ++---
 drivers/infiniband/hw/mlx5/dmah.c      |  4 +-
 drivers/infiniband/hw/mlx5/fs.c        | 18 ++++----
 drivers/infiniband/hw/mlx5/gsi.c       | 14 +++---
 drivers/infiniband/hw/mlx5/ib_virt.c   | 12 ++---
 drivers/infiniband/hw/mlx5/macsec.c    | 10 ++---
 drivers/infiniband/hw/mlx5/mad.c       | 14 +++---
 drivers/infiniband/hw/mlx5/main.c      | 80 +++++++++++++++++-----------------
 drivers/infiniband/hw/mlx5/mlx5_ib.h   | 17 ++++----
 drivers/infiniband/hw/mlx5/mr.c        | 66 ++++++++++++++--------------
 drivers/infiniband/hw/mlx5/odp.c       | 28 ++++++------
 drivers/infiniband/hw/mlx5/qos.c       |  4 +-
 drivers/infiniband/hw/mlx5/qp.c        | 48 ++++++++++----------
 drivers/infiniband/hw/mlx5/restrack.c  |  6 +--
 drivers/infiniband/hw/mlx5/srq.c       | 12 ++---
 drivers/infiniband/hw/mlx5/std_types.c |  4 +-
 drivers/infiniband/hw/mlx5/umr.c       | 18 ++++----
 drivers/infiniband/hw/mlx5/wr.c        | 10 ++---
 22 files changed, 235 insertions(+), 234 deletions(-)

diff --git a/drivers/infiniband/hw/mlx5/ah.c b/drivers/infiniband/hw/mlx5/ah.c
index a3aa700d08355d063466b8c48d9c08c478788c60..643d0ce3452696352f7edac5bbf83012b8689033 100644
--- a/drivers/infiniband/hw/mlx5/ah.c
+++ b/drivers/infiniband/hw/mlx5/ah.c
@@ -102,7 +102,7 @@ int mlx5_ib_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr,
 {
 	struct rdma_ah_attr *ah_attr = init_attr->ah_attr;
 	struct mlx5_ib_ah *ah = to_mah(ibah);
-	struct mlx5_ib_dev *dev = to_mdev(ibah->device);
+	struct mlx5_ib_dev *dev = to_dev(ibah->device);
 	enum rdma_ah_attr_type ah_type = ah_attr->type;
 
 	if ((ah_type == RDMA_AH_ATTR_TYPE_ROCE) &&
diff --git a/drivers/infiniband/hw/mlx5/counters.c b/drivers/infiniband/hw/mlx5/counters.c
index 2250b195571c5c9ac92e924029e1e2faaaff1046..35a9f03211c6cb91f9410153ff952adcdf68a37f 100644
--- a/drivers/infiniband/hw/mlx5/counters.c
+++ b/drivers/infiniband/hw/mlx5/counters.c
@@ -207,7 +207,7 @@ static int mlx5_ib_destroy_counters(struct ib_counters *counters)
 
 	mlx5_ib_counters_clear_description(counters);
 	if (mcounters->hw_cntrs_hndl)
-		mlx5_fc_destroy(to_mdev(counters->device)->mdev,
+		mlx5_fc_destroy(to_dev(counters->device)->mdev,
 				mcounters->hw_cntrs_hndl);
 	return 0;
 }
@@ -278,7 +278,7 @@ static struct rdma_hw_stats *do_alloc_stats(const struct mlx5_ib_counters *cnts)
 static struct rdma_hw_stats *
 mlx5_ib_alloc_hw_device_stats(struct ib_device *ibdev)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	const struct mlx5_ib_counters *cnts = &dev->port[0].cnts;
 
 	return do_alloc_stats(cnts);
@@ -287,7 +287,7 @@ mlx5_ib_alloc_hw_device_stats(struct ib_device *ibdev)
 static struct rdma_hw_stats *
 mlx5_ib_alloc_hw_port_stats(struct ib_device *ibdev, u32 port_num)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	const struct mlx5_ib_counters *cnts = get_counters(dev, port_num);
 
 	return do_alloc_stats(cnts);
@@ -388,7 +388,7 @@ static int do_get_hw_stats(struct ib_device *ibdev,
 			   struct rdma_hw_stats *stats,
 			   u32 port_num, int index)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	const struct mlx5_ib_counters *cnts = get_counters(dev, port_num);
 	struct mlx5_core_dev *mdev;
 	int ret, num_counters;
@@ -459,7 +459,7 @@ static bool is_rdma_bytes_counter(u32 type)
 
 static int do_per_qp_get_op_stat(struct rdma_counter *counter)
 {
-	struct mlx5_ib_dev *dev = to_mdev(counter->device);
+	struct mlx5_ib_dev *dev = to_dev(counter->device);
 	const struct mlx5_ib_counters *cnts = get_counters(dev, counter->port);
 	struct mlx5_rdma_counter *mcounter = to_mcounter(counter);
 	int i, ret, index, num_hw_counters;
@@ -496,7 +496,7 @@ static int do_get_op_stat(struct ib_device *ibdev,
 			  struct rdma_hw_stats *stats,
 			  u32 port_num, int index)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	const struct mlx5_ib_counters *cnts;
 	const struct mlx5_ib_op_fc *opfcs;
 	u64 packets, bytes;
@@ -530,7 +530,7 @@ static int do_get_op_stats(struct ib_device *ibdev,
 			   struct rdma_hw_stats *stats,
 			   u32 port_num)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	const struct mlx5_ib_counters *cnts;
 	int index, ret, num_hw_counters;
 
@@ -552,7 +552,7 @@ static int mlx5_ib_get_hw_stats(struct ib_device *ibdev,
 				u32 port_num, int index)
 {
 	int num_counters, num_hw_counters, num_op_counters;
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	const struct mlx5_ib_counters *cnts;
 
 	cnts = get_counters(dev, port_num);
@@ -581,7 +581,7 @@ static int mlx5_ib_get_hw_stats(struct ib_device *ibdev,
 static struct rdma_hw_stats *
 mlx5_ib_counter_alloc_stats(struct rdma_counter *counter)
 {
-	struct mlx5_ib_dev *dev = to_mdev(counter->device);
+	struct mlx5_ib_dev *dev = to_dev(counter->device);
 	const struct mlx5_ib_counters *cnts = get_counters(dev, counter->port);
 
 	return do_alloc_stats(cnts);
@@ -589,7 +589,7 @@ mlx5_ib_counter_alloc_stats(struct rdma_counter *counter)
 
 static int mlx5_ib_counter_update_stats(struct rdma_counter *counter)
 {
-	struct mlx5_ib_dev *dev = to_mdev(counter->device);
+	struct mlx5_ib_dev *dev = to_dev(counter->device);
 	const struct mlx5_ib_counters *cnts = get_counters(dev, counter->port);
 	int ret;
 
@@ -607,7 +607,7 @@ static int mlx5_ib_counter_update_stats(struct rdma_counter *counter)
 static int mlx5_ib_counter_dealloc(struct rdma_counter *counter)
 {
 	struct mlx5_rdma_counter *mcounter = to_mcounter(counter);
-	struct mlx5_ib_dev *dev = to_mdev(counter->device);
+	struct mlx5_ib_dev *dev = to_dev(counter->device);
 	u32 in[MLX5_ST_SZ_DW(dealloc_q_counter_in)] = {};
 
 	if (!counter->id)
@@ -625,7 +625,7 @@ static int mlx5_ib_counter_bind_qp(struct rdma_counter *counter,
 				   struct ib_qp *qp, u32 port)
 {
 	struct mlx5_rdma_counter *mcounter = to_mcounter(counter);
-	struct mlx5_ib_dev *dev = to_mdev(qp->device);
+	struct mlx5_ib_dev *dev = to_dev(qp->device);
 	bool new = false;
 	int err;
 
@@ -1012,7 +1012,7 @@ static int read_flow_counters(struct ib_device *ibdev,
 			      struct mlx5_read_counters_attr *read_attr)
 {
 	struct mlx5_fc *fc = read_attr->hw_cntrs_hndl;
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 
 	return mlx5_fc_query(dev->mdev, fc,
 			     &read_attr->out[IB_COUNTER_PACKETS],
@@ -1083,7 +1083,7 @@ int mlx5_ib_flow_counters_set_data(struct ib_counters *ibcounters,
 
 	if (!mcounters->hw_cntrs_hndl) {
 		mcounters->hw_cntrs_hndl = mlx5_fc_create(
-			to_mdev(ibcounters->device)->mdev, false);
+			to_dev(ibcounters->device)->mdev, false);
 		if (IS_ERR(mcounters->hw_cntrs_hndl)) {
 			ret = PTR_ERR(mcounters->hw_cntrs_hndl);
 			goto free;
@@ -1115,7 +1115,7 @@ int mlx5_ib_flow_counters_set_data(struct ib_counters *ibcounters,
 
 free_hndl:
 	if (hw_hndl) {
-		mlx5_fc_destroy(to_mdev(ibcounters->device)->mdev,
+		mlx5_fc_destroy(to_dev(ibcounters->device)->mdev,
 				mcounters->hw_cntrs_hndl);
 		mcounters->hw_cntrs_hndl = NULL;
 	}
@@ -1143,7 +1143,7 @@ void mlx5_ib_counters_clear_description(struct ib_counters *counters)
 static int mlx5_ib_modify_stat(struct ib_device *device, u32 port,
 			       unsigned int index, bool enable)
 {
-	struct mlx5_ib_dev *dev = to_mdev(device);
+	struct mlx5_ib_dev *dev = to_dev(device);
 	struct mlx5_ib_op_fc *opfc, *in_use_opfc;
 	struct mlx5_ib_counters *cnts;
 	u32 num_hw_counters, type;
diff --git a/drivers/infiniband/hw/mlx5/cq.c b/drivers/infiniband/hw/mlx5/cq.c
index 2581a7693585b2ed57b04b54b8505d3d71ed7238..b28ce05fab8f3d668d4e9b43c5562e7a88c37b4a 100644
--- a/drivers/infiniband/hw/mlx5/cq.c
+++ b/drivers/infiniband/hw/mlx5/cq.c
@@ -51,7 +51,7 @@ static void mlx5_ib_cq_comp(struct mlx5_core_cq *cq, struct mlx5_eqe *eqe)
 static void mlx5_ib_cq_event(struct mlx5_core_cq *mcq, enum mlx5_event type)
 {
 	struct mlx5_ib_cq *cq = container_of(mcq, struct mlx5_ib_cq, mcq);
-	struct mlx5_ib_dev *dev = to_mdev(cq->ibcq.device);
+	struct mlx5_ib_dev *dev = to_dev(cq->ibcq.device);
 	struct ib_cq *ibcq = &cq->ibcq;
 	struct ib_event event;
 
@@ -171,7 +171,7 @@ static void handle_responder(struct ib_wc *wc, struct mlx5_cqe64 *cqe,
 {
 	enum rdma_link_layer ll =
 		rdma_port_get_link_layer(qp->ibqp.device, qp->port);
-	struct mlx5_ib_dev *dev = to_mdev(qp->ibqp.device);
+	struct mlx5_ib_dev *dev = to_dev(qp->ibqp.device);
 	struct mlx5_ib_srq *srq = NULL;
 	struct mlx5_ib_wq *wq;
 	u16 wqe_ctr;
@@ -452,7 +452,7 @@ static int mlx5_poll_one(struct mlx5_ib_cq *cq,
 			 struct mlx5_ib_qp **cur_qp,
 			 struct ib_wc *wc)
 {
-	struct mlx5_ib_dev *dev = to_mdev(cq->ibcq.device);
+	struct mlx5_ib_dev *dev = to_dev(cq->ibcq.device);
 	struct mlx5_err_cqe *err_cqe;
 	struct mlx5_cqe64 *cqe64;
 	struct mlx5_core_qp *mqp;
@@ -585,7 +585,7 @@ static int mlx5_poll_one(struct mlx5_ib_cq *cq,
 static int poll_soft_wc(struct mlx5_ib_cq *cq, int num_entries,
 			struct ib_wc *wc, bool is_fatal_err)
 {
-	struct mlx5_ib_dev *dev = to_mdev(cq->ibcq.device);
+	struct mlx5_ib_dev *dev = to_dev(cq->ibcq.device);
 	struct mlx5_ib_wc *soft_wc, *next;
 	int npolled = 0;
 
@@ -612,7 +612,7 @@ int mlx5_ib_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc)
 {
 	struct mlx5_ib_cq *cq = to_mcq(ibcq);
 	struct mlx5_ib_qp *cur_qp = NULL;
-	struct mlx5_ib_dev *dev = to_mdev(cq->ibcq.device);
+	struct mlx5_ib_dev *dev = to_dev(cq->ibcq.device);
 	struct mlx5_core_dev *mdev = dev->mdev;
 	unsigned long flags;
 	int soft_polled = 0;
@@ -647,7 +647,7 @@ int mlx5_ib_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc)
 
 int mlx5_ib_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags flags)
 {
-	struct mlx5_core_dev *mdev = to_mdev(ibcq->device)->mdev;
+	struct mlx5_core_dev *mdev = to_dev(ibcq->device)->mdev;
 	struct mlx5_ib_cq *cq = to_mcq(ibcq);
 	void __iomem *uar_page = mdev->priv.bfreg.up->map;
 	unsigned long irq_flags;
@@ -956,7 +956,7 @@ int mlx5_ib_create_user_cq(struct ib_cq *ibcq,
 	struct mlx5_ib_create_cq_resp uresp = {};
 	int entries = attr->cqe;
 	int vector = attr->comp_vector;
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	struct mlx5_ib_cq *cq = to_mcq(ibcq);
 	u32 out[MLX5_ST_SZ_DW(create_cq_out)];
 	int index;
@@ -1044,7 +1044,7 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
 	struct ib_device *ibdev = ibcq->device;
 	int entries = attr->cqe;
 	int vector = attr->comp_vector;
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	struct mlx5_ib_cq *cq = to_mcq(ibcq);
 	u32 out[MLX5_ST_SZ_DW(create_cq_out)];
 	int index;
@@ -1114,7 +1114,7 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
 
 int mlx5_ib_pre_destroy_cq(struct ib_cq *cq)
 {
-	struct mlx5_ib_dev *dev = to_mdev(cq->device);
+	struct mlx5_ib_dev *dev = to_dev(cq->device);
 	struct mlx5_ib_cq *mcq = to_mcq(cq);
 
 	if (!cq->uobject)
@@ -1126,7 +1126,7 @@ int mlx5_ib_pre_destroy_cq(struct ib_cq *cq)
 void mlx5_ib_post_destroy_cq(struct ib_cq *cq)
 {
 	WARN_ON(!list_empty(&to_mcq(cq)->wc_list));
-	destroy_cq_kernel(to_mdev(cq->device), to_mcq(cq));
+	destroy_cq_kernel(to_dev(cq->device), to_mcq(cq));
 }
 
 int mlx5_ib_destroy_cq(struct ib_cq *cq, struct ib_udata *udata)
@@ -1213,7 +1213,7 @@ void mlx5_ib_cq_clean(struct mlx5_ib_cq *cq, u32 qpn, struct mlx5_ib_srq *srq)
 
 int mlx5_ib_modify_cq(struct ib_cq *cq, u16 cq_count, u16 cq_period)
 {
-	struct mlx5_ib_dev *dev = to_mdev(cq->device);
+	struct mlx5_ib_dev *dev = to_dev(cq->device);
 	struct mlx5_ib_cq *mcq = to_mcq(cq);
 	int err;
 
@@ -1288,7 +1288,7 @@ static int resize_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq,
 
 static int copy_resize_cqes(struct mlx5_ib_cq *cq)
 {
-	struct mlx5_ib_dev *dev = to_mdev(cq->ibcq.device);
+	struct mlx5_ib_dev *dev = to_dev(cq->ibcq.device);
 	struct mlx5_cqe64 *scqe64;
 	struct mlx5_cqe64 *dcqe64;
 	void *start_cqe;
@@ -1344,7 +1344,7 @@ static int copy_resize_cqes(struct mlx5_ib_cq *cq)
 int mlx5_ib_resize_cq(struct ib_cq *ibcq, unsigned int entries,
 		      struct ib_udata *udata)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibcq->device);
+	struct mlx5_ib_dev *dev = to_dev(ibcq->device);
 	struct mlx5_ib_cq *cq = to_mcq(ibcq);
 	void *cqc;
 	u32 *in;
diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c
index 7e84dd15ac1f987af3f74563bcd1b30f15a385ca..75f5fc256ff6eab4f3ba2de4c0d9c3d7da8d5432 100644
--- a/drivers/infiniband/hw/mlx5/devx.c
+++ b/drivers/infiniband/hw/mlx5/devx.c
@@ -634,7 +634,7 @@ static u64 devx_get_obj_id(const void *in)
 static bool devx_is_valid_obj_id(struct uverbs_attr_bundle *attrs,
 				 struct ib_uobject *uobj, const void *in)
 {
-	struct mlx5_ib_dev *dev = mlx5_udata_to_mdev(&attrs->driver_udata);
+	struct mlx5_ib_dev *dev = udata_to_dev(&attrs->driver_udata);
 	u64 obj_id = devx_get_obj_id(in);
 
 	if (!obj_id)
@@ -979,7 +979,7 @@ static int devx_get_uid(struct mlx5_ib_ucontext *c, void *cmd_in)
 		if (c->devx_uid)
 			return c->devx_uid;
 
-		dev = to_mdev(c->ibucontext.device);
+		dev = to_dev(c->ibucontext.device);
 		if (dev->devx_whitelist_uid)
 			return dev->devx_whitelist_uid;
 
@@ -1043,7 +1043,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_QUERY_EQN)(
 	c = devx_ufile2uctx(attrs);
 	if (IS_ERR(c))
 		return PTR_ERR(c);
-	dev = to_mdev(c->ibucontext.device);
+	dev = to_dev(c->ibucontext.device);
 
 	err = mlx5_comp_eqn_get(dev->mdev, user_vector, &dev_eqn);
 	if (err < 0)
@@ -1087,7 +1087,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_QUERY_UAR)(
 	c = devx_ufile2uctx(attrs);
 	if (IS_ERR(c))
 		return PTR_ERR(c);
-	dev = to_mdev(c->ibucontext.device);
+	dev = to_dev(c->ibucontext.device);
 
 	if (uverbs_copy_from(&user_idx, attrs,
 			     MLX5_IB_ATTR_DEVX_QUERY_UAR_USER_IDX))
@@ -1120,7 +1120,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OTHER)(
 	c = devx_ufile2uctx(attrs);
 	if (IS_ERR(c))
 		return PTR_ERR(c);
-	dev = to_mdev(c->ibucontext.device);
+	dev = to_dev(c->ibucontext.device);
 
 	uid = devx_get_uid(c, cmd_in);
 	if (uid < 0)
@@ -1455,7 +1455,7 @@ static int devx_obj_cleanup(struct ib_uobject *uobject,
 	struct mlx5_ib_dev *dev;
 	int ret;
 
-	dev = mlx5_udata_to_mdev(&attrs->driver_udata);
+	dev = udata_to_dev(&attrs->driver_udata);
 	if (obj->flags & DEVX_OBJ_FLAGS_INDIRECT_MKEY &&
 	    xa_erase(&obj->ib_dev->odp_mkeys,
 		     mlx5_base_mkey(obj->mkey.key)))
@@ -1534,7 +1534,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)(
 		attrs, MLX5_IB_ATTR_DEVX_OBJ_CREATE_HANDLE);
 	struct mlx5_ib_ucontext *c = rdma_udata_to_drv_context(
 		&attrs->driver_udata, struct mlx5_ib_ucontext, ibucontext);
-	struct mlx5_ib_dev *dev = to_mdev(c->ibucontext.device);
+	struct mlx5_ib_dev *dev = to_dev(c->ibucontext.device);
 	u32 out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)];
 	struct devx_obj *obj;
 	u16 obj_type = 0;
@@ -1652,7 +1652,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_MODIFY)(
 							  MLX5_IB_ATTR_DEVX_OBJ_MODIFY_HANDLE);
 	struct mlx5_ib_ucontext *c = rdma_udata_to_drv_context(
 		&attrs->driver_udata, struct mlx5_ib_ucontext, ibucontext);
-	struct mlx5_ib_dev *dev = to_mdev(c->ibucontext.device);
+	struct mlx5_ib_dev *dev = to_dev(c->ibucontext.device);
 	void *cmd_out;
 	int err, err2;
 	int uid;
@@ -1702,7 +1702,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_QUERY)(
 	void *cmd_out;
 	int err, err2;
 	int uid;
-	struct mlx5_ib_dev *dev = to_mdev(c->ibucontext.device);
+	struct mlx5_ib_dev *dev = to_dev(c->ibucontext.device);
 
 	if (MLX5_GET(general_obj_in_cmd_hdr, cmd_in, vhca_tunnel_id))
 		return -EINVAL;
@@ -1764,7 +1764,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_ASYNC_CMD_FD_ALLOC)(
 
 	struct ib_uobject *uobj = uverbs_attr_get_uobject(
 		attrs, MLX5_IB_ATTR_DEVX_ASYNC_CMD_FD_ALLOC_HANDLE);
-	struct mlx5_ib_dev *dev = mlx5_udata_to_mdev(&attrs->driver_udata);
+	struct mlx5_ib_dev *dev = udata_to_dev(&attrs->driver_udata);
 
 	ev_file = container_of(uobj, struct devx_async_cmd_event_file,
 			       uobj);
@@ -1781,7 +1781,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_ASYNC_EVENT_FD_ALLOC)(
 	struct devx_async_event_file *ev_file;
 	struct mlx5_ib_ucontext *c = rdma_udata_to_drv_context(
 		&attrs->driver_udata, struct mlx5_ib_ucontext, ibucontext);
-	struct mlx5_ib_dev *dev = to_mdev(c->ibucontext.device);
+	struct mlx5_ib_dev *dev = to_dev(c->ibucontext.device);
 	u32 flags;
 	int err;
 
@@ -1841,7 +1841,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_ASYNC_QUERY)(
 	struct ib_uobject *fd_uobj;
 	int err;
 	int uid;
-	struct mlx5_ib_dev *dev = to_mdev(c->ibucontext.device);
+	struct mlx5_ib_dev *dev = to_dev(c->ibucontext.device);
 	struct devx_async_cmd_event_file *ev_file;
 	struct devx_async_data *async_data;
 
@@ -2077,7 +2077,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_SUBSCRIBE_EVENT)(
 				MLX5_IB_ATTR_DEVX_SUBSCRIBE_EVENT_OBJ_HANDLE);
 	struct mlx5_ib_ucontext *c = rdma_udata_to_drv_context(
 		&attrs->driver_udata, struct mlx5_ib_ucontext, ibucontext);
-	struct mlx5_ib_dev *dev = to_mdev(c->ibucontext.device);
+	struct mlx5_ib_dev *dev = to_dev(c->ibucontext.device);
 	struct ib_uobject *fd_uobj;
 	struct devx_obj *obj = NULL;
 	struct devx_async_event_file *ev_file;
@@ -2398,7 +2398,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_UMEM_REG)(
 	u32 obj_id;
 	struct mlx5_ib_ucontext *c = rdma_udata_to_drv_context(
 		&attrs->driver_udata, struct mlx5_ib_ucontext, ibucontext);
-	struct mlx5_ib_dev *dev = to_mdev(c->ibucontext.device);
+	struct mlx5_ib_dev *dev = to_dev(c->ibucontext.device);
 	int access_flags;
 	int err;
 
@@ -2712,7 +2712,7 @@ void mlx5_ib_ufile_hw_cleanup(struct ib_uverbs_file *ufile)
 	struct mlx5_async_cmd *async_cmd;
 	struct ib_ucontext *ucontext = ufile->ucontext;
 	struct ib_device *device = ucontext->device;
-	struct mlx5_ib_dev *dev = to_mdev(device);
+	struct mlx5_ib_dev *dev = to_dev(device);
 	struct ib_uobject *uobject;
 	struct devx_obj *obj;
 	int head = 0;
@@ -3245,7 +3245,7 @@ DECLARE_UVERBS_NAMED_OBJECT(
 
 static bool devx_is_supported(struct ib_device *device)
 {
-	struct mlx5_ib_dev *dev = to_mdev(device);
+	struct mlx5_ib_dev *dev = to_dev(device);
 
 	return MLX5_CAP_GEN(dev->mdev, log_max_uctx);
 }
diff --git a/drivers/infiniband/hw/mlx5/dm.c b/drivers/infiniband/hw/mlx5/dm.c
index a67e8e5099e9a3ef21e120f982b3b4fd833b60e5..fbb46d821865b3f87602068431365c46a40c2bcf 100644
--- a/drivers/infiniband/hw/mlx5/dm.c
+++ b/drivers/infiniband/hw/mlx5/dm.c
@@ -167,7 +167,7 @@ static void mlx5_ib_dm_memic_free(struct kref *kref)
 {
 	struct mlx5_ib_dm_memic *dm =
 		container_of(kref, struct mlx5_ib_dm_memic, ref);
-	struct mlx5_ib_dev *dev = to_mdev(dm->base.ibdm.device);
+	struct mlx5_ib_dev *dev = to_dev(dm->base.ibdm.device);
 
 	mlx5_cmd_dealloc_memic(&dev->dm, dm->base.dev_addr, dm->base.size);
 	kfree(dm);
@@ -209,7 +209,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DM_MAP_OP_ADDR)(
 {
 	struct ib_uobject *uobj = uverbs_attr_get_uobject(
 		attrs, MLX5_IB_ATTR_DM_MAP_OP_ADDR_REQ_HANDLE);
-	struct mlx5_ib_dev *dev = to_mdev(uobj->context->device);
+	struct mlx5_ib_dev *dev = to_dev(uobj->context->device);
 	struct ib_dm *ibdm = uobj->object;
 	struct mlx5_ib_dm_memic *dm = to_memic(ibdm);
 	struct mlx5_ib_dm_op_entry *op_entry;
@@ -278,7 +278,7 @@ static struct ib_dm *handle_alloc_dm_memic(struct ib_ucontext *ctx,
 					   struct ib_dm_alloc_attr *attr,
 					   struct uverbs_attr_bundle *attrs)
 {
-	struct mlx5_dm *dm_db = &to_mdev(ctx->device)->dm;
+	struct mlx5_dm *dm_db = &to_dev(ctx->device)->dm;
 	struct mlx5_ib_dm_memic *dm;
 	u64 start_offset;
 	u16 page_idx;
@@ -357,7 +357,7 @@ static struct ib_dm *handle_alloc_dm_sw_icm(struct ib_ucontext *ctx,
 					    struct uverbs_attr_bundle *attrs,
 					    int type)
 {
-	struct mlx5_core_dev *mdev = to_mdev(ctx->device)->mdev;
+	struct mlx5_core_dev *mdev = to_dev(ctx->device)->mdev;
 	enum mlx5_sw_icm_type icm_type;
 	struct mlx5_ib_dm_icm *dm;
 	u64 act_size;
@@ -435,7 +435,7 @@ struct ib_dm *mlx5_ib_alloc_dm(struct ib_device *ibdev,
 	if (err)
 		return ERR_PTR(err);
 
-	mlx5_ib_dbg(to_mdev(ibdev), "alloc_dm req: dm_type=%d user_length=0x%llx log_alignment=%d\n",
+	mlx5_ib_dbg(to_dev(ibdev), "alloc_dm req: dm_type=%d user_length=0x%llx log_alignment=%d\n",
 		    type, attr->length, attr->alignment);
 
 	switch (type) {
@@ -474,7 +474,7 @@ static int mlx5_dm_icm_dealloc(struct mlx5_ib_ucontext *ctx,
 			       struct mlx5_ib_dm_icm *dm)
 {
 	enum mlx5_sw_icm_type type = get_icm_type(dm->base.type);
-	struct mlx5_core_dev *mdev = to_mdev(dm->base.ibdm.device)->mdev;
+	struct mlx5_core_dev *mdev = to_dev(dm->base.ibdm.device)->mdev;
 	int err;
 
 	err = mlx5_dm_sw_icm_dealloc(mdev, type, dm->base.size, ctx->devx_uid,
diff --git a/drivers/infiniband/hw/mlx5/dmah.c b/drivers/infiniband/hw/mlx5/dmah.c
index 362a88992ffa2d5411c65c02e429b569adba8d74..84641e06d63c1ebc20ac57dbc11c36a46554b638 100644
--- a/drivers/infiniband/hw/mlx5/dmah.c
+++ b/drivers/infiniband/hw/mlx5/dmah.c
@@ -13,7 +13,7 @@
 static int mlx5_ib_alloc_dmah(struct ib_dmah *ibdmah,
 			      struct uverbs_attr_bundle *attrs)
 {
-	struct mlx5_core_dev *mdev = to_mdev(ibdmah->device)->mdev;
+	struct mlx5_core_dev *mdev = to_dev(ibdmah->device)->mdev;
 	struct mlx5_ib_dmah *dmah = to_mdmah(ibdmah);
 	u16 st_bits = BIT(IB_DMAH_CPU_ID_EXISTS) |
 		      BIT(IB_DMAH_MEM_TYPE_EXISTS);
@@ -40,7 +40,7 @@ static int mlx5_ib_dealloc_dmah(struct ib_dmah *ibdmah,
 				struct uverbs_attr_bundle *attrs)
 {
 	struct mlx5_ib_dmah *dmah = to_mdmah(ibdmah);
-	struct mlx5_core_dev *mdev = to_mdev(ibdmah->device)->mdev;
+	struct mlx5_core_dev *mdev = to_dev(ibdmah->device)->mdev;
 
 	if (ibdmah->valid_fields & BIT(IB_DMAH_CPU_ID_EXISTS))
 		return mlx5_st_dealloc_index(mdev, dmah->st_index);
diff --git a/drivers/infiniband/hw/mlx5/fs.c b/drivers/infiniband/hw/mlx5/fs.c
index 63cc78c99498eac9b11afa0b5c6ad5ea549708b4..4f92d749287f496918387d44f3534bb4c4d58c24 100644
--- a/drivers/infiniband/hw/mlx5/fs.c
+++ b/drivers/infiniband/hw/mlx5/fs.c
@@ -687,7 +687,7 @@ enum flow_table_type {
 
 static bool __maybe_unused mlx5_ib_shared_ft_allowed(struct ib_device *device)
 {
-	struct mlx5_ib_dev *dev = to_mdev(device);
+	struct mlx5_ib_dev *dev = to_dev(device);
 
 	return MLX5_CAP_GEN(dev->mdev, shared_object_to_user_object_allowed);
 }
@@ -1364,7 +1364,7 @@ void mlx5_ib_fs_remove_op_fc(struct mlx5_ib_dev *dev,
 
 void mlx5r_fs_unbind_op_fc(struct ib_qp *qp, struct xarray *qpn_opfc_xa)
 {
-	struct mlx5_ib_dev *dev = to_mdev(qp->device);
+	struct mlx5_ib_dev *dev = to_dev(qp->device);
 	struct mlx5_per_qp_opfc *per_qp_opfc;
 	struct mlx5_ib_op_fc *in_use_opfc;
 	struct mlx5_ib_flow_prio *prio;
@@ -1403,7 +1403,7 @@ int mlx5r_fs_bind_op_fc(struct ib_qp *qp,
 			struct mlx5_fc *fc_arr[MLX5_IB_OPCOUNTER_MAX],
 			struct xarray *qpn_opfc_xa, u32 port)
 {
-	struct mlx5_ib_dev *dev = to_mdev(qp->device);
+	struct mlx5_ib_dev *dev = to_dev(qp->device);
 	struct mlx5_per_qp_opfc *per_qp_opfc;
 	struct mlx5_ib_flow_prio *prio;
 	struct mlx5_ib_counters *cnts;
@@ -1729,7 +1729,7 @@ static struct ib_flow *mlx5_ib_create_flow(struct ib_qp *qp,
 					   struct ib_flow_attr *flow_attr,
 					   struct ib_udata *udata)
 {
-	struct mlx5_ib_dev *dev = to_mdev(qp->device);
+	struct mlx5_ib_dev *dev = to_dev(qp->device);
 	struct mlx5_ib_qp *mqp = to_mqp(qp);
 	struct mlx5_ib_flow_handler *handler = NULL;
 	struct mlx5_flow_destination *dst = NULL;
@@ -2472,7 +2472,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_CREATE_FLOW)(
 	fs_matcher = uverbs_attr_get_obj(attrs,
 					 MLX5_IB_ATTR_CREATE_FLOW_MATCHER);
 	uobj =  uverbs_attr_get_uobject(attrs, MLX5_IB_ATTR_CREATE_FLOW_HANDLE);
-	dev = mlx5_udata_to_mdev(&attrs->driver_udata);
+	dev = udata_to_dev(&attrs->driver_udata);
 
 	if (get_dests(attrs, fs_matcher, &dest_id, &dest_type, &qp, &flags))
 		return -EINVAL;
@@ -2910,7 +2910,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_FLOW_MATCHER_CREATE)(
 {
 	struct ib_uobject *uobj = uverbs_attr_get_uobject(
 		attrs, MLX5_IB_ATTR_FLOW_MATCHER_CREATE_HANDLE);
-	struct mlx5_ib_dev *dev = mlx5_udata_to_mdev(&attrs->driver_udata);
+	struct mlx5_ib_dev *dev = udata_to_dev(&attrs->driver_udata);
 	struct mlx5_ib_flow_matcher *obj;
 	int err;
 
@@ -2988,7 +2988,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_STEERING_ANCHOR_CREATE)(
 {
 	struct ib_uobject *uobj = uverbs_attr_get_uobject(
 		attrs, MLX5_IB_ATTR_STEERING_ANCHOR_CREATE_HANDLE);
-	struct mlx5_ib_dev *dev = mlx5_udata_to_mdev(&attrs->driver_udata);
+	struct mlx5_ib_dev *dev = udata_to_dev(&attrs->driver_udata);
 	enum mlx5_ib_uapi_flow_table_type ib_uapi_ft_type;
 	enum mlx5_flow_namespace_type ns_type;
 	struct mlx5_ib_steering_anchor *obj;
@@ -3114,7 +3114,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_FLOW_ACTION_CREATE_MODIFY_HEADER)(
 {
 	struct ib_uobject *uobj = uverbs_attr_get_uobject(
 		attrs, MLX5_IB_ATTR_CREATE_MODIFY_HEADER_HANDLE);
-	struct mlx5_ib_dev *dev = mlx5_udata_to_mdev(&attrs->driver_udata);
+	struct mlx5_ib_dev *dev = udata_to_dev(&attrs->driver_udata);
 	enum mlx5_ib_uapi_flow_table_type ft_type;
 	struct ib_flow_action *action;
 	int num_actions;
@@ -3240,7 +3240,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_FLOW_ACTION_CREATE_PACKET_REFORMAT)(
 {
 	struct ib_uobject *uobj = uverbs_attr_get_uobject(attrs,
 		MLX5_IB_ATTR_CREATE_PACKET_REFORMAT_HANDLE);
-	struct mlx5_ib_dev *dev = mlx5_udata_to_mdev(&attrs->driver_udata);
+	struct mlx5_ib_dev *dev = udata_to_dev(&attrs->driver_udata);
 	enum mlx5_ib_uapi_flow_action_packet_reformat_type dv_prt;
 	enum mlx5_ib_uapi_flow_table_type ft_type;
 	struct mlx5_ib_flow_action *maction;
diff --git a/drivers/infiniband/hw/mlx5/gsi.c b/drivers/infiniband/hw/mlx5/gsi.c
index b2e2a219639d293d7da69303d361374932f2f6db..16c2afbcef6ede74c703e95414f7e0e43974b808 100644
--- a/drivers/infiniband/hw/mlx5/gsi.c
+++ b/drivers/infiniband/hw/mlx5/gsi.c
@@ -88,7 +88,7 @@ static void handle_single_completion(struct ib_cq *cq, struct ib_wc *wc)
 int mlx5_ib_create_gsi(struct ib_pd *pd, struct mlx5_ib_qp *mqp,
 		       struct ib_qp_init_attr *attr)
 {
-	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	struct mlx5_ib_gsi_qp *gsi;
 	struct ib_qp_init_attr hw_init_attr = *attr;
 	const u8 port_num = attr->port_num;
@@ -168,7 +168,7 @@ int mlx5_ib_create_gsi(struct ib_pd *pd, struct mlx5_ib_qp *mqp,
 
 int mlx5_ib_destroy_gsi(struct mlx5_ib_qp *mqp)
 {
-	struct mlx5_ib_dev *dev = to_mdev(mqp->ibqp.device);
+	struct mlx5_ib_dev *dev = to_dev(mqp->ibqp.device);
 	struct mlx5_ib_gsi_qp *gsi = &mqp->gsi;
 	const int port_num = gsi->port_num;
 	int qp_index;
@@ -220,7 +220,7 @@ static struct ib_qp *create_gsi_ud_qp(struct mlx5_ib_gsi_qp *gsi)
 static int modify_to_rts(struct mlx5_ib_gsi_qp *gsi, struct ib_qp *qp,
 			 u16 pkey_index)
 {
-	struct mlx5_ib_dev *dev = to_mdev(qp->device);
+	struct mlx5_ib_dev *dev = to_dev(qp->device);
 	struct ib_qp_attr attr;
 	int mask;
 	int ret;
@@ -260,7 +260,7 @@ static int modify_to_rts(struct mlx5_ib_gsi_qp *gsi, struct ib_qp *qp,
 static void setup_qp(struct mlx5_ib_gsi_qp *gsi, u16 qp_index)
 {
 	struct ib_device *device = gsi->rx_qp->device;
-	struct mlx5_ib_dev *dev = to_mdev(device);
+	struct mlx5_ib_dev *dev = to_dev(device);
 	int pkey_index = qp_index;
 	struct mlx5_ib_qp *mqp;
 	struct ib_qp *qp;
@@ -322,7 +322,7 @@ static void setup_qp(struct mlx5_ib_gsi_qp *gsi, u16 qp_index)
 int mlx5_ib_gsi_modify_qp(struct ib_qp *qp, struct ib_qp_attr *attr,
 			  int attr_mask)
 {
-	struct mlx5_ib_dev *dev = to_mdev(qp->device);
+	struct mlx5_ib_dev *dev = to_dev(qp->device);
 	struct mlx5_ib_qp *mqp = to_mqp(qp);
 	struct mlx5_ib_gsi_qp *gsi = &mqp->gsi;
 	u16 qp_index;
@@ -362,7 +362,7 @@ static int mlx5_ib_add_outstanding_wr(struct mlx5_ib_qp *mqp,
 				      struct ib_ud_wr *wr, struct ib_wc *wc)
 {
 	struct mlx5_ib_gsi_qp *gsi = &mqp->gsi;
-	struct mlx5_ib_dev *dev = to_mdev(gsi->rx_qp->device);
+	struct mlx5_ib_dev *dev = to_dev(gsi->rx_qp->device);
 	struct mlx5_ib_gsi_wr *gsi_wr;
 
 	if (gsi->outstanding_pi == gsi->outstanding_ci + gsi->cap.max_send_wr) {
@@ -412,7 +412,7 @@ static int mlx5_ib_gsi_silent_drop(struct mlx5_ib_qp *mqp, struct ib_ud_wr *wr)
 /* Call with gsi->lock locked */
 static struct ib_qp *get_tx_qp(struct mlx5_ib_gsi_qp *gsi, struct ib_ud_wr *wr)
 {
-	struct mlx5_ib_dev *dev = to_mdev(gsi->rx_qp->device);
+	struct mlx5_ib_dev *dev = to_dev(gsi->rx_qp->device);
 	struct mlx5_ib_ah *ah = to_mah(wr->ah);
 	int qp_index = wr->pkey_index;
 
diff --git a/drivers/infiniband/hw/mlx5/ib_virt.c b/drivers/infiniband/hw/mlx5/ib_virt.c
index 2c81a4e6712ef2b54576d1d3187b33d8a436cd4d..2c0122f26a49b1bbf5ef884c68080c613a5415d7 100644
--- a/drivers/infiniband/hw/mlx5/ib_virt.c
+++ b/drivers/infiniband/hw/mlx5/ib_virt.c
@@ -50,7 +50,7 @@ static inline u32 mlx_to_net_policy(enum port_state_policy mlx_policy)
 int mlx5_ib_get_vf_config(struct ib_device *device, int vf, u32 port,
 			  struct ifla_vf_info *info)
 {
-	struct mlx5_ib_dev *dev = to_mdev(device);
+	struct mlx5_ib_dev *dev = to_dev(device);
 	struct mlx5_core_dev *mdev = dev->mdev;
 	struct mlx5_hca_vport_context *rep;
 	int err;
@@ -92,7 +92,7 @@ static inline enum port_state_policy net_to_mlx_policy(int policy)
 int mlx5_ib_set_vf_link_state(struct ib_device *device, int vf,
 			      u32 port, int state)
 {
-	struct mlx5_ib_dev *dev = to_mdev(device);
+	struct mlx5_ib_dev *dev = to_dev(device);
 	struct mlx5_core_dev *mdev = dev->mdev;
 	struct mlx5_hca_vport_context *in;
 	struct mlx5_vf_context *vfs_ctx = mdev->priv.sriov.vfs_ctx;
@@ -126,7 +126,7 @@ int mlx5_ib_get_vf_stats(struct ib_device *device, int vf,
 	void *out;
 	int err;
 
-	dev = to_mdev(device);
+	dev = to_dev(device);
 	mdev = dev->mdev;
 
 	out = kzalloc(out_sz, GFP_KERNEL);
@@ -151,7 +151,7 @@ int mlx5_ib_get_vf_stats(struct ib_device *device, int vf,
 static int set_vf_node_guid(struct ib_device *device, int vf, u32 port,
 			    u64 guid)
 {
-	struct mlx5_ib_dev *dev = to_mdev(device);
+	struct mlx5_ib_dev *dev = to_dev(device);
 	struct mlx5_core_dev *mdev = dev->mdev;
 	struct mlx5_hca_vport_context *in;
 	struct mlx5_vf_context *vfs_ctx = mdev->priv.sriov.vfs_ctx;
@@ -175,7 +175,7 @@ static int set_vf_node_guid(struct ib_device *device, int vf, u32 port,
 static int set_vf_port_guid(struct ib_device *device, int vf, u32 port,
 			    u64 guid)
 {
-	struct mlx5_ib_dev *dev = to_mdev(device);
+	struct mlx5_ib_dev *dev = to_dev(device);
 	struct mlx5_core_dev *mdev = dev->mdev;
 	struct mlx5_hca_vport_context *in;
 	struct mlx5_vf_context *vfs_ctx = mdev->priv.sriov.vfs_ctx;
@@ -211,7 +211,7 @@ int mlx5_ib_get_vf_guid(struct ib_device *device, int vf, u32 port,
 			struct ifla_vf_guid *node_guid,
 			struct ifla_vf_guid *port_guid)
 {
-	struct mlx5_ib_dev *dev = to_mdev(device);
+	struct mlx5_ib_dev *dev = to_dev(device);
 	struct mlx5_core_dev *mdev = dev->mdev;
 	struct mlx5_vf_context *vfs_ctx = mdev->priv.sriov.vfs_ctx;
 
diff --git a/drivers/infiniband/hw/mlx5/macsec.c b/drivers/infiniband/hw/mlx5/macsec.c
index b44832025ab7c13fac82d2f987eda205586b7fec..0ea649298a96d8c0acd8902b453b1387c1c78185 100644
--- a/drivers/infiniband/hw/mlx5/macsec.c
+++ b/drivers/infiniband/hw/mlx5/macsec.c
@@ -216,7 +216,7 @@ void mlx5r_macsec_dealloc_gids(struct mlx5_ib_dev *dev)
 
 int mlx5r_add_gid_macsec_operations(const struct ib_gid_attr *attr)
 {
-	struct mlx5_ib_dev *dev = to_mdev(attr->device);
+	struct mlx5_ib_dev *dev = to_dev(attr->device);
 	struct mlx5_macsec_device *macsec_device;
 	const struct ib_gid_attr *physical_gid;
 	struct mlx5_reserved_gids *mgids;
@@ -259,7 +259,7 @@ int mlx5r_add_gid_macsec_operations(const struct ib_gid_attr *attr)
 	physical_gid = rdma_find_gid(attr->device, &attr->gid,
 				     attr->gid_type, NULL);
 	if (!IS_ERR(physical_gid)) {
-		ret = set_roce_addr(to_mdev(physical_gid->device),
+		ret = set_roce_addr(to_dev(physical_gid->device),
 				    physical_gid->port_num,
 				    physical_gid->index, NULL,
 				    physical_gid);
@@ -286,7 +286,7 @@ int mlx5r_add_gid_macsec_operations(const struct ib_gid_attr *attr)
 	return ret;
 
 rule_err:
-	set_roce_addr(to_mdev(physical_gid->device), physical_gid->port_num,
+	set_roce_addr(to_dev(physical_gid->device), physical_gid->port_num,
 		      physical_gid->index, &physical_gid->gid, physical_gid);
 	mgids->macsec_index = -1;
 gid_err:
@@ -300,7 +300,7 @@ int mlx5r_add_gid_macsec_operations(const struct ib_gid_attr *attr)
 
 void mlx5r_del_gid_macsec_operations(const struct ib_gid_attr *attr)
 {
-	struct mlx5_ib_dev *dev = to_mdev(attr->device);
+	struct mlx5_ib_dev *dev = to_dev(attr->device);
 	struct mlx5_macsec_device *macsec_device;
 	struct mlx5_reserved_gids *mgids;
 	struct net_device *ndev;
@@ -342,7 +342,7 @@ void mlx5r_del_gid_macsec_operations(const struct ib_gid_attr *attr)
 		if (mgids->macsec_index == attr->index) {
 			const struct ib_gid_attr *physical_gid = mgids->physical_gid;
 
-			set_roce_addr(to_mdev(physical_gid->device),
+			set_roce_addr(to_dev(physical_gid->device),
 				      physical_gid->port_num,
 				      physical_gid->index,
 				      &physical_gid->gid, physical_gid);
diff --git a/drivers/infiniband/hw/mlx5/mad.c b/drivers/infiniband/hw/mlx5/mad.c
index 7fe6285359612b6cb92562b2ab8be459b4aeace4..c21f0632d83de4709ae133193f4b3e9f08b3f76e 100644
--- a/drivers/infiniband/hw/mlx5/mad.c
+++ b/drivers/infiniband/hw/mlx5/mad.c
@@ -302,7 +302,7 @@ int mlx5_ib_process_mad(struct ib_device *ibdev, int mad_flags, u32 port_num,
 			const struct ib_mad *in, struct ib_mad *out,
 			size_t *out_mad_size, u16 *out_mad_pkey_index)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	u8 mgmt_class = in->mad_hdr.mgmt_class;
 	u8 method = in->mad_hdr.method;
 	u16 slid;
@@ -343,7 +343,7 @@ int mlx5_ib_process_mad(struct ib_device *ibdev, int mad_flags, u32 port_num,
 		return IB_MAD_RESULT_SUCCESS;
 	}
 
-	err = mlx5_MAD_IFC(to_mdev(ibdev), mad_flags & IB_MAD_IGNORE_MKEY,
+	err = mlx5_MAD_IFC(to_dev(ibdev), mad_flags & IB_MAD_IGNORE_MKEY,
 			   mad_flags & IB_MAD_IGNORE_BKEY, port_num, in_wc,
 			   in_grh, in, out);
 	if (err)
@@ -402,7 +402,7 @@ static int mlx5_query_mad_ifc_smp_attr_node_info(struct ib_device *ibdev,
 	ib_init_query_mad(in_mad);
 	in_mad->attr_id = IB_SMP_ATTR_NODE_INFO;
 
-	err = mlx5_MAD_IFC(to_mdev(ibdev), 1, 1, 1, NULL, NULL, in_mad,
+	err = mlx5_MAD_IFC(to_dev(ibdev), 1, 1, 1, NULL, NULL, in_mad,
 			   out_mad);
 
 	kfree(in_mad);
@@ -541,7 +541,7 @@ int mlx5_query_mad_ifc_pkey(struct ib_device *ibdev, u32 port, u16 index,
 	in_mad->attr_id  = IB_SMP_ATTR_PKEY_TABLE;
 	in_mad->attr_mod = cpu_to_be32(index / 32);
 
-	err = mlx5_MAD_IFC(to_mdev(ibdev), 1, 1, port, NULL, NULL, in_mad,
+	err = mlx5_MAD_IFC(to_dev(ibdev), 1, 1, port, NULL, NULL, in_mad,
 			   out_mad);
 	if (err)
 		goto out;
@@ -570,7 +570,7 @@ int mlx5_query_mad_ifc_gids(struct ib_device *ibdev, u32 port, int index,
 	in_mad->attr_id  = IB_SMP_ATTR_PORT_INFO;
 	in_mad->attr_mod = cpu_to_be32(port);
 
-	err = mlx5_MAD_IFC(to_mdev(ibdev), 1, 1, port, NULL, NULL, in_mad,
+	err = mlx5_MAD_IFC(to_dev(ibdev), 1, 1, port, NULL, NULL, in_mad,
 			   out_mad);
 	if (err)
 		goto out;
@@ -581,7 +581,7 @@ int mlx5_query_mad_ifc_gids(struct ib_device *ibdev, u32 port, int index,
 	in_mad->attr_id  = IB_SMP_ATTR_GUID_INFO;
 	in_mad->attr_mod = cpu_to_be32(index / 8);
 
-	err = mlx5_MAD_IFC(to_mdev(ibdev), 1, 1, port, NULL, NULL, in_mad,
+	err = mlx5_MAD_IFC(to_dev(ibdev), 1, 1, port, NULL, NULL, in_mad,
 			   out_mad);
 	if (err)
 		goto out;
@@ -597,7 +597,7 @@ int mlx5_query_mad_ifc_gids(struct ib_device *ibdev, u32 port, int index,
 int mlx5_query_mad_ifc_port(struct ib_device *ibdev, u32 port,
 			    struct ib_port_attr *props)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	struct mlx5_core_dev *mdev = dev->mdev;
 	struct ib_smp *in_mad;
 	struct ib_smp *out_mad;
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 1ecd79929f8cf446f924bb1ff377bb243a5bfe03..a78418699e90d6032dec949d1e0d8462d11c1239 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -110,7 +110,7 @@ mlx5_port_type_cap_to_rdma_ll(int port_type_cap)
 static enum rdma_link_layer
 mlx5_ib_port_link_layer(struct ib_device *device, u32 port_num)
 {
-	struct mlx5_ib_dev *dev = to_mdev(device);
+	struct mlx5_ib_dev *dev = to_dev(device);
 	int port_type_cap = MLX5_CAP_GEN(dev->mdev, port_type);
 
 	return mlx5_port_type_cap_to_rdma_ll(port_type_cap);
@@ -536,7 +536,7 @@ static int translate_eth_proto_oper(u32 eth_proto_oper, u16 *active_speed,
 static int mlx5_query_port_roce(struct ib_device *device, u32 port_num,
 				struct ib_port_attr *props)
 {
-	struct mlx5_ib_dev *dev = to_mdev(device);
+	struct mlx5_ib_dev *dev = to_dev(device);
 	u32 out[MLX5_ST_SZ_DW(ptys_reg)] = {0};
 	struct mlx5_core_dev *mdev;
 	struct net_device *ndev, *upper;
@@ -687,7 +687,7 @@ static int mlx5_ib_add_gid(const struct ib_gid_attr *attr,
 	if (ret)
 		return ret;
 
-	return set_roce_addr(to_mdev(attr->device), attr->port_num,
+	return set_roce_addr(to_dev(attr->device), attr->port_num,
 			     attr->index, &attr->gid, attr);
 }
 
@@ -696,7 +696,7 @@ static int mlx5_ib_del_gid(const struct ib_gid_attr *attr,
 {
 	int ret;
 
-	ret = set_roce_addr(to_mdev(attr->device), attr->port_num,
+	ret = set_roce_addr(to_dev(attr->device), attr->port_num,
 			    attr->index, NULL, attr);
 	if (ret)
 		return ret;
@@ -729,7 +729,7 @@ enum {
 
 static int mlx5_get_vport_access_method(struct ib_device *ibdev)
 {
-	if (mlx5_use_mad_ifc(to_mdev(ibdev)))
+	if (mlx5_use_mad_ifc(to_dev(ibdev)))
 		return MLX5_VPORT_ACCESS_METHOD_MAD;
 
 	if (mlx5_ib_port_link_layer(ibdev, 1) ==
@@ -772,7 +772,7 @@ static void get_atomic_caps_qp(struct mlx5_ib_dev *dev,
 static int mlx5_query_system_image_guid(struct ib_device *ibdev,
 					__be64 *sys_image_guid)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	struct mlx5_core_dev *mdev = dev->mdev;
 	u64 tmp;
 	int err;
@@ -804,7 +804,7 @@ static int mlx5_query_system_image_guid(struct ib_device *ibdev,
 static int mlx5_query_max_pkeys(struct ib_device *ibdev,
 				u16 *max_pkeys)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	struct mlx5_core_dev *mdev = dev->mdev;
 
 	switch (mlx5_get_vport_access_method(ibdev)) {
@@ -825,7 +825,7 @@ static int mlx5_query_max_pkeys(struct ib_device *ibdev,
 static int mlx5_query_vendor_id(struct ib_device *ibdev,
 				u32 *vendor_id)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 
 	switch (mlx5_get_vport_access_method(ibdev)) {
 	case MLX5_VPORT_ACCESS_METHOD_MAD:
@@ -947,7 +947,7 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
 				struct ib_udata *uhw)
 {
 	size_t uhw_outlen = (uhw) ? uhw->outlen : 0;
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	struct mlx5_core_dev *mdev = dev->mdev;
 	int err = -ENOMEM;
 	int max_sq_desc;
@@ -1376,7 +1376,7 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
 static void translate_active_width(struct ib_device *ibdev, u16 active_width,
 				   u8 *ib_width)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 
 	if (active_width & MLX5_PTYS_WIDTH_1X)
 		*ib_width = IB_WIDTH_1X;
@@ -1461,7 +1461,7 @@ static int translate_max_vl_num(struct ib_device *ibdev, u8 vl_hw_cap,
 static int mlx5_query_hca_port(struct ib_device *ibdev, u32 port,
 			       struct ib_port_attr *props)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	struct mlx5_core_dev *mdev = dev->mdev;
 	struct mlx5_hca_vport_context *rep;
 	u8 vl_hw_cap, plane_index = 0;
@@ -1562,7 +1562,7 @@ int mlx5_ib_query_port(struct ib_device *ibdev, u32 port,
 	}
 
 	if (!ret && props) {
-		struct mlx5_ib_dev *dev = to_mdev(ibdev);
+		struct mlx5_ib_dev *dev = to_dev(ibdev);
 		struct mlx5_core_dev *mdev;
 		bool put_mdev = true;
 
@@ -1709,7 +1709,7 @@ static int mlx5_ib_query_port_speed_rep(struct mlx5_ib_dev *dev, u32 port_num,
 
 int mlx5_ib_query_port_speed(struct ib_device *ibdev, u32 port_num, u64 *speed)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 
 	if (mlx5_ib_port_link_layer(ibdev, port_num) ==
 	    IB_LINK_LAYER_INFINIBAND || mlx5_core_mp_enabled(dev->mdev))
@@ -1723,7 +1723,7 @@ int mlx5_ib_query_port_speed(struct ib_device *ibdev, u32 port_num, u64 *speed)
 static int mlx5_ib_query_gid(struct ib_device *ibdev, u32 port, int index,
 			     union ib_gid *gid)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	struct mlx5_core_dev *mdev = dev->mdev;
 
 	switch (mlx5_get_vport_access_method(ibdev)) {
@@ -1742,7 +1742,7 @@ static int mlx5_ib_query_gid(struct ib_device *ibdev, u32 port, int index,
 static int mlx5_query_hca_nic_pkey(struct ib_device *ibdev, u32 port,
 				   u16 index, u16 *pkey)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	struct mlx5_core_dev *mdev;
 	bool put_mdev = true;
 	u32 mdev_port_num;
@@ -1784,7 +1784,7 @@ static int mlx5_ib_query_pkey(struct ib_device *ibdev, u32 port, u16 index,
 static int mlx5_ib_modify_device(struct ib_device *ibdev, int mask,
 				 struct ib_device_modify *props)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	struct mlx5_reg_node_desc in;
 	struct mlx5_reg_node_desc out;
 	int err;
@@ -1847,7 +1847,7 @@ static int set_port_caps_atomic(struct mlx5_ib_dev *dev, u32 port_num, u32 mask,
 static int mlx5_ib_modify_port(struct ib_device *ibdev, u32 port, int mask,
 			       struct ib_port_modify *props)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	struct ib_port_attr attr;
 	u32 tmp;
 	int err;
@@ -2116,7 +2116,7 @@ static int set_ucontext_resp(struct ib_ucontext *uctx,
 			     struct mlx5_ib_alloc_ucontext_resp *resp)
 {
 	struct ib_device *ibdev = uctx->device;
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	struct mlx5_ib_ucontext *context = to_mucontext(uctx);
 	struct mlx5_bfreg_info *bfregi = &context->bfregi;
 
@@ -2200,7 +2200,7 @@ static int mlx5_ib_alloc_ucontext(struct ib_ucontext *uctx,
 				  struct ib_udata *udata)
 {
 	struct ib_device *ibdev = uctx->device;
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	struct mlx5_ib_alloc_ucontext_req_v2 req;
 	struct mlx5_ib_alloc_ucontext_resp resp = {};
 	struct mlx5_ib_ucontext *context = to_mucontext(uctx);
@@ -2372,7 +2372,7 @@ static int mlx5_ib_query_ucontext(struct ib_ucontext *ibcontext,
 static void mlx5_ib_dealloc_ucontext(struct ib_ucontext *ibcontext)
 {
 	struct mlx5_ib_ucontext *context = to_mucontext(ibcontext);
-	struct mlx5_ib_dev *dev = to_mdev(ibcontext->device);
+	struct mlx5_ib_dev *dev = to_dev(ibcontext->device);
 	struct mlx5_bfreg_info *bfregi;
 
 	bfregi = &context->bfregi;
@@ -2503,7 +2503,7 @@ static int mlx5_ib_mmap_get_pfns(struct rdma_user_mmap_entry *entry,
 				 struct p2pdma_provider **provider)
 {
 	struct mlx5_user_mmap_entry *mentry = to_mmmap(entry);
-	struct pci_dev *pdev = to_mdev(entry->ucontext->device)->mdev->pdev;
+	struct pci_dev *pdev = to_dev(entry->ucontext->device)->mdev->pdev;
 	int bar;
 
 	phys_vec->paddr = mentry->address;
@@ -2551,7 +2551,7 @@ static void mlx5_ib_free_var_mmap_entry(struct mlx5_user_mmap_entry *mentry,
 static void mlx5_ib_mmap_free(struct rdma_user_mmap_entry *entry)
 {
 	struct mlx5_user_mmap_entry *mentry = to_mmmap(entry);
-	struct mlx5_ib_dev *dev = to_mdev(entry->ucontext->device);
+	struct mlx5_ib_dev *dev = to_dev(entry->ucontext->device);
 	struct mlx5_var_table *var_table = &dev->var_table;
 	struct mlx5_ib_ucontext *context = to_mucontext(entry->ucontext);
 	struct mlx5_var_region *var_region;
@@ -2743,7 +2743,7 @@ static u64 mlx5_entry_to_mmap_offset(struct mlx5_user_mmap_entry *entry)
 static int mlx5_ib_mmap(struct ib_ucontext *ibcontext, struct vm_area_struct *vma)
 {
 	struct mlx5_ib_ucontext *context = to_mucontext(ibcontext);
-	struct mlx5_ib_dev *dev = to_mdev(ibcontext->device);
+	struct mlx5_ib_dev *dev = to_dev(ibcontext->device);
 	unsigned long command;
 	phys_addr_t pfn;
 
@@ -2805,7 +2805,7 @@ static int mlx5_ib_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)
 	uid = context ? context->devx_uid : 0;
 	MLX5_SET(alloc_pd_in, in, opcode, MLX5_CMD_OP_ALLOC_PD);
 	MLX5_SET(alloc_pd_in, in, uid, uid);
-	err = mlx5_cmd_exec_inout(to_mdev(ibdev)->mdev, alloc_pd, in, out);
+	err = mlx5_cmd_exec_inout(to_dev(ibdev)->mdev, alloc_pd, in, out);
 	if (err)
 		return err;
 
@@ -2815,7 +2815,7 @@ static int mlx5_ib_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)
 		resp.pdn = pd->pdn;
 		err = ib_respond_udata(udata, resp);
 		if (err) {
-			mlx5_cmd_dealloc_pd(to_mdev(ibdev)->mdev, pd->pdn, uid);
+			mlx5_cmd_dealloc_pd(to_dev(ibdev)->mdev, pd->pdn, uid);
 			return err;
 		}
 	}
@@ -2825,7 +2825,7 @@ static int mlx5_ib_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)
 
 static int mlx5_ib_dealloc_pd(struct ib_pd *pd, struct ib_udata *udata)
 {
-	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	struct mlx5_ib_pd *mpd = to_mpd(pd);
 
 	return mlx5_cmd_dealloc_pd(dev->mdev, mpd->pdn, mpd->uid);
@@ -2833,7 +2833,7 @@ static int mlx5_ib_dealloc_pd(struct ib_pd *pd, struct ib_udata *udata)
 
 static int mlx5_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibqp->device);
+	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
 	struct mlx5_ib_qp *mqp = to_mqp(ibqp);
 	int err;
 	u16 uid;
@@ -2856,7 +2856,7 @@ static int mlx5_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 
 static int mlx5_ib_mcg_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibqp->device);
+	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
 	int err;
 	u16 uid;
 
@@ -3485,7 +3485,7 @@ static void mlx5_ib_dev_res_cleanup(struct mlx5_ib_dev *dev)
 static u32 get_core_cap_flags(struct ib_device *ibdev,
 			      struct mlx5_hca_vport_context *rep)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	enum rdma_link_layer ll = mlx5_ib_port_link_layer(ibdev, 1);
 	u8 l3_type_cap = MLX5_CAP_ROCE(dev->mdev, l3_type);
 	u8 roce_version_cap = MLX5_CAP_ROCE(dev->mdev, roce_version);
@@ -3527,7 +3527,7 @@ static int mlx5_port_immutable(struct ib_device *ibdev, u32 port_num,
 			       struct ib_port_immutable *immutable)
 {
 	struct ib_port_attr attr;
-	struct mlx5_ib_dev *dev = to_mdev(ibdev);
+	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	enum rdma_link_layer ll = mlx5_ib_port_link_layer(ibdev, port_num);
 	struct mlx5_hca_vport_context rep = {0};
 	int err;
@@ -3786,7 +3786,7 @@ static int mlx5_ib_rn_get_params(struct ib_device *device, u32 port_num,
 	if (type != RDMA_NETDEV_IPOIB)
 		return -EOPNOTSUPP;
 
-	return mlx5_rdma_rn_get_params(to_mdev(device)->mdev, device, params);
+	return mlx5_rdma_rn_get_params(to_dev(device)->mdev, device, params);
 }
 
 static ssize_t delay_drop_timeout_read(struct file *filp, char __user *buf,
@@ -4118,7 +4118,7 @@ alloc_var_entry(struct mlx5_ib_ucontext *c, u32 flags)
 	u32 page_idx;
 	int err;
 
-	var_table = &to_mdev(c->ibucontext.device)->var_table;
+	var_table = &to_dev(c->ibucontext.device)->var_table;
 	if (flags & MLX5_IB_UAPI_VAR_ALLOC_FLAG_TLP)
 		var_region = &var_table->tlp_var_region;
 	else
@@ -4186,11 +4186,11 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_VAR_OBJ_ALLOC)(
 		return err;
 
 	if (flags & MLX5_IB_UAPI_VAR_ALLOC_FLAG_TLP) {
-		if (!MLX5_CAP_GEN(to_mdev(c->ibucontext.device)->mdev,
+		if (!MLX5_CAP_GEN(to_dev(c->ibucontext.device)->mdev,
 				  tlp_device_emulation_manager))
 			return -EOPNOTSUPP;
 	} else {
-		if (!(MLX5_CAP_GEN_64(to_mdev(c->ibucontext.device)->mdev,
+		if (!(MLX5_CAP_GEN_64(to_dev(c->ibucontext.device)->mdev,
 				      general_obj_types) &
 		      MLX5_GENERAL_OBJ_TYPES_CAP_VIRTIO_NET_Q))
 			return -EOPNOTSUPP;
@@ -4253,7 +4253,7 @@ DECLARE_UVERBS_NAMED_OBJECT(MLX5_IB_OBJECT_VAR,
 
 static bool var_is_supported(struct ib_device *device)
 {
-	struct mlx5_ib_dev *dev = to_mdev(device);
+	struct mlx5_ib_dev *dev = to_dev(device);
 
 	return (MLX5_CAP_GEN_64(dev->mdev, general_obj_types) &
 			MLX5_GENERAL_OBJ_TYPES_CAP_VIRTIO_NET_Q) ||
@@ -4273,7 +4273,7 @@ alloc_uar_entry(struct mlx5_ib_ucontext *c,
 	if (!entry)
 		return ERR_PTR(-ENOMEM);
 
-	dev = to_mdev(c->ibucontext.device);
+	dev = to_dev(c->ibucontext.device);
 	err = mlx5_cmd_uar_alloc(dev->mdev, &uar_index, c->devx_uid);
 	if (err)
 		goto end;
@@ -4323,7 +4323,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_UAR_OBJ_ALLOC)(
 	    alloc_type != MLX5_IB_UAPI_UAR_ALLOC_TYPE_NC)
 		return -EOPNOTSUPP;
 
-	if (!mlx5_wc_support_get(to_mdev(c->ibucontext.device)->mdev) &&
+	if (!mlx5_wc_support_get(to_dev(c->ibucontext.device)->mdev) &&
 	    alloc_type == MLX5_IB_UAPI_UAR_ALLOC_TYPE_BF)
 		return -EOPNOTSUPP;
 
@@ -5213,7 +5213,7 @@ static struct ib_device *mlx5_ib_add_sub_dev(struct ib_device *parent,
 					     enum rdma_nl_dev_type type,
 					     const char *name)
 {
-	struct mlx5_ib_dev *mparent = to_mdev(parent), *mplane;
+	struct mlx5_ib_dev *mparent = to_dev(parent), *mplane;
 	enum rdma_link_layer ll;
 	int ret;
 
@@ -5261,9 +5261,9 @@ static struct ib_device *mlx5_ib_add_sub_dev(struct ib_device *parent,
 
 static void mlx5_ib_del_sub_dev(struct ib_device *sub_dev)
 {
-	struct mlx5_ib_dev *dev = to_mdev(sub_dev);
+	struct mlx5_ib_dev *dev = to_dev(sub_dev);
 
-	to_mdev(sub_dev->parent)->smi_dev = NULL;
+	to_dev(sub_dev->parent)->smi_dev = NULL;
 	__mlx5_ib_remove(dev, dev->profile, MLX5_IB_STAGE_MAX);
 }
 
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index 3f5a465ff34719c391aac73254149b6b8622274e..8e2b354ef239e72b6e1da1867f508ec9cd4eddc8 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -1171,22 +1171,23 @@ static inline struct mlx5_ib_xrcd *to_mxrcd(struct ib_xrcd *ibxrcd)
 	return container_of(ibxrcd, struct mlx5_ib_xrcd, ibxrcd);
 }
 
-static inline struct mlx5_ib_dev *to_mdev(struct ib_device *ibdev)
+static inline struct mlx5_ib_dev *to_dev(struct ib_device *ibdev)
 {
 	return container_of(ibdev, struct mlx5_ib_dev, ib_dev);
 }
 
-static inline struct mlx5_ib_dev *mr_to_mdev(struct mlx5_ib_mr *mr)
+static inline struct mlx5_ib_dev *mr_to_dev(struct mlx5_ib_mr *mr)
 {
-	return to_mdev(mr->ibmr.device);
+	return to_dev(mr->ibmr.device);
 }
 
-static inline struct mlx5_ib_dev *mlx5_udata_to_mdev(struct ib_udata *udata)
+static inline struct mlx5_ib_dev *udata_to_dev(struct ib_udata *udata)
 {
-	struct mlx5_ib_ucontext *context = rdma_udata_to_drv_context(
-		udata, struct mlx5_ib_ucontext, ibucontext);
+	struct mlx5_ib_ucontext *context =
+		rdma_udata_to_drv_context(udata, struct mlx5_ib_ucontext,
+					  ibucontext);
 
-	return to_mdev(context->ibucontext.device);
+	return to_dev(context->ibucontext.device);
 }
 
 static inline struct mlx5_ib_cq *to_mcq(struct ib_cq *ibcq)
@@ -1747,7 +1748,7 @@ static inline unsigned long
 mlx5_umem_dmabuf_find_best_pgsz(struct ib_umem_dmabuf *umem_dmabuf,
 				int access_mode)
 {
-	return mlx5_umem_mkc_find_best_pgsz(to_mdev(umem_dmabuf->umem.ibdev),
+	return mlx5_umem_mkc_find_best_pgsz(to_dev(umem_dmabuf->umem.ibdev),
 					    &umem_dmabuf->umem,
 					    umem_dmabuf->umem.iova,
 					    access_mode);
diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c
index 54303a3ef99d341ac6757d1792a053575994f3ab..1262d3ebc59213bfc3188042d25c625c6cfa43c2 100644
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@ -62,7 +62,7 @@ static int __mlx5_ib_dereg_mr(struct ib_mr *ibmr);
 static void set_mkc_access_pd_addr_fields(void *mkc, int acc, u64 start_addr,
 					  struct ib_pd *pd)
 {
-	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 
 	MLX5_SET(mkc, mkc, a, !!(acc & IB_ACCESS_REMOTE_ATOMIC));
 	MLX5_SET(mkc, mkc, rw, !!(acc & IB_ACCESS_REMOTE_WRITE));
@@ -248,7 +248,7 @@ static int mlx5r_create_mkeys(struct ib_device *device, struct ib_frmr_key *key,
 			MLX5_MKC_ACCESS_MODE_KSM :
 			MLX5_MKC_ACCESS_MODE_MTT;
 
-	struct mlx5_ib_dev *dev = to_mdev(device);
+	struct mlx5_ib_dev *dev = to_dev(device);
 	size_t inlen = MLX5_ST_SZ_BYTES(create_mkey_in);
 	u16 st_index;
 	void *mkc;
@@ -303,7 +303,7 @@ static int mlx5r_create_mkeys(struct ib_device *device, struct ib_frmr_key *key,
 static void mlx5r_destroy_mkeys(struct ib_device *device, u32 *handles,
 				unsigned int count)
 {
-	struct mlx5_ib_dev *dev = to_mdev(device);
+	struct mlx5_ib_dev *dev = to_dev(device);
 	int i, err;
 
 	for (i = 0; i < count; i++) {
@@ -319,7 +319,7 @@ static int mlx5r_build_frmr_key(struct ib_device *device,
 				const struct ib_frmr_key *in,
 				struct ib_frmr_key *out)
 {
-	struct mlx5_ib_dev *dev = to_mdev(device);
+	struct mlx5_ib_dev *dev = to_dev(device);
 
 	/* check HW capabilities of users requested frmr key */
 	if ((in->ats && !MLX5_CAP_GEN(dev->mdev, ats)) ||
@@ -346,7 +346,7 @@ static const struct ib_frmr_pool_ops mlx5r_frmr_pool_ops = {
 
 int mlx5r_frmr_pools_init(struct ib_device *device)
 {
-	struct mlx5_ib_dev *dev = to_mdev(device);
+	struct mlx5_ib_dev *dev = to_dev(device);
 
 	mutex_init(&dev->slow_path_mutex);
 	return ib_frmr_pools_init(device, &mlx5r_frmr_pool_ops);
@@ -359,7 +359,7 @@ void mlx5r_frmr_pools_cleanup(struct ib_device *device)
 
 struct ib_mr *mlx5_ib_get_dma_mr(struct ib_pd *pd, int acc)
 {
-	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	int inlen = MLX5_ST_SZ_BYTES(create_mkey_in);
 	struct mlx5_ib_mr *mr;
 	void *mkc;
@@ -443,7 +443,7 @@ static struct mlx5_ib_mr *alloc_cacheable_mr(struct ib_pd *pd,
 					     int access_flags, int access_mode,
 					     u16 st_index, u8 ph)
 {
-	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	struct mlx5_ib_mr *mr;
 	unsigned long page_size;
 
@@ -473,7 +473,7 @@ static struct ib_mr *
 reg_create_crossing_vhca_mr(struct ib_pd *pd, u64 iova, u64 length, int access_flags,
 			    u32 crossed_lkey)
 {
-	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	int access_mode = MLX5_MKC_ACCESS_MODE_CROSSING;
 	struct mlx5_ib_mr *mr;
 	void *mkc;
@@ -535,7 +535,7 @@ static struct mlx5_ib_mr *reg_create(struct ib_pd *pd, struct ib_umem *umem,
 				     unsigned long page_size, bool populate,
 				     int access_mode, u16 st_index, u8 ph)
 {
-	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	struct mlx5_ib_mr *mr;
 	__be64 *pas;
 	void *mkc;
@@ -640,7 +640,7 @@ static struct mlx5_ib_mr *reg_create(struct ib_pd *pd, struct ib_umem *umem,
 static struct ib_mr *mlx5_ib_get_dm_mr(struct ib_pd *pd, u64 start_addr,
 				       u64 length, int acc, int mode)
 {
-	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	int inlen = MLX5_ST_SZ_BYTES(create_mkey_in);
 	struct mlx5_ib_mr *mr;
 	void *mkc;
@@ -704,7 +704,7 @@ struct ib_mr *mlx5_ib_reg_dm_mr(struct ib_pd *pd, struct ib_dm *dm,
 				struct uverbs_attr_bundle *attrs)
 {
 	struct mlx5_ib_dm *mdm = to_mdm(dm);
-	struct mlx5_core_dev *mdev = to_mdev(dm->device)->mdev;
+	struct mlx5_core_dev *mdev = to_dev(dm->device)->mdev;
 	u64 start_addr = mdm->dev_addr + attr->offset;
 	int mode;
 
@@ -737,7 +737,7 @@ static struct ib_mr *create_real_mr(struct ib_pd *pd, struct ib_umem *umem,
 				    u64 iova, int access_flags,
 				    struct ib_dmah *dmah)
 {
-	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	struct mlx5_ib_mr *mr = NULL;
 	bool xlt_with_umr;
 	u16 st_index = MLX5_MKC_PCIE_TPH_NO_STEERING_TAG_INDEX;
@@ -796,7 +796,7 @@ static struct ib_mr *create_user_odp_mr(struct ib_pd *pd, u64 start, u64 length,
 					u64 iova, int access_flags,
 					struct ib_udata *udata)
 {
-	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	struct ib_umem_odp *odp;
 	struct mlx5_ib_mr *mr;
 	int err;
@@ -858,7 +858,7 @@ struct ib_mr *mlx5_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
 				  struct ib_dmah *dmah,
 				  struct ib_udata *udata)
 {
-	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	struct ib_umem *umem;
 	int err;
 
@@ -909,7 +909,7 @@ reg_user_mr_dmabuf(struct ib_pd *pd, struct device *dma_device,
 		   struct ib_dmah *dmah)
 {
 	bool pinned_mode = (access_mode == MLX5_MKC_ACCESS_MODE_KSM);
-	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	struct mlx5_ib_mr *mr = NULL;
 	struct ib_umem_dmabuf *umem_dmabuf;
 	u16 st_index = MLX5_MKC_PCIE_TPH_NO_STEERING_TAG_INDEX;
@@ -985,7 +985,7 @@ reg_user_mr_dmabuf_by_data_direct(struct ib_pd *pd, u64 offset,
 				  u64 length, u64 virt_addr,
 				  int fd, int access_flags)
 {
-	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	struct mlx5_data_direct_dev *data_direct_dev;
 	struct ib_mr *crossing_mr;
 	struct ib_mr *crossed_mr;
@@ -1040,7 +1040,7 @@ struct ib_mr *mlx5_ib_reg_user_mr_dmabuf(struct ib_pd *pd, u64 offset,
 					 struct ib_dmah *dmah,
 					 struct uverbs_attr_bundle *attrs)
 {
-	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	int mlx5_access_flags = 0;
 	int err;
 
@@ -1095,7 +1095,7 @@ static bool can_use_umr_rereg_pas(struct mlx5_ib_mr *mr,
 				  int new_access_flags, u64 iova,
 				  unsigned long *page_size)
 {
-	struct mlx5_ib_dev *dev = to_mdev(mr->ibmr.device);
+	struct mlx5_ib_dev *dev = to_dev(mr->ibmr.device);
 	u8 access_mode;
 
 	/* We only track the allocated sizes of MRs from the frmr pools */
@@ -1121,7 +1121,7 @@ static int umr_rereg_pas(struct mlx5_ib_mr *mr, struct ib_pd *pd,
 			 int access_flags, int flags, struct ib_umem *new_umem,
 			 u64 iova, unsigned long page_size)
 {
-	struct mlx5_ib_dev *dev = to_mdev(mr->ibmr.device);
+	struct mlx5_ib_dev *dev = to_dev(mr->ibmr.device);
 	int upd_flags = MLX5_IB_UPD_XLT_ADDR | MLX5_IB_UPD_XLT_ENABLE;
 	struct ib_umem *old_umem = mr->umem;
 	int err;
@@ -1167,7 +1167,7 @@ struct ib_mr *mlx5_ib_rereg_user_mr(struct ib_mr *ib_mr, int flags, u64 start,
 				    struct ib_pd *new_pd,
 				    struct ib_udata *udata)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ib_mr->device);
+	struct mlx5_ib_dev *dev = to_dev(ib_mr->device);
 	struct mlx5_ib_mr *mr = to_mmr(ib_mr);
 	int err;
 
@@ -1285,7 +1285,7 @@ mlx5_alloc_priv_descs(struct ib_device *device,
 		      int ndescs,
 		      int desc_size)
 {
-	struct mlx5_ib_dev *dev = to_mdev(device);
+	struct mlx5_ib_dev *dev = to_dev(device);
 	struct device *ddev = &dev->mdev->pdev->dev;
 	int size = ndescs * desc_size;
 	int add_size;
@@ -1324,7 +1324,7 @@ mlx5_free_priv_descs(struct mlx5_ib_mr *mr)
 	    mr->ibmr.type != IB_MR_TYPE_DM && mr->descs) {
 		struct ib_device *device = mr->ibmr.device;
 		int size = mr->max_descs * mr->desc_size;
-		struct mlx5_ib_dev *dev = to_mdev(device);
+		struct mlx5_ib_dev *dev = to_dev(device);
 
 		dma_unmap_single(&dev->mdev->pdev->dev, mr->desc_map, size,
 				 DMA_TO_DEVICE);
@@ -1335,7 +1335,7 @@ mlx5_free_priv_descs(struct mlx5_ib_mr *mr)
 
 static int mlx5_ib_revoke_data_direct_mr(struct mlx5_ib_mr *mr)
 {
-	struct mlx5_ib_dev *dev = to_mdev(mr->ibmr.device);
+	struct mlx5_ib_dev *dev = to_dev(mr->ibmr.device);
 	struct ib_umem_dmabuf *umem_dmabuf = to_ib_umem_dmabuf(mr->umem);
 	int err;
 
@@ -1397,7 +1397,7 @@ static int mlx5r_handle_mkey_cleanup(struct mlx5_ib_mr *mr)
 {
 	bool is_odp_dma_buf = is_dmabuf_mr(mr) &&
 			      !to_ib_umem_dmabuf(mr->umem)->pinned;
-	struct mlx5_ib_dev *dev = to_mdev(mr->ibmr.device);
+	struct mlx5_ib_dev *dev = to_dev(mr->ibmr.device);
 	bool is_odp = is_odp_mr(mr);
 	int ret;
 
@@ -1437,7 +1437,7 @@ static int mlx5r_handle_mkey_cleanup(struct mlx5_ib_mr *mr)
 static int __mlx5_ib_dereg_mr(struct ib_mr *ibmr)
 {
 	struct mlx5_ib_mr *mr = to_mmr(ibmr);
-	struct mlx5_ib_dev *dev = to_mdev(ibmr->device);
+	struct mlx5_ib_dev *dev = to_dev(ibmr->device);
 	int rc;
 
 	/*
@@ -1447,7 +1447,7 @@ static int __mlx5_ib_dereg_mr(struct ib_mr *ibmr)
 	 */
 	if (IS_ENABLED(CONFIG_INFINIBAND_ON_DEMAND_PAGING) &&
 	    refcount_read(&mr->mmkey.usecount) != 0 &&
-	    xa_erase(&mr_to_mdev(mr)->odp_mkeys, mlx5_base_mkey(mr->mmkey.key)))
+	    xa_erase(&mr_to_dev(mr)->odp_mkeys, mlx5_base_mkey(mr->mmkey.key)))
 		mlx5r_deref_wait_odp_mkey(&mr->mmkey);
 
 	if (ibmr->type == IB_MR_TYPE_INTEGRITY) {
@@ -1523,7 +1523,7 @@ static int dereg_crossing_data_direct_mr(struct mlx5_ib_dev *dev,
 int mlx5_ib_dereg_mr(struct ib_mr *ibmr, struct ib_udata *udata)
 {
 	struct mlx5_ib_mr *mr = to_mmr(ibmr);
-	struct mlx5_ib_dev *dev = to_mdev(ibmr->device);
+	struct mlx5_ib_dev *dev = to_dev(ibmr->device);
 
 	if (mr->data_direct)
 		return dereg_crossing_data_direct_mr(dev, mr);
@@ -1534,7 +1534,7 @@ int mlx5_ib_dereg_mr(struct ib_mr *ibmr, struct ib_udata *udata)
 static void mlx5_set_umr_free_mkey(struct ib_pd *pd, u32 *in, int ndescs,
 				   int access_mode, int page_shift)
 {
-	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	void *mkc;
 
 	mkc = MLX5_ADDR_OF(create_mkey_in, in, memory_key_mkey_entry);
@@ -1556,7 +1556,7 @@ static int _mlx5_alloc_mkey_descs(struct ib_pd *pd, struct mlx5_ib_mr *mr,
 				  int ndescs, int desc_size, int page_shift,
 				  int access_mode, u32 *in, int inlen)
 {
-	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	int err;
 
 	mr->access_mode = access_mode;
@@ -1647,7 +1647,7 @@ static int mlx5_alloc_integrity_descs(struct ib_pd *pd, struct mlx5_ib_mr *mr,
 				      int max_num_sg, int max_num_meta_sg,
 				      u32 *in, int inlen)
 {
-	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	u32 psv_index[2];
 	void *mkc;
 	int err;
@@ -1725,7 +1725,7 @@ static struct ib_mr *__mlx5_ib_alloc_mr(struct ib_pd *pd,
 					enum ib_mr_type mr_type, u32 max_num_sg,
 					u32 max_num_meta_sg)
 {
-	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	int inlen = MLX5_ST_SZ_BYTES(create_mkey_in);
 	int ndescs = ALIGN(max_num_sg, 4);
 	struct mlx5_ib_mr *mr;
@@ -1790,7 +1790,7 @@ struct ib_mr *mlx5_ib_alloc_mr_integrity(struct ib_pd *pd,
 
 int mlx5_ib_alloc_mw(struct ib_mw *ibmw, struct ib_udata *udata)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibmw->device);
+	struct mlx5_ib_dev *dev = to_dev(ibmw->device);
 	int inlen = MLX5_ST_SZ_BYTES(create_mkey_in);
 	struct mlx5_ib_mw *mw = to_mmw(ibmw);
 	unsigned int ndescs;
@@ -1863,7 +1863,7 @@ int mlx5_ib_alloc_mw(struct ib_mw *ibmw, struct ib_udata *udata)
 
 int mlx5_ib_dealloc_mw(struct ib_mw *mw)
 {
-	struct mlx5_ib_dev *dev = to_mdev(mw->device);
+	struct mlx5_ib_dev *dev = to_dev(mw->device);
 	struct mlx5_ib_mw *mmw = to_mmw(mw);
 
 	if (IS_ENABLED(CONFIG_INFINIBAND_ON_DEMAND_PAGING) &&
diff --git a/drivers/infiniband/hw/mlx5/odp.c b/drivers/infiniband/hw/mlx5/odp.c
index 0b1b63d36e4bcd7622147a1e31dbaaf4915e7c69..a4318b11cd81b73f3907015d54d15ef14df61b2b 100644
--- a/drivers/infiniband/hw/mlx5/odp.c
+++ b/drivers/infiniband/hw/mlx5/odp.c
@@ -107,12 +107,12 @@ static u8 mlx5_imr_ksm_page_shift;
 static void populate_ksm(struct mlx5_ksm *pksm, size_t idx, size_t nentries,
 			struct mlx5_ib_mr *imr, int flags)
 {
-	struct mlx5_core_dev *mdev = mr_to_mdev(imr)->mdev;
+	struct mlx5_core_dev *mdev = mr_to_dev(imr)->mdev;
 	struct mlx5_ksm *end = pksm + nentries;
 	u64 step = MLX5_CAP_ODP(mdev, mem_page_fault) ? mlx5_imr_mtt_size : 0;
 	__be32 key = MLX5_CAP_ODP(mdev, mem_page_fault) ?
 			     cpu_to_be32(imr->null_mmkey.key) :
-			     mr_to_mdev(imr)->mkeys.null_mkey;
+			     mr_to_dev(imr)->mkeys.null_mkey;
 	u64 va = MLX5_CAP_ODP(mdev, mem_page_fault) ?
 			     idx * mlx5_imr_mtt_size : 0;
 
@@ -254,8 +254,8 @@ static void destroy_unused_implicit_child_mr(struct mlx5_ib_mr *mr)
 		return;
 	}
 
-	if (MLX5_CAP_ODP(mr_to_mdev(mr)->mdev, mem_page_fault))
-		xa_erase(&mr_to_mdev(mr)->odp_mkeys,
+	if (MLX5_CAP_ODP(mr_to_dev(mr)->mdev, mem_page_fault))
+		xa_erase(&mr_to_dev(mr)->odp_mkeys,
 			 mlx5_base_mkey(mr->mmkey.key));
 	xa_unlock(&imr->implicit_children);
 
@@ -469,7 +469,7 @@ static void mlx5_ib_page_fault_resume(struct mlx5_ib_dev *dev,
 static struct mlx5_ib_mr *implicit_get_child_mr(struct mlx5_ib_mr *imr,
 						unsigned long idx)
 {
-	struct mlx5_ib_dev *dev = mr_to_mdev(imr);
+	struct mlx5_ib_dev *dev = mr_to_dev(imr);
 	struct ib_umem_odp *odp;
 	struct mlx5_ib_mr *mr;
 	struct mlx5_ib_mr *ret;
@@ -491,7 +491,7 @@ static struct mlx5_ib_mr *implicit_get_child_mr(struct mlx5_ib_mr *imr,
 
 	mr->access_flags = imr->access_flags;
 	mr->ibmr.pd = imr->ibmr.pd;
-	mr->ibmr.device = &mr_to_mdev(imr)->ib_dev;
+	mr->ibmr.device = &mr_to_dev(imr)->ib_dev;
 	mr->umem = &odp->umem;
 	mr->ibmr.lkey = mr->mmkey.key;
 	mr->ibmr.rkey = mr->mmkey.key;
@@ -540,7 +540,7 @@ static struct mlx5_ib_mr *implicit_get_child_mr(struct mlx5_ib_mr *imr,
 		mr->mmkey.type = MLX5_MKEY_IMPLICIT_CHILD;
 	}
 	xa_unlock(&imr->implicit_children);
-	mlx5_ib_dbg(mr_to_mdev(imr), "key %x mr %p\n", mr->mmkey.key, mr);
+	mlx5_ib_dbg(mr_to_dev(imr), "key %x mr %p\n", mr->mmkey.key, mr);
 	return mr;
 
 out_lock:
@@ -604,7 +604,7 @@ static int alloc_implicit_mr_null_mkey(struct mlx5_ib_dev *dev,
 struct mlx5_ib_mr *mlx5_ib_alloc_implicit_mr(struct mlx5_ib_pd *pd,
 					     int access_flags)
 {
-	struct mlx5_ib_dev *dev = to_mdev(pd->ibpd.device);
+	struct mlx5_ib_dev *dev = to_dev(pd->ibpd.device);
 	struct ib_umem_odp *umem_odp;
 	struct mlx5_ib_mr *imr;
 	int err;
@@ -680,10 +680,10 @@ void mlx5_ib_free_odp_mr(struct mlx5_ib_mr *mr)
 	}
 
 	if (mr->null_mmkey.key) {
-		xa_erase(&mr_to_mdev(mr)->odp_mkeys,
+		xa_erase(&mr_to_dev(mr)->odp_mkeys,
 			 mlx5_base_mkey(mr->null_mmkey.key));
 
-		mlx5_core_destroy_mkey(mr_to_mdev(mr)->mdev,
+		mlx5_core_destroy_mkey(mr_to_dev(mr)->mdev,
 				       mr->null_mmkey.key);
 	}
 }
@@ -732,7 +732,7 @@ static int pagefault_real_mr(struct mlx5_ib_mr *mr, struct ib_umem_odp *odp,
 
 	if (ret < 0) {
 		if (ret != -EAGAIN)
-			mlx5_ib_err(mr_to_mdev(mr),
+			mlx5_ib_err(mr_to_dev(mr),
 				    "Failed to update mkey page tables\n");
 		goto out;
 	}
@@ -830,7 +830,7 @@ static int pagefault_implicit_mr(struct mlx5_ib_mr *imr,
 		MLX5_IB_UPD_XLT_INDIRECT | MLX5_IB_UPD_XLT_ATOMIC, 0);
 	mutex_unlock(&odp_imr->umem_mutex);
 	if (err) {
-		mlx5_ib_err(mr_to_mdev(imr), "Failed to update PAS\n");
+		mlx5_ib_err(mr_to_dev(imr), "Failed to update PAS\n");
 		return err;
 	}
 	return ret;
@@ -948,7 +948,7 @@ int mlx5_ib_init_odp_mr(struct mlx5_ib_mr *mr, struct ib_pd *pd)
 
 int mlx5_ib_init_dmabuf_mr(struct mlx5_ib_mr *mr, struct ib_pd *pd)
 {
-	struct mlx5_ib_dev *dev = mr_to_mdev(mr);
+	struct mlx5_ib_dev *dev = mr_to_dev(mr);
 	u32 pdn;
 	int ret;
 
@@ -1967,7 +1967,7 @@ static struct mlx5_ib_mr *
 get_prefetchable_mr(struct ib_pd *pd, enum ib_uverbs_advise_mr_advice advice,
 		    u32 lkey)
 {
-	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	struct mlx5_ib_mr *mr = NULL;
 	struct mlx5_ib_mkey *mmkey;
 
diff --git a/drivers/infiniband/hw/mlx5/qos.c b/drivers/infiniband/hw/mlx5/qos.c
index ab7f5db18c9333009b9c916399e006026ac6b0f7..fea229c29611d46dae2ecaa39f786f9063063233 100644
--- a/drivers/infiniband/hw/mlx5/qos.c
+++ b/drivers/infiniband/hw/mlx5/qos.c
@@ -14,7 +14,7 @@
 
 static bool pp_is_supported(struct ib_device *device)
 {
-	struct mlx5_ib_dev *dev = to_mdev(device);
+	struct mlx5_ib_dev *dev = to_dev(device);
 
 	return (MLX5_CAP_GEN(dev->mdev, qos) &&
 		MLX5_CAP_QOS(dev->mdev, packet_pacing) &&
@@ -44,7 +44,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_PP_OBJ_ALLOC)(
 	if (!c->devx_uid)
 		return -EINVAL;
 
-	dev = to_mdev(c->ibucontext.device);
+	dev = to_dev(c->ibucontext.device);
 	pp_entry = kzalloc_obj(*pp_entry);
 	if (!pp_entry)
 		return -ENOMEM;
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index e4f18f7567d67e80b0a07157204caa4da193bf9b..da4e9a52d2f9b778368ca0ae520442af42cbb23e 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -326,7 +326,7 @@ int mlx5_ib_read_wqe_srq(struct mlx5_ib_srq *srq, int wqe_index, void *buffer,
 
 static void mlx5_ib_qp_err_syndrome(struct ib_qp *ibqp)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibqp->device);
+	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
 	int outlen = MLX5_ST_SZ_BYTES(query_qp_out);
 	struct mlx5_ib_qp *qp = to_mqp(ibqp);
 	void *pas_ext_union, *err_syn;
@@ -3251,7 +3251,7 @@ static int get_qp_uidx(struct mlx5_ib_qp *qp,
 
 static int mlx5_ib_destroy_dct(struct mlx5_ib_qp *mqp)
 {
-	struct mlx5_ib_dev *dev = to_mdev(mqp->ibqp.device);
+	struct mlx5_ib_dev *dev = to_dev(mqp->ibqp.device);
 
 	if (mqp->state == IB_QPS_RTR) {
 		int err;
@@ -3305,7 +3305,7 @@ int mlx5_ib_create_qp(struct ib_qp *ibqp, struct ib_qp_init_attr *attr,
 		      struct ib_udata *udata)
 {
 	struct mlx5_create_qp_params params = {};
-	struct mlx5_ib_dev *dev = to_mdev(ibqp->device);
+	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
 	struct mlx5_ib_qp *qp = to_mqp(ibqp);
 	struct ib_pd *pd = ibqp->pd;
 	enum ib_qp_type type;
@@ -3404,7 +3404,7 @@ int mlx5_ib_create_qp(struct ib_qp *ibqp, struct ib_qp_init_attr *attr,
 
 int mlx5_ib_destroy_qp(struct ib_qp *qp, struct ib_udata *udata)
 {
-	struct mlx5_ib_dev *dev = to_mdev(qp->device);
+	struct mlx5_ib_dev *dev = to_dev(qp->device);
 	struct mlx5_ib_qp *mqp = to_mqp(qp);
 
 	if (mqp->type == IB_QPT_GSI)
@@ -3421,7 +3421,7 @@ static int set_qpc_atomic_flags(struct mlx5_ib_qp *qp,
 				const struct ib_qp_attr *attr, int attr_mask,
 				void *qpc)
 {
-	struct mlx5_ib_dev *dev = to_mdev(qp->ibqp.device);
+	struct mlx5_ib_dev *dev = to_dev(qp->ibqp.device);
 	u8 dest_rd_atomic;
 	u32 access_flags;
 
@@ -4170,7 +4170,7 @@ static unsigned int get_tx_affinity(struct ib_qp *qp,
 {
 	struct mlx5_ib_ucontext *ucontext = rdma_udata_to_drv_context(
 		udata, struct mlx5_ib_ucontext, ibucontext);
-	struct mlx5_ib_dev *dev = to_mdev(qp->device);
+	struct mlx5_ib_dev *dev = to_dev(qp->device);
 	struct mlx5_ib_qp *mqp = to_mqp(qp);
 	struct mlx5_ib_qp_base *qp_base;
 	unsigned int tx_affinity;
@@ -4226,7 +4226,7 @@ static int __mlx5_ib_qp_set_raw_qp_counter(struct mlx5_ib_qp *qp, u32 set_id,
 static int __mlx5_ib_qp_set_counter(struct ib_qp *qp,
 				    struct rdma_counter *counter)
 {
-	struct mlx5_ib_dev *dev = to_mdev(qp->device);
+	struct mlx5_ib_dev *dev = to_dev(qp->device);
 	u32 in[MLX5_ST_SZ_DW(rts2rts_qp_in)] = {};
 	struct mlx5_ib_qp *mqp = to_mqp(qp);
 	struct mlx5_ib_qp_base *base;
@@ -4299,7 +4299,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
 		}
 	};
 
-	struct mlx5_ib_dev *dev = to_mdev(ibqp->device);
+	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
 	struct mlx5_ib_qp *qp = to_mqp(ibqp);
 	struct mlx5_ib_qp_base *base = &qp->trans_qp.base;
 	struct mlx5_ib_cq *send_cq, *recv_cq;
@@ -4667,7 +4667,7 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 			      struct ib_udata *udata)
 {
 	struct mlx5_ib_qp *qp = to_mqp(ibqp);
-	struct mlx5_ib_dev *dev = to_mdev(ibqp->device);
+	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
 	enum ib_qp_state cur_state, new_state;
 	int required = IB_QP_STATE;
 	void *dctc;
@@ -4830,7 +4830,7 @@ static int validate_rd_atomic(struct mlx5_ib_dev *dev, struct ib_qp_attr *attr,
 int mlx5_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 		      int attr_mask, struct ib_udata *udata)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibqp->device);
+	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
 	struct mlx5_ib_modify_qp_resp resp = {};
 	struct mlx5_ib_qp *qp = to_mqp(ibqp);
 	struct mlx5_ib_modify_qp ucmd = {};
@@ -5242,7 +5242,7 @@ static int mlx5_ib_dct_query_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *mqp,
 int mlx5_ib_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr,
 		     int qp_attr_mask, struct ib_qp_init_attr *qp_init_attr)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibqp->device);
+	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
 	struct mlx5_ib_qp *qp = to_mqp(ibqp);
 	int err = 0;
 	u8 raw_packet_qp_state;
@@ -5311,7 +5311,7 @@ int mlx5_ib_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr,
 
 int mlx5_ib_alloc_xrcd(struct ib_xrcd *ibxrcd, struct ib_udata *udata)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibxrcd->device);
+	struct mlx5_ib_dev *dev = to_dev(ibxrcd->device);
 	struct mlx5_ib_xrcd *xrcd = to_mxrcd(ibxrcd);
 
 	if (!MLX5_CAP_GEN(dev->mdev, xrc))
@@ -5322,7 +5322,7 @@ int mlx5_ib_alloc_xrcd(struct ib_xrcd *ibxrcd, struct ib_udata *udata)
 
 int mlx5_ib_dealloc_xrcd(struct ib_xrcd *xrcd, struct ib_udata *udata)
 {
-	struct mlx5_ib_dev *dev = to_mdev(xrcd->device);
+	struct mlx5_ib_dev *dev = to_dev(xrcd->device);
 	u32 xrcdn = to_mxrcd(xrcd)->xrcdn;
 
 	return mlx5_cmd_xrcd_dealloc(dev->mdev, xrcdn, 0);
@@ -5331,7 +5331,7 @@ int mlx5_ib_dealloc_xrcd(struct ib_xrcd *xrcd, struct ib_udata *udata)
 static void mlx5_ib_wq_event(struct mlx5_core_qp *core_qp, int type)
 {
 	struct mlx5_ib_rwq *rwq = to_mibrwq(core_qp);
-	struct mlx5_ib_dev *dev = to_mdev(rwq->ibwq.device);
+	struct mlx5_ib_dev *dev = to_dev(rwq->ibwq.device);
 	struct ib_event event;
 
 	if (rwq->ibwq.event_handler) {
@@ -5387,7 +5387,7 @@ static int  create_rq(struct mlx5_ib_rwq *rwq, struct ib_pd *pd,
 	int inlen;
 	int err;
 
-	dev = to_mdev(pd->device);
+	dev = to_dev(pd->device);
 
 	ts_format = get_rq_ts_format(dev, to_mcq(init_attr->cq));
 	if (ts_format < 0)
@@ -5529,7 +5529,7 @@ static int prepare_user_rq(struct ib_pd *pd,
 			   struct ib_udata *udata,
 			   struct mlx5_ib_rwq *rwq)
 {
-	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	struct mlx5_ib_create_wq ucmd;
 	int err;
 
@@ -5612,7 +5612,7 @@ struct ib_wq *mlx5_ib_create_wq(struct ib_pd *pd,
 	    init_attr->create_flags & IB_WQ_FLAGS_DELAY_DROP)
 		return ERR_PTR(-EPERM);
 
-	dev = to_mdev(pd->device);
+	dev = to_dev(pd->device);
 	switch (init_attr->wq_type) {
 	case IB_WQT_RQ:
 		rwq = kzalloc_obj(*rwq);
@@ -5656,7 +5656,7 @@ struct ib_wq *mlx5_ib_create_wq(struct ib_pd *pd,
 
 int mlx5_ib_destroy_wq(struct ib_wq *wq, struct ib_udata *udata)
 {
-	struct mlx5_ib_dev *dev = to_mdev(wq->device);
+	struct mlx5_ib_dev *dev = to_dev(wq->device);
 	struct mlx5_ib_rwq *rwq = to_mrwq(wq);
 	int ret;
 
@@ -5674,7 +5674,7 @@ int mlx5_ib_create_rwq_ind_table(struct ib_rwq_ind_table *ib_rwq_ind_table,
 {
 	struct mlx5_ib_rwq_ind_table *rwq_ind_tbl =
 		to_mrwq_ind_table(ib_rwq_ind_table);
-	struct mlx5_ib_dev *dev = to_mdev(ib_rwq_ind_table->device);
+	struct mlx5_ib_dev *dev = to_dev(ib_rwq_ind_table->device);
 	int sz = 1 << init_attr->log_ind_tbl_size;
 	struct mlx5_ib_create_rwq_ind_tbl_resp resp = {};
 	size_t min_resp_len;
@@ -5742,7 +5742,7 @@ int mlx5_ib_create_rwq_ind_table(struct ib_rwq_ind_table *ib_rwq_ind_table,
 int mlx5_ib_destroy_rwq_ind_table(struct ib_rwq_ind_table *ib_rwq_ind_tbl)
 {
 	struct mlx5_ib_rwq_ind_table *rwq_ind_tbl = to_mrwq_ind_table(ib_rwq_ind_tbl);
-	struct mlx5_ib_dev *dev = to_mdev(ib_rwq_ind_tbl->device);
+	struct mlx5_ib_dev *dev = to_dev(ib_rwq_ind_tbl->device);
 
 	return mlx5_cmd_destroy_rqt(dev->mdev, rwq_ind_tbl->rqtn, rwq_ind_tbl->uid);
 }
@@ -5750,7 +5750,7 @@ int mlx5_ib_destroy_rwq_ind_table(struct ib_rwq_ind_table *ib_rwq_ind_tbl)
 int mlx5_ib_modify_wq(struct ib_wq *wq, struct ib_wq_attr *wq_attr,
 		      u32 wq_attr_mask, struct ib_udata *udata)
 {
-	struct mlx5_ib_dev *dev = to_mdev(wq->device);
+	struct mlx5_ib_dev *dev = to_dev(wq->device);
 	struct mlx5_ib_rwq *rwq = to_mrwq(wq);
 	struct mlx5_ib_modify_wq ucmd = {};
 	int curr_wq_state;
@@ -5906,7 +5906,7 @@ void mlx5_ib_drain_sq(struct ib_qp *qp)
 		},
 	};
 	int ret;
-	struct mlx5_ib_dev *dev = to_mdev(qp->device);
+	struct mlx5_ib_dev *dev = to_dev(qp->device);
 	struct mlx5_core_dev *mdev = dev->mdev;
 
 	ret = ib_modify_qp(qp, &attr, IB_QP_STATE);
@@ -5935,7 +5935,7 @@ void mlx5_ib_drain_rq(struct ib_qp *qp)
 	struct ib_recv_wr rwr = {};
 	const struct ib_recv_wr *bad_rwr;
 	int ret;
-	struct mlx5_ib_dev *dev = to_mdev(qp->device);
+	struct mlx5_ib_dev *dev = to_dev(qp->device);
 	struct mlx5_core_dev *mdev = dev->mdev;
 
 	ret = ib_modify_qp(qp, &attr, IB_QP_STATE);
@@ -5963,7 +5963,7 @@ void mlx5_ib_drain_rq(struct ib_qp *qp)
  */
 int mlx5_ib_qp_set_counter(struct ib_qp *qp, struct rdma_counter *counter)
 {
-	struct mlx5_ib_dev *dev = to_mdev(qp->device);
+	struct mlx5_ib_dev *dev = to_dev(qp->device);
 	struct mlx5_ib_qp *mqp = to_mqp(qp);
 	int err = 0;
 
diff --git a/drivers/infiniband/hw/mlx5/restrack.c b/drivers/infiniband/hw/mlx5/restrack.c
index 8a68b083b1b610215441438ab7bce189b97eba0f..866252cdce52452968519c8e785068a27cd40a34 100644
--- a/drivers/infiniband/hw/mlx5/restrack.c
+++ b/drivers/infiniband/hw/mlx5/restrack.c
@@ -124,7 +124,7 @@ static int fill_res_mr_entry_raw(struct sk_buff *msg, struct ib_mr *ibmr)
 {
 	struct mlx5_ib_mr *mr = to_mmr(ibmr);
 
-	return fill_res_raw(msg, mr_to_mdev(mr), MLX5_SGMT_TYPE_PRM_QUERY_MKEY,
+	return fill_res_raw(msg, mr_to_dev(mr), MLX5_SGMT_TYPE_PRM_QUERY_MKEY,
 			    mlx5_mkey_to_idx(mr->mmkey.key));
 }
 
@@ -158,7 +158,7 @@ static int fill_res_mr_entry(struct sk_buff *msg, struct ib_mr *ibmr)
 
 static int fill_res_cq_entry_raw(struct sk_buff *msg, struct ib_cq *ibcq)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibcq->device);
+	struct mlx5_ib_dev *dev = to_dev(ibcq->device);
 	struct mlx5_ib_cq *cq = to_mcq(ibcq);
 
 	return fill_res_raw(msg, dev, MLX5_SGMT_TYPE_PRM_QUERY_CQ, cq->mcq.cqn);
@@ -191,7 +191,7 @@ static int fill_res_qp_entry(struct sk_buff *msg, struct ib_qp *ibqp)
 
 static int fill_res_qp_entry_raw(struct sk_buff *msg, struct ib_qp *ibqp)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibqp->device);
+	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
 
 	return fill_res_raw(msg, dev, MLX5_SGMT_TYPE_PRM_QUERY_QP,
 			    ibqp->qp_num);
diff --git a/drivers/infiniband/hw/mlx5/srq.c b/drivers/infiniband/hw/mlx5/srq.c
index 6a4a937d97ce98acc6803b0cfa38c556935a6f87..a52fd1811956196a6f0c1b63c1e2608b2e5b1ff6 100644
--- a/drivers/infiniband/hw/mlx5/srq.c
+++ b/drivers/infiniband/hw/mlx5/srq.c
@@ -47,7 +47,7 @@ static int create_srq_user(struct ib_pd *pd, struct mlx5_ib_srq *srq,
 			   struct mlx5_srq_attr *in,
 			   struct ib_udata *udata, int buf_size)
 {
-	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	struct mlx5_ib_create_srq ucmd;
 	struct mlx5_ib_ucontext *ucontext = rdma_udata_to_drv_context(
 		udata, struct mlx5_ib_ucontext, ibucontext);
@@ -192,7 +192,7 @@ int mlx5_ib_create_srq(struct ib_srq *ib_srq,
 		       struct ib_srq_init_attr *init_attr,
 		       struct ib_udata *udata)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ib_srq->device);
+	struct mlx5_ib_dev *dev = to_dev(ib_srq->device);
 	struct mlx5_ib_srq *srq = to_msrq(ib_srq);
 	size_t desc_size;
 	size_t buf_size;
@@ -324,7 +324,7 @@ int mlx5_ib_create_srq(struct ib_srq *ib_srq,
 int mlx5_ib_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,
 		       enum ib_srq_attr_mask attr_mask, struct ib_udata *udata)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibsrq->device);
+	struct mlx5_ib_dev *dev = to_dev(ibsrq->device);
 	struct mlx5_ib_srq *srq = to_msrq(ibsrq);
 	int ret;
 
@@ -349,7 +349,7 @@ int mlx5_ib_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,
 
 int mlx5_ib_query_srq(struct ib_srq *ibsrq, struct ib_srq_attr *srq_attr)
 {
-	struct mlx5_ib_dev *dev = to_mdev(ibsrq->device);
+	struct mlx5_ib_dev *dev = to_dev(ibsrq->device);
 	struct mlx5_ib_srq *srq = to_msrq(ibsrq);
 	int ret;
 	struct mlx5_srq_attr *out;
@@ -373,7 +373,7 @@ int mlx5_ib_query_srq(struct ib_srq *ibsrq, struct ib_srq_attr *srq_attr)
 
 int mlx5_ib_destroy_srq(struct ib_srq *srq, struct ib_udata *udata)
 {
-	struct mlx5_ib_dev *dev = to_mdev(srq->device);
+	struct mlx5_ib_dev *dev = to_dev(srq->device);
 	struct mlx5_ib_srq *msrq = to_msrq(srq);
 	int ret;
 
@@ -408,7 +408,7 @@ int mlx5_ib_post_srq_recv(struct ib_srq *ibsrq, const struct ib_recv_wr *wr,
 	struct mlx5_ib_srq *srq = to_msrq(ibsrq);
 	struct mlx5_wqe_srq_next_seg *next;
 	struct mlx5_wqe_data_seg *scat;
-	struct mlx5_ib_dev *dev = to_mdev(ibsrq->device);
+	struct mlx5_ib_dev *dev = to_dev(ibsrq->device);
 	struct mlx5_core_dev *mdev = dev->mdev;
 	unsigned long flags;
 	int err = 0;
diff --git a/drivers/infiniband/hw/mlx5/std_types.c b/drivers/infiniband/hw/mlx5/std_types.c
index b705b88dc917b9a91a3216abf780caa4c805bf37..3f15feca98b529fda3d2619a4c260b2398d895ee 100644
--- a/drivers/infiniband/hw/mlx5/std_types.c
+++ b/drivers/infiniband/hw/mlx5/std_types.c
@@ -166,7 +166,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_QUERY_PORT)(
 	c = to_mucontext(ib_uverbs_get_ucontext(attrs));
 	if (IS_ERR(c))
 		return PTR_ERR(c);
-	dev = to_mdev(c->ibucontext.device);
+	dev = to_dev(c->ibucontext.device);
 
 	if (!rdma_is_port_valid(&dev->ib_dev, port_num))
 		return -EINVAL;
@@ -200,7 +200,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_GET_DATA_DIRECT_SYSFS_PATH)(
 	c = to_mucontext(ib_uverbs_get_ucontext(attrs));
 	if (IS_ERR(c))
 		return PTR_ERR(c);
-	dev = to_mdev(c->ibucontext.device);
+	dev = to_dev(c->ibucontext.device);
 	mutex_lock(&dev->data_direct_lock);
 	data_direct_dev = mlx5_data_direct_get_dev(dev->mdev->data_direct);
 	if (!data_direct_dev) {
diff --git a/drivers/infiniband/hw/mlx5/umr.c b/drivers/infiniband/hw/mlx5/umr.c
index 711075e3d9ea05a5e829d6545085933feef5ecb0..f030885505df5e1fbfb9413d1ff7a2a3d041580d 100644
--- a/drivers/infiniband/hw/mlx5/umr.c
+++ b/drivers/infiniband/hw/mlx5/umr.c
@@ -243,7 +243,7 @@ static int mlx5r_umr_post_send(struct ib_qp *ibqp, u32 mkey, struct ib_cqe *cqe,
 		with_data ? sizeof(struct mlx5r_umr_wqe) :
 			    sizeof(struct mlx5r_umr_wqe) -
 				    sizeof(struct mlx5_wqe_data_seg);
-	struct mlx5_ib_dev *dev = to_mdev(ibqp->device);
+	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
 	struct mlx5_core_dev *mdev = dev->mdev;
 	struct mlx5_ib_qp *qp = to_mqp(ibqp);
 	struct mlx5_wqe_ctrl_seg *ctrl;
@@ -422,7 +422,7 @@ static int mlx5r_umr_post_send_wait(struct mlx5_ib_dev *dev, u32 mkey,
  */
 int mlx5r_umr_revoke_mr(struct mlx5_ib_mr *mr)
 {
-	struct mlx5_ib_dev *dev = mr_to_mdev(mr);
+	struct mlx5_ib_dev *dev = mr_to_dev(mr);
 	struct mlx5r_umr_wqe wqe = {};
 
 	if (dev->mdev->state == MLX5_DEVICE_STATE_INTERNAL_ERROR)
@@ -462,7 +462,7 @@ static void mlx5r_umr_set_access_flags(struct mlx5_ib_dev *dev,
 int mlx5r_umr_rereg_pd_access(struct mlx5_ib_mr *mr, struct ib_pd *pd,
 			      int access_flags)
 {
-	struct mlx5_ib_dev *dev = mr_to_mdev(mr);
+	struct mlx5_ib_dev *dev = mr_to_dev(mr);
 	struct mlx5r_umr_wqe wqe = {};
 	int err;
 
@@ -674,7 +674,7 @@ static void _mlx5r_umr_init_wqe(struct mlx5_ib_mr *mr,
 				unsigned int flags, u32 pdn,
 				unsigned int page_shift)
 {
-	struct mlx5_ib_dev *dev = mr_to_mdev(mr);
+	struct mlx5_ib_dev *dev = mr_to_dev(mr);
 
 	mlx5r_umr_set_update_xlt_ctrl_seg(&wqe->ctrl_seg, flags, sg);
 	mlx5r_umr_set_update_xlt_mkey_seg(dev, &wqe->mkey_seg, mr, pdn,
@@ -687,7 +687,7 @@ static int _mlx5r_umr_update_mr_pas(struct mlx5_ib_mr *mr, unsigned int flags,
 				    size_t nblocks)
 {
 	size_t ent_size = dd ? sizeof(struct mlx5_ksm) : sizeof(struct mlx5_mtt);
-	struct mlx5_ib_dev *dev = mr_to_mdev(mr);
+	struct mlx5_ib_dev *dev = mr_to_dev(mr);
 	struct device *ddev = &dev->mdev->pdev->dev;
 	struct mlx5r_umr_wqe wqe = {};
 	size_t processed_blocks = 0;
@@ -812,7 +812,7 @@ int mlx5r_umr_update_data_direct_ksm_pas_range(struct mlx5_ib_mr *mr,
 		return -EINVAL;
 
 	return _mlx5r_umr_update_mr_pas(mr, flags,
-					mr_to_mdev(mr)->mdev->data_direct->pdn,
+					mr_to_dev(mr)->mdev->data_direct->pdn,
 					true, start_block, nblocks);
 }
 
@@ -854,7 +854,7 @@ int mlx5r_umr_update_xlt(struct mlx5_ib_mr *mr, u64 idx, int npages,
 			       ? sizeof(struct mlx5_klm)
 			       : sizeof(struct mlx5_mtt);
 	const int page_align = MLX5_UMR_FLEX_ALIGNMENT / desc_size;
-	struct mlx5_ib_dev *dev = mr_to_mdev(mr);
+	struct mlx5_ib_dev *dev = mr_to_dev(mr);
 	struct device *ddev = &dev->mdev->pdev->dev;
 	const int page_mask = page_align - 1;
 	struct mlx5r_umr_wqe wqe = {};
@@ -943,7 +943,7 @@ int mlx5r_umr_update_xlt(struct mlx5_ib_mr *mr, u64 idx, int npages,
 int mlx5r_umr_update_mr_page_shift(struct mlx5_ib_mr *mr,
 				   unsigned int page_shift)
 {
-	struct mlx5_ib_dev *dev = mr_to_mdev(mr);
+	struct mlx5_ib_dev *dev = mr_to_dev(mr);
 	struct mlx5r_umr_wqe wqe = {};
 	int err;
 
@@ -996,7 +996,7 @@ static int _mlx5r_umr_zap_mkey(struct mlx5_ib_mr *mr, unsigned int flags,
 			       u32 pdn, bool dd)
 {
 	unsigned int old_page_shift = mr->page_shift;
-	struct mlx5_ib_dev *dev = mr_to_mdev(mr);
+	struct mlx5_ib_dev *dev = mr_to_dev(mr);
 	unsigned int max_page_shift;
 	size_t page_shift_nblocks;
 	unsigned int max_log_size;
diff --git a/drivers/infiniband/hw/mlx5/wr.c b/drivers/infiniband/hw/mlx5/wr.c
index bb2c60380fe2169a0b9d9bdeae461c7aedb8d3d3..3d3fdbce1354f4390b1ebbd14114c0efd93f46df 100644
--- a/drivers/infiniband/hw/mlx5/wr.c
+++ b/drivers/infiniband/hw/mlx5/wr.c
@@ -639,7 +639,7 @@ static int set_reg_wr(struct mlx5_ib_qp *qp,
 {
 	struct mlx5_ib_mr *mr = to_mmr(wr->mr);
 	struct mlx5_ib_pd *pd = to_mpd(qp->ibqp.pd);
-	struct mlx5_ib_dev *dev = to_mdev(pd->ibpd.device);
+	struct mlx5_ib_dev *dev = to_dev(pd->ibpd.device);
 	int mr_list_size = (mr->mmkey.ndescs + mr->meta_ndescs) * mr->desc_size;
 	bool umr_inline = mr_list_size <= MLX5_IB_SQ_UMR_INLINE_THRESHOLD;
 	bool atomic = wr->access & IB_ACCESS_REMOTE_ATOMIC;
@@ -651,13 +651,13 @@ static int set_reg_wr(struct mlx5_ib_qp *qp,
 	 */
 	if (!mlx5r_umr_can_reconfig(dev, 0, wr->access)) {
 		mlx5_ib_warn(
-			to_mdev(qp->ibqp.device),
+			to_dev(qp->ibqp.device),
 			"Fast update for MR access flags is not possible\n");
 		return -EINVAL;
 	}
 
 	if (unlikely(wr->wr.send_flags & IB_SEND_INLINE)) {
-		mlx5_ib_warn(to_mdev(qp->ibqp.device),
+		mlx5_ib_warn(to_dev(qp->ibqp.device),
 			     "Invalid IB_SEND_INLINE send flag\n");
 		return -EINVAL;
 	}
@@ -1055,7 +1055,7 @@ int mlx5_ib_post_send(struct ib_qp *ibqp, const struct ib_send_wr *wr,
 		      const struct ib_send_wr **bad_wr, bool drain)
 {
 	struct mlx5_wqe_ctrl_seg *ctrl = NULL;  /* compiler warning */
-	struct mlx5_ib_dev *dev = to_mdev(ibqp->device);
+	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
 	struct mlx5_core_dev *mdev = dev->mdev;
 	struct mlx5_ib_qp *qp = to_mqp(ibqp);
 	struct mlx5_wqe_xrc_seg *xrc;
@@ -1212,7 +1212,7 @@ int mlx5_ib_post_recv(struct ib_qp *ibqp, const struct ib_recv_wr *wr,
 	struct mlx5_ib_qp *qp = to_mqp(ibqp);
 	struct mlx5_wqe_data_seg *scat;
 	struct mlx5_rwqe_sig *sig;
-	struct mlx5_ib_dev *dev = to_mdev(ibqp->device);
+	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
 	struct mlx5_core_dev *mdev = dev->mdev;
 	unsigned long flags;
 	int err = 0;

-- 
2.49.0


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH rdma-next 03/11] RDMA/mlx5: Select the PD and SRQ core device through the PD
  2026-11-17 14:01 [PATCH rdma-next 00/11] RDMA/mlx5: Preparation for SD support Edward Srouji
  2026-11-17 14:01 ` [PATCH rdma-next 01/11] RDMA/mlx5: Enforce dev/mdev naming for device pointers Edward Srouji
  2026-11-17 14:01 ` [PATCH rdma-next 02/11] RDMA/mlx5: Rename to_mdev() helpers that return an IB device Edward Srouji
@ 2026-11-17 14:01 ` Edward Srouji
  2026-11-17 14:01 ` [PATCH rdma-next 04/11] RDMA/mlx5: Select the core device through PD for QP commands Edward Srouji
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Edward Srouji @ 2026-11-17 14:01 UTC (permalink / raw)
  To: Leon Romanovsky, Jason Gunthorpe, Sabrina Dubroca
  Cc: linux-rdma, linux-kernel, netdev, Edward Srouji,
	Akiva Goldberger, Michael Gur

From: Akiva Goldberger <agoldberger@nvidia.com>

An SRQ is tied to a PD when it is allocated. Use the SRQ's PD to select
the backend mlx5_core_dev for all SRQ flows that require it.

Add helpers pd_to_mdev() and srq_to_mdev() to replace dev->mdev
references in the SRQ flows, and allocate and free the PD itself on
the core device pd_to_mdev() returns.

Also, enforce a single naming scheme for dev/mdev resolvers in mlx5_ib.
A resolver is named <resource>_to_mdev() or <resource>_to_dev() after
the resource it takes, as the helpers renamed in the previous patch
already are. Where several resource types have to be accepted, as an
ib_pd and an mlx5_ib_pd are for pd_to_mdev(), the resolver is a
_Generic() over per-type helpers.

No functional change.

Signed-off-by: Akiva Goldberger <agoldberger@nvidia.com>
Reviewed-by: Michael Gur <michaelgur@nvidia.com>
Signed-off-by: Edward Srouji <edwards@nvidia.com>
---
 drivers/infiniband/hw/mlx5/main.c    |   8 +--
 drivers/infiniband/hw/mlx5/mlx5_ib.h |  27 ++++++++
 drivers/infiniband/hw/mlx5/srq.c     |  42 ++++++------
 drivers/infiniband/hw/mlx5/srq.h     |   4 +-
 drivers/infiniband/hw/mlx5/srq_cmd.c | 124 +++++++++++++++++------------------
 5 files changed, 115 insertions(+), 90 deletions(-)

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index a78418699e90d6032dec949d1e0d8462d11c1239..28a2d75b3f37cade52130da86d011965823352bf 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -2793,7 +2793,6 @@ static int mlx5_ib_mmap(struct ib_ucontext *ibcontext, struct vm_area_struct *vm
 static int mlx5_ib_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)
 {
 	struct mlx5_ib_pd *pd = to_mpd(ibpd);
-	struct ib_device *ibdev = ibpd->device;
 	struct mlx5_ib_alloc_pd_resp resp = {};
 	int err;
 	u32 out[MLX5_ST_SZ_DW(alloc_pd_out)] = {};
@@ -2805,7 +2804,7 @@ static int mlx5_ib_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)
 	uid = context ? context->devx_uid : 0;
 	MLX5_SET(alloc_pd_in, in, opcode, MLX5_CMD_OP_ALLOC_PD);
 	MLX5_SET(alloc_pd_in, in, uid, uid);
-	err = mlx5_cmd_exec_inout(to_dev(ibdev)->mdev, alloc_pd, in, out);
+	err = mlx5_cmd_exec_inout(pd_to_mdev(pd), alloc_pd, in, out);
 	if (err)
 		return err;
 
@@ -2815,7 +2814,7 @@ static int mlx5_ib_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)
 		resp.pdn = pd->pdn;
 		err = ib_respond_udata(udata, resp);
 		if (err) {
-			mlx5_cmd_dealloc_pd(to_dev(ibdev)->mdev, pd->pdn, uid);
+			mlx5_cmd_dealloc_pd(pd_to_mdev(pd), pd->pdn, uid);
 			return err;
 		}
 	}
@@ -2825,10 +2824,9 @@ static int mlx5_ib_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)
 
 static int mlx5_ib_dealloc_pd(struct ib_pd *pd, struct ib_udata *udata)
 {
-	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	struct mlx5_ib_pd *mpd = to_mpd(pd);
 
-	return mlx5_cmd_dealloc_pd(dev->mdev, mpd->pdn, mpd->uid);
+	return mlx5_cmd_dealloc_pd(pd_to_mdev(mpd), mpd->pdn, mpd->uid);
 }
 
 static int mlx5_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index 8e2b354ef239e72b6e1da1867f508ec9cd4eddc8..bbb73314921bdec91186bf5e855850fcb2b30632 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -1240,6 +1240,33 @@ static inline struct mlx5_ib_mr *to_mmr(struct ib_mr *ibmr)
 	return container_of(ibmr, struct mlx5_ib_mr, ibmr);
 }
 
+/*
+ * Device resolvers.
+ *
+ * Each helper is named <resource>_to_mdev() or <resource>_to_dev(). Where more
+ * than one resource type has to be accepted, the interface is a _Generic()
+ * that dispatches to one helper per type.
+ */
+static inline struct mlx5_core_dev *__ib_pd_to_mdev(struct ib_pd *pd)
+{
+	return to_dev(pd->device)->mdev;
+}
+
+static inline struct mlx5_core_dev *__mlx5_ib_pd_to_mdev(struct mlx5_ib_pd *pd)
+{
+	return to_dev(pd->ibpd.device)->mdev;
+}
+
+#define pd_to_mdev(pd) \
+	_Generic((pd), \
+		struct ib_pd * : __ib_pd_to_mdev, \
+		struct mlx5_ib_pd * : __mlx5_ib_pd_to_mdev)(pd)
+
+static inline struct mlx5_core_dev *srq_to_mdev(struct mlx5_core_srq *msrq)
+{
+	return pd_to_mdev(to_mibsrq(msrq)->ibsrq.pd);
+}
+
 static inline struct mlx5_ib_mw *to_mmw(struct ib_mw *ibmw)
 {
 	return container_of(ibmw, struct mlx5_ib_mw, ibmw);
diff --git a/drivers/infiniband/hw/mlx5/srq.c b/drivers/infiniband/hw/mlx5/srq.c
index a52fd1811956196a6f0c1b63c1e2608b2e5b1ff6..9f03cb7619bdf78bf031801af092ffd3d47de75f 100644
--- a/drivers/infiniband/hw/mlx5/srq.c
+++ b/drivers/infiniband/hw/mlx5/srq.c
@@ -90,7 +90,7 @@ static int create_srq_user(struct ib_pd *pd, struct mlx5_ib_srq *srq,
 	}
 
 	in->uid = (in->type != IB_SRQT_XRC) ?  to_mpd(pd)->uid : 0;
-	if (MLX5_CAP_GEN(dev->mdev, cqe_version) == MLX5_CQE_VERSION_V1 &&
+	if (MLX5_CAP_GEN(pd_to_mdev(pd), cqe_version) == MLX5_CQE_VERSION_V1 &&
 	    in->type != IB_SRQT_BASIC)
 		in->user_index = uidx;
 
@@ -105,18 +105,19 @@ static int create_srq_user(struct ib_pd *pd, struct mlx5_ib_srq *srq,
 static int create_srq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_srq *srq,
 			     struct mlx5_srq_attr *in, int buf_size)
 {
+	struct mlx5_core_dev *mdev = pd_to_mdev(srq->ibsrq.pd);
 	int err;
 	int i;
 	struct mlx5_wqe_srq_next_seg *next;
 
-	err = mlx5_db_alloc(dev->mdev, &srq->db);
+	err = mlx5_db_alloc(mdev, &srq->db);
 	if (err) {
 		mlx5_ib_warn(dev, "alloc dbell rec failed\n");
 		return err;
 	}
 
-	if (mlx5_frag_buf_alloc_node(dev->mdev, buf_size, &srq->buf,
-				     dev->mdev->priv.numa_node)) {
+	if (mlx5_frag_buf_alloc_node(mdev, buf_size, &srq->buf,
+				     mdev->priv.numa_node)) {
 		mlx5_ib_dbg(dev, "buf alloc failed\n");
 		err = -ENOMEM;
 		goto err_db;
@@ -151,7 +152,7 @@ static int create_srq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_srq *srq,
 	srq->wq_sig = 0;
 
 	in->log_page_size = srq->buf.page_shift - MLX5_ADAPTER_PAGE_SHIFT;
-	if (MLX5_CAP_GEN(dev->mdev, cqe_version) == MLX5_CQE_VERSION_V1 &&
+	if (MLX5_CAP_GEN(mdev, cqe_version) == MLX5_CQE_VERSION_V1 &&
 	    in->type != IB_SRQT_BASIC)
 		in->user_index = MLX5_IB_DEFAULT_UIDX;
 
@@ -161,10 +162,10 @@ static int create_srq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_srq *srq,
 	kvfree(in->pas);
 
 err_buf:
-	mlx5_frag_buf_free(dev->mdev, &srq->buf);
+	mlx5_frag_buf_free(mdev, &srq->buf);
 
 err_db:
-	mlx5_db_free(dev->mdev, &srq->db);
+	mlx5_db_free(mdev, &srq->db);
 	return err;
 }
 
@@ -181,11 +182,13 @@ static void destroy_srq_user(struct ib_pd *pd, struct mlx5_ib_srq *srq,
 }
 
 
-static void destroy_srq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_srq *srq)
+static void destroy_srq_kernel(struct mlx5_ib_srq *srq)
 {
+	struct mlx5_core_dev *mdev = pd_to_mdev(srq->ibsrq.pd);
+
 	kvfree(srq->wrid);
-	mlx5_frag_buf_free(dev->mdev, &srq->buf);
-	mlx5_db_free(dev->mdev, &srq->db);
+	mlx5_frag_buf_free(mdev, &srq->buf);
+	mlx5_db_free(mdev, &srq->db);
 }
 
 int mlx5_ib_create_srq(struct ib_srq *ib_srq,
@@ -194,12 +197,13 @@ int mlx5_ib_create_srq(struct ib_srq *ib_srq,
 {
 	struct mlx5_ib_dev *dev = to_dev(ib_srq->device);
 	struct mlx5_ib_srq *srq = to_msrq(ib_srq);
+	struct mlx5_core_dev *mdev = pd_to_mdev(ib_srq->pd);
 	size_t desc_size;
 	size_t buf_size;
 	int err;
 	struct mlx5_srq_attr in = {};
-	__u32 max_srq_wqes = 1 << MLX5_CAP_GEN(dev->mdev, log_max_srq_sz);
-	__u32 max_sge_sz =  MLX5_CAP_GEN(dev->mdev, max_wqe_sz_rq) /
+	__u32 max_srq_wqes = 1 << MLX5_CAP_GEN(mdev, log_max_srq_sz);
+	__u32 max_sge_sz =  MLX5_CAP_GEN(mdev, max_wqe_sz_rq) /
 			    sizeof(struct mlx5_wqe_data_seg);
 
 	if (init_attr->srq_type != IB_SRQT_BASIC &&
@@ -269,7 +273,7 @@ int mlx5_ib_create_srq(struct ib_srq *ib_srq,
 		in.tm_log_list_size =
 			ilog2(init_attr->ext.tag_matching.max_num_tags) + 1;
 		if (in.tm_log_list_size >
-		    MLX5_CAP_GEN(dev->mdev, log_tag_matching_list_sz)) {
+		    MLX5_CAP_GEN(mdev, log_tag_matching_list_sz)) {
 			mlx5_ib_dbg(dev, "TM SRQ max_num_tags exceeding limit\n");
 			err = -EINVAL;
 			goto err_usr_kern_srq;
@@ -316,7 +320,7 @@ int mlx5_ib_create_srq(struct ib_srq *ib_srq,
 	if (udata)
 		destroy_srq_user(ib_srq->pd, srq, udata);
 	else
-		destroy_srq_kernel(dev, srq);
+		destroy_srq_kernel(srq);
 
 	return err;
 }
@@ -324,7 +328,6 @@ int mlx5_ib_create_srq(struct ib_srq *ib_srq,
 int mlx5_ib_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,
 		       enum ib_srq_attr_mask attr_mask, struct ib_udata *udata)
 {
-	struct mlx5_ib_dev *dev = to_dev(ibsrq->device);
 	struct mlx5_ib_srq *srq = to_msrq(ibsrq);
 	int ret;
 
@@ -337,7 +340,7 @@ int mlx5_ib_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,
 			return -EINVAL;
 
 		mutex_lock(&srq->mutex);
-		ret = mlx5_cmd_arm_srq(dev, &srq->msrq, attr->srq_limit, 1);
+		ret = mlx5_cmd_arm_srq(&srq->msrq, attr->srq_limit, 1);
 		mutex_unlock(&srq->mutex);
 
 		if (ret)
@@ -349,7 +352,6 @@ int mlx5_ib_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,
 
 int mlx5_ib_query_srq(struct ib_srq *ibsrq, struct ib_srq_attr *srq_attr)
 {
-	struct mlx5_ib_dev *dev = to_dev(ibsrq->device);
 	struct mlx5_ib_srq *srq = to_msrq(ibsrq);
 	int ret;
 	struct mlx5_srq_attr *out;
@@ -358,7 +360,7 @@ int mlx5_ib_query_srq(struct ib_srq *ibsrq, struct ib_srq_attr *srq_attr)
 	if (!out)
 		return -ENOMEM;
 
-	ret = mlx5_cmd_query_srq(dev, &srq->msrq, out);
+	ret = mlx5_cmd_query_srq(&srq->msrq, out);
 	if (ret)
 		goto out_box;
 
@@ -384,7 +386,7 @@ int mlx5_ib_destroy_srq(struct ib_srq *srq, struct ib_udata *udata)
 	if (udata)
 		destroy_srq_user(srq->pd, msrq, udata);
 	else
-		destroy_srq_kernel(dev, msrq);
+		destroy_srq_kernel(msrq);
 	return 0;
 }
 
@@ -409,7 +411,7 @@ int mlx5_ib_post_srq_recv(struct ib_srq *ibsrq, const struct ib_recv_wr *wr,
 	struct mlx5_wqe_srq_next_seg *next;
 	struct mlx5_wqe_data_seg *scat;
 	struct mlx5_ib_dev *dev = to_dev(ibsrq->device);
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = pd_to_mdev(ibsrq->pd);
 	unsigned long flags;
 	int err = 0;
 	int nreq;
diff --git a/drivers/infiniband/hw/mlx5/srq.h b/drivers/infiniband/hw/mlx5/srq.h
index a7e3dc5564ac90ec8ddc536480e7ea5201e06cd5..76d389ec6b08f188a74cd555c9477dccb4f2368f 100644
--- a/drivers/infiniband/hw/mlx5/srq.h
+++ b/drivers/infiniband/hw/mlx5/srq.h
@@ -58,9 +58,9 @@ struct mlx5_srq_table {
 int mlx5_cmd_create_srq(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
 			struct mlx5_srq_attr *in);
 int mlx5_cmd_destroy_srq(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq);
-int mlx5_cmd_query_srq(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
+int mlx5_cmd_query_srq(struct mlx5_core_srq *srq,
 		       struct mlx5_srq_attr *out);
-int mlx5_cmd_arm_srq(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
+int mlx5_cmd_arm_srq(struct mlx5_core_srq *srq,
 		     u16 lwm, int is_srq);
 struct mlx5_core_srq *mlx5_cmd_get_srq(struct mlx5_ib_dev *dev, u32 srqn);
 
diff --git a/drivers/infiniband/hw/mlx5/srq_cmd.c b/drivers/infiniband/hw/mlx5/srq_cmd.c
index c1a088120915c5741f37ed44fd2e8139bcb6802e..944b53074f69dca3a1b25b2dc8a41dae7546dcac 100644
--- a/drivers/infiniband/hw/mlx5/srq_cmd.c
+++ b/drivers/infiniband/hw/mlx5/srq_cmd.c
@@ -111,7 +111,7 @@ static int __set_srq_page_size(struct mlx5_srq_attr *in,
 					MLX5_ADAPTER_PAGE_SHIFT, page_offset,  \
 					64, &(in)->page_offset))
 
-static int create_srq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
+static int create_srq_cmd(struct mlx5_core_srq *srq,
 			  struct mlx5_srq_attr *in)
 {
 	u32 create_out[MLX5_ST_SZ_DW(create_srq_out)] = {0};
@@ -150,7 +150,7 @@ static int create_srq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
 	MLX5_SET(create_srq_in, create_in, opcode,
 		 MLX5_CMD_OP_CREATE_SRQ);
 
-	err = mlx5_cmd_exec(dev->mdev, create_in, inlen, create_out,
+	err = mlx5_cmd_exec(srq_to_mdev(srq), create_in, inlen, create_out,
 			    sizeof(create_out));
 	kvfree(create_in);
 	if (!err) {
@@ -161,7 +161,7 @@ static int create_srq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
 	return err;
 }
 
-static int destroy_srq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq)
+static int destroy_srq_cmd(struct mlx5_core_srq *srq)
 {
 	u32 in[MLX5_ST_SZ_DW(destroy_srq_in)] = {};
 
@@ -169,10 +169,10 @@ static int destroy_srq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq)
 	MLX5_SET(destroy_srq_in, in, srqn, srq->srqn);
 	MLX5_SET(destroy_srq_in, in, uid, srq->uid);
 
-	return mlx5_cmd_exec_in(dev->mdev, destroy_srq, in);
+	return mlx5_cmd_exec_in(srq_to_mdev(srq), destroy_srq, in);
 }
 
-static int arm_srq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
+static int arm_srq_cmd(struct mlx5_core_srq *srq,
 		       u16 lwm, int is_srq)
 {
 	u32 in[MLX5_ST_SZ_DW(arm_rq_in)] = {};
@@ -183,10 +183,10 @@ static int arm_srq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
 	MLX5_SET(arm_rq_in, in, lwm, lwm);
 	MLX5_SET(arm_rq_in, in, uid, srq->uid);
 
-	return mlx5_cmd_exec_in(dev->mdev, arm_rq, in);
+	return mlx5_cmd_exec_in(srq_to_mdev(srq), arm_rq, in);
 }
 
-static int query_srq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
+static int query_srq_cmd(struct mlx5_core_srq *srq,
 			 struct mlx5_srq_attr *out)
 {
 	u32 in[MLX5_ST_SZ_DW(query_srq_in)] = {};
@@ -200,7 +200,7 @@ static int query_srq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
 
 	MLX5_SET(query_srq_in, in, opcode, MLX5_CMD_OP_QUERY_SRQ);
 	MLX5_SET(query_srq_in, in, srqn, srq->srqn);
-	err = mlx5_cmd_exec_inout(dev->mdev, query_srq, in, srq_out);
+	err = mlx5_cmd_exec_inout(srq_to_mdev(srq), query_srq, in, srq_out);
 	if (err)
 		goto out;
 
@@ -213,8 +213,7 @@ static int query_srq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
 	return err;
 }
 
-static int create_xrc_srq_cmd(struct mlx5_ib_dev *dev,
-			      struct mlx5_core_srq *srq,
+static int create_xrc_srq_cmd(struct mlx5_core_srq *srq,
 			      struct mlx5_srq_attr *in)
 {
 	u32 create_out[MLX5_ST_SZ_DW(create_xrc_srq_out)];
@@ -255,7 +254,7 @@ static int create_xrc_srq_cmd(struct mlx5_ib_dev *dev,
 		 MLX5_CMD_OP_CREATE_XRC_SRQ);
 
 	memset(create_out, 0, sizeof(create_out));
-	err = mlx5_cmd_exec(dev->mdev, create_in, inlen, create_out,
+	err = mlx5_cmd_exec(srq_to_mdev(srq), create_in, inlen, create_out,
 			    sizeof(create_out));
 	if (err)
 		goto out;
@@ -267,8 +266,7 @@ static int create_xrc_srq_cmd(struct mlx5_ib_dev *dev,
 	return err;
 }
 
-static int destroy_xrc_srq_cmd(struct mlx5_ib_dev *dev,
-			       struct mlx5_core_srq *srq)
+static int destroy_xrc_srq_cmd(struct mlx5_core_srq *srq)
 {
 	u32 in[MLX5_ST_SZ_DW(destroy_xrc_srq_in)] = {};
 
@@ -276,10 +274,10 @@ static int destroy_xrc_srq_cmd(struct mlx5_ib_dev *dev,
 	MLX5_SET(destroy_xrc_srq_in, in, xrc_srqn, srq->srqn);
 	MLX5_SET(destroy_xrc_srq_in, in, uid, srq->uid);
 
-	return mlx5_cmd_exec_in(dev->mdev, destroy_xrc_srq, in);
+	return mlx5_cmd_exec_in(srq_to_mdev(srq), destroy_xrc_srq, in);
 }
 
-static int arm_xrc_srq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
+static int arm_xrc_srq_cmd(struct mlx5_core_srq *srq,
 			   u16 lwm)
 {
 	u32 in[MLX5_ST_SZ_DW(arm_xrc_srq_in)] = {};
@@ -291,11 +289,10 @@ static int arm_xrc_srq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
 	MLX5_SET(arm_xrc_srq_in, in, lwm, lwm);
 	MLX5_SET(arm_xrc_srq_in, in, uid, srq->uid);
 
-	return  mlx5_cmd_exec_in(dev->mdev, arm_xrc_srq, in);
+	return  mlx5_cmd_exec_in(srq_to_mdev(srq), arm_xrc_srq, in);
 }
 
-static int query_xrc_srq_cmd(struct mlx5_ib_dev *dev,
-			     struct mlx5_core_srq *srq,
+static int query_xrc_srq_cmd(struct mlx5_core_srq *srq,
 			     struct mlx5_srq_attr *out)
 {
 	u32 in[MLX5_ST_SZ_DW(query_xrc_srq_in)] = {};
@@ -310,7 +307,8 @@ static int query_xrc_srq_cmd(struct mlx5_ib_dev *dev,
 	MLX5_SET(query_xrc_srq_in, in, opcode, MLX5_CMD_OP_QUERY_XRC_SRQ);
 	MLX5_SET(query_xrc_srq_in, in, xrc_srqn, srq->srqn);
 
-	err = mlx5_cmd_exec_inout(dev->mdev, query_xrc_srq, in, xrcsrq_out);
+	err = mlx5_cmd_exec_inout(srq_to_mdev(srq), query_xrc_srq, in,
+				  xrcsrq_out);
 	if (err)
 		goto out;
 
@@ -325,7 +323,7 @@ static int query_xrc_srq_cmd(struct mlx5_ib_dev *dev,
 	return err;
 }
 
-static int create_rmp_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
+static int create_rmp_cmd(struct mlx5_core_srq *srq,
 			  struct mlx5_srq_attr *in)
 {
 	void *create_out = NULL;
@@ -371,7 +369,8 @@ static int create_rmp_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
 		memcpy(pas, in->pas, pas_size);
 
 	MLX5_SET(create_rmp_in, create_in, opcode, MLX5_CMD_OP_CREATE_RMP);
-	err = mlx5_cmd_exec(dev->mdev, create_in, inlen, create_out, outlen);
+	err = mlx5_cmd_exec(srq_to_mdev(srq), create_in, inlen, create_out,
+			    outlen);
 	if (!err) {
 		srq->srqn = MLX5_GET(create_rmp_out, create_out, rmpn);
 		srq->uid = in->uid;
@@ -383,17 +382,17 @@ static int create_rmp_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
 	return err;
 }
 
-static int destroy_rmp_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq)
+static int destroy_rmp_cmd(struct mlx5_core_srq *srq)
 {
 	u32 in[MLX5_ST_SZ_DW(destroy_rmp_in)] = {};
 
 	MLX5_SET(destroy_rmp_in, in, opcode, MLX5_CMD_OP_DESTROY_RMP);
 	MLX5_SET(destroy_rmp_in, in, rmpn, srq->srqn);
 	MLX5_SET(destroy_rmp_in, in, uid, srq->uid);
-	return mlx5_cmd_exec_in(dev->mdev, destroy_rmp, in);
+	return mlx5_cmd_exec_in(srq_to_mdev(srq), destroy_rmp, in);
 }
 
-static int arm_rmp_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
+static int arm_rmp_cmd(struct mlx5_core_srq *srq,
 		       u16 lwm)
 {
 	void *out = NULL;
@@ -427,7 +426,7 @@ static int arm_rmp_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
 	MLX5_SET(rmpc, rmpc, state, MLX5_RMPC_STATE_RDY);
 	MLX5_SET(modify_rmp_in, in, opcode, MLX5_CMD_OP_MODIFY_RMP);
 
-	err = mlx5_cmd_exec_inout(dev->mdev, modify_rmp, in, out);
+	err = mlx5_cmd_exec_inout(srq_to_mdev(srq), modify_rmp, in, out);
 
 out:
 	kvfree(in);
@@ -435,7 +434,7 @@ static int arm_rmp_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
 	return err;
 }
 
-static int query_rmp_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
+static int query_rmp_cmd(struct mlx5_core_srq *srq,
 			 struct mlx5_srq_attr *out)
 {
 	u32 *rmp_out = NULL;
@@ -457,7 +456,7 @@ static int query_rmp_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
 
 	MLX5_SET(query_rmp_in, rmp_in, opcode, MLX5_CMD_OP_QUERY_RMP);
 	MLX5_SET(query_rmp_in, rmp_in, rmpn,   srq->srqn);
-	err = mlx5_cmd_exec_inout(dev->mdev, query_rmp, rmp_in, rmp_out);
+	err = mlx5_cmd_exec_inout(srq_to_mdev(srq), query_rmp, rmp_in, rmp_out);
 	if (err)
 		goto out;
 
@@ -472,7 +471,7 @@ static int query_rmp_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
 	return err;
 }
 
-static int create_xrq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
+static int create_xrq_cmd(struct mlx5_core_srq *srq,
 			  struct mlx5_srq_attr *in)
 {
 	u32 create_out[MLX5_ST_SZ_DW(create_xrq_out)] = {0};
@@ -521,7 +520,7 @@ static int create_xrq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
 	MLX5_SET(xrqc, xrqc, cqn, in->cqn);
 	MLX5_SET(create_xrq_in, create_in, opcode, MLX5_CMD_OP_CREATE_XRQ);
 	MLX5_SET(create_xrq_in, create_in, uid, in->uid);
-	err = mlx5_cmd_exec(dev->mdev, create_in, inlen, create_out,
+	err = mlx5_cmd_exec(srq_to_mdev(srq), create_in, inlen, create_out,
 			    sizeof(create_out));
 	kvfree(create_in);
 	if (!err) {
@@ -532,7 +531,7 @@ static int create_xrq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
 	return err;
 }
 
-static int destroy_xrq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq)
+static int destroy_xrq_cmd(struct mlx5_core_srq *srq)
 {
 	u32 in[MLX5_ST_SZ_DW(destroy_xrq_in)] = {};
 
@@ -540,11 +539,10 @@ static int destroy_xrq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq)
 	MLX5_SET(destroy_xrq_in, in, xrqn, srq->srqn);
 	MLX5_SET(destroy_xrq_in, in, uid, srq->uid);
 
-	return mlx5_cmd_exec_in(dev->mdev, destroy_xrq, in);
+	return mlx5_cmd_exec_in(srq_to_mdev(srq), destroy_xrq, in);
 }
 
-static int arm_xrq_cmd(struct mlx5_ib_dev *dev,
-		       struct mlx5_core_srq *srq,
+static int arm_xrq_cmd(struct mlx5_core_srq *srq,
 		       u16 lwm)
 {
 	u32 in[MLX5_ST_SZ_DW(arm_rq_in)] = {};
@@ -555,10 +553,10 @@ static int arm_xrq_cmd(struct mlx5_ib_dev *dev,
 	MLX5_SET(arm_rq_in, in, lwm, lwm);
 	MLX5_SET(arm_rq_in, in, uid, srq->uid);
 
-	return mlx5_cmd_exec_in(dev->mdev, arm_rq, in);
+	return mlx5_cmd_exec_in(srq_to_mdev(srq), arm_rq, in);
 }
 
-static int query_xrq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
+static int query_xrq_cmd(struct mlx5_core_srq *srq,
 			 struct mlx5_srq_attr *out)
 {
 	u32 in[MLX5_ST_SZ_DW(query_xrq_in)] = {};
@@ -574,7 +572,7 @@ static int query_xrq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
 	MLX5_SET(query_xrq_in, in, opcode, MLX5_CMD_OP_QUERY_XRQ);
 	MLX5_SET(query_xrq_in, in, xrqn, srq->srqn);
 
-	err = mlx5_cmd_exec_inout(dev->mdev, query_xrq, in, xrq_out);
+	err = mlx5_cmd_exec_inout(srq_to_mdev(srq), query_xrq, in, xrq_out);
 	if (err)
 		goto out;
 
@@ -597,32 +595,32 @@ static int query_xrq_cmd(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
 	return err;
 }
 
-static int create_srq_split(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
+static int create_srq_split(struct mlx5_core_srq *srq,
 			    struct mlx5_srq_attr *in)
 {
-	if (!dev->mdev->issi)
-		return create_srq_cmd(dev, srq, in);
+	if (!srq_to_mdev(srq)->issi)
+		return create_srq_cmd(srq, in);
 	switch (srq->common.res) {
 	case MLX5_RES_XSRQ:
-		return create_xrc_srq_cmd(dev, srq, in);
+		return create_xrc_srq_cmd(srq, in);
 	case MLX5_RES_XRQ:
-		return create_xrq_cmd(dev, srq, in);
+		return create_xrq_cmd(srq, in);
 	default:
-		return create_rmp_cmd(dev, srq, in);
+		return create_rmp_cmd(srq, in);
 	}
 }
 
-static int destroy_srq_split(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq)
+static int destroy_srq_split(struct mlx5_core_srq *srq)
 {
-	if (!dev->mdev->issi)
-		return destroy_srq_cmd(dev, srq);
+	if (!srq_to_mdev(srq)->issi)
+		return destroy_srq_cmd(srq);
 	switch (srq->common.res) {
 	case MLX5_RES_XSRQ:
-		return destroy_xrc_srq_cmd(dev, srq);
+		return destroy_xrc_srq_cmd(srq);
 	case MLX5_RES_XRQ:
-		return destroy_xrq_cmd(dev, srq);
+		return destroy_xrq_cmd(srq);
 	default:
-		return destroy_rmp_cmd(dev, srq);
+		return destroy_rmp_cmd(srq);
 	}
 }
 
@@ -643,7 +641,7 @@ int mlx5_cmd_create_srq(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
 		srq->common.res = MLX5_RES_SRQ;
 	}
 
-	err = create_srq_split(dev, srq, in);
+	err = create_srq_split(srq, in);
 	if (err)
 		return err;
 
@@ -657,7 +655,7 @@ int mlx5_cmd_create_srq(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
 	return 0;
 
 err_destroy_srq_split:
-	destroy_srq_split(dev, srq);
+	destroy_srq_split(srq);
 
 	return err;
 }
@@ -673,7 +671,7 @@ int mlx5_cmd_destroy_srq(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq)
 	if (WARN_ON(tmp != srq))
 		return xa_err(tmp) ?: -EINVAL;
 
-	err = destroy_srq_split(dev, srq);
+	err = destroy_srq_split(srq);
 	if (err) {
 		/*
 		 * We don't need to check returned result for an error,
@@ -697,33 +695,33 @@ int mlx5_cmd_destroy_srq(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq)
 	return 0;
 }
 
-int mlx5_cmd_query_srq(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
+int mlx5_cmd_query_srq(struct mlx5_core_srq *srq,
 		       struct mlx5_srq_attr *out)
 {
-	if (!dev->mdev->issi)
-		return query_srq_cmd(dev, srq, out);
+	if (!srq_to_mdev(srq)->issi)
+		return query_srq_cmd(srq, out);
 	switch (srq->common.res) {
 	case MLX5_RES_XSRQ:
-		return query_xrc_srq_cmd(dev, srq, out);
+		return query_xrc_srq_cmd(srq, out);
 	case MLX5_RES_XRQ:
-		return query_xrq_cmd(dev, srq, out);
+		return query_xrq_cmd(srq, out);
 	default:
-		return query_rmp_cmd(dev, srq, out);
+		return query_rmp_cmd(srq, out);
 	}
 }
 
-int mlx5_cmd_arm_srq(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,
+int mlx5_cmd_arm_srq(struct mlx5_core_srq *srq,
 		     u16 lwm, int is_srq)
 {
-	if (!dev->mdev->issi)
-		return arm_srq_cmd(dev, srq, lwm, is_srq);
+	if (!srq_to_mdev(srq)->issi)
+		return arm_srq_cmd(srq, lwm, is_srq);
 	switch (srq->common.res) {
 	case MLX5_RES_XSRQ:
-		return arm_xrc_srq_cmd(dev, srq, lwm);
+		return arm_xrc_srq_cmd(srq, lwm);
 	case MLX5_RES_XRQ:
-		return arm_xrq_cmd(dev, srq, lwm);
+		return arm_xrq_cmd(srq, lwm);
 	default:
-		return arm_rmp_cmd(dev, srq, lwm);
+		return arm_rmp_cmd(srq, lwm);
 	}
 }
 

-- 
2.49.0


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH rdma-next 04/11] RDMA/mlx5: Select the core device through PD for QP commands
  2026-11-17 14:01 [PATCH rdma-next 00/11] RDMA/mlx5: Preparation for SD support Edward Srouji
                   ` (2 preceding siblings ...)
  2026-11-17 14:01 ` [PATCH rdma-next 03/11] RDMA/mlx5: Select the PD and SRQ core device through the PD Edward Srouji
@ 2026-11-17 14:01 ` Edward Srouji
  2026-11-17 14:01 ` [PATCH rdma-next 05/11] RDMA/mlx5: Cache the MR core device and resolve the MW's via its PD Edward Srouji
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Edward Srouji @ 2026-11-17 14:01 UTC (permalink / raw)
  To: Leon Romanovsky, Jason Gunthorpe, Sabrina Dubroca
  Cc: linux-rdma, linux-kernel, netdev, Edward Srouji,
	Akiva Goldberger, Michael Gur

From: Akiva Goldberger <agoldberger@nvidia.com>

All QPs are bound to a PD, either through ibqp->pd or, for XRC target
QPs, through the devr.p0 PD. Add qp_to_mdev() to derive the core device
from a QP through its associated PD.

A DCT is created either by verbs, inside an mlx5_ib_qp, or by DEVX,
inside a devx_obj, so the DCT commands cannot reach its PD the same way.
Rather than store a core device in every DCT, have their callers pass
it, resolved from the QP or the ucontext that owns the DCT.

No functional change.

Signed-off-by: Akiva Goldberger <agoldberger@nvidia.com>
Reviewed-by: Michael Gur <michaelgur@nvidia.com>
Signed-off-by: Edward Srouji <edwards@nvidia.com>
---
 drivers/infiniband/hw/mlx5/devx.c    |  11 ++--
 drivers/infiniband/hw/mlx5/main.c    |   3 +-
 drivers/infiniband/hw/mlx5/mlx5_ib.h |  23 ++++++++
 drivers/infiniband/hw/mlx5/qp.c      |  59 +++++++++----------
 drivers/infiniband/hw/mlx5/qp.h      |  32 +++++------
 drivers/infiniband/hw/mlx5/qpc.c     | 107 +++++++++++++++++++----------------
 6 files changed, 136 insertions(+), 99 deletions(-)

diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c
index 75f5fc256ff6eab4f3ba2de4c0d9c3d7da8d5432..aa27fce2e197c22a9b2ebdfae5c96cbd0a41102f 100644
--- a/drivers/infiniband/hw/mlx5/devx.c
+++ b/drivers/infiniband/hw/mlx5/devx.c
@@ -1469,7 +1469,8 @@ static int devx_obj_cleanup(struct ib_uobject *uobject,
 	if (obj->flags & DEVX_OBJ_FLAGS_HW_FREED)
 		ret = 0;
 	else if (obj->flags & DEVX_OBJ_FLAGS_DCT)
-		ret = mlx5_core_destroy_dct(obj->ib_dev, &obj->core_dct);
+		ret = mlx5_core_destroy_dct(obj->ib_dev, obj->ib_dev->mdev,
+					    &obj->core_dct);
 	else if (obj->flags & DEVX_OBJ_FLAGS_CQ)
 		ret = mlx5_core_destroy_cq(obj->ib_dev->mdev, &obj->core_cq);
 	else
@@ -1572,8 +1573,9 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)(
 
 	if (opcode == MLX5_CMD_OP_CREATE_DCT) {
 		obj->flags |= DEVX_OBJ_FLAGS_DCT;
-		err = mlx5_core_create_dct(dev, &obj->core_dct, cmd_in,
-					   cmd_in_len, cmd_out, cmd_out_len);
+		err = mlx5_core_create_dct(dev, dev->mdev, &obj->core_dct,
+					   cmd_in, cmd_in_len, cmd_out,
+					   cmd_out_len);
 	} else if (opcode == MLX5_CMD_OP_CREATE_CQ &&
 		   !is_apu_cq(dev, cmd_in)) {
 		obj->flags |= DEVX_OBJ_FLAGS_CQ;
@@ -1631,7 +1633,8 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)(
 
 obj_destroy:
 	if (obj->flags & DEVX_OBJ_FLAGS_DCT)
-		mlx5_core_destroy_dct(obj->ib_dev, &obj->core_dct);
+		mlx5_core_destroy_dct(obj->ib_dev, obj->ib_dev->mdev,
+				      &obj->core_dct);
 	else if (obj->flags & DEVX_OBJ_FLAGS_CQ)
 		mlx5_core_destroy_cq(obj->ib_dev->mdev, &obj->core_cq);
 	else
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 28a2d75b3f37cade52130da86d011965823352bf..4ec9b56afef7d9fb52ebcd22e0858eb741d010be 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -3030,7 +3030,8 @@ static void delay_drop_handler(struct work_struct *work)
 	atomic_inc(&delay_drop->events_cnt);
 
 	mutex_lock(&delay_drop->lock);
-	err = mlx5_core_set_delay_drop(delay_drop->dev, delay_drop->timeout);
+	err = mlx5_core_set_delay_drop(delay_drop->dev->mdev,
+				       delay_drop->timeout);
 	if (err) {
 		mlx5_ib_warn(delay_drop->dev, "Failed to set delay drop, timeout=%u\n",
 			     delay_drop->timeout);
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index bbb73314921bdec91186bf5e855850fcb2b30632..feca1db57921f34dcdb687d1eca59fecc2fd385f 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -1262,6 +1262,29 @@ static inline struct mlx5_core_dev *__mlx5_ib_pd_to_mdev(struct mlx5_ib_pd *pd)
 		struct ib_pd * : __ib_pd_to_mdev, \
 		struct mlx5_ib_pd * : __mlx5_ib_pd_to_mdev)(pd)
 
+static inline struct mlx5_core_dev *__ibqp_to_mdev(struct ib_qp *ibqp)
+{
+	struct ib_pd *pd = ibqp->pd ?: to_dev(ibqp->device)->devr.p0;
+
+	return pd_to_mdev(pd);
+}
+
+static inline struct mlx5_core_dev *__mlx5_ibqp_to_mdev(struct mlx5_ib_qp *qp)
+{
+	return __ibqp_to_mdev(&qp->ibqp);
+}
+
+static inline struct mlx5_core_dev *__mqp_to_mdev(struct mlx5_core_qp *mqp)
+{
+	return __mlx5_ibqp_to_mdev(to_mibqp(mqp));
+}
+
+#define qp_to_mdev(q) \
+	_Generic((q), \
+		struct ib_qp * : __ibqp_to_mdev, \
+		struct mlx5_ib_qp * : __mlx5_ibqp_to_mdev, \
+		struct mlx5_core_qp * : __mqp_to_mdev)(q)
+
 static inline struct mlx5_core_dev *srq_to_mdev(struct mlx5_core_srq *msrq)
 {
 	return pd_to_mdev(to_mibsrq(msrq)->ibsrq.pd);
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index da4e9a52d2f9b778368ca0ae520442af42cbb23e..2196e06f593e16693f682fc0e9eb7a3b18131f60 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -326,22 +326,22 @@ int mlx5_ib_read_wqe_srq(struct mlx5_ib_srq *srq, int wqe_index, void *buffer,
 
 static void mlx5_ib_qp_err_syndrome(struct ib_qp *ibqp)
 {
-	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
+	struct mlx5_core_dev *mdev = qp_to_mdev(ibqp);
 	int outlen = MLX5_ST_SZ_BYTES(query_qp_out);
 	struct mlx5_ib_qp *qp = to_mqp(ibqp);
 	void *pas_ext_union, *err_syn;
 	u32 *outb;
 	int err;
 
-	if (!MLX5_CAP_GEN(dev->mdev, qpc_extension) ||
-	    !MLX5_CAP_GEN(dev->mdev, qp_error_syndrome))
+	if (!MLX5_CAP_GEN(mdev, qpc_extension) ||
+	    !MLX5_CAP_GEN(mdev, qp_error_syndrome))
 		return;
 
 	outb = kzalloc(outlen, GFP_KERNEL);
 	if (!outb)
 		return;
 
-	err = mlx5_core_qp_query(dev, &qp->trans_qp.base.mqp, outb, outlen,
+	err = mlx5_core_qp_query(mdev, &qp->trans_qp.base.mqp, outb, outlen,
 				 true);
 	if (err)
 		goto out;
@@ -1439,7 +1439,7 @@ static int create_raw_packet_qp_sq(struct mlx5_ib_dev *dev,
 	pas = (__be64 *)MLX5_ADDR_OF(wq, wq, pas);
 	mlx5_ib_populate_pas(sq->ubuffer.umem, page_size, pas, 0);
 
-	err = mlx5_core_create_sq_tracked(dev, in, inlen, &sq->base.mqp);
+	err = mlx5_core_create_sq_tracked(pd, in, inlen, &sq->base.mqp);
 
 	kvfree(in);
 
@@ -1455,11 +1455,10 @@ static int create_raw_packet_qp_sq(struct mlx5_ib_dev *dev,
 	return err;
 }
 
-static void destroy_raw_packet_qp_sq(struct mlx5_ib_dev *dev,
-				     struct mlx5_ib_sq *sq)
+static void destroy_raw_packet_qp_sq(struct ib_pd *pd, struct mlx5_ib_sq *sq)
 {
 	destroy_flow_rule_vport_sq(sq);
-	mlx5_core_destroy_sq_tracked(dev, &sq->base.mqp);
+	mlx5_core_destroy_sq_tracked(pd, &sq->base.mqp);
 	ib_umem_release(sq->ubuffer.umem);
 }
 
@@ -1526,17 +1525,16 @@ static int create_raw_packet_qp_rq(struct mlx5_ib_dev *dev,
 	pas = (__be64 *)MLX5_ADDR_OF(wq, wq, pas);
 	mlx5_ib_populate_pas(umem, page_size, pas, 0);
 
-	err = mlx5_core_create_rq_tracked(dev, in, inlen, &rq->base.mqp);
+	err = mlx5_core_create_rq_tracked(pd, in, inlen, &rq->base.mqp);
 
 	kvfree(in);
 
 	return err;
 }
 
-static void destroy_raw_packet_qp_rq(struct mlx5_ib_dev *dev,
-				     struct mlx5_ib_rq *rq)
+static void destroy_raw_packet_qp_rq(struct ib_pd *pd, struct mlx5_ib_rq *rq)
 {
-	mlx5_core_destroy_rq_tracked(dev, &rq->base.mqp);
+	mlx5_core_destroy_rq_tracked(pd, &rq->base.mqp);
 }
 
 static void destroy_raw_packet_qp_tir(struct mlx5_ib_dev *dev,
@@ -1690,11 +1688,11 @@ static int create_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 	return 0;
 
 err_destroy_rq:
-	destroy_raw_packet_qp_rq(dev, rq);
+	destroy_raw_packet_qp_rq(pd, rq);
 err_destroy_sq:
 	if (!qp->sq.wqe_cnt)
 		return err;
-	destroy_raw_packet_qp_sq(dev, sq);
+	destroy_raw_packet_qp_sq(pd, sq);
 err_destroy_tis:
 	destroy_raw_packet_qp_tis(dev, sq, pd);
 
@@ -1710,11 +1708,11 @@ static void destroy_raw_packet_qp(struct mlx5_ib_dev *dev,
 
 	if (qp->rq.wqe_cnt) {
 		destroy_raw_packet_qp_tir(dev, rq, qp->flags_en, qp->ibqp.pd);
-		destroy_raw_packet_qp_rq(dev, rq);
+		destroy_raw_packet_qp_rq(qp->ibqp.pd, rq);
 	}
 
 	if (qp->sq.wqe_cnt) {
-		destroy_raw_packet_qp_sq(dev, sq);
+		destroy_raw_packet_qp_sq(qp->ibqp.pd, sq);
 		destroy_raw_packet_qp_tis(dev, sq, qp->ibqp.pd);
 	}
 }
@@ -2722,7 +2720,7 @@ static void destroy_qp_common(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 	if (qp->state != IB_QPS_RESET) {
 		if (qp->type != IB_QPT_RAW_PACKET &&
 		    !(qp->flags & IB_QP_CREATE_SOURCE_QPN)) {
-			err = mlx5_core_qp_modify(dev, MLX5_CMD_OP_2RST_QP, 0,
+			err = mlx5_core_qp_modify(MLX5_CMD_OP_2RST_QP, 0,
 						  NULL, &base->mqp, NULL);
 		} else {
 			struct mlx5_modify_raw_qp_param raw_qp_param = {
@@ -3256,7 +3254,8 @@ static int mlx5_ib_destroy_dct(struct mlx5_ib_qp *mqp)
 	if (mqp->state == IB_QPS_RTR) {
 		int err;
 
-		err = mlx5_core_destroy_dct(dev, &mqp->dct.mdct);
+		err = mlx5_core_destroy_dct(dev, qp_to_mdev(mqp),
+					    &mqp->dct.mdct);
 		if (err) {
 			mlx5_ib_warn(dev, "failed to destroy DCT %d\n", err);
 			return err;
@@ -4550,7 +4549,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
 					ucmd->ece_options : 0;
 			resp->response_length = sizeof(*resp);
 		}
-		err = mlx5_core_qp_modify(dev, op, optpar, qpc, &base->mqp,
+		err = mlx5_core_qp_modify(op, optpar, qpc, &base->mqp,
 					  &resp->ece_options);
 
 		if (err) {
@@ -4758,7 +4757,8 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 			MLX5_SET(dctc, dctc, dp_ordering_force, 1);
 		}
 
-		err = mlx5_core_create_dct(dev, &qp->dct.mdct, qp->dct.in,
+		err = mlx5_core_create_dct(dev, qp_to_mdev(qp), &qp->dct.mdct,
+					   qp->dct.in,
 					   MLX5_ST_SZ_BYTES(create_dct_in), out,
 					   sizeof(out));
 		err = mlx5_cmd_check(dev->mdev, err, qp->dct.in, out);
@@ -4769,7 +4769,8 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 			resp.ece_options = MLX5_GET(create_dct_out, out, ece);
 		err = ib_respond_udata(udata, resp);
 		if (err) {
-			mlx5_core_destroy_dct(dev, &qp->dct.mdct);
+			mlx5_core_destroy_dct(dev, qp_to_mdev(qp),
+					      &qp->dct.mdct);
 			return err;
 		}
 	} else {
@@ -5122,8 +5123,8 @@ static int query_qp_attr(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 	if (!outb)
 		return -ENOMEM;
 
-	err = mlx5_core_qp_query(dev, &qp->trans_qp.base.mqp, outb, outlen,
-				 false);
+	err = mlx5_core_qp_query(qp_to_mdev(qp), &qp->trans_qp.base.mqp, outb,
+				 outlen, false);
 	if (err)
 		goto out;
 
@@ -5201,7 +5202,7 @@ static int mlx5_ib_dct_query_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *mqp,
 	if (!out)
 		return -ENOMEM;
 
-	err = mlx5_core_dct_query(dev, dct, out, outlen);
+	err = mlx5_core_dct_query(qp_to_mdev(mqp), dct, out, outlen);
 	if (err)
 		goto out;
 
@@ -5361,7 +5362,7 @@ static int set_delay_drop(struct mlx5_ib_dev *dev)
 	if (dev->delay_drop.activate)
 		goto out;
 
-	err = mlx5_core_set_delay_drop(dev, dev->delay_drop.timeout);
+	err = mlx5_core_set_delay_drop(dev->mdev, dev->delay_drop.timeout);
 	if (err)
 		goto out;
 
@@ -5473,13 +5474,13 @@ static int  create_rq(struct mlx5_ib_rwq *rwq, struct ib_pd *pd,
 	}
 	rq_pas0 = (__be64 *)MLX5_ADDR_OF(wq, wq, pas);
 	mlx5_ib_populate_pas(rwq->umem, 1UL << rwq->page_shift, rq_pas0, 0);
-	err = mlx5_core_create_rq_tracked(dev, in, inlen, &rwq->core_qp);
+	err = mlx5_core_create_rq_tracked(pd, in, inlen, &rwq->core_qp);
 	if (!err && init_attr->create_flags & IB_WQ_FLAGS_DELAY_DROP) {
 		err = set_delay_drop(dev);
 		if (err) {
 			mlx5_ib_warn(dev, "Failed to enable delay drop err=%d\n",
 				     err);
-			mlx5_core_destroy_rq_tracked(dev, &rwq->core_qp);
+			mlx5_core_destroy_rq_tracked(pd, &rwq->core_qp);
 		} else {
 			rwq->create_flags |= MLX5_IB_WQ_FLAGS_DELAY_DROP;
 		}
@@ -5646,7 +5647,7 @@ struct ib_wq *mlx5_ib_create_wq(struct ib_pd *pd,
 	return &rwq->ibwq;
 
 err_copy:
-	mlx5_core_destroy_rq_tracked(dev, &rwq->core_qp);
+	mlx5_core_destroy_rq_tracked(pd, &rwq->core_qp);
 err_user_rq:
 	destroy_user_rq(dev, pd, rwq, udata);
 err:
@@ -5660,7 +5661,7 @@ int mlx5_ib_destroy_wq(struct ib_wq *wq, struct ib_udata *udata)
 	struct mlx5_ib_rwq *rwq = to_mrwq(wq);
 	int ret;
 
-	ret = mlx5_core_destroy_rq_tracked(dev, &rwq->core_qp);
+	ret = mlx5_core_destroy_rq_tracked(wq->pd, &rwq->core_qp);
 	if (ret)
 		return ret;
 	destroy_user_rq(dev, wq->pd, rwq, udata);
diff --git a/drivers/infiniband/hw/mlx5/qp.h b/drivers/infiniband/hw/mlx5/qp.h
index 2530e7730635f30cf6b2fe9b54a3c61de5d1f53c..9dabf0326071814eb44c47637ef95e6088ba35d8 100644
--- a/drivers/infiniband/hw/mlx5/qp.h
+++ b/drivers/infiniband/hw/mlx5/qp.h
@@ -21,29 +21,29 @@ struct mlx5_qp_table {
 int mlx5_init_qp_table(struct mlx5_ib_dev *dev);
 void mlx5_cleanup_qp_table(struct mlx5_ib_dev *dev);
 
-int mlx5_core_create_dct(struct mlx5_ib_dev *dev, struct mlx5_core_dct *qp,
-			 u32 *in, int inlen, u32 *out, int outlen);
+int mlx5_core_create_dct(struct mlx5_ib_dev *dev, struct mlx5_core_dev *mdev,
+			 struct mlx5_core_dct *qp, u32 *in, int inlen,
+			 u32 *out, int outlen);
 int mlx5_qpc_create_qp(struct mlx5_ib_dev *dev, struct mlx5_core_qp *qp,
 		       u32 *in, int inlen, u32 *out);
-int mlx5_core_qp_modify(struct mlx5_ib_dev *dev, u16 opcode, u32 opt_param_mask,
-			void *qpc, struct mlx5_core_qp *qp, u32 *ece);
+int mlx5_core_qp_modify(u16 opcode, u32 opt_param_mask, void *qpc,
+			struct mlx5_core_qp *qp, u32 *ece);
 int mlx5_core_destroy_qp(struct mlx5_ib_dev *dev, struct mlx5_core_qp *qp);
-int mlx5_core_destroy_dct(struct mlx5_ib_dev *dev, struct mlx5_core_dct *dct);
-int mlx5_core_qp_query(struct mlx5_ib_dev *dev, struct mlx5_core_qp *qp,
+int mlx5_core_destroy_dct(struct mlx5_ib_dev *dev, struct mlx5_core_dev *mdev,
+			  struct mlx5_core_dct *dct);
+int mlx5_core_qp_query(struct mlx5_core_dev *mdev, struct mlx5_core_qp *qp,
 		       u32 *out, int outlen, bool qpc_ext);
-int mlx5_core_dct_query(struct mlx5_ib_dev *dev, struct mlx5_core_dct *dct,
+int mlx5_core_dct_query(struct mlx5_core_dev *mdev, struct mlx5_core_dct *dct,
 			u32 *out, int outlen);
 
-int mlx5_core_set_delay_drop(struct mlx5_ib_dev *dev, u32 timeout_usec);
+int mlx5_core_set_delay_drop(struct mlx5_core_dev *mdev, u32 timeout_usec);
 
-int mlx5_core_destroy_rq_tracked(struct mlx5_ib_dev *dev,
-				 struct mlx5_core_qp *rq);
-int mlx5_core_create_sq_tracked(struct mlx5_ib_dev *dev, u32 *in, int inlen,
+int mlx5_core_destroy_rq_tracked(struct ib_pd *pd, struct mlx5_core_qp *rq);
+int mlx5_core_create_sq_tracked(struct ib_pd *pd, u32 *in, int inlen,
 				struct mlx5_core_qp *sq);
-void mlx5_core_destroy_sq_tracked(struct mlx5_ib_dev *dev,
-				  struct mlx5_core_qp *sq);
+void mlx5_core_destroy_sq_tracked(struct ib_pd *pd, struct mlx5_core_qp *sq);
 
-int mlx5_core_create_rq_tracked(struct mlx5_ib_dev *dev, u32 *in, int inlen,
+int mlx5_core_create_rq_tracked(struct ib_pd *pd, u32 *in, int inlen,
 				struct mlx5_core_qp *rq);
 
 struct mlx5_core_rsc_common *mlx5_core_res_hold(struct mlx5_ib_dev *dev,
@@ -51,8 +51,8 @@ struct mlx5_core_rsc_common *mlx5_core_res_hold(struct mlx5_ib_dev *dev,
 						enum mlx5_res_type res_type);
 void mlx5_core_res_put(struct mlx5_core_rsc_common *res);
 
-int mlx5_core_xrcd_alloc(struct mlx5_ib_dev *dev, u32 *xrcdn);
-int mlx5_core_xrcd_dealloc(struct mlx5_ib_dev *dev, u32 xrcdn);
+int mlx5_core_xrcd_alloc(struct mlx5_core_dev *mdev, u32 *xrcdn);
+int mlx5_core_xrcd_dealloc(struct mlx5_core_dev *mdev, u32 xrcdn);
 int mlx5_ib_qp_set_counter(struct ib_qp *qp, struct rdma_counter *counter);
 int mlx5_ib_qp_event_init(void);
 void mlx5_ib_qp_event_cleanup(void);
diff --git a/drivers/infiniband/hw/mlx5/qpc.c b/drivers/infiniband/hw/mlx5/qpc.c
index a1b15c0346d34e9b969a2b60298b78930d8769d6..5fde1570c75da4d91aa3dc9de2962e89d21a2448 100644
--- a/drivers/infiniband/hw/mlx5/qpc.c
+++ b/drivers/infiniband/hw/mlx5/qpc.c
@@ -9,7 +9,7 @@
 #include "mlx5_ib.h"
 #include "qp.h"
 
-static int mlx5_core_drain_dct(struct mlx5_ib_dev *dev,
+static int mlx5_core_drain_dct(struct mlx5_core_dev *mdev,
 			       struct mlx5_core_dct *dct);
 
 static struct mlx5_core_rsc_common *
@@ -208,7 +208,7 @@ static void destroy_resource_common(struct mlx5_ib_dev *dev,
 	wait_for_completion(&qp->common.free);
 }
 
-static int _mlx5_core_destroy_dct(struct mlx5_ib_dev *dev,
+static int _mlx5_core_destroy_dct(struct mlx5_core_dev *mdev,
 				  struct mlx5_core_dct *dct)
 {
 	u32 in[MLX5_ST_SZ_DW(destroy_dct_in)] = {};
@@ -217,11 +217,12 @@ static int _mlx5_core_destroy_dct(struct mlx5_ib_dev *dev,
 	MLX5_SET(destroy_dct_in, in, opcode, MLX5_CMD_OP_DESTROY_DCT);
 	MLX5_SET(destroy_dct_in, in, dctn, qp->qpn);
 	MLX5_SET(destroy_dct_in, in, uid, qp->uid);
-	return mlx5_cmd_exec_in(dev->mdev, destroy_dct, in);
+	return mlx5_cmd_exec_in(mdev, destroy_dct, in);
 }
 
-int mlx5_core_create_dct(struct mlx5_ib_dev *dev, struct mlx5_core_dct *dct,
-			 u32 *in, int inlen, u32 *out, int outlen)
+int mlx5_core_create_dct(struct mlx5_ib_dev *dev, struct mlx5_core_dev *mdev,
+			 struct mlx5_core_dct *dct, u32 *in, int inlen,
+			 u32 *out, int outlen)
 {
 	struct mlx5_core_qp *qp = &dct->mqp;
 	int err;
@@ -229,7 +230,7 @@ int mlx5_core_create_dct(struct mlx5_ib_dev *dev, struct mlx5_core_dct *dct,
 	init_completion(&dct->drained);
 	MLX5_SET(create_dct_in, in, opcode, MLX5_CMD_OP_CREATE_DCT);
 
-	err = mlx5_cmd_do(dev->mdev, in, inlen, out, outlen);
+	err = mlx5_cmd_do(mdev, in, inlen, out, outlen);
 	if (err)
 		return err;
 
@@ -241,19 +242,20 @@ int mlx5_core_create_dct(struct mlx5_ib_dev *dev, struct mlx5_core_dct *dct,
 
 	return 0;
 err_cmd:
-	_mlx5_core_destroy_dct(dev, dct);
+	_mlx5_core_destroy_dct(mdev, dct);
 	return err;
 }
 
 int mlx5_qpc_create_qp(struct mlx5_ib_dev *dev, struct mlx5_core_qp *qp,
 		       u32 *in, int inlen, u32 *out)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	u32 din[MLX5_ST_SZ_DW(destroy_qp_in)] = {};
 	int err;
 
 	MLX5_SET(create_qp_in, in, opcode, MLX5_CMD_OP_CREATE_QP);
 
-	err = mlx5_cmd_exec(dev->mdev, in, inlen, out,
+	err = mlx5_cmd_exec(mdev, in, inlen, out,
 			    MLX5_ST_SZ_BYTES(create_qp_out));
 	if (err)
 		return err;
@@ -274,7 +276,7 @@ int mlx5_qpc_create_qp(struct mlx5_ib_dev *dev, struct mlx5_core_qp *qp,
 		goto err_cmd;
 
 	if (dev->ib_dev.type != RDMA_DEVICE_TYPE_SMI)
-		mlx5_debug_qp_add(dev->mdev, qp);
+		mlx5_debug_qp_add(mdev, qp);
 
 	return 0;
 
@@ -282,11 +284,11 @@ int mlx5_qpc_create_qp(struct mlx5_ib_dev *dev, struct mlx5_core_qp *qp,
 	MLX5_SET(destroy_qp_in, din, opcode, MLX5_CMD_OP_DESTROY_QP);
 	MLX5_SET(destroy_qp_in, din, qpn, qp->qpn);
 	MLX5_SET(destroy_qp_in, din, uid, qp->uid);
-	mlx5_cmd_exec_in(dev->mdev, destroy_qp, din);
+	mlx5_cmd_exec_in(mdev, destroy_qp, din);
 	return err;
 }
 
-static int mlx5_core_drain_dct(struct mlx5_ib_dev *dev,
+static int mlx5_core_drain_dct(struct mlx5_core_dev *mdev,
 			       struct mlx5_core_dct *dct)
 {
 	u32 in[MLX5_ST_SZ_DW(drain_dct_in)] = {};
@@ -295,19 +297,19 @@ static int mlx5_core_drain_dct(struct mlx5_ib_dev *dev,
 	MLX5_SET(drain_dct_in, in, opcode, MLX5_CMD_OP_DRAIN_DCT);
 	MLX5_SET(drain_dct_in, in, dctn, qp->qpn);
 	MLX5_SET(drain_dct_in, in, uid, qp->uid);
-	return mlx5_cmd_exec_in(dev->mdev, drain_dct, in);
+	return mlx5_cmd_exec_in(mdev, drain_dct, in);
 }
 
-int mlx5_core_destroy_dct(struct mlx5_ib_dev *dev,
+int mlx5_core_destroy_dct(struct mlx5_ib_dev *dev, struct mlx5_core_dev *mdev,
 			  struct mlx5_core_dct *dct)
 {
 	struct mlx5_qp_table *table = &dev->qp_table;
 	struct mlx5_core_dct *tmp;
 	int err;
 
-	err = mlx5_core_drain_dct(dev, dct);
+	err = mlx5_core_drain_dct(mdev, dct);
 	if (err) {
-		if (dev->mdev->state == MLX5_DEVICE_STATE_INTERNAL_ERROR)
+		if (mdev->state == MLX5_DEVICE_STATE_INTERNAL_ERROR)
 			goto destroy;
 
 		return err;
@@ -319,7 +321,7 @@ int mlx5_core_destroy_dct(struct mlx5_ib_dev *dev,
 	if (WARN_ON(tmp != dct))
 		return xa_err(tmp) ?: -EINVAL;
 
-	err = _mlx5_core_destroy_dct(dev, dct);
+	err = _mlx5_core_destroy_dct(mdev, dct);
 	if (err) {
 		xa_cmpxchg_irq(&table->dct_xa, dct->mqp.qpn, XA_ZERO_ENTRY, dct, 0);
 		return err;
@@ -337,20 +339,21 @@ int mlx5_core_destroy_dct(struct mlx5_ib_dev *dev,
 
 int mlx5_core_destroy_qp(struct mlx5_ib_dev *dev, struct mlx5_core_qp *qp)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	u32 in[MLX5_ST_SZ_DW(destroy_qp_in)] = {};
 
 	if (dev->ib_dev.type != RDMA_DEVICE_TYPE_SMI)
-		mlx5_debug_qp_remove(dev->mdev, qp);
+		mlx5_debug_qp_remove(mdev, qp);
 
 	destroy_resource_common(dev, qp);
 
 	MLX5_SET(destroy_qp_in, in, opcode, MLX5_CMD_OP_DESTROY_QP);
 	MLX5_SET(destroy_qp_in, in, qpn, qp->qpn);
 	MLX5_SET(destroy_qp_in, in, uid, qp->uid);
-	return mlx5_cmd_exec_in(dev->mdev, destroy_qp, in);
+	return mlx5_cmd_exec_in(mdev, destroy_qp, in);
 }
 
-int mlx5_core_set_delay_drop(struct mlx5_ib_dev *dev,
+int mlx5_core_set_delay_drop(struct mlx5_core_dev *mdev,
 			     u32 timeout_usec)
 {
 	u32 in[MLX5_ST_SZ_DW(set_delay_drop_params_in)] = {};
@@ -359,7 +362,7 @@ int mlx5_core_set_delay_drop(struct mlx5_ib_dev *dev,
 		 MLX5_CMD_OP_SET_DELAY_DROP_PARAMS);
 	MLX5_SET(set_delay_drop_params_in, in, delay_drop_timeout,
 		 timeout_usec / 100);
-	return mlx5_cmd_exec_in(dev->mdev, set_delay_drop_params, in);
+	return mlx5_cmd_exec_in(mdev, set_delay_drop_params, in);
 }
 
 struct mbox_info {
@@ -509,18 +512,19 @@ static int modify_qp_mbox_alloc(struct mlx5_core_dev *mdev, u16 opcode, int qpn,
 	return 0;
 }
 
-int mlx5_core_qp_modify(struct mlx5_ib_dev *dev, u16 opcode, u32 opt_param_mask,
-			void *qpc, struct mlx5_core_qp *qp, u32 *ece)
+int mlx5_core_qp_modify(u16 opcode, u32 opt_param_mask, void *qpc,
+			struct mlx5_core_qp *qp, u32 *ece)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	struct mbox_info mbox;
 	int err;
 
-	err = modify_qp_mbox_alloc(dev->mdev, opcode, qp->qpn, opt_param_mask,
+	err = modify_qp_mbox_alloc(mdev, opcode, qp->qpn, opt_param_mask,
 				   qpc, &mbox, qp->uid, (ece) ? *ece : 0);
 	if (err)
 		return err;
 
-	err = mlx5_cmd_exec(dev->mdev, mbox.in, mbox.inlen, mbox.out,
+	err = mlx5_cmd_exec(mdev, mbox.in, mbox.inlen, mbox.out,
 			    mbox.outlen);
 
 	if (ece)
@@ -556,7 +560,7 @@ void mlx5_cleanup_qp_table(struct mlx5_ib_dev *dev)
 		mlx5_qp_debugfs_cleanup(dev->mdev);
 }
 
-int mlx5_core_qp_query(struct mlx5_ib_dev *dev, struct mlx5_core_qp *qp,
+int mlx5_core_qp_query(struct mlx5_core_dev *mdev, struct mlx5_core_qp *qp,
 		       u32 *out, int outlen, bool qpc_ext)
 {
 	u32 in[MLX5_ST_SZ_DW(query_qp_in)] = {};
@@ -565,10 +569,10 @@ int mlx5_core_qp_query(struct mlx5_ib_dev *dev, struct mlx5_core_qp *qp,
 	MLX5_SET(query_qp_in, in, qpn, qp->qpn);
 	MLX5_SET(query_qp_in, in, qpc_ext, qpc_ext);
 
-	return mlx5_cmd_exec(dev->mdev, in, sizeof(in), out, outlen);
+	return mlx5_cmd_exec(mdev, in, sizeof(in), out, outlen);
 }
 
-int mlx5_core_dct_query(struct mlx5_ib_dev *dev, struct mlx5_core_dct *dct,
+int mlx5_core_dct_query(struct mlx5_core_dev *mdev, struct mlx5_core_dct *dct,
 			u32 *out, int outlen)
 {
 	u32 in[MLX5_ST_SZ_DW(query_dct_in)] = {};
@@ -577,49 +581,51 @@ int mlx5_core_dct_query(struct mlx5_ib_dev *dev, struct mlx5_core_dct *dct,
 	MLX5_SET(query_dct_in, in, opcode, MLX5_CMD_OP_QUERY_DCT);
 	MLX5_SET(query_dct_in, in, dctn, qp->qpn);
 
-	return mlx5_cmd_exec(dev->mdev, (void *)&in, sizeof(in), (void *)out,
-			     outlen);
+	return mlx5_cmd_exec(mdev, (void *)&in, sizeof(in),
+			     (void *)out, outlen);
 }
 
-int mlx5_core_xrcd_alloc(struct mlx5_ib_dev *dev, u32 *xrcdn)
+int mlx5_core_xrcd_alloc(struct mlx5_core_dev *mdev, u32 *xrcdn)
 {
 	u32 out[MLX5_ST_SZ_DW(alloc_xrcd_out)] = {};
 	u32 in[MLX5_ST_SZ_DW(alloc_xrcd_in)] = {};
 	int err;
 
 	MLX5_SET(alloc_xrcd_in, in, opcode, MLX5_CMD_OP_ALLOC_XRCD);
-	err = mlx5_cmd_exec_inout(dev->mdev, alloc_xrcd, in, out);
+	err = mlx5_cmd_exec_inout(mdev, alloc_xrcd, in, out);
 	if (!err)
 		*xrcdn = MLX5_GET(alloc_xrcd_out, out, xrcd);
 	return err;
 }
 
-int mlx5_core_xrcd_dealloc(struct mlx5_ib_dev *dev, u32 xrcdn)
+int mlx5_core_xrcd_dealloc(struct mlx5_core_dev *mdev, u32 xrcdn)
 {
 	u32 in[MLX5_ST_SZ_DW(dealloc_xrcd_in)] = {};
 
 	MLX5_SET(dealloc_xrcd_in, in, opcode, MLX5_CMD_OP_DEALLOC_XRCD);
 	MLX5_SET(dealloc_xrcd_in, in, xrcd, xrcdn);
-	return mlx5_cmd_exec_in(dev->mdev, dealloc_xrcd, in);
+	return mlx5_cmd_exec_in(mdev, dealloc_xrcd, in);
 }
 
-static int destroy_rq_tracked(struct mlx5_ib_dev *dev, u32 rqn, u16 uid)
+static int destroy_rq_tracked(struct mlx5_core_dev *mdev, u32 rqn, u16 uid)
 {
 	u32 in[MLX5_ST_SZ_DW(destroy_rq_in)] = {};
 
 	MLX5_SET(destroy_rq_in, in, opcode, MLX5_CMD_OP_DESTROY_RQ);
 	MLX5_SET(destroy_rq_in, in, rqn, rqn);
 	MLX5_SET(destroy_rq_in, in, uid, uid);
-	return mlx5_cmd_exec_in(dev->mdev, destroy_rq, in);
+	return mlx5_cmd_exec_in(mdev, destroy_rq, in);
 }
 
-int mlx5_core_create_rq_tracked(struct mlx5_ib_dev *dev, u32 *in, int inlen,
+int mlx5_core_create_rq_tracked(struct ib_pd *pd, u32 *in, int inlen,
 				struct mlx5_core_qp *rq)
 {
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	int err;
 	u32 rqn;
 
-	err = mlx5_core_create_rq(dev->mdev, in, inlen, &rqn);
+	err = mlx5_core_create_rq(mdev, in, inlen, &rqn);
 	if (err)
 		return err;
 
@@ -632,14 +638,14 @@ int mlx5_core_create_rq_tracked(struct mlx5_ib_dev *dev, u32 *in, int inlen,
 	return 0;
 
 err_destroy_rq:
-	destroy_rq_tracked(dev, rq->qpn, rq->uid);
+	destroy_rq_tracked(mdev, rq->qpn, rq->uid);
 
 	return err;
 }
 
-int mlx5_core_destroy_rq_tracked(struct mlx5_ib_dev *dev,
-				 struct mlx5_core_qp *rq)
+int mlx5_core_destroy_rq_tracked(struct ib_pd *pd, struct mlx5_core_qp *rq)
 {
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	int ret;
 
 	/* The rq destruction can be called again in case it fails, hence we
@@ -647,7 +653,7 @@ int mlx5_core_destroy_rq_tracked(struct mlx5_ib_dev *dev,
 	 * is completed successfully we actually destroy the resources.
 	 */
 	modify_resource_common_state(dev, rq, true);
-	ret = destroy_rq_tracked(dev, rq->qpn, rq->uid);
+	ret = destroy_rq_tracked(pd_to_mdev(pd), rq->qpn, rq->uid);
 	if (ret) {
 		modify_resource_common_state(dev, rq, false);
 		return ret;
@@ -656,24 +662,26 @@ int mlx5_core_destroy_rq_tracked(struct mlx5_ib_dev *dev,
 	return 0;
 }
 
-static void destroy_sq_tracked(struct mlx5_ib_dev *dev, u32 sqn, u16 uid)
+static void destroy_sq_tracked(struct mlx5_core_dev *mdev, u32 sqn, u16 uid)
 {
 	u32 in[MLX5_ST_SZ_DW(destroy_sq_in)] = {};
 
 	MLX5_SET(destroy_sq_in, in, opcode, MLX5_CMD_OP_DESTROY_SQ);
 	MLX5_SET(destroy_sq_in, in, sqn, sqn);
 	MLX5_SET(destroy_sq_in, in, uid, uid);
-	mlx5_cmd_exec_in(dev->mdev, destroy_sq, in);
+	mlx5_cmd_exec_in(mdev, destroy_sq, in);
 }
 
-int mlx5_core_create_sq_tracked(struct mlx5_ib_dev *dev, u32 *in, int inlen,
+int mlx5_core_create_sq_tracked(struct ib_pd *pd, u32 *in, int inlen,
 				struct mlx5_core_qp *sq)
 {
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	u32 out[MLX5_ST_SZ_DW(create_sq_out)] = {};
 	int err;
 
 	MLX5_SET(create_sq_in, in, opcode, MLX5_CMD_OP_CREATE_SQ);
-	err = mlx5_cmd_exec(dev->mdev, in, inlen, out, sizeof(out));
+	err = mlx5_cmd_exec(mdev, in, inlen, out, sizeof(out));
 	if (err)
 		return err;
 
@@ -686,16 +694,17 @@ int mlx5_core_create_sq_tracked(struct mlx5_ib_dev *dev, u32 *in, int inlen,
 	return 0;
 
 err_destroy_sq:
-	destroy_sq_tracked(dev, sq->qpn, sq->uid);
+	destroy_sq_tracked(mdev, sq->qpn, sq->uid);
 
 	return err;
 }
 
-void mlx5_core_destroy_sq_tracked(struct mlx5_ib_dev *dev,
-				  struct mlx5_core_qp *sq)
+void mlx5_core_destroy_sq_tracked(struct ib_pd *pd, struct mlx5_core_qp *sq)
 {
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
+
 	destroy_resource_common(dev, sq);
-	destroy_sq_tracked(dev, sq->qpn, sq->uid);
+	destroy_sq_tracked(pd_to_mdev(pd), sq->qpn, sq->uid);
 }
 
 struct mlx5_core_rsc_common *mlx5_core_res_hold(struct mlx5_ib_dev *dev,

-- 
2.49.0


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH rdma-next 05/11] RDMA/mlx5: Cache the MR core device and resolve the MW's via its PD
  2026-11-17 14:01 [PATCH rdma-next 00/11] RDMA/mlx5: Preparation for SD support Edward Srouji
                   ` (3 preceding siblings ...)
  2026-11-17 14:01 ` [PATCH rdma-next 04/11] RDMA/mlx5: Select the core device through PD for QP commands Edward Srouji
@ 2026-11-17 14:01 ` Edward Srouji
  2026-11-17 14:01 ` [PATCH rdma-next 06/11] RDMA/mlx5: Select the AH core device through their PD Edward Srouji
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Edward Srouji @ 2026-11-17 14:01 UTC (permalink / raw)
  To: Leon Romanovsky, Jason Gunthorpe, Sabrina Dubroca
  Cc: linux-rdma, linux-kernel, netdev, Edward Srouji,
	Akiva Goldberger, Michael Gur

From: Akiva Goldberger <agoldberger@nvidia.com>

Add mr_to_mdev() and mw_to_mdev() to reach the core device of an MR or
an MW from the resource itself instead of dev->mdev.

An MW resolves its core device through its PD, like the other resources
in this series. An MR cannot: ib_mr->pd is not a fixed pointer, since
IB_MR_REREG_PD replaces it in place, and ODP page faults, prefetch and
mmu notifier invalidation reach an MR without the uobject lock that
protects it. Store the core device in the MR when it is created instead.
MRs taken from the MR cache get it from their caller, which resolves it
from the PD or from the parent implicit ODP MR.

No functional change.

Signed-off-by: Akiva Goldberger <agoldberger@nvidia.com>
Reviewed-by: Michael Gur <michaelgur@nvidia.com>
Signed-off-by: Edward Srouji <edwards@nvidia.com>
---
 drivers/infiniband/hw/mlx5/devx.c    |   2 +-
 drivers/infiniband/hw/mlx5/mlx5_ib.h |  49 ++++++----
 drivers/infiniband/hw/mlx5/mr.c      | 172 ++++++++++++++++++++---------------
 drivers/infiniband/hw/mlx5/odp.c     |  34 ++++---
 drivers/infiniband/hw/mlx5/umr.c     | 127 +++++++++++++-------------
 drivers/infiniband/hw/mlx5/umr.h     |  22 ++---
 drivers/infiniband/hw/mlx5/wr.c      |   3 +-
 7 files changed, 226 insertions(+), 183 deletions(-)

diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c
index aa27fce2e197c22a9b2ebdfae5c96cbd0a41102f..6d390e784b2f9eed524db40b8c9e2927c7de50a0 100644
--- a/drivers/infiniband/hw/mlx5/devx.c
+++ b/drivers/infiniband/hw/mlx5/devx.c
@@ -2382,7 +2382,7 @@ static int devx_umem_reg_cmd_alloc(struct mlx5_ib_dev *dev,
 	MLX5_SET(umem, umem, page_offset,
 		 ib_umem_dma_offset(obj->umem, page_size));
 
-	if (mlx5_umem_needs_ats(dev, obj->umem, access))
+	if (mlx5_umem_needs_ats(dev->mdev, obj->umem, access))
 		MLX5_SET(umem, umem, ats, 1);
 
 	mlx5_ib_populate_pas(obj->umem, page_size, mtt,
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index feca1db57921f34dcdb687d1eca59fecc2fd385f..f110803cd30694f05ce7d5bf9fdd35e6b5c003fd 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -680,6 +680,7 @@ struct mlx5_ib_mkey {
 struct mlx5_ib_mr {
 	struct ib_mr ibmr;
 	struct mlx5_ib_mkey mmkey;
+	struct mlx5_core_dev *mdev;
 
 	struct ib_umem *umem;
 	/* The mr is data direct related */
@@ -1290,6 +1291,16 @@ static inline struct mlx5_core_dev *srq_to_mdev(struct mlx5_core_srq *msrq)
 	return pd_to_mdev(to_mibsrq(msrq)->ibsrq.pd);
 }
 
+static inline struct mlx5_core_dev *mr_to_mdev(struct mlx5_ib_mr *mr)
+{
+	return mr->mdev;
+}
+
+static inline struct mlx5_core_dev *mw_to_mdev(struct ib_mw *ibmw)
+{
+	return pd_to_mdev(ibmw->pd);
+}
+
 static inline struct mlx5_ib_mw *to_mmw(struct ib_mw *ibmw)
 {
 	return container_of(ibmw, struct mlx5_ib_mw, ibmw);
@@ -1429,6 +1440,7 @@ int mlx5_ib_get_cqe_size(struct ib_cq *ibcq);
 int mlx5r_frmr_pools_init(struct ib_device *device);
 void mlx5r_frmr_pools_cleanup(struct ib_device *device);
 struct mlx5_ib_mr *mlx5_mr_cache_alloc(struct mlx5_ib_dev *dev,
+				       struct mlx5_core_dev *mdev,
 				       int access_flags, int access_mode,
 				       int ndescs);
 
@@ -1716,10 +1728,10 @@ static inline bool rt_supported(int ts_cap)
  *
  * For now assume if the umem is a dma_buf then it is P2P.
  */
-static inline bool mlx5_umem_needs_ats(struct mlx5_ib_dev *dev,
+static inline bool mlx5_umem_needs_ats(struct mlx5_core_dev *mdev,
 				       struct ib_umem *umem, int access_flags)
 {
-	if (!MLX5_CAP_GEN(dev->mdev, ats) || !umem->is_dmabuf)
+	if (!MLX5_CAP_GEN(mdev, ats) || !umem->is_dmabuf)
 		return false;
 	return access_flags & IB_ACCESS_RELAXED_ORDERING;
 }
@@ -1733,39 +1745,39 @@ static inline u32 smi_to_native_portnum(struct mlx5_ib_dev *dev, u32 port)
 	return (port - 1) / dev->num_ports + 1;
 }
 
-static inline unsigned int get_max_log_entity_size_cap(struct mlx5_ib_dev *dev,
-						       int access_mode)
+static inline unsigned int
+get_max_log_entity_size_cap(struct mlx5_core_dev *mdev, int access_mode)
 {
 	int max_log_size = 0;
 
 	if (access_mode == MLX5_MKC_ACCESS_MODE_MTT)
 		max_log_size =
-			MLX5_CAP_GEN_2(dev->mdev, max_mkey_log_entity_size_mtt);
+			MLX5_CAP_GEN_2(mdev, max_mkey_log_entity_size_mtt);
 	else if (access_mode == MLX5_MKC_ACCESS_MODE_KSM)
 		max_log_size = MLX5_CAP_GEN_2(
-			dev->mdev, max_mkey_log_entity_size_fixed_buffer);
+			mdev, max_mkey_log_entity_size_fixed_buffer);
 
 	if (!max_log_size ||
 	    (max_log_size > 31 &&
-	     !MLX5_CAP_GEN_2(dev->mdev, umr_log_entity_size_5)))
+	     !MLX5_CAP_GEN_2(mdev, umr_log_entity_size_5)))
 		max_log_size = 31;
 
 	return max_log_size;
 }
 
-static inline unsigned int get_min_log_entity_size_cap(struct mlx5_ib_dev *dev,
-						       int access_mode)
+static inline unsigned int
+get_min_log_entity_size_cap(struct mlx5_core_dev *mdev, int access_mode)
 {
 	int min_log_size = 0;
 
 	if (access_mode == MLX5_MKC_ACCESS_MODE_KSM &&
-	    MLX5_CAP_GEN_2(dev->mdev,
+	    MLX5_CAP_GEN_2(mdev,
 			   min_mkey_log_entity_size_fixed_buffer_valid))
 		min_log_size = MLX5_CAP_GEN_2(
-			dev->mdev, min_mkey_log_entity_size_fixed_buffer);
+			mdev, min_mkey_log_entity_size_fixed_buffer);
 	else
 		min_log_size =
-			MLX5_CAP_GEN_2(dev->mdev, log_min_mkey_entity_size);
+			MLX5_CAP_GEN_2(mdev, log_min_mkey_entity_size);
 
 	min_log_size = max(min_log_size, MLX5_ADAPTER_PAGE_SHIFT);
 	return min_log_size;
@@ -1776,14 +1788,16 @@ static inline unsigned int get_min_log_entity_size_cap(struct mlx5_ib_dev *dev,
  * specifies both the page_offset and the on-the-wire IOVA
  */
 static __always_inline unsigned long
-mlx5_umem_mkc_find_best_pgsz(struct mlx5_ib_dev *dev, struct ib_umem *umem,
+mlx5_umem_mkc_find_best_pgsz(struct mlx5_core_dev *mdev, struct ib_umem *umem,
 			     u64 iova, int access_mode)
 {
 	unsigned int max_log_entity_size_cap, min_log_entity_size_cap;
 	unsigned long bitmap;
 
-	max_log_entity_size_cap = get_max_log_entity_size_cap(dev, access_mode);
-	min_log_entity_size_cap = get_min_log_entity_size_cap(dev, access_mode);
+	max_log_entity_size_cap =
+		get_max_log_entity_size_cap(mdev, access_mode);
+	min_log_entity_size_cap =
+		get_min_log_entity_size_cap(mdev, access_mode);
 
 	bitmap = GENMASK_ULL(max_log_entity_size_cap, min_log_entity_size_cap);
 
@@ -1795,10 +1809,11 @@ mlx5_umem_mkc_find_best_pgsz(struct mlx5_ib_dev *dev, struct ib_umem *umem,
 }
 
 static inline unsigned long
-mlx5_umem_dmabuf_find_best_pgsz(struct ib_umem_dmabuf *umem_dmabuf,
+mlx5_umem_dmabuf_find_best_pgsz(struct mlx5_core_dev *mdev,
+				struct ib_umem_dmabuf *umem_dmabuf,
 				int access_mode)
 {
-	return mlx5_umem_mkc_find_best_pgsz(to_dev(umem_dmabuf->umem.ibdev),
+	return mlx5_umem_mkc_find_best_pgsz(mdev,
 					    &umem_dmabuf->umem,
 					    umem_dmabuf->umem.iova,
 					    access_mode);
diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c
index 1262d3ebc59213bfc3188042d25c625c6cfa43c2..c30da9eb9659ebfa635d9480c0a44591618980c7 100644
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@ -46,9 +46,9 @@
 #include "umr.h"
 #include "dmah.h"
 
-static int mkey_max_umr_order(struct mlx5_ib_dev *dev)
+static int mkey_max_umr_order(struct mlx5_core_dev *mdev)
 {
-	if (MLX5_CAP_GEN(dev->mdev, umr_extended_translation_offset))
+	if (MLX5_CAP_GEN(mdev, umr_extended_translation_offset))
 		return MLX5_MAX_UMR_EXTENDED_SHIFT;
 	return MLX5_MAX_UMR_SHIFT;
 }
@@ -62,7 +62,7 @@ static int __mlx5_ib_dereg_mr(struct ib_mr *ibmr);
 static void set_mkc_access_pd_addr_fields(void *mkc, int acc, u64 start_addr,
 					  struct ib_pd *pd)
 {
-	struct mlx5_ib_dev *dev = to_dev(pd->device);
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 
 	MLX5_SET(mkc, mkc, a, !!(acc & IB_ACCESS_REMOTE_ATOMIC));
 	MLX5_SET(mkc, mkc, rw, !!(acc & IB_ACCESS_REMOTE_WRITE));
@@ -71,13 +71,13 @@ static void set_mkc_access_pd_addr_fields(void *mkc, int acc, u64 start_addr,
 	MLX5_SET(mkc, mkc, lr, 1);
 
 	if (acc & IB_ACCESS_RELAXED_ORDERING) {
-		if (MLX5_CAP_GEN(dev->mdev, relaxed_ordering_write))
+		if (MLX5_CAP_GEN(mdev, relaxed_ordering_write))
 			MLX5_SET(mkc, mkc, relaxed_ordering_write, 1);
 
-		if (MLX5_CAP_GEN(dev->mdev, relaxed_ordering_read) ||
-		    (MLX5_CAP_GEN(dev->mdev,
+		if (MLX5_CAP_GEN(mdev, relaxed_ordering_read) ||
+		    (MLX5_CAP_GEN(mdev,
 				  relaxed_ordering_read_pci_enabled) &&
-		     pcie_relaxed_ordering_enabled(dev->mdev->pdev)))
+		     pcie_relaxed_ordering_enabled(mdev->pdev)))
 			MLX5_SET(mkc, mkc, relaxed_ordering_read, 1);
 	}
 
@@ -97,12 +97,13 @@ static void assign_mkey_variant(struct mlx5_ib_dev *dev, u32 *mkey, u32 *in)
 }
 
 static int mlx5_ib_create_mkey(struct mlx5_ib_dev *dev,
+			       struct mlx5_core_dev *mdev,
 			       struct mlx5_ib_mkey *mkey, u32 *in, int inlen)
 {
 	int ret;
 
 	assign_mkey_variant(dev, &mkey->key, in);
-	ret = mlx5_core_create_mkey(dev->mdev, &mkey->key, in, inlen);
+	ret = mlx5_core_create_mkey(mdev, &mkey->key, in, inlen);
 	if (!ret)
 		init_waitqueue_head(&mkey->wait);
 
@@ -113,7 +114,8 @@ static int destroy_mkey(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr)
 {
 	WARN_ON(xa_load(&dev->odp_mkeys, mlx5_base_mkey(mr->mmkey.key)));
 
-	return mlx5_core_destroy_mkey(dev->mdev, mr->mmkey.key);
+	return mlx5_core_destroy_mkey(mr_to_mdev(mr),
+				      mr->mmkey.key);
 }
 
 static int get_mkc_octo_size(unsigned int access_mode, unsigned int ndescs)
@@ -135,25 +137,25 @@ static int get_mkc_octo_size(unsigned int access_mode, unsigned int ndescs)
 	return ret;
 }
 
-static int get_unchangeable_access_flags(struct mlx5_ib_dev *dev,
+static int get_unchangeable_access_flags(struct mlx5_core_dev *mdev,
 					 int access_flags)
 {
 	int ret = 0;
 
 	if ((access_flags & IB_ACCESS_REMOTE_ATOMIC) &&
-	    MLX5_CAP_GEN(dev->mdev, atomic) &&
-	    MLX5_CAP_GEN(dev->mdev, umr_modify_atomic_disabled))
+	    MLX5_CAP_GEN(mdev, atomic) &&
+	    MLX5_CAP_GEN(mdev, umr_modify_atomic_disabled))
 		ret |= IB_ACCESS_REMOTE_ATOMIC;
 
 	if ((access_flags & IB_ACCESS_RELAXED_ORDERING) &&
-	    MLX5_CAP_GEN(dev->mdev, relaxed_ordering_write) &&
-	    !MLX5_CAP_GEN(dev->mdev, relaxed_ordering_write_umr))
+	    MLX5_CAP_GEN(mdev, relaxed_ordering_write) &&
+	    !MLX5_CAP_GEN(mdev, relaxed_ordering_write_umr))
 		ret |= IB_ACCESS_RELAXED_ORDERING;
 
 	if ((access_flags & IB_ACCESS_RELAXED_ORDERING) &&
-	    (MLX5_CAP_GEN(dev->mdev, relaxed_ordering_read) ||
-	     MLX5_CAP_GEN(dev->mdev, relaxed_ordering_read_pci_enabled)) &&
-	    !MLX5_CAP_GEN(dev->mdev, relaxed_ordering_read_umr))
+	    (MLX5_CAP_GEN(mdev, relaxed_ordering_read) ||
+	     MLX5_CAP_GEN(mdev, relaxed_ordering_read_pci_enabled)) &&
+	    !MLX5_CAP_GEN(mdev, relaxed_ordering_read_umr))
 		ret |= IB_ACCESS_RELAXED_ORDERING;
 
 	return ret;
@@ -167,10 +169,12 @@ static int get_unchangeable_access_flags(struct mlx5_ib_dev *dev,
 #define MLX5_FRMR_POOLS_KERNEL_KEY_ST_INDEX_MASK GENMASK_ULL(15, 0)
 
 static struct mlx5_ib_mr *
-_mlx5_frmr_pool_alloc(struct mlx5_ib_dev *dev, struct ib_umem *umem,
+_mlx5_frmr_pool_alloc(struct ib_pd *pd, struct ib_umem *umem,
 		      int access_flags, int access_mode,
 		      unsigned long page_size, u16 st_index, u8 ph)
 {
+	struct mlx5_ib_dev *dev = to_dev(pd->device);
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	struct mlx5_ib_mr *mr;
 	int err;
 
@@ -178,9 +182,12 @@ _mlx5_frmr_pool_alloc(struct mlx5_ib_dev *dev, struct ib_umem *umem,
 	if (!mr)
 		return ERR_PTR(-ENOMEM);
 
-	mr->ibmr.frmr.key.ats = mlx5_umem_needs_ats(dev, umem, access_flags);
+	mr->mdev = pd_to_mdev(pd);
+
+	mr->ibmr.frmr.key.ats = mlx5_umem_needs_ats(mdev, umem,
+						    access_flags);
 	mr->ibmr.frmr.key.access_flags =
-		get_unchangeable_access_flags(dev, access_flags);
+		get_unchangeable_access_flags(mdev, access_flags);
 	mr->ibmr.frmr.key.num_dma_blocks =
 		ib_umem_num_dma_blocks(umem, page_size);
 	mr->ibmr.frmr.key.vendor_key =
@@ -207,12 +214,13 @@ _mlx5_frmr_pool_alloc(struct mlx5_ib_dev *dev, struct ib_umem *umem,
 }
 
 struct mlx5_ib_mr *mlx5_mr_cache_alloc(struct mlx5_ib_dev *dev,
+				       struct mlx5_core_dev *mdev,
 				       int access_flags, int access_mode,
 				       int ndescs)
 {
 	struct ib_frmr_key key = {
 		.access_flags =
-			get_unchangeable_access_flags(dev, access_flags),
+			get_unchangeable_access_flags(mdev, access_flags),
 		.vendor_key = access_mode == MLX5_MKC_ACCESS_MODE_MTT ?
 				      0 :
 				      MLX5_FRMR_POOLS_KEY_ACCESS_MODE_KSM_MASK,
@@ -226,6 +234,8 @@ struct mlx5_ib_mr *mlx5_mr_cache_alloc(struct mlx5_ib_dev *dev,
 	if (!mr)
 		return ERR_PTR(-ENOMEM);
 
+	mr->mdev = mdev;
+
 	init_waitqueue_head(&mr->mmkey.wait);
 
 	mr->ibmr.frmr.key = key;
@@ -323,7 +333,7 @@ static int mlx5r_build_frmr_key(struct ib_device *device,
 
 	/* check HW capabilities of users requested frmr key */
 	if ((in->ats && !MLX5_CAP_GEN(dev->mdev, ats)) ||
-	    ilog2(in->num_dma_blocks) > mkey_max_umr_order(dev))
+	    ilog2(in->num_dma_blocks) > mkey_max_umr_order(dev->mdev))
 		return -EOPNOTSUPP;
 
 	if (in->vendor_key & ~MLX5_FRMR_POOLS_KEY_VENDOR_KEY_SUPPORTED)
@@ -331,7 +341,7 @@ static int mlx5r_build_frmr_key(struct ib_device *device,
 
 	out->ats = in->ats;
 	out->access_flags =
-		get_unchangeable_access_flags(dev, in->access_flags);
+		get_unchangeable_access_flags(dev->mdev, in->access_flags);
 	out->vendor_key = in->vendor_key;
 	out->num_dma_blocks = in->num_dma_blocks;
 
@@ -370,6 +380,8 @@ struct ib_mr *mlx5_ib_get_dma_mr(struct ib_pd *pd, int acc)
 	if (!mr)
 		return ERR_PTR(-ENOMEM);
 
+	mr->mdev = pd_to_mdev(pd);
+
 	in = kzalloc(inlen, GFP_KERNEL);
 	if (!in) {
 		err = -ENOMEM;
@@ -382,9 +394,10 @@ struct ib_mr *mlx5_ib_get_dma_mr(struct ib_pd *pd, int acc)
 	MLX5_SET(mkc, mkc, length64, 1);
 	set_mkc_access_pd_addr_fields(mkc, acc | IB_ACCESS_RELAXED_ORDERING, 0,
 				      pd);
-	MLX5_SET(mkc, mkc, ma_translation_mode, MLX5_CAP_GEN(dev->mdev, ats));
+	MLX5_SET(mkc, mkc, ma_translation_mode,
+		 MLX5_CAP_GEN(pd_to_mdev(pd), ats));
 
-	err = mlx5_ib_create_mkey(dev, &mr->mmkey, in, inlen);
+	err = mlx5_ib_create_mkey(dev, mr_to_mdev(mr), &mr->mmkey, in, inlen);
 	if (err)
 		goto err_in;
 
@@ -450,12 +463,12 @@ static struct mlx5_ib_mr *alloc_cacheable_mr(struct ib_pd *pd,
 	if (umem->is_dmabuf)
 		page_size = mlx5_umem_dmabuf_default_pgsz(umem, iova);
 	else
-		page_size = mlx5_umem_mkc_find_best_pgsz(dev, umem, iova,
-							 access_mode);
+		page_size = mlx5_umem_mkc_find_best_pgsz(pd_to_mdev(pd), umem,
+							 iova, access_mode);
 	if (WARN_ON(!page_size))
 		return ERR_PTR(-EINVAL);
 
-	mr = _mlx5_frmr_pool_alloc(dev, umem, access_flags, access_mode,
+	mr = _mlx5_frmr_pool_alloc(pd, umem, access_flags, access_mode,
 				   page_size, st_index, ph);
 	if (IS_ERR(mr))
 		return mr;
@@ -474,6 +487,7 @@ reg_create_crossing_vhca_mr(struct ib_pd *pd, u64 iova, u64 length, int access_f
 			    u32 crossed_lkey)
 {
 	struct mlx5_ib_dev *dev = to_dev(pd->device);
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	int access_mode = MLX5_MKC_ACCESS_MODE_CROSSING;
 	struct mlx5_ib_mr *mr;
 	void *mkc;
@@ -481,13 +495,15 @@ reg_create_crossing_vhca_mr(struct ib_pd *pd, u64 iova, u64 length, int access_f
 	u32 *in;
 	int err;
 
-	if (!MLX5_CAP_GEN(dev->mdev, crossing_vhca_mkey))
+	if (!MLX5_CAP_GEN(mdev, crossing_vhca_mkey))
 		return ERR_PTR(-EOPNOTSUPP);
 
 	mr = kzalloc_obj(*mr);
 	if (!mr)
 		return ERR_PTR(-ENOMEM);
 
+	mr->mdev = pd_to_mdev(pd);
+
 	inlen = MLX5_ST_SZ_BYTES(create_mkey_in);
 	in = kvzalloc(inlen, GFP_KERNEL);
 	if (!in) {
@@ -497,7 +513,7 @@ reg_create_crossing_vhca_mr(struct ib_pd *pd, u64 iova, u64 length, int access_f
 
 	mkc = MLX5_ADDR_OF(create_mkey_in, in, memory_key_mkey_entry);
 	MLX5_SET(mkc, mkc, crossing_target_vhca_id,
-		 MLX5_CAP_GEN(dev->mdev, vhca_id));
+		 MLX5_CAP_GEN(mdev, vhca_id));
 	MLX5_SET(mkc, mkc, translations_octword_size, crossed_lkey);
 	MLX5_SET(mkc, mkc, access_mode_1_0, access_mode & 0x3);
 	MLX5_SET(mkc, mkc, access_mode_4_2, (access_mode >> 2) & 0x7);
@@ -508,7 +524,7 @@ reg_create_crossing_vhca_mr(struct ib_pd *pd, u64 iova, u64 length, int access_f
 
 	MLX5_SET(mkc, mkc, free, 0);
 	MLX5_SET(mkc, mkc, umr_en, 0);
-	err = mlx5_ib_create_mkey(dev, &mr->mmkey, in, inlen);
+	err = mlx5_ib_create_mkey(dev, mr_to_mdev(mr), &mr->mmkey, in, inlen);
 	if (err)
 		goto err_2;
 
@@ -536,13 +552,14 @@ static struct mlx5_ib_mr *reg_create(struct ib_pd *pd, struct ib_umem *umem,
 				     int access_mode, u16 st_index, u8 ph)
 {
 	struct mlx5_ib_dev *dev = to_dev(pd->device);
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	struct mlx5_ib_mr *mr;
 	__be64 *pas;
 	void *mkc;
 	int inlen;
 	u32 *in;
 	int err;
-	bool pg_cap = !!(MLX5_CAP_GEN(dev->mdev, pg)) &&
+	bool pg_cap = !!(MLX5_CAP_GEN(mdev, pg)) &&
 		(access_mode == MLX5_MKC_ACCESS_MODE_MTT) &&
 		(ph == MLX5_IB_NO_PH);
 	bool ksm_mode = (access_mode == MLX5_MKC_ACCESS_MODE_KSM);
@@ -553,6 +570,8 @@ static struct mlx5_ib_mr *reg_create(struct ib_pd *pd, struct ib_umem *umem,
 	if (!mr)
 		return ERR_PTR(-ENOMEM);
 
+	mr->mdev = pd_to_mdev(pd);
+
 	mr->ibmr.pd = pd;
 	mr->access_flags = access_flags;
 	mr->page_shift = order_base_2(page_size);
@@ -601,7 +620,7 @@ static struct mlx5_ib_mr *reg_create(struct ib_pd *pd, struct ib_umem *umem,
 		MLX5_SET(mkc, mkc, translations_octword_size,
 			 get_octo_len(iova, umem->length, mr->page_shift));
 	MLX5_SET(mkc, mkc, log_page_size, mr->page_shift);
-	if (mlx5_umem_needs_ats(dev, umem, access_flags))
+	if (mlx5_umem_needs_ats(mdev, umem, access_flags))
 		MLX5_SET(mkc, mkc, ma_translation_mode, 1);
 	if (populate) {
 		MLX5_SET(create_mkey_in, in, translations_octword_actual_size,
@@ -615,7 +634,7 @@ static struct mlx5_ib_mr *reg_create(struct ib_pd *pd, struct ib_umem *umem,
 			MLX5_SET(mkc, mkc, pcie_tph_steering_tag_index, st_index);
 	}
 
-	err = mlx5_ib_create_mkey(dev, &mr->mmkey, in, inlen);
+	err = mlx5_ib_create_mkey(dev, mr_to_mdev(mr), &mr->mmkey, in, inlen);
 	if (err) {
 		mlx5_ib_warn(dev, "create mkey failed\n");
 		goto err_2;
@@ -651,6 +670,8 @@ static struct ib_mr *mlx5_ib_get_dm_mr(struct ib_pd *pd, u64 start_addr,
 	if (!mr)
 		return ERR_PTR(-ENOMEM);
 
+	mr->mdev = pd_to_mdev(pd);
+
 	in = kzalloc(inlen, GFP_KERNEL);
 	if (!in) {
 		err = -ENOMEM;
@@ -664,7 +685,7 @@ static struct ib_mr *mlx5_ib_get_dm_mr(struct ib_pd *pd, u64 start_addr,
 	MLX5_SET64(mkc, mkc, len, length);
 	set_mkc_access_pd_addr_fields(mkc, acc, start_addr, pd);
 
-	err = mlx5_ib_create_mkey(dev, &mr->mmkey, in, inlen);
+	err = mlx5_ib_create_mkey(dev, mr_to_mdev(mr), &mr->mmkey, in, inlen);
 	if (err)
 		goto err_in;
 
@@ -752,14 +773,15 @@ static struct ib_mr *create_real_mr(struct ib_pd *pd, struct ib_umem *umem,
 			st_index = mdmah->st_index;
 	}
 
-	xlt_with_umr = mlx5r_umr_can_load_pas(dev, umem->length);
+	xlt_with_umr = mlx5r_umr_can_load_pas(pd_to_mdev(pd), umem->length);
 	if (xlt_with_umr) {
 		mr = alloc_cacheable_mr(pd, umem, iova, access_flags,
 					MLX5_MKC_ACCESS_MODE_MTT,
 					st_index, ph);
 	} else {
 		unsigned long page_size = mlx5_umem_mkc_find_best_pgsz(
-				dev, umem, iova, MLX5_MKC_ACCESS_MODE_MTT);
+				pd_to_mdev(pd), umem, iova,
+				MLX5_MKC_ACCESS_MODE_MTT);
 
 		mutex_lock(&dev->slow_path_mutex);
 		mr = reg_create(pd, umem, iova, access_flags, page_size,
@@ -774,7 +796,7 @@ static struct ib_mr *create_real_mr(struct ib_pd *pd, struct ib_umem *umem,
 
 	mlx5_ib_dbg(dev, "mkey 0x%x\n", mr->mmkey.key);
 
-	atomic_add(ib_umem_num_pages(umem), &dev->mdev->priv.reg_pages);
+	atomic_add(ib_umem_num_pages(umem), &mr_to_mdev(mr)->priv.reg_pages);
 
 	if (xlt_with_umr) {
 		/*
@@ -820,7 +842,7 @@ static struct ib_mr *create_user_odp_mr(struct ib_pd *pd, u64 start, u64 length,
 	}
 
 	/* ODP requires xlt update via umr to work. */
-	if (!mlx5r_umr_can_load_pas(dev, length))
+	if (!mlx5r_umr_can_load_pas(pd_to_mdev(pd), length))
 		return ERR_PTR(-EINVAL);
 
 	odp = ib_umem_odp_get(&dev->ib_dev, start, length, access_flags,
@@ -956,7 +978,8 @@ reg_user_mr_dmabuf(struct ib_pd *pd, struct device *dma_device,
 
 	mlx5_ib_dbg(dev, "mkey 0x%x\n", mr->mmkey.key);
 
-	atomic_add(ib_umem_num_pages(mr->umem), &dev->mdev->priv.reg_pages);
+	atomic_add(ib_umem_num_pages(mr->umem),
+		   &mr_to_mdev(mr)->priv.reg_pages);
 	umem_dmabuf->private = mr;
 	if (!pinned_mode) {
 		err = mlx5r_odp_create_eq(dev, &dev->odp_pf_eq);
@@ -1061,7 +1084,7 @@ struct ib_mr *mlx5_ib_reg_user_mr_dmabuf(struct ib_pd *pd, u64 offset,
 		    offset, virt_addr, length, fd, access_flags, mlx5_access_flags);
 
 	/* dmabuf requires xlt update via umr to work. */
-	if (!mlx5r_umr_can_load_pas(dev, length))
+	if (!mlx5r_umr_can_load_pas(pd_to_mdev(pd), length))
 		return ERR_PTR(-EINVAL);
 
 	if (mlx5_access_flags & MLX5_IB_UAPI_REG_DMABUF_ACCESS_DATA_DIRECT)
@@ -1076,7 +1099,7 @@ struct ib_mr *mlx5_ib_reg_user_mr_dmabuf(struct ib_pd *pd, u64 offset,
  * True if the change in access flags can be done via UMR, only some access
  * flags can be updated.
  */
-static bool can_use_umr_rereg_access(struct mlx5_ib_dev *dev,
+static bool can_use_umr_rereg_access(struct mlx5_core_dev *mdev,
 				     unsigned int current_access_flags,
 				     unsigned int target_access_flags)
 {
@@ -1086,7 +1109,7 @@ static bool can_use_umr_rereg_access(struct mlx5_ib_dev *dev,
 		      IB_ACCESS_REMOTE_READ | IB_ACCESS_RELAXED_ORDERING |
 		      IB_ACCESS_REMOTE_ATOMIC))
 		return false;
-	return mlx5r_umr_can_reconfig(dev, current_access_flags,
+	return mlx5r_umr_can_reconfig(mdev, current_access_flags,
 				      target_access_flags);
 }
 
@@ -1095,13 +1118,12 @@ static bool can_use_umr_rereg_pas(struct mlx5_ib_mr *mr,
 				  int new_access_flags, u64 iova,
 				  unsigned long *page_size)
 {
-	struct mlx5_ib_dev *dev = to_dev(mr->ibmr.device);
 	u8 access_mode;
 
 	/* We only track the allocated sizes of MRs from the frmr pools */
 	if (!mr->ibmr.frmr.pool)
 		return false;
-	if (!mlx5r_umr_can_load_pas(dev, new_umem->length))
+	if (!mlx5r_umr_can_load_pas(mr_to_mdev(mr), new_umem->length))
 		return false;
 
 	access_mode = mr->ibmr.frmr.key.vendor_key &
@@ -1110,7 +1132,8 @@ static bool can_use_umr_rereg_pas(struct mlx5_ib_mr *mr,
 			      MLX5_MKC_ACCESS_MODE_MTT;
 
 	*page_size =
-		mlx5_umem_mkc_find_best_pgsz(dev, new_umem, iova, access_mode);
+		mlx5_umem_mkc_find_best_pgsz(mr_to_mdev(mr), new_umem, iova,
+					     access_mode);
 	if (WARN_ON(!*page_size))
 		return false;
 	return (mr->ibmr.frmr.key.num_dma_blocks) >=
@@ -1121,7 +1144,6 @@ static int umr_rereg_pas(struct mlx5_ib_mr *mr, struct ib_pd *pd,
 			 int access_flags, int flags, struct ib_umem *new_umem,
 			 u64 iova, unsigned long page_size)
 {
-	struct mlx5_ib_dev *dev = to_dev(mr->ibmr.device);
 	int upd_flags = MLX5_IB_UPD_XLT_ADDR | MLX5_IB_UPD_XLT_ENABLE;
 	struct ib_umem *old_umem = mr->umem;
 	int err;
@@ -1156,9 +1178,11 @@ static int umr_rereg_pas(struct mlx5_ib_mr *mr, struct ib_pd *pd,
 		return err;
 	}
 
-	atomic_sub(ib_umem_num_pages(old_umem), &dev->mdev->priv.reg_pages);
+	atomic_sub(ib_umem_num_pages(old_umem),
+		   &mr_to_mdev(mr)->priv.reg_pages);
 	ib_umem_release(old_umem);
-	atomic_add(ib_umem_num_pages(new_umem), &dev->mdev->priv.reg_pages);
+	atomic_add(ib_umem_num_pages(new_umem),
+		   &mr_to_mdev(mr)->priv.reg_pages);
 	return 0;
 }
 
@@ -1212,7 +1236,7 @@ struct ib_mr *mlx5_ib_rereg_user_mr(struct ib_mr *ib_mr, int flags, u64 start,
 		struct ib_umem *umem;
 
 		/* Fast path for PD/access change */
-		if (can_use_umr_rereg_access(dev, mr->access_flags,
+		if (can_use_umr_rereg_access(mr_to_mdev(mr), mr->access_flags,
 					     new_access_flags)) {
 			err = mlx5r_umr_rereg_pd_access(mr, new_pd,
 							new_access_flags);
@@ -1233,7 +1257,8 @@ struct ib_mr *mlx5_ib_rereg_user_mr(struct ib_mr *ib_mr, int flags, u64 start,
 			return ERR_PTR(err);
 		umem = mr->umem;
 		mr->umem = NULL;
-		atomic_sub(ib_umem_num_pages(umem), &dev->mdev->priv.reg_pages);
+		atomic_sub(ib_umem_num_pages(umem),
+			   &mr_to_mdev(mr)->priv.reg_pages);
 
 		return create_real_mr(new_pd, umem, mr->ibmr.iova,
 				      new_access_flags, NULL);
@@ -1247,7 +1272,8 @@ struct ib_mr *mlx5_ib_rereg_user_mr(struct ib_mr *ib_mr, int flags, u64 start,
 		goto recreate;
 
 	if (!(new_access_flags & IB_ACCESS_ON_DEMAND) &&
-	    can_use_umr_rereg_access(dev, mr->access_flags, new_access_flags)) {
+	    can_use_umr_rereg_access(mr_to_mdev(mr), mr->access_flags,
+				     new_access_flags)) {
 		struct ib_umem *new_umem;
 		unsigned long page_size;
 
@@ -1280,13 +1306,11 @@ struct ib_mr *mlx5_ib_rereg_user_mr(struct ib_mr *ib_mr, int flags, u64 start,
 }
 
 static int
-mlx5_alloc_priv_descs(struct ib_device *device,
-		      struct mlx5_ib_mr *mr,
+mlx5_alloc_priv_descs(struct mlx5_ib_mr *mr,
 		      int ndescs,
 		      int desc_size)
 {
-	struct mlx5_ib_dev *dev = to_dev(device);
-	struct device *ddev = &dev->mdev->pdev->dev;
+	struct device *ddev = &mr_to_mdev(mr)->pdev->dev;
 	int size = ndescs * desc_size;
 	int add_size;
 	int ret;
@@ -1322,11 +1346,9 @@ mlx5_free_priv_descs(struct mlx5_ib_mr *mr)
 {
 	if (!mr->umem && !mr->data_direct &&
 	    mr->ibmr.type != IB_MR_TYPE_DM && mr->descs) {
-		struct ib_device *device = mr->ibmr.device;
 		int size = mr->max_descs * mr->desc_size;
-		struct mlx5_ib_dev *dev = to_dev(device);
 
-		dma_unmap_single(&dev->mdev->pdev->dev, mr->desc_map, size,
+		dma_unmap_single(&mr_to_mdev(mr)->pdev->dev, mr->desc_map, size,
 				 DMA_TO_DEVICE);
 		kfree(mr->descs_alloc);
 		mr->descs = NULL;
@@ -1437,6 +1459,7 @@ static int mlx5r_handle_mkey_cleanup(struct mlx5_ib_mr *mr)
 static int __mlx5_ib_dereg_mr(struct ib_mr *ibmr)
 {
 	struct mlx5_ib_mr *mr = to_mmr(ibmr);
+	struct mlx5_core_dev *mdev = mr_to_mdev(mr);
 	struct mlx5_ib_dev *dev = to_dev(ibmr->device);
 	int rc;
 
@@ -1467,11 +1490,11 @@ static int __mlx5_ib_dereg_mr(struct ib_mr *ibmr)
 			mr->klm_mr = NULL;
 		}
 
-		if (mlx5_core_destroy_psv(dev->mdev,
+		if (mlx5_core_destroy_psv(mdev,
 					  mr->sig->psv_memory.psv_idx))
 			mlx5_ib_warn(dev, "failed to destroy mem psv %d\n",
 				     mr->sig->psv_memory.psv_idx);
-		if (mlx5_core_destroy_psv(dev->mdev, mr->sig->psv_wire.psv_idx))
+		if (mlx5_core_destroy_psv(mdev, mr->sig->psv_wire.psv_idx))
 			mlx5_ib_warn(dev, "failed to destroy wire psv %d\n",
 				     mr->sig->psv_wire.psv_idx);
 		kfree(mr->sig);
@@ -1488,7 +1511,7 @@ static int __mlx5_ib_dereg_mr(struct ib_mr *ibmr)
 
 		if (!is_odp)
 			atomic_sub(ib_umem_num_pages(mr->umem),
-				   &dev->mdev->priv.reg_pages);
+				   &mdev->priv.reg_pages);
 		ib_umem_release(mr->umem);
 		if (is_odp)
 			mlx5_ib_free_odp_mr(mr);
@@ -1534,7 +1557,6 @@ int mlx5_ib_dereg_mr(struct ib_mr *ibmr, struct ib_udata *udata)
 static void mlx5_set_umr_free_mkey(struct ib_pd *pd, u32 *in, int ndescs,
 				   int access_mode, int page_shift)
 {
-	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	void *mkc;
 
 	mkc = MLX5_ADDR_OF(create_mkey_in, in, memory_key_mkey_entry);
@@ -1549,7 +1571,8 @@ static void mlx5_set_umr_free_mkey(struct ib_pd *pd, u32 *in, int ndescs,
 	MLX5_SET(mkc, mkc, log_page_size, page_shift);
 	if (access_mode == MLX5_MKC_ACCESS_MODE_PA ||
 	    access_mode == MLX5_MKC_ACCESS_MODE_MTT)
-		MLX5_SET(mkc, mkc, ma_translation_mode, MLX5_CAP_GEN(dev->mdev, ats));
+		MLX5_SET(mkc, mkc, ma_translation_mode,
+			 MLX5_CAP_GEN(pd_to_mdev(pd), ats));
 }
 
 static int _mlx5_alloc_mkey_descs(struct ib_pd *pd, struct mlx5_ib_mr *mr,
@@ -1563,13 +1586,13 @@ static int _mlx5_alloc_mkey_descs(struct ib_pd *pd, struct mlx5_ib_mr *mr,
 	mr->desc_size = desc_size;
 	mr->max_descs = ndescs;
 
-	err = mlx5_alloc_priv_descs(pd->device, mr, ndescs, desc_size);
+	err = mlx5_alloc_priv_descs(mr, ndescs, desc_size);
 	if (err)
 		return err;
 
 	mlx5_set_umr_free_mkey(pd, in, ndescs, access_mode, page_shift);
 
-	err = mlx5_ib_create_mkey(dev, &mr->mmkey, in, inlen);
+	err = mlx5_ib_create_mkey(dev, mr_to_mdev(mr), &mr->mmkey, in, inlen);
 	if (err)
 		goto err_free_descs;
 
@@ -1599,6 +1622,8 @@ static struct mlx5_ib_mr *mlx5_ib_alloc_pi_mr(struct ib_pd *pd,
 	if (!mr)
 		return ERR_PTR(-ENOMEM);
 
+	mr->mdev = pd_to_mdev(pd);
+
 	mr->ibmr.pd = pd;
 	mr->ibmr.device = pd->device;
 
@@ -1648,6 +1673,7 @@ static int mlx5_alloc_integrity_descs(struct ib_pd *pd, struct mlx5_ib_mr *mr,
 				      u32 *in, int inlen)
 {
 	struct mlx5_ib_dev *dev = to_dev(pd->device);
+	struct mlx5_core_dev *mdev = mr_to_mdev(mr);
 	u32 psv_index[2];
 	void *mkc;
 	int err;
@@ -1657,7 +1683,7 @@ static int mlx5_alloc_integrity_descs(struct ib_pd *pd, struct mlx5_ib_mr *mr,
 		return -ENOMEM;
 
 	/* create mem & wire PSVs */
-	err = mlx5_core_create_psv(dev->mdev, to_mpd(pd)->pdn, 2, psv_index);
+	err = mlx5_core_create_psv(mdev, to_mpd(pd)->pdn, 2, psv_index);
 	if (err)
 		goto err_free_sig;
 
@@ -1709,10 +1735,10 @@ static int mlx5_alloc_integrity_descs(struct ib_pd *pd, struct mlx5_ib_mr *mr,
 	mlx5_ib_dereg_mr(&mr->klm_mr->ibmr, NULL);
 	mr->klm_mr = NULL;
 err_destroy_psv:
-	if (mlx5_core_destroy_psv(dev->mdev, mr->sig->psv_memory.psv_idx))
+	if (mlx5_core_destroy_psv(mdev, mr->sig->psv_memory.psv_idx))
 		mlx5_ib_warn(dev, "failed to destroy mem psv %d\n",
 			     mr->sig->psv_memory.psv_idx);
-	if (mlx5_core_destroy_psv(dev->mdev, mr->sig->psv_wire.psv_idx))
+	if (mlx5_core_destroy_psv(mdev, mr->sig->psv_wire.psv_idx))
 		mlx5_ib_warn(dev, "failed to destroy wire psv %d\n",
 			     mr->sig->psv_wire.psv_idx);
 err_free_sig:
@@ -1736,6 +1762,8 @@ static struct ib_mr *__mlx5_ib_alloc_mr(struct ib_pd *pd,
 	if (!mr)
 		return ERR_PTR(-ENOMEM);
 
+	mr->mdev = pd_to_mdev(pd);
+
 	in = kzalloc(inlen, GFP_KERNEL);
 	if (!in) {
 		err = -ENOMEM;
@@ -1829,7 +1857,7 @@ int mlx5_ib_alloc_mw(struct ib_mw *ibmw, struct ib_udata *udata)
 	MLX5_SET(mkc, mkc, en_rinval, !!((ibmw->type == IB_MW_TYPE_2)));
 	MLX5_SET(mkc, mkc, qpn, 0xffffff);
 
-	err = mlx5_ib_create_mkey(dev, &mw->mmkey, in, inlen);
+	err = mlx5_ib_create_mkey(dev, mw_to_mdev(ibmw), &mw->mmkey, in, inlen);
 	if (err)
 		goto free;
 
@@ -1855,7 +1883,7 @@ int mlx5_ib_alloc_mw(struct ib_mw *ibmw, struct ib_udata *udata)
 	return 0;
 
 free_mkey:
-	mlx5_core_destroy_mkey(dev->mdev, mw->mmkey.key);
+	mlx5_core_destroy_mkey(mw_to_mdev(ibmw), mw->mmkey.key);
 free:
 	kfree(in);
 	return err;
@@ -1874,7 +1902,7 @@ int mlx5_ib_dealloc_mw(struct ib_mw *mw)
 		 */
 		mlx5r_deref_wait_odp_mkey(&mmw->mmkey);
 
-	return mlx5_core_destroy_mkey(dev->mdev, mmw->mmkey.key);
+	return mlx5_core_destroy_mkey(mw_to_mdev(mw), mmw->mmkey.key);
 }
 
 int mlx5_ib_check_mr_status(struct ib_mr *ibmr, u32 check_mask,
diff --git a/drivers/infiniband/hw/mlx5/odp.c b/drivers/infiniband/hw/mlx5/odp.c
index a4318b11cd81b73f3907015d54d15ef14df61b2b..bb1de90df73e1c1bfa6211531ea401239e0daf9f 100644
--- a/drivers/infiniband/hw/mlx5/odp.c
+++ b/drivers/infiniband/hw/mlx5/odp.c
@@ -107,7 +107,7 @@ static u8 mlx5_imr_ksm_page_shift;
 static void populate_ksm(struct mlx5_ksm *pksm, size_t idx, size_t nentries,
 			struct mlx5_ib_mr *imr, int flags)
 {
-	struct mlx5_core_dev *mdev = mr_to_dev(imr)->mdev;
+	struct mlx5_core_dev *mdev = mr_to_mdev(imr);
 	struct mlx5_ksm *end = pksm + nentries;
 	u64 step = MLX5_CAP_ODP(mdev, mem_page_fault) ? mlx5_imr_mtt_size : 0;
 	__be32 key = MLX5_CAP_ODP(mdev, mem_page_fault) ?
@@ -254,7 +254,7 @@ static void destroy_unused_implicit_child_mr(struct mlx5_ib_mr *mr)
 		return;
 	}
 
-	if (MLX5_CAP_ODP(mr_to_dev(mr)->mdev, mem_page_fault))
+	if (MLX5_CAP_ODP(mr_to_mdev(mr), mem_page_fault))
 		xa_erase(&mr_to_dev(mr)->odp_mkeys,
 			 mlx5_base_mkey(mr->mmkey.key));
 	xa_unlock(&imr->implicit_children);
@@ -367,7 +367,8 @@ static void internal_fill_odp_caps(struct mlx5_ib_dev *dev)
 
 	memset(caps, 0, sizeof(*caps));
 
-	if (!MLX5_CAP_GEN(dev->mdev, pg) || !mlx5r_umr_can_load_pas(dev, 0))
+	if (!MLX5_CAP_GEN(dev->mdev, pg) ||
+	    !mlx5r_umr_can_load_pas(dev->mdev, 0))
 		return;
 
 	caps->general_caps = IB_ODP_SUPPORT;
@@ -425,7 +426,7 @@ static void internal_fill_odp_caps(struct mlx5_ib_dev *dev)
 	    !MLX5_CAP_GEN(dev->mdev, umr_indirect_mkey_disabled) &&
 	    mlx5_imr_ksm_entries != 0 &&
 	    !(mlx5_imr_ksm_page_shift >
-	      get_max_log_entity_size_cap(dev, MLX5_MKC_ACCESS_MODE_KSM)))
+	      get_max_log_entity_size_cap(dev->mdev, MLX5_MKC_ACCESS_MODE_KSM)))
 		caps->general_caps |= IB_ODP_SUPPORT_IMPLICIT;
 }
 
@@ -481,7 +482,7 @@ static struct mlx5_ib_mr *implicit_get_child_mr(struct mlx5_ib_mr *imr,
 	if (IS_ERR(odp))
 		return ERR_CAST(odp);
 
-	mr = mlx5_mr_cache_alloc(dev, imr->access_flags,
+	mr = mlx5_mr_cache_alloc(dev, mr_to_mdev(imr), imr->access_flags,
 				 MLX5_MKC_ACCESS_MODE_MTT,
 				 mlx5_imr_mtt_entries);
 	if (IS_ERR(mr)) {
@@ -529,7 +530,7 @@ static struct mlx5_ib_mr *implicit_get_child_mr(struct mlx5_ib_mr *imr,
 		goto out_lock;
 	}
 
-	if (MLX5_CAP_ODP(dev->mdev, mem_page_fault)) {
+	if (MLX5_CAP_ODP(mr_to_mdev(imr), mem_page_fault)) {
 		ret = xa_store(&dev->odp_mkeys, mlx5_base_mkey(mr->mmkey.key),
 			       &mr->mmkey, GFP_KERNEL);
 		if (xa_is_err(ret)) {
@@ -557,8 +558,7 @@ static struct mlx5_ib_mr *implicit_get_child_mr(struct mlx5_ib_mr *imr,
  * The null mkey is created with the properties to enable getting the page
  * fault for every time it is accessed and having all relevant access flags.
  */
-static int alloc_implicit_mr_null_mkey(struct mlx5_ib_dev *dev,
-				       struct mlx5_ib_mr *imr,
+static int alloc_implicit_mr_null_mkey(struct mlx5_ib_mr *imr,
 				       struct mlx5_ib_pd *pd)
 {
 	size_t inlen = MLX5_ST_SZ_BYTES(create_mkey_in) + 64;
@@ -590,7 +590,8 @@ static int alloc_implicit_mr_null_mkey(struct mlx5_ib_dev *dev,
 	MLX5_SET64(mkc, mkc, start_addr, 0);
 	MLX5_SET(mkc, mkc, qpn, 0xffffff);
 
-	err = mlx5_core_create_mkey(dev->mdev, &imr->null_mmkey.key, in, inlen);
+	err = mlx5_core_create_mkey(mr_to_mdev(imr), &imr->null_mmkey.key, in,
+				    inlen);
 	if (err)
 		goto free_in;
 
@@ -609,14 +610,16 @@ struct mlx5_ib_mr *mlx5_ib_alloc_implicit_mr(struct mlx5_ib_pd *pd,
 	struct mlx5_ib_mr *imr;
 	int err;
 
-	if (!mlx5r_umr_can_load_pas(dev, mlx5_imr_mtt_entries * PAGE_SIZE))
+	if (!mlx5r_umr_can_load_pas(pd_to_mdev(pd),
+				    mlx5_imr_mtt_entries * PAGE_SIZE))
 		return ERR_PTR(-EOPNOTSUPP);
 
 	umem_odp = ib_umem_odp_alloc_implicit(&dev->ib_dev, access_flags);
 	if (IS_ERR(umem_odp))
 		return ERR_CAST(umem_odp);
 
-	imr = mlx5_mr_cache_alloc(dev, access_flags, MLX5_MKC_ACCESS_MODE_KSM,
+	imr = mlx5_mr_cache_alloc(dev, pd_to_mdev(pd), access_flags,
+				  MLX5_MKC_ACCESS_MODE_KSM,
 				  mlx5_imr_ksm_entries);
 	if (IS_ERR(imr)) {
 		ib_umem_odp_release(umem_odp);
@@ -633,8 +636,8 @@ struct mlx5_ib_mr *mlx5_ib_alloc_implicit_mr(struct mlx5_ib_pd *pd,
 	imr->is_odp_implicit = true;
 	xa_init(&imr->implicit_children);
 
-	if (MLX5_CAP_ODP(dev->mdev, mem_page_fault)) {
-		err = alloc_implicit_mr_null_mkey(dev, imr, pd);
+	if (MLX5_CAP_ODP(pd_to_mdev(pd), mem_page_fault)) {
+		err = alloc_implicit_mr_null_mkey(imr, pd);
 		if (err)
 			goto out_mr;
 
@@ -683,7 +686,7 @@ void mlx5_ib_free_odp_mr(struct mlx5_ib_mr *mr)
 		xa_erase(&mr_to_dev(mr)->odp_mkeys,
 			 mlx5_base_mkey(mr->null_mmkey.key));
 
-		mlx5_core_destroy_mkey(mr_to_dev(mr)->mdev,
+		mlx5_core_destroy_mkey(mr_to_mdev(mr),
 				       mr->null_mmkey.key);
 	}
 }
@@ -858,7 +861,8 @@ static int pagefault_dmabuf_mr(struct mlx5_ib_mr *mr, size_t bcnt,
 		return err;
 	}
 
-	page_size = mlx5_umem_dmabuf_find_best_pgsz(umem_dmabuf, access_mode);
+	page_size = mlx5_umem_dmabuf_find_best_pgsz(mr_to_mdev(mr), umem_dmabuf,
+						    access_mode);
 	if (!page_size) {
 		ib_umem_dmabuf_unmap_pages(umem_dmabuf);
 		err = -EINVAL;
diff --git a/drivers/infiniband/hw/mlx5/umr.c b/drivers/infiniband/hw/mlx5/umr.c
index f030885505df5e1fbfb9413d1ff7a2a3d041580d..f9485591130d3276c7344855d7545f89b7d3fb49 100644
--- a/drivers/infiniband/hw/mlx5/umr.c
+++ b/drivers/infiniband/hw/mlx5/umr.c
@@ -34,20 +34,20 @@ static __be64 get_umr_disable_mr_mask(void)
 	return cpu_to_be64(result);
 }
 
-static __be64 get_umr_update_translation_mask(struct mlx5_ib_dev *dev)
+static __be64 get_umr_update_translation_mask(struct mlx5_core_dev *mdev)
 {
 	u64 result;
 
 	result = MLX5_MKEY_MASK_LEN |
 		 MLX5_MKEY_MASK_PAGE_SIZE |
 		 MLX5_MKEY_MASK_START_ADDR;
-	if (MLX5_CAP_GEN_2(dev->mdev, umr_log_entity_size_5))
+	if (MLX5_CAP_GEN_2(mdev, umr_log_entity_size_5))
 		result |= MLX5_MKEY_MASK_PAGE_SIZE_5;
 
 	return cpu_to_be64(result);
 }
 
-static __be64 get_umr_update_access_mask(struct mlx5_ib_dev *dev)
+static __be64 get_umr_update_access_mask(struct mlx5_core_dev *mdev)
 {
 	u64 result;
 
@@ -56,13 +56,13 @@ static __be64 get_umr_update_access_mask(struct mlx5_ib_dev *dev)
 		 MLX5_MKEY_MASK_RR |
 		 MLX5_MKEY_MASK_RW;
 
-	if (MLX5_CAP_GEN(dev->mdev, atomic))
+	if (MLX5_CAP_GEN(mdev, atomic))
 		result |= MLX5_MKEY_MASK_A;
 
-	if (MLX5_CAP_GEN(dev->mdev, relaxed_ordering_write_umr))
+	if (MLX5_CAP_GEN(mdev, relaxed_ordering_write_umr))
 		result |= MLX5_MKEY_MASK_RELAXED_ORDERING_WRITE;
 
-	if (MLX5_CAP_GEN(dev->mdev, relaxed_ordering_read_umr))
+	if (MLX5_CAP_GEN(mdev, relaxed_ordering_read_umr))
 		result |= MLX5_MKEY_MASK_RELAXED_ORDERING_READ;
 
 	return cpu_to_be64(result);
@@ -77,22 +77,22 @@ static __be64 get_umr_update_pd_mask(void)
 	return cpu_to_be64(result);
 }
 
-static int umr_check_mkey_mask(struct mlx5_ib_dev *dev, u64 mask)
+static int umr_check_mkey_mask(struct mlx5_core_dev *mdev, u64 mask)
 {
 	if (mask & MLX5_MKEY_MASK_PAGE_SIZE &&
-	    MLX5_CAP_GEN(dev->mdev, umr_modify_entity_size_disabled))
+	    MLX5_CAP_GEN(mdev, umr_modify_entity_size_disabled))
 		return -EPERM;
 
 	if (mask & MLX5_MKEY_MASK_A &&
-	    MLX5_CAP_GEN(dev->mdev, umr_modify_atomic_disabled))
+	    MLX5_CAP_GEN(mdev, umr_modify_atomic_disabled))
 		return -EPERM;
 
 	if (mask & MLX5_MKEY_MASK_RELAXED_ORDERING_WRITE &&
-	    !MLX5_CAP_GEN(dev->mdev, relaxed_ordering_write_umr))
+	    !MLX5_CAP_GEN(mdev, relaxed_ordering_write_umr))
 		return -EPERM;
 
 	if (mask & MLX5_MKEY_MASK_RELAXED_ORDERING_READ &&
-	    !MLX5_CAP_GEN(dev->mdev, relaxed_ordering_read_umr))
+	    !MLX5_CAP_GEN(mdev, relaxed_ordering_read_umr))
 		return -EPERM;
 
 	return 0;
@@ -243,8 +243,7 @@ static int mlx5r_umr_post_send(struct ib_qp *ibqp, u32 mkey, struct ib_cqe *cqe,
 		with_data ? sizeof(struct mlx5r_umr_wqe) :
 			    sizeof(struct mlx5r_umr_wqe) -
 				    sizeof(struct mlx5_wqe_data_seg);
-	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = qp_to_mdev(ibqp);
 	struct mlx5_ib_qp *qp = to_mqp(ibqp);
 	struct mlx5_wqe_ctrl_seg *ctrl;
 	union {
@@ -352,14 +351,18 @@ static inline void mlx5r_umr_init_context(struct mlx5r_umr_context *context)
 	init_completion(&context->done);
 }
 
-static int mlx5r_umr_post_send_wait(struct mlx5_ib_dev *dev, u32 mkey,
-				   struct mlx5r_umr_wqe *wqe, bool with_data)
+static int mlx5r_umr_post_send_wait(struct mlx5_ib_mr *mr,
+				    struct mlx5r_umr_wqe *wqe, bool with_data)
 {
+	struct mlx5_ib_dev *dev = mr_to_dev(mr);
+	struct mlx5_core_dev *mdev = mr_to_mdev(mr);
 	struct umr_common *umrc = &dev->umrc;
 	struct mlx5r_umr_context umr_context;
+	u32 mkey = mr->mmkey.key;
 	int err;
 
-	err = umr_check_mkey_mask(dev, be64_to_cpu(wqe->ctrl_seg.mkey_mask));
+	err = umr_check_mkey_mask(mdev,
+				  be64_to_cpu(wqe->ctrl_seg.mkey_mask));
 	if (WARN_ON(err))
 		return err;
 
@@ -425,7 +428,7 @@ int mlx5r_umr_revoke_mr(struct mlx5_ib_mr *mr)
 	struct mlx5_ib_dev *dev = mr_to_dev(mr);
 	struct mlx5r_umr_wqe wqe = {};
 
-	if (dev->mdev->state == MLX5_DEVICE_STATE_INTERNAL_ERROR)
+	if (mr_to_mdev(mr)->state == MLX5_DEVICE_STATE_INTERNAL_ERROR)
 		return 0;
 
 	wqe.ctrl_seg.mkey_mask |= get_umr_update_pd_mask();
@@ -438,16 +441,16 @@ int mlx5r_umr_revoke_mr(struct mlx5_ib_mr *mr)
 	MLX5_SET(mkc, &wqe.mkey_seg, mkey_7_0,
 		 mlx5_mkey_variant(mr->mmkey.key));
 
-	return mlx5r_umr_post_send_wait(dev, mr->mmkey.key, &wqe, false);
+	return mlx5r_umr_post_send_wait(mr, &wqe, false);
 }
 
-static void mlx5r_umr_set_access_flags(struct mlx5_ib_dev *dev,
+static void mlx5r_umr_set_access_flags(struct mlx5_core_dev *mdev,
 				       struct mlx5_mkey_seg *seg,
 				       unsigned int access_flags)
 {
 	bool ro_read = (access_flags & IB_ACCESS_RELAXED_ORDERING) &&
-		       (MLX5_CAP_GEN(dev->mdev, relaxed_ordering_read) ||
-			pcie_relaxed_ordering_enabled(dev->mdev->pdev));
+		       (MLX5_CAP_GEN(mdev, relaxed_ordering_read) ||
+			pcie_relaxed_ordering_enabled(mdev->pdev));
 
 	MLX5_SET(mkc, seg, a, !!(access_flags & IB_ACCESS_REMOTE_ATOMIC));
 	MLX5_SET(mkc, seg, rw, !!(access_flags & IB_ACCESS_REMOTE_WRITE));
@@ -462,22 +465,22 @@ static void mlx5r_umr_set_access_flags(struct mlx5_ib_dev *dev,
 int mlx5r_umr_rereg_pd_access(struct mlx5_ib_mr *mr, struct ib_pd *pd,
 			      int access_flags)
 {
-	struct mlx5_ib_dev *dev = mr_to_dev(mr);
+	struct mlx5_core_dev *mdev = mr_to_mdev(mr);
 	struct mlx5r_umr_wqe wqe = {};
 	int err;
 
-	wqe.ctrl_seg.mkey_mask = get_umr_update_access_mask(dev);
+	wqe.ctrl_seg.mkey_mask = get_umr_update_access_mask(mdev);
 	wqe.ctrl_seg.mkey_mask |= get_umr_update_pd_mask();
 	wqe.ctrl_seg.flags = MLX5_UMR_CHECK_FREE;
 	wqe.ctrl_seg.flags |= MLX5_UMR_INLINE;
 
-	mlx5r_umr_set_access_flags(dev, &wqe.mkey_seg, access_flags);
+	mlx5r_umr_set_access_flags(mdev, &wqe.mkey_seg, access_flags);
 	MLX5_SET(mkc, &wqe.mkey_seg, pd, to_mpd(pd)->pdn);
 	MLX5_SET(mkc, &wqe.mkey_seg, qpn, 0xffffff);
 	MLX5_SET(mkc, &wqe.mkey_seg, mkey_7_0,
 		 mlx5_mkey_variant(mr->mmkey.key));
 
-	err = mlx5r_umr_post_send_wait(dev, mr->mmkey.key, &wqe, false);
+	err = mlx5r_umr_post_send_wait(mr, &wqe, false);
 	if (err)
 		return err;
 
@@ -550,11 +553,9 @@ static void mlx5r_umr_free_xlt(void *xlt, size_t length)
 	kfree(xlt);
 }
 
-static void mlx5r_umr_unmap_free_xlt(struct mlx5_ib_dev *dev, void *xlt,
+static void mlx5r_umr_unmap_free_xlt(struct device *ddev, void *xlt,
 				     struct ib_sge *sg)
 {
-	struct device *ddev = &dev->mdev->pdev->dev;
-
 	dma_unmap_single(ddev, sg->addr, sg->length, DMA_TO_DEVICE);
 	mlx5r_umr_free_xlt(xlt, sg->length);
 }
@@ -562,11 +563,11 @@ static void mlx5r_umr_unmap_free_xlt(struct mlx5_ib_dev *dev, void *xlt,
 /*
  * Create an XLT buffer ready for submission.
  */
-static void *mlx5r_umr_create_xlt(struct mlx5_ib_dev *dev, struct ib_sge *sg,
-				  size_t nents, size_t ent_size,
-				  unsigned int flags)
+static void *mlx5r_umr_create_xlt(struct mlx5_ib_mr *mr, struct device *ddev,
+				  struct ib_sge *sg, size_t nents,
+				  size_t ent_size, unsigned int flags)
 {
-	struct device *ddev = &dev->mdev->pdev->dev;
+	struct mlx5_ib_dev *dev = mr_to_dev(mr);
 	dma_addr_t dma;
 	void *xlt;
 
@@ -600,12 +601,11 @@ mlx5r_umr_set_update_xlt_ctrl_seg(struct mlx5_wqe_umr_ctrl_seg *ctrl_seg,
 		cpu_to_be16(mlx5r_umr_get_xlt_octo(sg->length));
 }
 
-static void mlx5r_umr_set_update_xlt_mkey_seg(struct mlx5_ib_dev *dev,
-					      struct mlx5_mkey_seg *mkey_seg,
+static void mlx5r_umr_set_update_xlt_mkey_seg(struct mlx5_mkey_seg *mkey_seg,
 					      struct mlx5_ib_mr *mr, u32 pdn,
 					      unsigned int page_shift)
 {
-	mlx5r_umr_set_access_flags(dev, mkey_seg, mr->access_flags);
+	mlx5r_umr_set_access_flags(mr_to_mdev(mr), mkey_seg, mr->access_flags);
 	MLX5_SET(mkc, mkey_seg, pd, pdn);
 	MLX5_SET64(mkc, mkey_seg, start_addr, mr->ibmr.iova);
 	MLX5_SET64(mkc, mkey_seg, len, mr->ibmr.length);
@@ -633,11 +633,11 @@ static void mlx5r_umr_update_offset(struct mlx5_wqe_umr_ctrl_seg *ctrl_seg,
 	ctrl_seg->flags |= MLX5_UMR_TRANSLATION_OFFSET_EN;
 }
 
-static void mlx5r_umr_final_update_xlt(struct mlx5_ib_dev *dev,
-				       struct mlx5r_umr_wqe *wqe,
+static void mlx5r_umr_final_update_xlt(struct mlx5r_umr_wqe *wqe,
 				       struct mlx5_ib_mr *mr, struct ib_sge *sg,
 				       unsigned int flags)
 {
+	struct mlx5_core_dev *mdev = mr_to_mdev(mr);
 	bool update_pd_access, update_translation;
 
 	if (flags & MLX5_IB_UPD_XLT_ENABLE)
@@ -648,7 +648,7 @@ static void mlx5r_umr_final_update_xlt(struct mlx5_ib_dev *dev,
 			   flags & MLX5_IB_UPD_XLT_ACCESS;
 
 	if (update_pd_access) {
-		wqe->ctrl_seg.mkey_mask |= get_umr_update_access_mask(dev);
+		wqe->ctrl_seg.mkey_mask |= get_umr_update_access_mask(mdev);
 		wqe->ctrl_seg.mkey_mask |= get_umr_update_pd_mask();
 	}
 
@@ -656,7 +656,8 @@ static void mlx5r_umr_final_update_xlt(struct mlx5_ib_dev *dev,
 		flags & MLX5_IB_UPD_XLT_ENABLE || flags & MLX5_IB_UPD_XLT_ADDR;
 
 	if (update_translation) {
-		wqe->ctrl_seg.mkey_mask |= get_umr_update_translation_mask(dev);
+		wqe->ctrl_seg.mkey_mask |=
+			get_umr_update_translation_mask(mdev);
 		if (!mr->ibmr.length)
 			MLX5_SET(mkc, &wqe->mkey_seg, length64, 1);
 		if (flags & MLX5_IB_UPD_XLT_KEEP_PGSZ)
@@ -674,11 +675,8 @@ static void _mlx5r_umr_init_wqe(struct mlx5_ib_mr *mr,
 				unsigned int flags, u32 pdn,
 				unsigned int page_shift)
 {
-	struct mlx5_ib_dev *dev = mr_to_dev(mr);
-
 	mlx5r_umr_set_update_xlt_ctrl_seg(&wqe->ctrl_seg, flags, sg);
-	mlx5r_umr_set_update_xlt_mkey_seg(dev, &wqe->mkey_seg, mr, pdn,
-					  page_shift);
+	mlx5r_umr_set_update_xlt_mkey_seg(&wqe->mkey_seg, mr, pdn, page_shift);
 	mlx5r_umr_set_update_xlt_data_seg(&wqe->data_seg, sg);
 }
 
@@ -688,7 +686,7 @@ static int _mlx5r_umr_update_mr_pas(struct mlx5_ib_mr *mr, unsigned int flags,
 {
 	size_t ent_size = dd ? sizeof(struct mlx5_ksm) : sizeof(struct mlx5_mtt);
 	struct mlx5_ib_dev *dev = mr_to_dev(mr);
-	struct device *ddev = &dev->mdev->pdev->dev;
+	struct device *ddev = &mr_to_mdev(mr)->pdev->dev;
 	struct mlx5r_umr_wqe wqe = {};
 	size_t processed_blocks = 0;
 	struct ib_block_iter biter;
@@ -712,7 +710,8 @@ static int _mlx5r_umr_update_mr_pas(struct mlx5_ib_mr *mr, unsigned int flags,
 	if (nblocks)
 		total_blocks = nblocks;
 
-	entry = mlx5r_umr_create_xlt(dev, &sg, total_blocks, ent_size, flags);
+	entry = mlx5r_umr_create_xlt(mr, ddev, &sg, total_blocks, ent_size,
+				     flags);
 	if (!entry)
 		return -ENOMEM;
 
@@ -744,7 +743,7 @@ static int _mlx5r_umr_update_mr_pas(struct mlx5_ib_mr *mr, unsigned int flags,
 			dma_sync_single_for_device(ddev, sg.addr, sg.length,
 						   DMA_TO_DEVICE);
 
-			err = mlx5r_umr_post_send_wait(dev, mr->mmkey.key, &wqe,
+			err = mlx5r_umr_post_send_wait(mr, &wqe,
 						       true);
 			if (err)
 				goto err;
@@ -790,14 +789,14 @@ static int _mlx5r_umr_update_mr_pas(struct mlx5_ib_mr *mr, unsigned int flags,
 	final_size = curr_entry - entry;
 	sg.length = ALIGN(final_size, MLX5_UMR_FLEX_ALIGNMENT);
 	memset(curr_entry, 0, sg.length - final_size);
-	mlx5r_umr_final_update_xlt(dev, &wqe, mr, &sg, flags);
+	mlx5r_umr_final_update_xlt(&wqe, mr, &sg, flags);
 
 	dma_sync_single_for_device(ddev, sg.addr, sg.length, DMA_TO_DEVICE);
-	err = mlx5r_umr_post_send_wait(dev, mr->mmkey.key, &wqe, true);
+	err = mlx5r_umr_post_send_wait(mr, &wqe, true);
 
 err:
 	sg.length = orig_sg_length;
-	mlx5r_umr_unmap_free_xlt(dev, entry, &sg);
+	mlx5r_umr_unmap_free_xlt(ddev, entry, &sg);
 	return err;
 }
 
@@ -842,9 +841,9 @@ int mlx5r_umr_update_mr_pas(struct mlx5_ib_mr *mr, unsigned int flags, u32 pdn)
 	return mlx5r_umr_update_mr_pas_range(mr, flags, pdn, 0, 0);
 }
 
-static bool umr_can_use_indirect_mkey(struct mlx5_ib_dev *dev)
+static bool umr_can_use_indirect_mkey(struct mlx5_core_dev *mdev)
 {
-	return !MLX5_CAP_GEN(dev->mdev, umr_indirect_mkey_disabled);
+	return !MLX5_CAP_GEN(mdev, umr_indirect_mkey_disabled);
 }
 
 int mlx5r_umr_update_xlt(struct mlx5_ib_mr *mr, u64 idx, int npages,
@@ -854,8 +853,8 @@ int mlx5r_umr_update_xlt(struct mlx5_ib_mr *mr, u64 idx, int npages,
 			       ? sizeof(struct mlx5_klm)
 			       : sizeof(struct mlx5_mtt);
 	const int page_align = MLX5_UMR_FLEX_ALIGNMENT / desc_size;
-	struct mlx5_ib_dev *dev = mr_to_dev(mr);
-	struct device *ddev = &dev->mdev->pdev->dev;
+	struct mlx5_core_dev *mdev = mr_to_mdev(mr);
+	struct device *ddev = &mdev->pdev->dev;
 	const int page_mask = page_align - 1;
 	struct mlx5r_umr_wqe wqe = {};
 	size_t pages_mapped = 0;
@@ -868,7 +867,7 @@ int mlx5r_umr_update_xlt(struct mlx5_ib_mr *mr, u64 idx, int npages,
 	void *xlt;
 
 	if ((flags & MLX5_IB_UPD_XLT_INDIRECT) &&
-	    !umr_can_use_indirect_mkey(dev))
+	    !umr_can_use_indirect_mkey(mdev))
 		return -EPERM;
 
 	if (WARN_ON(!mr->umem->is_odp))
@@ -883,7 +882,7 @@ int mlx5r_umr_update_xlt(struct mlx5_ib_mr *mr, u64 idx, int npages,
 	}
 	pages_to_map = ALIGN(npages, page_align);
 
-	xlt = mlx5r_umr_create_xlt(dev, &sg, npages, desc_size, flags);
+	xlt = mlx5r_umr_create_xlt(mr, ddev, &sg, npages, desc_size, flags);
 	if (!xlt)
 		return -ENOMEM;
 
@@ -898,8 +897,7 @@ int mlx5r_umr_update_xlt(struct mlx5_ib_mr *mr, u64 idx, int npages,
 	}
 
 	mlx5r_umr_set_update_xlt_ctrl_seg(&wqe.ctrl_seg, flags, &sg);
-	mlx5r_umr_set_update_xlt_mkey_seg(dev, &wqe.mkey_seg, mr, pdn,
-					  page_shift);
+	mlx5r_umr_set_update_xlt_mkey_seg(&wqe.mkey_seg, mr, pdn, page_shift);
 	mlx5r_umr_set_update_xlt_data_seg(&wqe.data_seg, &sg);
 
 	for (pages_mapped = 0;
@@ -925,12 +923,12 @@ int mlx5r_umr_update_xlt(struct mlx5_ib_mr *mr, u64 idx, int npages,
 		sg.length = ALIGN(size_to_map, MLX5_UMR_FLEX_ALIGNMENT);
 
 		if (pages_mapped + pages_iter >= pages_to_map)
-			mlx5r_umr_final_update_xlt(dev, &wqe, mr, &sg, flags);
+			mlx5r_umr_final_update_xlt(&wqe, mr, &sg, flags);
 		mlx5r_umr_update_offset(&wqe.ctrl_seg, idx * desc_size);
-		err = mlx5r_umr_post_send_wait(dev, mr->mmkey.key, &wqe, true);
+		err = mlx5r_umr_post_send_wait(mr, &wqe, true);
 	}
 	sg.length = orig_sg_length;
-	mlx5r_umr_unmap_free_xlt(dev, xlt, &sg);
+	mlx5r_umr_unmap_free_xlt(ddev, xlt, &sg);
 	return err;
 }
 
@@ -943,12 +941,12 @@ int mlx5r_umr_update_xlt(struct mlx5_ib_mr *mr, u64 idx, int npages,
 int mlx5r_umr_update_mr_page_shift(struct mlx5_ib_mr *mr,
 				   unsigned int page_shift)
 {
-	struct mlx5_ib_dev *dev = mr_to_dev(mr);
 	struct mlx5r_umr_wqe wqe = {};
 	int err;
 
 	/* Build UMR wqe: we touch only PAGE_SIZE, so use the dedicated mask */
-	wqe.ctrl_seg.mkey_mask = get_umr_update_translation_mask(dev);
+	wqe.ctrl_seg.mkey_mask =
+		get_umr_update_translation_mask(mr_to_mdev(mr));
 
 	/* MR must be free while page size is modified */
 	wqe.ctrl_seg.flags = MLX5_UMR_CHECK_FREE | MLX5_UMR_INLINE;
@@ -959,7 +957,7 @@ int mlx5r_umr_update_mr_page_shift(struct mlx5_ib_mr *mr,
 	MLX5_SET64(mkc, &wqe.mkey_seg, start_addr, mr->ibmr.iova);
 	MLX5_SET64(mkc, &wqe.mkey_seg, len, mr->ibmr.length);
 
-	err = mlx5r_umr_post_send_wait(dev, mr->mmkey.key, &wqe, false);
+	err = mlx5r_umr_post_send_wait(mr, &wqe, false);
 	if (!err)
 		mr->page_shift = page_shift;
 
@@ -996,7 +994,6 @@ static int _mlx5r_umr_zap_mkey(struct mlx5_ib_mr *mr, unsigned int flags,
 			       u32 pdn, bool dd)
 {
 	unsigned int old_page_shift = mr->page_shift;
-	struct mlx5_ib_dev *dev = mr_to_dev(mr);
 	unsigned int max_page_shift;
 	size_t page_shift_nblocks;
 	unsigned int max_log_size;
@@ -1006,7 +1003,7 @@ static int _mlx5r_umr_zap_mkey(struct mlx5_ib_mr *mr, unsigned int flags,
 	access_mode = dd ? MLX5_MKC_ACCESS_MODE_KSM : MLX5_MKC_ACCESS_MODE_MTT;
 	flags |= MLX5_IB_UPD_XLT_KEEP_PGSZ | MLX5_IB_UPD_XLT_ZAP |
 		 MLX5_IB_UPD_XLT_ATOMIC;
-	max_log_size = get_max_log_entity_size_cap(dev, access_mode);
+	max_log_size = get_max_log_entity_size_cap(mr_to_mdev(mr), access_mode);
 	max_page_shift = order_base_2(mr->ibmr.length);
 	max_page_shift = min(max(max_page_shift, page_shift), max_log_size);
 	/* Count blocks in units of max_page_shift, we will zap exactly this
diff --git a/drivers/infiniband/hw/mlx5/umr.h b/drivers/infiniband/hw/mlx5/umr.h
index bda7123781a953abbdea578d960ae7c870be66b2..eb01a2300e6169c9b0f35a09313e07b04d151337 100644
--- a/drivers/infiniband/hw/mlx5/umr.h
+++ b/drivers/infiniband/hw/mlx5/umr.h
@@ -20,7 +20,7 @@ void mlx5r_umr_resource_cleanup(struct mlx5_ib_dev *dev);
 int mlx5r_umr_init(struct mlx5_ib_dev *dev);
 void mlx5r_umr_cleanup(struct mlx5_ib_dev *dev);
 
-static inline bool mlx5r_umr_can_load_pas(struct mlx5_ib_dev *dev,
+static inline bool mlx5r_umr_can_load_pas(struct mlx5_core_dev *mdev,
 					  size_t length)
 {
 	/*
@@ -31,14 +31,14 @@ static inline bool mlx5r_umr_can_load_pas(struct mlx5_ib_dev *dev,
 	 * quirky hardware by just saying it can't use PAS lists with UMR at
 	 * all.
 	 */
-	if (MLX5_CAP_GEN(dev->mdev, umr_modify_entity_size_disabled))
+	if (MLX5_CAP_GEN(mdev, umr_modify_entity_size_disabled))
 		return false;
 
 	/*
 	 * length is the size of the MR in bytes when mlx5_ib_update_xlt() is
 	 * used.
 	 */
-	if (!MLX5_CAP_GEN(dev->mdev, umr_extended_translation_offset) &&
+	if (!MLX5_CAP_GEN(mdev, umr_extended_translation_offset) &&
 	    length >= MLX5_MAX_UMR_PAGES * PAGE_SIZE)
 		return false;
 	return true;
@@ -49,26 +49,26 @@ static inline bool mlx5r_umr_can_load_pas(struct mlx5_ib_dev *dev,
  * Older HW cannot use UMR to update certain elements of the MKC. See
  * get_umr_update_access_mask() and umr_check_mkey_mask()
  */
-static inline bool mlx5r_umr_can_reconfig(struct mlx5_ib_dev *dev,
+static inline bool mlx5r_umr_can_reconfig(struct mlx5_core_dev *mdev,
 					  unsigned int current_access_flags,
 					  unsigned int target_access_flags)
 {
 	unsigned int diffs = current_access_flags ^ target_access_flags;
 
 	if ((diffs & IB_ACCESS_REMOTE_ATOMIC) &&
-	    MLX5_CAP_GEN(dev->mdev, atomic) &&
-	    MLX5_CAP_GEN(dev->mdev, umr_modify_atomic_disabled))
+	    MLX5_CAP_GEN(mdev, atomic) &&
+	    MLX5_CAP_GEN(mdev, umr_modify_atomic_disabled))
 		return false;
 
 	if ((diffs & IB_ACCESS_RELAXED_ORDERING) &&
-	    MLX5_CAP_GEN(dev->mdev, relaxed_ordering_write) &&
-	    !MLX5_CAP_GEN(dev->mdev, relaxed_ordering_write_umr))
+	    MLX5_CAP_GEN(mdev, relaxed_ordering_write) &&
+	    !MLX5_CAP_GEN(mdev, relaxed_ordering_write_umr))
 		return false;
 
 	if ((diffs & IB_ACCESS_RELAXED_ORDERING) &&
-	    (MLX5_CAP_GEN(dev->mdev, relaxed_ordering_read) ||
-	     MLX5_CAP_GEN(dev->mdev, relaxed_ordering_read_pci_enabled)) &&
-	    !MLX5_CAP_GEN(dev->mdev, relaxed_ordering_read_umr))
+	    (MLX5_CAP_GEN(mdev, relaxed_ordering_read) ||
+	     MLX5_CAP_GEN(mdev, relaxed_ordering_read_pci_enabled)) &&
+	    !MLX5_CAP_GEN(mdev, relaxed_ordering_read_umr))
 		return false;
 
 	return true;
diff --git a/drivers/infiniband/hw/mlx5/wr.c b/drivers/infiniband/hw/mlx5/wr.c
index 3d3fdbce1354f4390b1ebbd14114c0efd93f46df..7d1a64d24df181ad5b23580c00d68a3b48baf960 100644
--- a/drivers/infiniband/hw/mlx5/wr.c
+++ b/drivers/infiniband/hw/mlx5/wr.c
@@ -639,7 +639,6 @@ static int set_reg_wr(struct mlx5_ib_qp *qp,
 {
 	struct mlx5_ib_mr *mr = to_mmr(wr->mr);
 	struct mlx5_ib_pd *pd = to_mpd(qp->ibqp.pd);
-	struct mlx5_ib_dev *dev = to_dev(pd->ibpd.device);
 	int mr_list_size = (mr->mmkey.ndescs + mr->meta_ndescs) * mr->desc_size;
 	bool umr_inline = mr_list_size <= MLX5_IB_SQ_UMR_INLINE_THRESHOLD;
 	bool atomic = wr->access & IB_ACCESS_REMOTE_ATOMIC;
@@ -649,7 +648,7 @@ static int set_reg_wr(struct mlx5_ib_qp *qp,
 	 * Relaxed Ordering is set implicitly in mlx5_set_umr_free_mkey() and
 	 * kernel ULPs are not aware of it, so we don't set it here.
 	 */
-	if (!mlx5r_umr_can_reconfig(dev, 0, wr->access)) {
+	if (!mlx5r_umr_can_reconfig(mr_to_mdev(mr), 0, wr->access)) {
 		mlx5_ib_warn(
 			to_dev(qp->ibqp.device),
 			"Fast update for MR access flags is not possible\n");

-- 
2.49.0


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH rdma-next 06/11] RDMA/mlx5: Select the AH core device through their PD
  2026-11-17 14:01 [PATCH rdma-next 00/11] RDMA/mlx5: Preparation for SD support Edward Srouji
                   ` (4 preceding siblings ...)
  2026-11-17 14:01 ` [PATCH rdma-next 05/11] RDMA/mlx5: Cache the MR core device and resolve the MW's via its PD Edward Srouji
@ 2026-11-17 14:01 ` Edward Srouji
  2026-11-17 14:01 ` [PATCH rdma-next 07/11] RDMA/mlx5: Select the QP core device through its PD Edward Srouji
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Edward Srouji @ 2026-11-17 14:01 UTC (permalink / raw)
  To: Leon Romanovsky, Jason Gunthorpe, Sabrina Dubroca
  Cc: linux-rdma, linux-kernel, netdev, Edward Srouji,
	Akiva Goldberger, Michael Gur

From: Akiva Goldberger <agoldberger@nvidia.com>

An AH retains its PD through ib_ah->pd. Use this PD to access the core
device instead of accessing it through dev->mdev.

No functional change.

Signed-off-by: Akiva Goldberger <agoldberger@nvidia.com>
Reviewed-by: Michael Gur <michaelgur@nvidia.com>
Signed-off-by: Edward Srouji <edwards@nvidia.com>
---
 drivers/infiniband/hw/mlx5/ah.c      | 20 ++++++++++----------
 drivers/infiniband/hw/mlx5/main.c    |  4 ++--
 drivers/infiniband/hw/mlx5/mlx5_ib.h |  2 +-
 drivers/infiniband/hw/mlx5/qp.c      |  7 ++++---
 drivers/infiniband/hw/mlx5/qp.h      |  2 +-
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/drivers/infiniband/hw/mlx5/ah.c b/drivers/infiniband/hw/mlx5/ah.c
index 643d0ce3452696352f7edac5bbf83012b8689033..758c41312c16f4a46d683539ffdc0a857c40ad48 100644
--- a/drivers/infiniband/hw/mlx5/ah.c
+++ b/drivers/infiniband/hw/mlx5/ah.c
@@ -32,8 +32,8 @@
 
 #include "mlx5_ib.h"
 
-static __be16 mlx5_ah_get_udp_sport(const struct mlx5_ib_dev *dev,
-				  const struct rdma_ah_attr *ah_attr)
+static __be16 mlx5_ah_get_udp_sport(struct mlx5_core_dev *mdev,
+				    const struct rdma_ah_attr *ah_attr)
 {
 	enum ib_gid_type gid_type = ah_attr->grh.sgid_attr->gid_type;
 	__be16 sport;
@@ -44,15 +44,16 @@ static __be16 mlx5_ah_get_udp_sport(const struct mlx5_ib_dev *dev,
 		sport = cpu_to_be16(
 			rdma_flow_label_to_udp_sport(ah_attr->grh.flow_label));
 	else
-		sport = mlx5_get_roce_udp_sport_min(dev,
+		sport = mlx5_get_roce_udp_sport_min(mdev,
 						    ah_attr->grh.sgid_attr);
 
 	return sport;
 }
 
-static int create_ib_ah(struct mlx5_ib_dev *dev, struct mlx5_ib_ah *ah,
-			 struct rdma_ah_init_attr *init_attr)
+static int create_ib_ah(struct mlx5_ib_ah *ah,
+			struct rdma_ah_init_attr *init_attr)
 {
+	struct mlx5_core_dev *mdev = pd_to_mdev(ah->ibah.pd);
 	struct rdma_ah_attr *ah_attr = init_attr->ah_attr;
 	enum ib_gid_type gid_type;
 	int rate_val;
@@ -68,7 +69,7 @@ static int create_ib_ah(struct mlx5_ib_dev *dev, struct mlx5_ib_ah *ah,
 		ah->av.tclass = grh->traffic_class;
 	}
 
-	rate_val = mlx5r_ib_rate(dev, rdma_ah_get_static_rate(ah_attr));
+	rate_val = mlx5r_ib_rate(mdev, rdma_ah_get_static_rate(ah_attr));
 	if (rate_val < 0)
 		return rate_val;
 	ah->av.stat_rate_sl = rate_val << 4;
@@ -76,13 +77,13 @@ static int create_ib_ah(struct mlx5_ib_dev *dev, struct mlx5_ib_ah *ah,
 	if (ah_attr->type == RDMA_AH_ATTR_TYPE_ROCE) {
 		if (init_attr->xmit_slave)
 			ah->xmit_port =
-				mlx5_lag_get_slave_port(dev->mdev,
+				mlx5_lag_get_slave_port(mdev,
 							init_attr->xmit_slave);
 		gid_type = ah_attr->grh.sgid_attr->gid_type;
 
 		memcpy(ah->av.rmac, ah_attr->roce.dmac,
 		       sizeof(ah_attr->roce.dmac));
-		ah->av.udp_sport = mlx5_ah_get_udp_sport(dev, ah_attr);
+		ah->av.udp_sport = mlx5_ah_get_udp_sport(mdev, ah_attr);
 		ah->av.stat_rate_sl |= (rdma_ah_get_sl(ah_attr) & 0x7) << 1;
 		if (gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP)
 #define MLX5_ECN_ENABLED BIT(1)
@@ -102,7 +103,6 @@ int mlx5_ib_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr,
 {
 	struct rdma_ah_attr *ah_attr = init_attr->ah_attr;
 	struct mlx5_ib_ah *ah = to_mah(ibah);
-	struct mlx5_ib_dev *dev = to_dev(ibah->device);
 	enum rdma_ah_attr_type ah_type = ah_attr->type;
 
 	if ((ah_type == RDMA_AH_ATTR_TYPE_ROCE) &&
@@ -126,7 +126,7 @@ int mlx5_ib_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr,
 			return err;
 	}
 
-	return create_ib_ah(dev, ah, init_attr);
+	return create_ib_ah(ah, init_attr);
 }
 
 int mlx5_ib_query_ah(struct ib_ah *ibah, struct rdma_ah_attr *ah_attr)
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 4ec9b56afef7d9fb52ebcd22e0858eb741d010be..f7ea8aa4ad210c51c2dfd82bbe16043af667b7d9 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -705,13 +705,13 @@ static int mlx5_ib_del_gid(const struct ib_gid_attr *attr,
 	return 0;
 }
 
-__be16 mlx5_get_roce_udp_sport_min(const struct mlx5_ib_dev *dev,
+__be16 mlx5_get_roce_udp_sport_min(const struct mlx5_core_dev *mdev,
 				   const struct ib_gid_attr *attr)
 {
 	if (attr->gid_type != IB_GID_TYPE_ROCE_UDP_ENCAP)
 		return 0;
 
-	return cpu_to_be16(MLX5_CAP_ROCE(dev->mdev, r_roce_min_src_udp_port));
+	return cpu_to_be16(MLX5_CAP_ROCE(mdev, r_roce_min_src_udp_port));
 }
 
 static int mlx5_use_mad_ifc(struct mlx5_ib_dev *dev)
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index f110803cd30694f05ce7d5bf9fdd35e6b5c003fd..8b878b33fcdff72ecfa37a860585193ab0ea9c13 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -1534,7 +1534,7 @@ int mlx5_ib_get_vf_guid(struct ib_device *device, int vf, u32 port,
 int mlx5_ib_set_vf_guid(struct ib_device *device, int vf, u32 port,
 			u64 guid, int type);
 
-__be16 mlx5_get_roce_udp_sport_min(const struct mlx5_ib_dev *dev,
+__be16 mlx5_get_roce_udp_sport_min(const struct mlx5_core_dev *mdev,
 				   const struct ib_gid_attr *attr);
 
 void mlx5_ib_cleanup_cong_debugfs(struct mlx5_ib_dev *dev, u32 port_num);
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 2196e06f593e16693f682fc0e9eb7a3b18131f60..2709e5465d3316eb08f25663a248fba62ebfe8c9 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -3497,7 +3497,7 @@ static int ib_to_mlx5_rate_map(u8 rate)
 	return 0;
 }
 
-int mlx5r_ib_rate(struct mlx5_ib_dev *dev, u8 rate)
+int mlx5r_ib_rate(struct mlx5_core_dev *mdev, u8 rate)
 {
 	u32 stat_rate_support;
 
@@ -3508,7 +3508,7 @@ int mlx5r_ib_rate(struct mlx5_ib_dev *dev, u8 rate)
 	if (rate < IB_RATE_2_5_GBPS || rate > IB_RATE_1600_GBPS)
 		return -EINVAL;
 
-	stat_rate_support = MLX5_CAP_GEN(dev->mdev, stat_rate_support);
+	stat_rate_support = MLX5_CAP_GEN(mdev, stat_rate_support);
 	while (rate != IB_RATE_PORT_CURRENT &&
 	       !(1 << ib_to_mlx5_rate_map(rate) & stat_rate_support))
 		--rate;
@@ -3587,6 +3587,7 @@ static int mlx5_set_path(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 			 int attr_mask, u32 path_flags,
 			 const struct ib_qp_attr *attr, bool alt)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	const struct ib_global_route *grh = rdma_ah_read_grh(ah);
 	int err;
 	enum ib_gid_type gid_type;
@@ -3647,7 +3648,7 @@ static int mlx5_set_path(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 		       sizeof(grh->dgid.raw));
 	}
 
-	err = mlx5r_ib_rate(dev, rdma_ah_get_static_rate(ah));
+	err = mlx5r_ib_rate(mdev, rdma_ah_get_static_rate(ah));
 	if (err < 0)
 		return err;
 	MLX5_SET(ads, path, stat_rate, err);
diff --git a/drivers/infiniband/hw/mlx5/qp.h b/drivers/infiniband/hw/mlx5/qp.h
index 9dabf0326071814eb44c47637ef95e6088ba35d8..e3be8077a481bb3ea1eb974938e2b55234790ff3 100644
--- a/drivers/infiniband/hw/mlx5/qp.h
+++ b/drivers/infiniband/hw/mlx5/qp.h
@@ -56,5 +56,5 @@ int mlx5_core_xrcd_dealloc(struct mlx5_core_dev *mdev, u32 xrcdn);
 int mlx5_ib_qp_set_counter(struct ib_qp *qp, struct rdma_counter *counter);
 int mlx5_ib_qp_event_init(void);
 void mlx5_ib_qp_event_cleanup(void);
-int mlx5r_ib_rate(struct mlx5_ib_dev *dev, u8 rate);
+int mlx5r_ib_rate(struct mlx5_core_dev *mdev, u8 rate);
 #endif /* _MLX5_IB_QP_H */

-- 
2.49.0


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH rdma-next 07/11] RDMA/mlx5: Select the QP core device through its PD
  2026-11-17 14:01 [PATCH rdma-next 00/11] RDMA/mlx5: Preparation for SD support Edward Srouji
                   ` (5 preceding siblings ...)
  2026-11-17 14:01 ` [PATCH rdma-next 06/11] RDMA/mlx5: Select the AH core device through their PD Edward Srouji
@ 2026-11-17 14:01 ` Edward Srouji
  2026-11-17 14:01 ` [PATCH rdma-next 08/11] RDMA/mlx5: Resolve core device from ucontext for DEVX resources Edward Srouji
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Edward Srouji @ 2026-11-17 14:01 UTC (permalink / raw)
  To: Leon Romanovsky, Jason Gunthorpe, Sabrina Dubroca
  Cc: linux-rdma, linux-kernel, netdev, Edward Srouji,
	Akiva Goldberger, Michael Gur

From: Akiva Goldberger <agoldberger@nvidia.com>

Resolve the core device from the QP across the QP create and modify
paths, instead of accessing the core dev through dev->mdev.
Delay drop is armed once for the whole IB device, so it stays on
dev->mdev.

No functional change.

Signed-off-by: Akiva Goldberger <agoldberger@nvidia.com>
Reviewed-by: Michael Gur <michaelgur@nvidia.com>
Signed-off-by: Edward Srouji <edwards@nvidia.com>
---
 drivers/infiniband/hw/mlx5/gsi.c     |  13 +-
 drivers/infiniband/hw/mlx5/ib_rep.c  |   3 +-
 drivers/infiniband/hw/mlx5/main.c    |   6 +-
 drivers/infiniband/hw/mlx5/mlx5_ib.h |  14 +-
 drivers/infiniband/hw/mlx5/qp.c      | 415 +++++++++++++++++++----------------
 drivers/infiniband/hw/mlx5/wr.c      |   4 +-
 6 files changed, 244 insertions(+), 211 deletions(-)

diff --git a/drivers/infiniband/hw/mlx5/gsi.c b/drivers/infiniband/hw/mlx5/gsi.c
index 16c2afbcef6ede74c703e95414f7e0e43974b808..62a570077585e1c98ce10f78c23eb1ea2781956f 100644
--- a/drivers/infiniband/hw/mlx5/gsi.c
+++ b/drivers/infiniband/hw/mlx5/gsi.c
@@ -38,9 +38,9 @@ struct mlx5_ib_gsi_wr {
 	bool completed:1;
 };
 
-static bool mlx5_ib_deth_sqpn_cap(struct mlx5_ib_dev *dev)
+static bool mlx5_ib_deth_sqpn_cap(struct mlx5_core_dev *mdev)
 {
-	return MLX5_CAP_GEN(dev->mdev, set_deth_sqpn);
+	return MLX5_CAP_GEN(mdev, set_deth_sqpn);
 }
 
 /* Call with gsi->lock locked */
@@ -89,15 +89,15 @@ int mlx5_ib_create_gsi(struct ib_pd *pd, struct mlx5_ib_qp *mqp,
 		       struct ib_qp_init_attr *attr)
 {
 	struct mlx5_ib_dev *dev = to_dev(pd->device);
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	struct mlx5_ib_gsi_qp *gsi;
 	struct ib_qp_init_attr hw_init_attr = *attr;
 	const u8 port_num = attr->port_num;
 	int num_qps = 0;
 	int ret;
 
-	if (mlx5_ib_deth_sqpn_cap(dev)) {
-		if (MLX5_CAP_GEN(dev->mdev,
-				 port_type) == MLX5_CAP_PORT_TYPE_IB)
+	if (mlx5_ib_deth_sqpn_cap(mdev)) {
+		if (MLX5_CAP_GEN(mdev, port_type) == MLX5_CAP_PORT_TYPE_IB)
 			num_qps = pd->device->attrs.max_pkeys;
 		else if (dev->lag_active)
 			num_qps = dev->lag_ports;
@@ -268,7 +268,8 @@ static void setup_qp(struct mlx5_ib_gsi_qp *gsi, u16 qp_index)
 	u16 pkey;
 	int ret;
 
-	if (MLX5_CAP_GEN(dev->mdev,  port_type) != MLX5_CAP_PORT_TYPE_IB)
+	if (MLX5_CAP_GEN(qp_to_mdev(gsi->rx_qp), port_type) !=
+	    MLX5_CAP_PORT_TYPE_IB)
 		pkey_index = 0;
 
 	ret = ib_query_pkey(device, gsi->port_num, pkey_index, &pkey);
diff --git a/drivers/infiniband/hw/mlx5/ib_rep.c b/drivers/infiniband/hw/mlx5/ib_rep.c
index b6bfc85c0c5703d1e7384a50caa2c46fbab8059e..416483ecb575620e48695871747ccbf6ab03d7e6 100644
--- a/drivers/infiniband/hw/mlx5/ib_rep.c
+++ b/drivers/infiniband/hw/mlx5/ib_rep.c
@@ -303,7 +303,8 @@ struct mlx5_flow_handle *create_flow_rule_vport_sq(struct mlx5_ib_dev *dev,
 						   struct mlx5_ib_sq *sq,
 						   u32 port)
 {
-	struct mlx5_eswitch *esw = dev->mdev->priv.eswitch;
+	struct mlx5_core_dev *mdev = qp_to_mdev(sq->base.container_mibqp);
+	struct mlx5_eswitch *esw = mdev->priv.eswitch;
 	struct mlx5_eswitch_rep *rep;
 
 	if (!dev->is_rep || !port)
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index f7ea8aa4ad210c51c2dfd82bbe16043af667b7d9..83b49f0fcdc06c9e7ccbad3c8765d2b6ca7d484d 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -2311,7 +2311,7 @@ static int mlx5_ib_alloc_ucontext(struct ib_ucontext *uctx,
 	context->lib_caps = req.lib_caps;
 	print_lib_caps(dev, context->lib_caps);
 
-	if (mlx5_ib_lag_should_assign_affinity(dev)) {
+	if (mlx5_ib_lag_should_assign_affinity(dev, dev->mdev)) {
 		u32 port = mlx5_core_native_port_num(dev->mdev) - 1;
 
 		atomic_set(&context->tx_port_affinity,
@@ -2844,7 +2844,7 @@ static int mlx5_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 		return -EOPNOTSUPP;
 	}
 
-	err = mlx5_cmd_attach_mcg(dev->mdev, gid, ibqp->qp_num, uid);
+	err = mlx5_cmd_attach_mcg(qp_to_mdev(ibqp), gid, ibqp->qp_num, uid);
 	if (err)
 		mlx5_ib_warn(dev, "failed attaching QPN 0x%x, MGID %pI6\n",
 			     ibqp->qp_num, gid->raw);
@@ -2860,7 +2860,7 @@ static int mlx5_ib_mcg_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 
 	uid = ibqp->pd ?
 		to_mpd(ibqp->pd)->uid : 0;
-	err = mlx5_cmd_detach_mcg(dev->mdev, gid, ibqp->qp_num, uid);
+	err = mlx5_cmd_detach_mcg(qp_to_mdev(ibqp), gid, ibqp->qp_num, uid);
 	if (err)
 		mlx5_ib_warn(dev, "failed detaching QPN 0x%x, MGID %pI6\n",
 			     ibqp->qp_num, gid->raw);
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index 8b878b33fcdff72ecfa37a860585193ab0ea9c13..48d5ab47b45c3d240409212f5ad18a68f1a14381 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -1673,7 +1673,9 @@ static inline void mlx5r_deref_wait_odp_mkey(struct mlx5_ib_mkey *mmkey)
 	wait_event(mmkey->wait, refcount_read(&mmkey->usecount) == 0);
 }
 
-static inline bool mlx5_ib_lag_should_assign_affinity(struct mlx5_ib_dev *dev)
+static inline bool
+mlx5_ib_lag_should_assign_affinity(struct mlx5_ib_dev *dev,
+				   struct mlx5_core_dev *mdev)
 {
 	/*
 	 * If the driver is in hash mode and the port_select_flow_table_bypass cap
@@ -1683,16 +1685,16 @@ static inline bool mlx5_ib_lag_should_assign_affinity(struct mlx5_ib_dev *dev)
 	 * the port affinity by default.
 	 */
 	if (dev->lag_active &&
-	    mlx5_lag_mode_is_hash(dev->mdev) &&
-	    MLX5_CAP_PORT_SELECTION(dev->mdev, port_select_flow_table_bypass))
+	    mlx5_lag_mode_is_hash(mdev) &&
+	    MLX5_CAP_PORT_SELECTION(mdev, port_select_flow_table_bypass))
 		return 0;
 
-	if (mlx5_lag_is_lacp_owner(dev->mdev) && !dev->lag_active)
+	if (mlx5_lag_is_lacp_owner(mdev) && !dev->lag_active)
 		return 0;
 
 	return dev->lag_active ||
-		(MLX5_CAP_GEN(dev->mdev, num_lag_ports) > 1 &&
-		 MLX5_CAP_GEN(dev->mdev, lag_tx_port_affinity));
+		(MLX5_CAP_GEN(mdev, num_lag_ports) > 1 &&
+		 MLX5_CAP_GEN(mdev, lag_tx_port_affinity));
 }
 
 static inline bool rt_supported(int ts_cap)
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 2709e5465d3316eb08f25663a248fba62ebfe8c9..1135e710e339818aaa15f1077874561745ca6305 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -443,11 +443,12 @@ static void mlx5_ib_qp_event(struct mlx5_core_qp *qp, int type)
 static int set_rq_size(struct mlx5_ib_dev *dev, struct ib_qp_cap *cap,
 		       int has_rq, struct mlx5_ib_qp *qp, struct mlx5_ib_create_qp *ucmd)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	int wqe_size;
 	int wq_size;
 
 	/* Sanity check RQ size before proceeding */
-	if (cap->max_recv_wr > (1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz)))
+	if (cap->max_recv_wr > (1 << MLX5_CAP_GEN(mdev, log_max_qp_sz)))
 		return -EINVAL;
 
 	if (!has_rq) {
@@ -479,10 +480,10 @@ static int set_rq_size(struct mlx5_ib_dev *dev, struct ib_qp_cap *cap,
 			wq_size = roundup_pow_of_two(cap->max_recv_wr) * wqe_size;
 			wq_size = max_t(int, wq_size, MLX5_SEND_WQE_BB);
 			qp->rq.wqe_cnt = wq_size / wqe_size;
-			if (wqe_size > MLX5_CAP_GEN(dev->mdev, max_wqe_sz_rq)) {
+			if (wqe_size > MLX5_CAP_GEN(mdev, max_wqe_sz_rq)) {
 				mlx5_ib_dbg(dev, "wqe_size %d, max %d\n",
 					    wqe_size,
-					    MLX5_CAP_GEN(dev->mdev,
+					    MLX5_CAP_GEN(mdev,
 							 max_wqe_sz_rq));
 				return -EINVAL;
 			}
@@ -598,6 +599,7 @@ static int get_send_sge(struct ib_qp_init_attr *attr, int wqe_size)
 static int calc_sq_size(struct mlx5_ib_dev *dev, struct ib_qp_init_attr *attr,
 			struct mlx5_ib_qp *qp)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	int wqe_size;
 	int wq_size;
 
@@ -609,9 +611,9 @@ static int calc_sq_size(struct mlx5_ib_dev *dev, struct ib_qp_init_attr *attr,
 	if (wqe_size < 0)
 		return wqe_size;
 
-	if (wqe_size > MLX5_CAP_GEN(dev->mdev, max_wqe_sz_sq)) {
+	if (wqe_size > MLX5_CAP_GEN(mdev, max_wqe_sz_sq)) {
 		mlx5_ib_dbg(dev, "wqe_size(%d) > max_sq_desc_sz(%d)\n",
-			    wqe_size, MLX5_CAP_GEN(dev->mdev, max_wqe_sz_sq));
+			    wqe_size, MLX5_CAP_GEN(mdev, max_wqe_sz_sq));
 		return -EINVAL;
 	}
 
@@ -621,11 +623,11 @@ static int calc_sq_size(struct mlx5_ib_dev *dev, struct ib_qp_init_attr *attr,
 
 	wq_size = roundup_pow_of_two(attr->cap.max_send_wr * wqe_size);
 	qp->sq.wqe_cnt = wq_size / MLX5_SEND_WQE_BB;
-	if (qp->sq.wqe_cnt > (1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz))) {
+	if (qp->sq.wqe_cnt > (1 << MLX5_CAP_GEN(mdev, log_max_qp_sz))) {
 		mlx5_ib_dbg(dev, "send queue size (%d * %d / %d -> %d) exceeds limits(%d)\n",
 			    attr->cap.max_send_wr, wqe_size, MLX5_SEND_WQE_BB,
 			    qp->sq.wqe_cnt,
-			    1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz));
+			    1 << MLX5_CAP_GEN(mdev, log_max_qp_sz));
 		return -ENOMEM;
 	}
 	qp->sq.wqe_shift = ilog2(MLX5_SEND_WQE_BB);
@@ -646,12 +648,13 @@ static int set_user_buf_size(struct mlx5_ib_dev *dev,
 			    struct mlx5_ib_qp_base *base,
 			    struct ib_qp_init_attr *attr)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	int desc_sz = 1 << qp->sq.wqe_shift;
 	int rq_buf_size, sq_buf_size;
 
-	if (desc_sz > MLX5_CAP_GEN(dev->mdev, max_wqe_sz_sq)) {
+	if (desc_sz > MLX5_CAP_GEN(mdev, max_wqe_sz_sq)) {
 		mlx5_ib_warn(dev, "desc_sz %d, max_sq_desc_sz %d\n",
-			     desc_sz, MLX5_CAP_GEN(dev->mdev, max_wqe_sz_sq));
+			     desc_sz, MLX5_CAP_GEN(mdev, max_wqe_sz_sq));
 		return -EINVAL;
 	}
 
@@ -663,10 +666,10 @@ static int set_user_buf_size(struct mlx5_ib_dev *dev,
 
 	qp->sq.wqe_cnt = ucmd->sq_wqe_count;
 
-	if (qp->sq.wqe_cnt > (1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz))) {
+	if (qp->sq.wqe_cnt > (1 << MLX5_CAP_GEN(mdev, log_max_qp_sz))) {
 		mlx5_ib_warn(dev, "wqe_cnt %d, max_wqes %d\n",
 			     qp->sq.wqe_cnt,
-			     1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz));
+			     1 << MLX5_CAP_GEN(mdev, log_max_qp_sz));
 		return -EINVAL;
 	}
 
@@ -1100,6 +1103,7 @@ static int _create_user_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 static void destroy_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 		       struct mlx5_ib_qp_base *base, struct ib_udata *udata)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	struct mlx5_ib_ucontext *context = rdma_udata_to_drv_context(
 		udata, struct mlx5_ib_ucontext, ibucontext);
 
@@ -1124,9 +1128,9 @@ static void destroy_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 	kvfree(qp->sq.wr_data);
 	kvfree(qp->rq.wrid);
 	if (qp->db.db)
-		mlx5_db_free(dev->mdev, &qp->db);
+		mlx5_db_free(mdev, &qp->db);
 	if (qp->buf.frags)
-		mlx5_frag_buf_free(dev->mdev, &qp->buf);
+		mlx5_frag_buf_free(mdev, &qp->buf);
 }
 
 static int _create_kernel_qp(struct mlx5_ib_dev *dev,
@@ -1134,6 +1138,7 @@ static int _create_kernel_qp(struct mlx5_ib_dev *dev,
 			     struct mlx5_ib_qp *qp, u32 **in, int *inlen,
 			     struct mlx5_ib_qp_base *base)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	int uar_index;
 	void *qpc;
 	int err;
@@ -1147,7 +1152,7 @@ static int _create_kernel_qp(struct mlx5_ib_dev *dev,
 	/* We need to divide by two since each register is comprised of
 	 * two buffers of identical size, namely odd and even
 	 */
-	qp->bf.buf_size = (1 << MLX5_CAP_GEN(dev->mdev, log_bf_reg_size)) / 2;
+	qp->bf.buf_size = (1 << MLX5_CAP_GEN(mdev, log_bf_reg_size)) / 2;
 	uar_index = qp->bf.bfreg->index;
 
 	err = calc_sq_size(dev, init_attr, qp);
@@ -1160,8 +1165,8 @@ static int _create_kernel_qp(struct mlx5_ib_dev *dev,
 	qp->sq.offset = qp->rq.wqe_cnt << qp->rq.wqe_shift;
 	base->ubuffer.buf_size = err + (qp->rq.wqe_cnt << qp->rq.wqe_shift);
 
-	err = mlx5_frag_buf_alloc_node(dev->mdev, base->ubuffer.buf_size,
-				       &qp->buf, dev->mdev->priv.numa_node);
+	err = mlx5_frag_buf_alloc_node(mdev, base->ubuffer.buf_size,
+				       &qp->buf, mdev->priv.numa_node);
 	if (err) {
 		mlx5_ib_dbg(dev, "err %d\n", err);
 		return err;
@@ -1193,7 +1198,7 @@ static int _create_kernel_qp(struct mlx5_ib_dev *dev,
 
 	qpc = MLX5_ADDR_OF(create_qp_in, *in, qpc);
 	MLX5_SET(qpc, qpc, uar_page, uar_index);
-	MLX5_SET(qpc, qpc, ts_format, mlx5_get_qp_default_ts(dev->mdev));
+	MLX5_SET(qpc, qpc, ts_format, mlx5_get_qp_default_ts(mdev));
 	MLX5_SET(qpc, qpc, log_page_size, qp->buf.page_shift - MLX5_ADAPTER_PAGE_SHIFT);
 
 	/* Set "fast registration enabled" for all kernel QPs */
@@ -1207,7 +1212,7 @@ static int _create_kernel_qp(struct mlx5_ib_dev *dev,
 				  (__be64 *)MLX5_ADDR_OF(create_qp_in,
 							 *in, pas));
 
-	err = mlx5_db_alloc(dev->mdev, &qp->db);
+	err = mlx5_db_alloc(mdev, &qp->db);
 	if (err) {
 		mlx5_ib_dbg(dev, "err %d\n", err);
 		goto err_free;
@@ -1237,13 +1242,13 @@ static int _create_kernel_qp(struct mlx5_ib_dev *dev,
 	kvfree(qp->sq.wrid);
 	kvfree(qp->sq.wr_data);
 	kvfree(qp->rq.wrid);
-	mlx5_db_free(dev->mdev, &qp->db);
+	mlx5_db_free(mdev, &qp->db);
 
 err_free:
 	kvfree(*in);
 
 err_buf:
-	mlx5_frag_buf_free(dev->mdev, &qp->buf);
+	mlx5_frag_buf_free(mdev, &qp->buf);
 	return err;
 }
 
@@ -1263,24 +1268,24 @@ static int create_raw_packet_qp_tis(struct mlx5_ib_dev *dev,
 				    struct mlx5_ib_sq *sq, u32 tdn,
 				    struct ib_pd *pd)
 {
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	u32 in[MLX5_ST_SZ_DW(create_tis_in)] = {};
 	void *tisc = MLX5_ADDR_OF(create_tis_in, in, ctx);
 
 	MLX5_SET(create_tis_in, in, uid, to_mpd(pd)->uid);
 	MLX5_SET(tisc, tisc, transport_domain, tdn);
-	if (!mlx5_ib_lag_should_assign_affinity(dev) &&
-	    mlx5_lag_is_lacp_owner(dev->mdev))
+	if (!mlx5_ib_lag_should_assign_affinity(dev, mdev) &&
+	    mlx5_lag_is_lacp_owner(mdev))
 		MLX5_SET(tisc, tisc, strict_lag_tx_port_affinity, 1);
 	if (qp->flags & IB_QP_CREATE_SOURCE_QPN)
 		MLX5_SET(tisc, tisc, underlay_qpn, qp->underlay_qpn);
 
-	return mlx5_core_create_tis(dev->mdev, in, &sq->tisn);
+	return mlx5_core_create_tis(mdev, in, &sq->tisn);
 }
 
-static void destroy_raw_packet_qp_tis(struct mlx5_ib_dev *dev,
-				      struct mlx5_ib_sq *sq, struct ib_pd *pd)
+static void destroy_raw_packet_qp_tis(struct mlx5_ib_sq *sq, struct ib_pd *pd)
 {
-	mlx5_cmd_destroy_tis(dev->mdev, sq->tisn, to_mpd(pd)->uid);
+	mlx5_cmd_destroy_tis(pd_to_mdev(pd), sq->tisn, to_mpd(pd)->uid);
 }
 
 static void destroy_flow_rule_vport_sq(struct mlx5_ib_sq *sq)
@@ -1296,9 +1301,10 @@ static bool fr_supported(int ts_cap)
 	       ts_cap == MLX5_TIMESTAMP_FORMAT_CAP_FREE_RUNNING_AND_REAL_TIME;
 }
 
-static int get_ts_format(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq,
-			 bool fr_sup, bool rt_sup)
+static int get_ts_format(struct mlx5_ib_cq *cq, bool fr_sup, bool rt_sup)
 {
+	struct mlx5_ib_dev *dev = to_dev(cq->ibcq.device);
+
 	if (cq->private_flags & MLX5_IB_CQ_PR_FLAGS_REAL_TIME_TS) {
 		if (!rt_sup) {
 			mlx5_ib_dbg(dev,
@@ -1319,35 +1325,37 @@ static int get_ts_format(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq,
 			MLX5_TIMESTAMP_FORMAT_DEFAULT;
 }
 
-static int get_rq_ts_format(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *recv_cq)
+static int get_rq_ts_format(struct mlx5_core_dev *mdev,
+			    struct mlx5_ib_cq *recv_cq)
 {
-	u8 ts_cap = MLX5_CAP_GEN(dev->mdev, rq_ts_format);
+	u8 ts_cap = MLX5_CAP_GEN(mdev, rq_ts_format);
 
-	return get_ts_format(dev, recv_cq, fr_supported(ts_cap),
+	return get_ts_format(recv_cq, fr_supported(ts_cap),
 			     rt_supported(ts_cap));
 }
 
-static int get_sq_ts_format(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *send_cq)
+static int get_sq_ts_format(struct mlx5_core_dev *mdev,
+			    struct mlx5_ib_cq *send_cq)
 {
-	u8 ts_cap = MLX5_CAP_GEN(dev->mdev, sq_ts_format);
+	u8 ts_cap = MLX5_CAP_GEN(mdev, sq_ts_format);
 
-	return get_ts_format(dev, send_cq, fr_supported(ts_cap),
+	return get_ts_format(send_cq, fr_supported(ts_cap),
 			     rt_supported(ts_cap));
 }
 
-static int get_qp_ts_format(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *send_cq,
+static int get_qp_ts_format(struct mlx5_ib_qp *qp, struct mlx5_ib_cq *send_cq,
 			    struct mlx5_ib_cq *recv_cq)
 {
-	u8 ts_cap = MLX5_CAP_ROCE(dev->mdev, qp_ts_format);
+	u8 ts_cap = MLX5_CAP_ROCE(qp_to_mdev(qp), qp_ts_format);
 	bool fr_sup = fr_supported(ts_cap);
 	bool rt_sup = rt_supported(ts_cap);
 	u8 default_ts = fr_sup ? MLX5_TIMESTAMP_FORMAT_FREE_RUNNING :
 				 MLX5_TIMESTAMP_FORMAT_DEFAULT;
 	int send_ts_format =
-		send_cq ? get_ts_format(dev, send_cq, fr_sup, rt_sup) :
+		send_cq ? get_ts_format(send_cq, fr_sup, rt_sup) :
 			  default_ts;
 	int recv_ts_format =
-		recv_cq ? get_ts_format(dev, recv_cq, fr_sup, rt_sup) :
+		recv_cq ? get_ts_format(recv_cq, fr_sup, rt_sup) :
 			  default_ts;
 
 	if (send_ts_format < 0 || recv_ts_format < 0)
@@ -1357,7 +1365,7 @@ static int get_qp_ts_format(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *send_cq,
 	    recv_ts_format != MLX5_TIMESTAMP_FORMAT_DEFAULT &&
 	    send_ts_format != recv_ts_format) {
 		mlx5_ib_dbg(
-			dev,
+			to_dev(qp->ibqp.device),
 			"The send ts_format does not match the receive ts_format\n");
 		return -EOPNOTSUPP;
 	}
@@ -1371,6 +1379,7 @@ static int create_raw_packet_qp_sq(struct mlx5_ib_dev *dev,
 				   struct mlx5_ib_sq *sq, void *qpin,
 				   struct ib_pd *pd, struct mlx5_ib_cq *cq)
 {
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	struct mlx5_ib_ubuffer *ubuffer = &sq->ubuffer;
 	__be64 *pas;
 	void *in;
@@ -1383,7 +1392,7 @@ static int create_raw_packet_qp_sq(struct mlx5_ib_dev *dev,
 	unsigned long page_size;
 	int ts_format;
 
-	ts_format = get_sq_ts_format(dev, cq);
+	ts_format = get_sq_ts_format(mdev, cq);
 	if (ts_format < 0)
 		return ts_format;
 
@@ -1413,7 +1422,7 @@ static int create_raw_packet_qp_sq(struct mlx5_ib_dev *dev,
 	MLX5_SET(create_sq_in, in, uid, to_mpd(pd)->uid);
 	sqc = MLX5_ADDR_OF(create_sq_in, in, ctx);
 	MLX5_SET(sqc, sqc, flush_in_error_en, 1);
-	if (MLX5_CAP_ETH(dev->mdev, multi_pkt_send_wqe))
+	if (MLX5_CAP_ETH(mdev, multi_pkt_send_wqe))
 		MLX5_SET(sqc, sqc, allow_multi_pkt_send_wqe, 1);
 	MLX5_SET(sqc, sqc, state, MLX5_SQC_STATE_RST);
 	MLX5_SET(sqc, sqc, ts_format, ts_format);
@@ -1421,8 +1430,8 @@ static int create_raw_packet_qp_sq(struct mlx5_ib_dev *dev,
 	MLX5_SET(sqc, sqc, cqn, MLX5_GET(qpc, qpc, cqn_snd));
 	MLX5_SET(sqc, sqc, tis_lst_sz, 1);
 	MLX5_SET(sqc, sqc, tis_num_0, sq->tisn);
-	if (MLX5_CAP_GEN(dev->mdev, eth_net_offloads) &&
-	    MLX5_CAP_ETH(dev->mdev, swp))
+	if (MLX5_CAP_GEN(mdev, eth_net_offloads) &&
+	    MLX5_CAP_ETH(mdev, swp))
 		MLX5_SET(sqc, sqc, allow_swp, 1);
 
 	wq = MLX5_ADDR_OF(sqc, sqc, wq);
@@ -1462,8 +1471,7 @@ static void destroy_raw_packet_qp_sq(struct ib_pd *pd, struct mlx5_ib_sq *sq)
 	ib_umem_release(sq->ubuffer.umem);
 }
 
-static int create_raw_packet_qp_rq(struct mlx5_ib_dev *dev,
-				   struct mlx5_ib_rq *rq, void *qpin,
+static int create_raw_packet_qp_rq(struct mlx5_ib_rq *rq, void *qpin,
 				   struct ib_pd *pd, struct mlx5_ib_cq *cq)
 {
 	struct mlx5_ib_qp *mqp = rq->base.container_mibqp;
@@ -1479,7 +1487,7 @@ static int create_raw_packet_qp_rq(struct mlx5_ib_dev *dev,
 	size_t inlen;
 	int err;
 
-	ts_format = get_rq_ts_format(dev, cq);
+	ts_format = get_rq_ts_format(pd_to_mdev(pd), cq);
 	if (ts_format < 0)
 		return ts_format;
 
@@ -1545,7 +1553,7 @@ static void destroy_raw_packet_qp_tir(struct mlx5_ib_dev *dev,
 	if (qp_flags_en & (MLX5_QP_FLAG_TIR_ALLOW_SELF_LB_UC |
 			   MLX5_QP_FLAG_TIR_ALLOW_SELF_LB_MC))
 		mlx5_ib_disable_lb(dev, false, true);
-	mlx5_cmd_destroy_tir(dev->mdev, rq->tirn, to_mpd(pd)->uid);
+	mlx5_cmd_destroy_tir(pd_to_mdev(pd), rq->tirn, to_mpd(pd)->uid);
 }
 
 static int create_raw_packet_qp_tir(struct mlx5_ib_dev *dev,
@@ -1553,6 +1561,7 @@ static int create_raw_packet_qp_tir(struct mlx5_ib_dev *dev,
 				    u32 *qp_flags_en, struct ib_pd *pd,
 				    u32 *out)
 {
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	u8 lb_flag = 0;
 	u32 *in;
 	void *tirc;
@@ -1585,7 +1594,7 @@ static int create_raw_packet_qp_tir(struct mlx5_ib_dev *dev,
 
 	MLX5_SET(tirc, tirc, self_lb_block, lb_flag);
 	MLX5_SET(create_tir_in, in, opcode, MLX5_CMD_OP_CREATE_TIR);
-	err = mlx5_cmd_exec_inout(dev->mdev, create_tir, in, out);
+	err = mlx5_cmd_exec_inout(mdev, create_tir, in, out);
 	rq->tirn = MLX5_GET(create_tir_out, out, tirn);
 	if (!err && MLX5_GET(tirc, tirc, self_lb_block)) {
 		err = mlx5_ib_enable_lb(dev, false, true);
@@ -1650,7 +1659,7 @@ static int create_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 			rq->flags |= MLX5_IB_RQ_CVLAN_STRIPPING;
 		if (qp->flags & IB_QP_CREATE_PCI_WRITE_END_PADDING)
 			rq->flags |= MLX5_IB_RQ_PCI_WRITE_END_PADDING;
-		err = create_raw_packet_qp_rq(dev, rq, in, pd,
+		err = create_raw_packet_qp_rq(rq, in, pd,
 					      to_mcq(init_attr->recv_cq));
 		if (err)
 			goto err_destroy_sq;
@@ -1665,8 +1674,10 @@ static int create_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 			resp->comp_mask |= MLX5_IB_CREATE_QP_RESP_MASK_RQN;
 			resp->tirn = rq->tirn;
 			resp->comp_mask |= MLX5_IB_CREATE_QP_RESP_MASK_TIRN;
-			if (MLX5_CAP_FLOWTABLE_NIC_RX(dev->mdev, sw_owner) ||
-			    MLX5_CAP_FLOWTABLE_NIC_RX(dev->mdev, sw_owner_v2)) {
+			if (MLX5_CAP_FLOWTABLE_NIC_RX(pd_to_mdev(pd),
+						      sw_owner) ||
+			    MLX5_CAP_FLOWTABLE_NIC_RX(pd_to_mdev(pd),
+						      sw_owner_v2)) {
 				resp->tir_icm_addr = MLX5_GET(
 					create_tir_out, out, icm_address_31_0);
 				resp->tir_icm_addr |=
@@ -1694,7 +1705,7 @@ static int create_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 		return err;
 	destroy_raw_packet_qp_sq(pd, sq);
 err_destroy_tis:
-	destroy_raw_packet_qp_tis(dev, sq, pd);
+	destroy_raw_packet_qp_tis(sq, pd);
 
 	return err;
 }
@@ -1713,7 +1724,7 @@ static void destroy_raw_packet_qp(struct mlx5_ib_dev *dev,
 
 	if (qp->sq.wqe_cnt) {
 		destroy_raw_packet_qp_sq(qp->ibqp.pd, sq);
-		destroy_raw_packet_qp_tis(dev, sq, qp->ibqp.pd);
+		destroy_raw_packet_qp_tis(sq, qp->ibqp.pd);
 	}
 }
 
@@ -1731,10 +1742,11 @@ static void raw_packet_qp_copy_info(struct mlx5_ib_qp *qp,
 
 static void destroy_rss_raw_qp_tir(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	if (qp->flags_en & (MLX5_QP_FLAG_TIR_ALLOW_SELF_LB_UC |
 			    MLX5_QP_FLAG_TIR_ALLOW_SELF_LB_MC))
 		mlx5_ib_disable_lb(dev, false, true);
-	mlx5_cmd_destroy_tir(dev->mdev, qp->rss_qp.tirn,
+	mlx5_cmd_destroy_tir(mdev, qp->rss_qp.tirn,
 			     to_mpd(qp->ibqp.pd)->uid);
 }
 
@@ -1755,6 +1767,7 @@ static int create_rss_raw_qp_tir(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 				 struct mlx5_ib_qp *qp,
 				 struct mlx5_create_qp_params *params)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	struct ib_qp_init_attr *init_attr = params->attr;
 	struct mlx5_ib_create_qp_rss *ucmd = params->ucmd;
 	struct ib_udata *udata = params->udata;
@@ -1912,14 +1925,14 @@ static int create_rss_raw_qp_tir(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 
 create_tir:
 	MLX5_SET(create_tir_in, in, opcode, MLX5_CMD_OP_CREATE_TIR);
-	err = mlx5_cmd_exec_inout(dev->mdev, create_tir, in, out);
+	err = mlx5_cmd_exec_inout(mdev, create_tir, in, out);
 
 	qp->rss_qp.tirn = MLX5_GET(create_tir_out, out, tirn);
 	if (!err && MLX5_GET(tirc, tirc, self_lb_block)) {
 		err = mlx5_ib_enable_lb(dev, false, true);
 
 		if (err)
-			mlx5_cmd_destroy_tir(dev->mdev, qp->rss_qp.tirn,
+			mlx5_cmd_destroy_tir(mdev, qp->rss_qp.tirn,
 					     to_mpd(pd)->uid);
 	}
 
@@ -1929,8 +1942,8 @@ static int create_rss_raw_qp_tir(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	if (mucontext->devx_uid) {
 		params->resp.comp_mask |= MLX5_IB_CREATE_QP_RESP_MASK_TIRN;
 		params->resp.tirn = qp->rss_qp.tirn;
-		if (MLX5_CAP_FLOWTABLE_NIC_RX(dev->mdev, sw_owner) ||
-		    MLX5_CAP_FLOWTABLE_NIC_RX(dev->mdev, sw_owner_v2)) {
+		if (MLX5_CAP_FLOWTABLE_NIC_RX(mdev, sw_owner) ||
+		    MLX5_CAP_FLOWTABLE_NIC_RX(mdev, sw_owner_v2)) {
 			params->resp.tir_icm_addr =
 				MLX5_GET(create_tir_out, out, icm_address_31_0);
 			params->resp.tir_icm_addr |=
@@ -1957,11 +1970,11 @@ static int create_rss_raw_qp_tir(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	return err;
 }
 
-static void configure_requester_scat_cqe(struct mlx5_ib_dev *dev,
-					 struct mlx5_ib_qp *qp,
+static void configure_requester_scat_cqe(struct mlx5_ib_qp *qp,
 					 struct ib_qp_init_attr *init_attr,
 					 void *qpc)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	int scqe_sz;
 	bool allow_scat_cqe = false;
 
@@ -1977,7 +1990,7 @@ static void configure_requester_scat_cqe(struct mlx5_ib_dev *dev,
 	}
 
 	if (init_attr->qp_type != MLX5_IB_QPT_DCI ||
-	    MLX5_CAP_GEN(dev->mdev, dc_req_scat_data_cqe))
+	    MLX5_CAP_GEN(mdev, dc_req_scat_data_cqe))
 		MLX5_SET(qpc, qpc, cs_req, MLX5_REQ_SCAT_DATA32_CQE);
 }
 
@@ -2000,11 +2013,11 @@ static int atomic_size_to_mode(int size_mask)
 	return MLX5_ATOMIC_MODE_8B;
 }
 
-static int get_atomic_mode(struct mlx5_ib_dev *dev,
-			   struct mlx5_ib_qp *qp)
+static int get_atomic_mode(struct mlx5_ib_qp *qp)
 {
-	u8 atomic_operations = MLX5_CAP_ATOMIC(dev->mdev, atomic_operations);
-	u8 atomic = MLX5_CAP_GEN(dev->mdev, atomic);
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
+	u8 atomic_operations = MLX5_CAP_ATOMIC(mdev, atomic_operations);
+	u8 atomic = MLX5_CAP_GEN(mdev, atomic);
 	int atomic_mode = -EOPNOTSUPP;
 	int atomic_size_mask;
 
@@ -2012,9 +2025,9 @@ static int get_atomic_mode(struct mlx5_ib_dev *dev,
 		return -EOPNOTSUPP;
 
 	if (qp->type == MLX5_IB_QPT_DCT)
-		atomic_size_mask = MLX5_CAP_ATOMIC(dev->mdev, atomic_size_dc);
+		atomic_size_mask = MLX5_CAP_ATOMIC(mdev, atomic_size_dc);
 	else
-		atomic_size_mask = MLX5_CAP_ATOMIC(dev->mdev, atomic_size_qp);
+		atomic_size_mask = MLX5_CAP_ATOMIC(mdev, atomic_size_qp);
 
 	if ((atomic_operations & MLX5_ATOMIC_OPS_EXTENDED_CMP_SWAP) ||
 	    (atomic_operations & MLX5_ATOMIC_OPS_EXTENDED_FETCH_ADD))
@@ -2040,7 +2053,7 @@ static int create_xrc_tgt_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 	struct mlx5_ib_resources *devr = &dev->devr;
 	u32 out[MLX5_ST_SZ_DW(create_qp_out)] = {};
 	int inlen = MLX5_ST_SZ_BYTES(create_qp_in);
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	struct mlx5_ib_qp_base *base;
 	unsigned long flags;
 	void *qpc;
@@ -2069,7 +2082,7 @@ static int create_xrc_tgt_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 	if (qp->flags & IB_QP_CREATE_MANAGED_RECV)
 		MLX5_SET(qpc, qpc, cd_slave_receive, 1);
 
-	MLX5_SET(qpc, qpc, ts_format, mlx5_get_qp_default_ts(dev->mdev));
+	MLX5_SET(qpc, qpc, ts_format, mlx5_get_qp_default_ts(mdev));
 	MLX5_SET(qpc, qpc, rq_type, MLX5_SRQ_RQ);
 	MLX5_SET(qpc, qpc, no_sq, 1);
 	MLX5_SET(qpc, qpc, cqn_rcv, to_mcq(devr->c0)->mcq.cqn);
@@ -2119,7 +2132,7 @@ static int create_dci(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	u32 uidx = params->uidx;
 	struct mlx5_ib_resources *devr = &dev->devr;
 	int inlen = MLX5_ST_SZ_BYTES(create_qp_in);
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	struct mlx5_ib_cq *send_cq;
 	struct mlx5_ib_cq *recv_cq;
 	unsigned long flags;
@@ -2156,7 +2169,7 @@ static int create_dci(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	if (ucmd->sq_wqe_count > (1 << MLX5_CAP_GEN(mdev, log_max_qp_sz)))
 		return -EINVAL;
 
-	ts_format = get_qp_ts_format(dev, to_mcq(init_attr->send_cq),
+	ts_format = get_qp_ts_format(qp, to_mcq(init_attr->send_cq),
 				     to_mcq(init_attr->recv_cq));
 
 	if (ts_format < 0)
@@ -2183,7 +2196,7 @@ static int create_dci(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	if (qp->flags & IB_QP_CREATE_MANAGED_SEND)
 		MLX5_SET(qpc, qpc, cd_slave_send, 1);
 	if (qp->flags_en & MLX5_QP_FLAG_SCATTER_CQE)
-		configure_requester_scat_cqe(dev, qp, init_attr, qpc);
+		configure_requester_scat_cqe(qp, init_attr, qpc);
 
 	if (qp->rq.wqe_cnt) {
 		MLX5_SET(qpc, qpc, log_rq_stride, qp->rq.wqe_shift - 4);
@@ -2280,7 +2293,7 @@ static int create_user_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	u32 uidx = params->uidx;
 	struct mlx5_ib_resources *devr = &dev->devr;
 	int inlen = MLX5_ST_SZ_BYTES(create_qp_in);
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	struct mlx5_ib_cq *send_cq;
 	struct mlx5_ib_cq *recv_cq;
 	unsigned long flags;
@@ -2324,7 +2337,7 @@ static int create_user_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 		return -EINVAL;
 
 	if (init_attr->qp_type != IB_QPT_RAW_PACKET) {
-		ts_format = get_qp_ts_format(dev, to_mcq(init_attr->send_cq),
+		ts_format = get_qp_ts_format(qp, to_mcq(init_attr->send_cq),
 					     to_mcq(init_attr->recv_cq));
 		if (ts_format < 0)
 			return ts_format;
@@ -2371,7 +2384,7 @@ static int create_user_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	}
 	if ((qp->flags_en & MLX5_QP_FLAG_SCATTER_CQE) &&
 	    (qp->type == MLX5_IB_QPT_DCI || qp->type == IB_QPT_RC))
-		configure_requester_scat_cqe(dev, qp, init_attr, qpc);
+		configure_requester_scat_cqe(qp, init_attr, qpc);
 
 	if (qp->rq.wqe_cnt) {
 		MLX5_SET(qpc, qpc, log_rq_stride, qp->rq.wqe_shift - 4);
@@ -2482,7 +2495,7 @@ static int create_kernel_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	struct mlx5_ib_resources *devr = &dev->devr;
 	u32 out[MLX5_ST_SZ_DW(create_qp_out)] = {};
 	int inlen = MLX5_ST_SZ_BYTES(create_qp_in);
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	struct mlx5_ib_cq *send_cq;
 	struct mlx5_ib_cq *recv_cq;
 	unsigned long flags;
@@ -2702,6 +2715,7 @@ static int modify_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 static void destroy_qp_common(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 			      struct ib_udata *udata)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	struct mlx5_ib_cq *send_cq, *recv_cq;
 	struct mlx5_ib_qp_base *base;
 	unsigned long flags;
@@ -2766,7 +2780,7 @@ static void destroy_qp_common(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 			mlx5_ib_warn(dev, "failed to destroy QP 0x%x\n",
 				     base->mqp.qpn);
 		if (qp->rl.rate) {
-			mlx5_rl_remove_rate(dev->mdev, &qp->rl);
+			mlx5_rl_remove_rate(mdev, &qp->rl);
 			memset(&qp->rl, 0, sizeof(qp->rl));
 		}
 	}
@@ -2774,16 +2788,17 @@ static void destroy_qp_common(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 	destroy_qp(dev, qp, base, udata);
 }
 
-static int create_dct(struct mlx5_ib_dev *dev, struct ib_pd *pd,
+static int create_dct(struct ib_pd *pd,
 		      struct mlx5_ib_qp *qp,
 		      struct mlx5_create_qp_params *params)
 {
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	struct ib_qp_init_attr *attr = params->attr;
 	struct mlx5_ib_create_qp *ucmd = params->ucmd;
 	u32 uidx = params->uidx;
 	void *dctc;
 
-	if (mlx5_lag_is_active(dev->mdev) && !MLX5_CAP_GEN(dev->mdev, lag_dct))
+	if (mlx5_lag_is_active(mdev) && !MLX5_CAP_GEN(mdev, lag_dct))
 		return -EOPNOTSUPP;
 
 	qp->dct.in = kzalloc(MLX5_ST_SZ_BYTES(create_dct_in), GFP_KERNEL);
@@ -2797,7 +2812,7 @@ static int create_dct(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	MLX5_SET(dctc, dctc, cqn, to_mcq(attr->recv_cq)->mcq.cqn);
 	MLX5_SET64(dctc, dctc, dc_access_key, ucmd->access_key);
 	MLX5_SET(dctc, dctc, user_index, uidx);
-	if (MLX5_CAP_GEN(dev->mdev, ece_support))
+	if (MLX5_CAP_GEN(mdev, ece_support))
 		MLX5_SET(dctc, dctc, ece, ucmd->ece_options);
 
 	if (qp->flags_en & MLX5_QP_FLAG_SCATTER_CQE) {
@@ -2811,16 +2826,19 @@ static int create_dct(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	return 0;
 }
 
-static int check_qp_type(struct mlx5_ib_dev *dev, struct ib_qp_init_attr *attr,
+static int check_qp_type(struct ib_qp *ibqp, struct ib_qp_init_attr *attr,
 			 enum ib_qp_type *type)
 {
-	if (attr->qp_type == IB_QPT_DRIVER && !MLX5_CAP_GEN(dev->mdev, dct))
+	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
+	struct mlx5_core_dev *mdev = qp_to_mdev(ibqp);
+
+	if (attr->qp_type == IB_QPT_DRIVER && !MLX5_CAP_GEN(mdev, dct))
 		goto out;
 
 	switch (attr->qp_type) {
 	case IB_QPT_XRC_TGT:
 	case IB_QPT_XRC_INI:
-		if (!MLX5_CAP_GEN(dev->mdev, xrc))
+		if (!MLX5_CAP_GEN(mdev, xrc))
 			goto out;
 		fallthrough;
 	case IB_QPT_RC:
@@ -2943,7 +2961,7 @@ static void process_vendor_flag(struct mlx5_ib_dev *dev, int *flags, int flag,
 static int process_vendor_flags(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 				void *ucmd, struct ib_qp_init_attr *attr)
 {
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	bool cond;
 	int flags;
 
@@ -3037,7 +3055,7 @@ static int process_create_flags(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 				struct ib_qp_init_attr *attr)
 {
 	enum ib_qp_type qp_type = qp->type;
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	int create_flags = attr->create_flags;
 	bool cond;
 
@@ -3048,7 +3066,7 @@ static int process_create_flags(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 		return (create_flags) ? -EINVAL : 0;
 
 	process_create_flag(dev, &create_flags, IB_QP_CREATE_NETIF_QP,
-			    mlx5_get_flow_namespace(dev->mdev,
+			    mlx5_get_flow_namespace(mdev,
 						    MLX5_FLOW_NAMESPACE_BYPASS),
 			    qp);
 	process_create_flag(dev, &create_flags,
@@ -3159,7 +3177,7 @@ static int create_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	switch (qp->type) {
 	case MLX5_IB_QPT_DCT:
 		rdma_restrack_no_track(&qp->ibqp.res);
-		err = create_dct(dev, pd, qp, params);
+		err = create_dct(pd, qp, params);
 		break;
 	case MLX5_IB_QPT_DCI:
 		err = create_dci(dev, pd, qp, params);
@@ -3314,7 +3332,7 @@ int mlx5_ib_create_qp(struct ib_qp *ibqp, struct ib_qp_init_attr *attr,
 	if (err)
 		return err;
 
-	err = check_qp_type(dev, attr, &type);
+	err = check_qp_type(ibqp, attr, &type);
 	if (err)
 		return err;
 
@@ -3420,7 +3438,6 @@ static int set_qpc_atomic_flags(struct mlx5_ib_qp *qp,
 				const struct ib_qp_attr *attr, int attr_mask,
 				void *qpc)
 {
-	struct mlx5_ib_dev *dev = to_dev(qp->ibqp.device);
 	u8 dest_rd_atomic;
 	u32 access_flags;
 
@@ -3442,7 +3459,7 @@ static int set_qpc_atomic_flags(struct mlx5_ib_qp *qp,
 	if (access_flags & IB_ACCESS_REMOTE_ATOMIC) {
 		int atomic_mode;
 
-		atomic_mode = get_atomic_mode(dev, qp);
+		atomic_mode = get_atomic_mode(qp);
 		if (atomic_mode < 0)
 			return -EOPNOTSUPP;
 
@@ -3516,8 +3533,7 @@ int mlx5r_ib_rate(struct mlx5_core_dev *mdev, u8 rate)
 	return ib_to_mlx5_rate_map(rate);
 }
 
-static int modify_raw_packet_eth_prio(struct mlx5_core_dev *mdev,
-				      struct mlx5_ib_sq *sq, u8 sl,
+static int modify_raw_packet_eth_prio(struct mlx5_ib_sq *sq, u8 sl,
 				      struct ib_pd *pd)
 {
 	void *in;
@@ -3536,15 +3552,14 @@ static int modify_raw_packet_eth_prio(struct mlx5_core_dev *mdev,
 	tisc = MLX5_ADDR_OF(modify_tis_in, in, ctx);
 	MLX5_SET(tisc, tisc, prio, ((sl & 0x7) << 1));
 
-	err = mlx5_core_modify_tis(mdev, sq->tisn, in);
+	err = mlx5_core_modify_tis(pd_to_mdev(pd), sq->tisn, in);
 
 	kvfree(in);
 
 	return err;
 }
 
-static int modify_raw_packet_tx_affinity(struct mlx5_core_dev *mdev,
-					 struct mlx5_ib_sq *sq, u8 tx_affinity,
+static int modify_raw_packet_tx_affinity(struct mlx5_ib_sq *sq, u8 tx_affinity,
 					 struct ib_pd *pd)
 {
 	void *in;
@@ -3563,7 +3578,7 @@ static int modify_raw_packet_tx_affinity(struct mlx5_core_dev *mdev,
 	tisc = MLX5_ADDR_OF(modify_tis_in, in, ctx);
 	MLX5_SET(tisc, tisc, lag_tx_port_affinity, tx_affinity);
 
-	err = mlx5_core_modify_tis(mdev, sq->tisn, in);
+	err = mlx5_core_modify_tis(pd_to_mdev(pd), sq->tisn, in);
 
 	kvfree(in);
 
@@ -3659,8 +3674,7 @@ static int mlx5_set_path(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 			 alt ? attr->alt_timeout : attr->timeout);
 
 	if ((qp->type == IB_QPT_RAW_PACKET) && qp->sq.wqe_cnt)
-		return modify_raw_packet_eth_prio(dev->mdev,
-						  &qp->raw_packet_qp.sq,
+		return modify_raw_packet_eth_prio(&qp->raw_packet_qp.sq,
 						  sl & 0xf, qp->ibqp.pd);
 
 	return 0;
@@ -3855,6 +3869,7 @@ static int modify_raw_packet_qp_rq(
 	struct mlx5_ib_dev *dev, struct mlx5_ib_rq *rq, int new_state,
 	const struct mlx5_modify_raw_qp_param *raw_qp_param, struct ib_pd *pd)
 {
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	void *in;
 	void *rqc;
 	int inlen;
@@ -3872,7 +3887,7 @@ static int modify_raw_packet_qp_rq(
 	MLX5_SET(rqc, rqc, state, new_state);
 
 	if (raw_qp_param->set_mask & MLX5_RAW_QP_MOD_SET_RQ_Q_CTR_ID) {
-		if (MLX5_CAP_GEN(dev->mdev, modify_rq_counter_set_id)) {
+		if (MLX5_CAP_GEN(mdev, modify_rq_counter_set_id)) {
 			MLX5_SET64(modify_rq_in, in, modify_bitmask,
 				   MLX5_MODIFY_RQ_IN_MODIFY_BITMASK_RQ_COUNTER_SET_ID);
 			MLX5_SET(rqc, rqc, counter_set_id, raw_qp_param->rq_q_ctr_id);
@@ -3882,7 +3897,7 @@ static int modify_raw_packet_qp_rq(
 				"RAW PACKET QP counters are not supported on current FW\n");
 	}
 
-	err = mlx5_core_modify_rq(dev->mdev, rq->base.mqp.qpn, in);
+	err = mlx5_core_modify_rq(mdev, rq->base.mqp.qpn, in);
 	if (err)
 		goto out;
 
@@ -3893,43 +3908,45 @@ static int modify_raw_packet_qp_rq(
 	return err;
 }
 
-static bool qp_rate_limit_supported(struct mlx5_ib_dev *dev,
-				    struct mlx5_ib_qp *qp)
+static bool qp_rate_limit_supported(struct mlx5_ib_qp *qp)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
+
 	if (qp->type == IB_QPT_RAW_PACKET ||
 	    qp->flags & IB_QP_CREATE_SOURCE_QPN)
 		return true;
 
 	if (qp->type == IB_QPT_UD)
-		return MLX5_CAP_QOS(dev->mdev, packet_pacing_req_ud);
+		return MLX5_CAP_QOS(mdev, packet_pacing_req_ud);
 
 	if (qp->type == IB_QPT_UC)
-		return MLX5_CAP_QOS(dev->mdev, packet_pacing_req_uc);
+		return MLX5_CAP_QOS(mdev, packet_pacing_req_uc);
 
 	return false;
 }
 
-static int qp_rl_parse(struct mlx5_ib_dev *dev,
-		       struct mlx5_ib_qp *qp,
+static int qp_rl_parse(struct mlx5_ib_qp *qp,
 		       const struct ib_qp_attr *attr,
 		       const struct mlx5_ib_modify_qp *ucmd,
 		       struct mlx5_rate_limit *rl_desired)
 {
-	if (!qp_rate_limit_supported(dev, qp))
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
+
+	if (!qp_rate_limit_supported(qp))
 		return -EOPNOTSUPP;
 
 	rl_desired->rate = attr->rate_limit;
 
 	if (ucmd->burst_info.max_burst_sz) {
 		if (!attr->rate_limit ||
-		    !MLX5_CAP_QOS(dev->mdev, packet_pacing_burst_bound))
+		    !MLX5_CAP_QOS(mdev, packet_pacing_burst_bound))
 			return -EINVAL;
 		rl_desired->max_burst_sz = ucmd->burst_info.max_burst_sz;
 	}
 
 	if (ucmd->burst_info.typical_pkt_sz) {
 		if (!attr->rate_limit ||
-		    !MLX5_CAP_QOS(dev->mdev, packet_pacing_typical_size))
+		    !MLX5_CAP_QOS(mdev, packet_pacing_typical_size))
 			return -EINVAL;
 		rl_desired->typical_pkt_sz = ucmd->burst_info.typical_pkt_sz;
 	}
@@ -3937,10 +3954,10 @@ static int qp_rl_parse(struct mlx5_ib_dev *dev,
 	return 0;
 }
 
-static int qp_rl_prepare(struct mlx5_ib_dev *dev,
-			 struct mlx5_ib_qp *qp, u16 op,
+static int qp_rl_prepare(struct mlx5_ib_qp *qp, u16 op,
 			 struct mlx5_rate_limit_ctx *ctx)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	int err;
 
 	ctx->rl_old = qp->rl;
@@ -3955,7 +3972,7 @@ static int qp_rl_prepare(struct mlx5_ib_dev *dev,
 	ctx->rl_changed = true;
 
 	if (ctx->rl_desired.rate) {
-		err = mlx5_rl_add_rate(dev->mdev, &ctx->rl_desired_index,
+		err = mlx5_rl_add_rate(mdev, &ctx->rl_desired_index,
 				       &ctx->rl_desired);
 		if (err) {
 			pr_err("Failed configuring rate limit(err %d): rate %u, max_burst_sz %u, typical_pkt_sz %u\n",
@@ -3969,18 +3986,18 @@ static int qp_rl_prepare(struct mlx5_ib_dev *dev,
 	return 0;
 }
 
-static void qp_rl_rollback(struct mlx5_core_dev *mdev,
+static void qp_rl_rollback(struct mlx5_ib_qp *qp,
 			   struct mlx5_rate_limit_ctx *ctx)
 {
 	if (ctx->rl_desired_index)
-		mlx5_rl_remove_rate(mdev, &ctx->rl_desired);
+		mlx5_rl_remove_rate(qp_to_mdev(qp), &ctx->rl_desired);
 }
 
-static void qp_rl_commit(struct mlx5_core_dev *mdev,
-			 struct mlx5_ib_qp *qp,
+static void qp_rl_commit(struct mlx5_ib_qp *qp,
 			 struct mlx5_rate_limit_ctx *ctx,
 			 enum ib_qp_state new_state)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	if (ctx->rl_changed) {
 		if (ctx->rl_old.rate)
 			mlx5_rl_remove_rate(mdev, &ctx->rl_old);
@@ -3999,9 +4016,10 @@ static void qp_rl_commit(struct mlx5_core_dev *mdev,
 }
 
 static int modify_raw_packet_qp_sq(
-	struct mlx5_core_dev *mdev, struct mlx5_ib_sq *sq, int new_state,
+	struct mlx5_ib_sq *sq, int new_state,
 	const struct mlx5_modify_raw_qp_param *raw_qp_param, struct ib_pd *pd)
 {
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	const struct mlx5_rate_limit_ctx *rl_ctx = &raw_qp_param->rl_ctx;
 	struct mlx5_ib_qp *ibqp = sq->base.container_mibqp;
 	void *in;
@@ -4105,7 +4123,7 @@ static int modify_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 		struct mlx5_flow_handle *flow_rule;
 
 		if (tx_affinity) {
-			err = modify_raw_packet_tx_affinity(dev->mdev, sq,
+			err = modify_raw_packet_tx_affinity(sq,
 							    tx_affinity,
 							    qp->ibqp.pd);
 			if (err)
@@ -4117,7 +4135,7 @@ static int modify_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 		if (IS_ERR(flow_rule))
 			return PTR_ERR(flow_rule);
 
-		err = modify_raw_packet_qp_sq(dev->mdev, sq, sq_state,
+		err = modify_raw_packet_qp_sq(sq, sq_state,
 					      raw_qp_param, qp->ibqp.pd);
 		if (err) {
 			if (flow_rule)
@@ -4137,11 +4155,12 @@ static int modify_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 }
 
 static unsigned int get_tx_affinity_rr(struct mlx5_ib_dev *dev,
+				       struct mlx5_core_dev *mdev,
 				       struct ib_udata *udata)
 {
 	struct mlx5_ib_ucontext *ucontext = rdma_udata_to_drv_context(
 		udata, struct mlx5_ib_ucontext, ibucontext);
-	u8 port_num = mlx5_core_native_port_num(dev->mdev) - 1;
+	u8 port_num = mlx5_core_native_port_num(mdev) - 1;
 	atomic_t *tx_port_affinity;
 
 	if (ucontext)
@@ -4150,7 +4169,8 @@ static unsigned int get_tx_affinity_rr(struct mlx5_ib_dev *dev,
 		tx_port_affinity = &dev->port[port_num].roce.tx_port_affinity;
 
 	return (unsigned int)atomic_add_return(1, tx_port_affinity) %
-		(dev->lag_active ? dev->lag_ports : MLX5_CAP_GEN(dev->mdev, num_lag_ports)) + 1;
+		(dev->lag_active ? dev->lag_ports :
+				   MLX5_CAP_GEN(mdev, num_lag_ports)) + 1;
 }
 
 static bool qp_supports_affinity(struct mlx5_ib_qp *qp)
@@ -4168,6 +4188,7 @@ static unsigned int get_tx_affinity(struct ib_qp *qp,
 				    int attr_mask, u8 init,
 				    struct ib_udata *udata)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	struct mlx5_ib_ucontext *ucontext = rdma_udata_to_drv_context(
 		udata, struct mlx5_ib_ucontext, ibucontext);
 	struct mlx5_ib_dev *dev = to_dev(qp->device);
@@ -4175,17 +4196,17 @@ static unsigned int get_tx_affinity(struct ib_qp *qp,
 	struct mlx5_ib_qp_base *qp_base;
 	unsigned int tx_affinity;
 
-	if (!(mlx5_ib_lag_should_assign_affinity(dev) &&
+	if (!(mlx5_ib_lag_should_assign_affinity(dev, mdev) &&
 	      qp_supports_affinity(mqp)))
 		return 0;
 
 	if (mqp->flags & MLX5_IB_QP_CREATE_SQPN_QP1)
 		tx_affinity = mqp->gsi_lag_port;
 	else if (init)
-		tx_affinity = get_tx_affinity_rr(dev, udata);
+		tx_affinity = get_tx_affinity_rr(dev, mdev, udata);
 	else if ((attr_mask & IB_QP_AV) && attr->xmit_slave)
 		tx_affinity =
-			mlx5_lag_get_slave_port(dev->mdev, attr->xmit_slave);
+			mlx5_lag_get_slave_port(mdev, attr->xmit_slave);
 	else
 		return 0;
 
@@ -4199,8 +4220,7 @@ static unsigned int get_tx_affinity(struct ib_qp *qp,
 	return tx_affinity;
 }
 
-static int __mlx5_ib_qp_set_raw_qp_counter(struct mlx5_ib_qp *qp, u32 set_id,
-					   struct mlx5_core_dev *mdev)
+static int __mlx5_ib_qp_set_raw_qp_counter(struct mlx5_ib_qp *qp, u32 set_id)
 {
 	struct mlx5_ib_raw_packet_qp *raw_packet_qp = &qp->raw_packet_qp;
 	struct mlx5_ib_rq *rq = &raw_packet_qp->rq;
@@ -4220,12 +4240,13 @@ static int __mlx5_ib_qp_set_raw_qp_counter(struct mlx5_ib_qp *qp, u32 set_id,
 		   MLX5_MODIFY_RQ_IN_MODIFY_BITMASK_RQ_COUNTER_SET_ID);
 	MLX5_SET(rqc, rqc, counter_set_id, set_id);
 
-	return mlx5_core_modify_rq(mdev, rq->base.mqp.qpn, in);
+	return mlx5_core_modify_rq(qp_to_mdev(qp), rq->base.mqp.qpn, in);
 }
 
 static int __mlx5_ib_qp_set_counter(struct ib_qp *qp,
 				    struct rdma_counter *counter)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	struct mlx5_ib_dev *dev = to_dev(qp->device);
 	u32 in[MLX5_ST_SZ_DW(rts2rts_qp_in)] = {};
 	struct mlx5_ib_qp *mqp = to_mqp(qp);
@@ -4239,7 +4260,7 @@ static int __mlx5_ib_qp_set_counter(struct ib_qp *qp,
 		set_id = mlx5_ib_get_counters_id(dev, mqp->port - 1);
 
 	if (mqp->type == IB_QPT_RAW_PACKET)
-		return __mlx5_ib_qp_set_raw_qp_counter(mqp, set_id, dev->mdev);
+		return __mlx5_ib_qp_set_raw_qp_counter(mqp, set_id);
 
 	base = &mqp->trans_qp.base;
 	MLX5_SET(rts2rts_qp_in, in, opcode, MLX5_CMD_OP_RTS2RTS_QP);
@@ -4250,7 +4271,7 @@ static int __mlx5_ib_qp_set_counter(struct ib_qp *qp,
 
 	qpc = MLX5_ADDR_OF(rts2rts_qp_in, in, qpc);
 	MLX5_SET(qpc, qpc, counter_set_id, set_id);
-	return mlx5_cmd_exec_in(dev->mdev, rts2rts_qp, in);
+	return mlx5_cmd_exec_in(mdev, rts2rts_qp, in);
 }
 
 static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
@@ -4261,6 +4282,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
 			       struct mlx5_ib_modify_qp_resp *resp,
 			       struct ib_udata *udata)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(ibqp);
 	static const u16 optab[MLX5_QP_NUM_STATE][MLX5_QP_NUM_STATE] = {
 		[MLX5_QP_STATE_RST] = {
 			[MLX5_QP_STATE_RST]	= MLX5_CMD_OP_2RST_QP,
@@ -4347,7 +4369,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
 
 	MLX5_SET(qpc, qpc, lag_tx_port_affinity, tx_affinity);
 	if (tx_affinity && new_state == IB_QPS_RTR &&
-	    MLX5_CAP_GEN(dev->mdev, init2_lag_tx_port_affinity))
+	    MLX5_CAP_GEN(mdev, init2_lag_tx_port_affinity))
 		optpar |= MLX5_QP_OPTPAR_LAG_TX_AFF;
 
 	if (is_sqp(qp->type)) {
@@ -4367,7 +4389,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
 		}
 		MLX5_SET(qpc, qpc, mtu, attr->path_mtu);
 		MLX5_SET(qpc, qpc, log_msg_max,
-			 MLX5_CAP_GEN(dev->mdev, log_max_msg));
+			 MLX5_CAP_GEN(mdev, log_max_msg));
 	}
 
 	if (attr_mask & IB_QP_DEST_QPN)
@@ -4495,7 +4517,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
 	}
 
 	if (attr_mask & IB_QP_RATE_LIMIT) {
-		err = qp_rl_parse(dev, qp, attr, ucmd, &rl_ctx.rl_desired);
+		err = qp_rl_parse(qp, attr, ucmd, &rl_ctx.rl_desired);
 		if (err)
 			goto out;
 	} else {
@@ -4504,7 +4526,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
 
 	op = optab[mlx5_cur][mlx5_new];
 	if (!mlx5_rl_are_equal(&rl_ctx.rl_desired, &qp->rl)) {
-		err = qp_rl_prepare(dev, qp, op, &rl_ctx);
+		err = qp_rl_prepare(qp, op, &rl_ctx);
 		if (err)
 			goto out;
 	}
@@ -4532,11 +4554,11 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
 
 		err = modify_raw_packet_qp(dev, qp, &raw_qp_param, tx_affinity);
 		if (err) {
-			qp_rl_rollback(dev->mdev, &raw_qp_param.rl_ctx);
+			qp_rl_rollback(qp, &raw_qp_param.rl_ctx);
 			goto out;
 		}
 
-		qp_rl_commit(dev->mdev, qp, &raw_qp_param.rl_ctx, new_state);
+		qp_rl_commit(qp, &raw_qp_param.rl_ctx, new_state);
 	} else {
 		if (rl_ctx.rl_changed) {
 			MLX5_SET(qpc, qpc, packet_pacing_rate_limit_index,
@@ -4546,7 +4568,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
 		if (udata) {
 			/* For the kernel flows, the resp will stay zero */
 			resp->ece_options =
-				MLX5_CAP_GEN(dev->mdev, ece_support) ?
+				MLX5_CAP_GEN(mdev, ece_support) ?
 					ucmd->ece_options : 0;
 			resp->response_length = sizeof(*resp);
 		}
@@ -4554,11 +4576,11 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
 					  &resp->ece_options);
 
 		if (err) {
-			qp_rl_rollback(dev->mdev, &rl_ctx);
+			qp_rl_rollback(qp, &rl_ctx);
 			goto out;
 		}
 
-		qp_rl_commit(dev->mdev, qp, &rl_ctx, new_state);
+		qp_rl_commit(qp, &rl_ctx, new_state);
 	}
 
 	if (err)
@@ -4666,6 +4688,7 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 			      int attr_mask, struct mlx5_ib_modify_qp *ucmd,
 			      struct ib_udata *udata)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(ibqp);
 	struct mlx5_ib_qp *qp = to_mqp(ibqp);
 	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
 	enum ib_qp_state cur_state, new_state;
@@ -4680,7 +4703,7 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 	new_state = attr->qp_state;
 
 	dctc = MLX5_ADDR_OF(create_dct_in, qp->dct.in, dct_context_entry);
-	if (MLX5_CAP_GEN(dev->mdev, ece_support) && ucmd->ece_options)
+	if (MLX5_CAP_GEN(mdev, ece_support) && ucmd->ece_options)
 		/*
 		 * DCT doesn't initialize QP till modify command is executed,
 		 * so we need to overwrite previously set ECE field if user
@@ -4709,7 +4732,7 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 		if (attr->qp_access_flags & IB_ACCESS_REMOTE_ATOMIC) {
 			int atomic_mode;
 
-			atomic_mode = get_atomic_mode(dev, qp);
+			atomic_mode = get_atomic_mode(qp);
 			if (atomic_mode < 0)
 				return -EOPNOTSUPP;
 
@@ -4717,9 +4740,9 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 			MLX5_SET(dctc, dctc, rae, 1);
 		}
 		MLX5_SET(dctc, dctc, pkey_index, attr->pkey_index);
-		if (mlx5_lag_is_active(dev->mdev))
+		if (mlx5_lag_is_active(mdev))
 			MLX5_SET(dctc, dctc, port,
-				 get_tx_affinity_rr(dev, udata));
+				 get_tx_affinity_rr(dev, mdev, udata));
 		else
 			MLX5_SET(dctc, dctc, port, attr->port_num);
 
@@ -4762,11 +4785,11 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 					   qp->dct.in,
 					   MLX5_ST_SZ_BYTES(create_dct_in), out,
 					   sizeof(out));
-		err = mlx5_cmd_check(dev->mdev, err, qp->dct.in, out);
+		err = mlx5_cmd_check(mdev, err, qp->dct.in, out);
 		if (err)
 			return err;
 		resp.dctn = qp->dct.mdct.mqp.qpn;
-		if (MLX5_CAP_GEN(dev->mdev, ece_support))
+		if (MLX5_CAP_GEN(mdev, ece_support))
 			resp.ece_options = MLX5_GET(create_dct_out, out, ece);
 		err = ib_respond_udata(udata, resp);
 		if (err) {
@@ -4795,22 +4818,20 @@ static bool mlx5_ib_modify_qp_allowed(struct mlx5_ib_dev *dev,
 	return false;
 }
 
-static int validate_rd_atomic(struct mlx5_ib_dev *dev, struct ib_qp_attr *attr,
+static int validate_rd_atomic(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 			      int attr_mask, enum ib_qp_type qp_type)
 {
+	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
+	struct mlx5_core_dev *mdev = qp_to_mdev(ibqp);
 	int log_max_ra_res;
 	int log_max_ra_req;
 
 	if (qp_type == MLX5_IB_QPT_DCI) {
-		log_max_ra_res = 1 << MLX5_CAP_GEN(dev->mdev,
-						   log_max_ra_res_dc);
-		log_max_ra_req = 1 << MLX5_CAP_GEN(dev->mdev,
-						   log_max_ra_req_dc);
+		log_max_ra_res = 1 << MLX5_CAP_GEN(mdev, log_max_ra_res_dc);
+		log_max_ra_req = 1 << MLX5_CAP_GEN(mdev, log_max_ra_req_dc);
 	} else {
-		log_max_ra_res = 1 << MLX5_CAP_GEN(dev->mdev,
-						   log_max_ra_res_qp);
-		log_max_ra_req = 1 << MLX5_CAP_GEN(dev->mdev,
-						   log_max_ra_req_qp);
+		log_max_ra_res = 1 << MLX5_CAP_GEN(mdev, log_max_ra_res_qp);
+		log_max_ra_req = 1 << MLX5_CAP_GEN(mdev, log_max_ra_req_qp);
 	}
 
 	if (attr_mask & IB_QP_MAX_QP_RD_ATOMIC &&
@@ -4832,6 +4853,7 @@ static int validate_rd_atomic(struct mlx5_ib_dev *dev, struct ib_qp_attr *attr,
 int mlx5_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 		      int attr_mask, struct ib_udata *udata)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(ibqp);
 	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
 	struct mlx5_ib_modify_qp_resp resp = {};
 	struct mlx5_ib_qp *qp = to_mqp(ibqp);
@@ -4860,7 +4882,7 @@ int mlx5_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 			return -EOPNOTSUPP;
 
 		if (ucmd.comp_mask & MLX5_IB_MODIFY_QP_OOO_DP) {
-			if (!get_dp_ooo_cap(dev->mdev, qp->type))
+			if (!get_dp_ooo_cap(mdev, qp->type))
 				return -EOPNOTSUPP;
 			qp->is_ooo_rq = 1;
 		}
@@ -4888,7 +4910,7 @@ int mlx5_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 	} else if (attr_mask == IB_QP_RATE_LIMIT && cur_state != IB_QPS_RTS) {
 		struct mlx5_rate_limit rl_desired = {};
 
-		err = qp_rl_parse(dev, qp, attr, &ucmd, &rl_desired);
+		err = qp_rl_parse(qp, attr, &ucmd, &rl_desired);
 		if (!err)
 			qp->rl_desired = rl_desired;
 		goto out;
@@ -4920,7 +4942,7 @@ int mlx5_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 		goto out;
 	}
 
-	if (!validate_rd_atomic(dev, attr, attr_mask, qp_type))
+	if (!validate_rd_atomic(ibqp, attr, attr_mask, qp_type))
 		goto out;
 
 	if (cur_state == new_state && cur_state == IB_QPS_RESET) {
@@ -4998,13 +5020,14 @@ static void to_rdma_ah_attr(struct mlx5_ib_dev *ibdev,
 	}
 }
 
-static int query_raw_packet_qp_sq_state(struct mlx5_ib_dev *dev,
+static int query_raw_packet_qp_sq_state(struct ib_pd *pd,
 					struct mlx5_ib_sq *sq,
 					u8 *sq_state)
 {
 	int err;
 
-	err = mlx5_core_query_sq_state(dev->mdev, sq->base.mqp.qpn, sq_state);
+	err = mlx5_core_query_sq_state(pd_to_mdev(pd), sq->base.mqp.qpn,
+				       sq_state);
 	if (err)
 		goto out;
 	sq->state = *sq_state;
@@ -5013,7 +5036,7 @@ static int query_raw_packet_qp_sq_state(struct mlx5_ib_dev *dev,
 	return err;
 }
 
-static int query_raw_packet_qp_rq_state(struct mlx5_ib_dev *dev,
+static int query_raw_packet_qp_rq_state(struct ib_pd *pd,
 					struct mlx5_ib_rq *rq,
 					u8 *rq_state)
 {
@@ -5027,7 +5050,7 @@ static int query_raw_packet_qp_rq_state(struct mlx5_ib_dev *dev,
 	if (!out)
 		return -ENOMEM;
 
-	err = mlx5_core_query_rq(dev->mdev, rq->base.mqp.qpn, out);
+	err = mlx5_core_query_rq(pd_to_mdev(pd), rq->base.mqp.qpn, out);
 	if (err)
 		goto out;
 
@@ -5085,8 +5108,7 @@ static int sqrq_state_to_qp_state(u8 sq_state, u8 rq_state,
 	return 0;
 }
 
-static int query_raw_packet_qp_state(struct mlx5_ib_dev *dev,
-				     struct mlx5_ib_qp *qp,
+static int query_raw_packet_qp_state(struct mlx5_ib_qp *qp,
 				     u8 *raw_packet_qp_state)
 {
 	struct mlx5_ib_raw_packet_qp *raw_packet_qp = &qp->raw_packet_qp;
@@ -5097,13 +5119,13 @@ static int query_raw_packet_qp_state(struct mlx5_ib_dev *dev,
 	u8 rq_state = MLX5_RQ_STATE_NA;
 
 	if (qp->sq.wqe_cnt) {
-		err = query_raw_packet_qp_sq_state(dev, sq, &sq_state);
+		err = query_raw_packet_qp_sq_state(qp->ibqp.pd, sq, &sq_state);
 		if (err)
 			return err;
 	}
 
 	if (qp->rq.wqe_cnt) {
-		err = query_raw_packet_qp_rq_state(dev, rq, &rq_state);
+		err = query_raw_packet_qp_rq_state(qp->ibqp.pd, rq, &rq_state);
 		if (err)
 			return err;
 	}
@@ -5268,7 +5290,7 @@ int mlx5_ib_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr,
 
 	if (qp->type == IB_QPT_RAW_PACKET ||
 	    qp->flags & IB_QP_CREATE_SOURCE_QPN) {
-		err = query_raw_packet_qp_state(dev, qp, &raw_packet_qp_state);
+		err = query_raw_packet_qp_state(qp, &raw_packet_qp_state);
 		if (err)
 			goto out;
 		qp->state = raw_packet_qp_state;
@@ -5379,6 +5401,7 @@ static int set_delay_drop(struct mlx5_ib_dev *dev)
 static int  create_rq(struct mlx5_ib_rwq *rwq, struct ib_pd *pd,
 		      struct ib_wq_init_attr *init_attr)
 {
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	struct mlx5_ib_dev *dev;
 	int has_net_offloads;
 	__be64 *rq_pas0;
@@ -5391,7 +5414,7 @@ static int  create_rq(struct mlx5_ib_rwq *rwq, struct ib_pd *pd,
 
 	dev = to_dev(pd->device);
 
-	ts_format = get_rq_ts_format(dev, to_mcq(init_attr->cq));
+	ts_format = get_rq_ts_format(mdev, to_mcq(init_attr->cq));
 	if (ts_format < 0)
 		return ts_format;
 
@@ -5414,7 +5437,7 @@ static int  create_rq(struct mlx5_ib_rwq *rwq, struct ib_pd *pd,
 		 rwq->create_flags & MLX5_IB_WQ_FLAGS_STRIDING_RQ ?
 		 MLX5_WQ_TYPE_CYCLIC_STRIDING_RQ : MLX5_WQ_TYPE_CYCLIC);
 	if (init_attr->create_flags & IB_WQ_FLAGS_PCI_WRITE_END_PADDING) {
-		if (!MLX5_CAP_GEN(dev->mdev, end_pad)) {
+		if (!MLX5_CAP_GEN(mdev, end_pad)) {
 			mlx5_ib_dbg(dev, "Scatter end padding is not supported\n");
 			err = -EOPNOTSUPP;
 			goto out;
@@ -5446,9 +5469,9 @@ static int  create_rq(struct mlx5_ib_rwq *rwq, struct ib_pd *pd,
 	MLX5_SET(wq, wq, log_wq_pg_sz, rwq->log_page_size);
 	MLX5_SET(wq, wq, wq_signature, rwq->wq_sig);
 	MLX5_SET64(wq, wq, dbr_addr, rwq->db.dma);
-	has_net_offloads = MLX5_CAP_GEN(dev->mdev, eth_net_offloads);
+	has_net_offloads = MLX5_CAP_GEN(mdev, eth_net_offloads);
 	if (init_attr->create_flags & IB_WQ_FLAGS_CVLAN_STRIPPING) {
-		if (!(has_net_offloads && MLX5_CAP_ETH(dev->mdev, vlan_cap))) {
+		if (!(has_net_offloads && MLX5_CAP_ETH(mdev, vlan_cap))) {
 			mlx5_ib_dbg(dev, "VLAN offloads are not supported\n");
 			err = -EOPNOTSUPP;
 			goto out;
@@ -5457,7 +5480,7 @@ static int  create_rq(struct mlx5_ib_rwq *rwq, struct ib_pd *pd,
 		MLX5_SET(rqc, rqc, vsd, 1);
 	}
 	if (init_attr->create_flags & IB_WQ_FLAGS_SCATTER_FCS) {
-		if (!(has_net_offloads && MLX5_CAP_ETH(dev->mdev, scatter_fcs))) {
+		if (!(has_net_offloads && MLX5_CAP_ETH(mdev, scatter_fcs))) {
 			mlx5_ib_dbg(dev, "Scatter FCS is not supported\n");
 			err = -EOPNOTSUPP;
 			goto out;
@@ -5491,13 +5514,13 @@ static int  create_rq(struct mlx5_ib_rwq *rwq, struct ib_pd *pd,
 	return err;
 }
 
-static int set_user_rq_size(struct mlx5_ib_dev *dev,
+static int set_user_rq_size(struct mlx5_core_dev *mdev,
 			    struct ib_wq_init_attr *wq_init_attr,
 			    struct mlx5_ib_create_wq *ucmd,
 			    struct mlx5_ib_rwq *rwq)
 {
 	/* Sanity check RQ size before proceeding */
-	if (wq_init_attr->max_wr > (1 << MLX5_CAP_GEN(dev->mdev, log_max_wq_sz)))
+	if (wq_init_attr->max_wr > (1 << MLX5_CAP_GEN(mdev, log_max_wq_sz)))
 		return -EINVAL;
 
 	if (!ucmd->rq_wqe_count)
@@ -5513,13 +5536,14 @@ static int set_user_rq_size(struct mlx5_ib_dev *dev,
 	return 0;
 }
 
-static bool log_of_strides_valid(struct mlx5_ib_dev *dev, u32 log_num_strides)
+static bool log_of_strides_valid(struct mlx5_core_dev *mdev,
+				 u32 log_num_strides)
 {
 	if ((log_num_strides > MLX5_MAX_SINGLE_WQE_LOG_NUM_STRIDES) ||
 	    (log_num_strides < MLX5_EXT_MIN_SINGLE_WQE_LOG_NUM_STRIDES))
 		return false;
 
-	if (!MLX5_CAP_GEN(dev->mdev, ext_stride_num_range) &&
+	if (!MLX5_CAP_GEN(mdev, ext_stride_num_range) &&
 	    (log_num_strides < MLX5_MIN_SINGLE_WQE_LOG_NUM_STRIDES))
 		return false;
 
@@ -5531,6 +5555,7 @@ static int prepare_user_rq(struct ib_pd *pd,
 			   struct ib_udata *udata,
 			   struct mlx5_ib_rwq *rwq)
 {
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	struct mlx5_ib_create_wq ucmd;
 	int err;
@@ -5544,7 +5569,7 @@ static int prepare_user_rq(struct ib_pd *pd,
 	}
 
 	if (ucmd.comp_mask & MLX5_IB_CREATE_WQ_STRIDING_RQ) {
-		if (!MLX5_CAP_GEN(dev->mdev, striding_rq)) {
+		if (!MLX5_CAP_GEN(mdev, striding_rq)) {
 			mlx5_ib_dbg(dev, "Striding RQ is not supported\n");
 			return -EOPNOTSUPP;
 		}
@@ -5558,13 +5583,13 @@ static int prepare_user_rq(struct ib_pd *pd,
 				    MLX5_MAX_SINGLE_STRIDE_LOG_NUM_BYTES);
 			return -EINVAL;
 		}
-		if (!log_of_strides_valid(dev,
+		if (!log_of_strides_valid(mdev,
 					  ucmd.single_wqe_log_num_of_strides)) {
 			mlx5_ib_dbg(
 				dev,
 				"Invalid log num strides (%u. Range is %u - %u)\n",
 				ucmd.single_wqe_log_num_of_strides,
-				MLX5_CAP_GEN(dev->mdev, ext_stride_num_range) ?
+				MLX5_CAP_GEN(mdev, ext_stride_num_range) ?
 					MLX5_EXT_MIN_SINGLE_WQE_LOG_NUM_STRIDES :
 					MLX5_MIN_SINGLE_WQE_LOG_NUM_STRIDES,
 				MLX5_MAX_SINGLE_WQE_LOG_NUM_STRIDES);
@@ -5577,7 +5602,7 @@ static int prepare_user_rq(struct ib_pd *pd,
 		rwq->create_flags |= MLX5_IB_WQ_FLAGS_STRIDING_RQ;
 	}
 
-	err = set_user_rq_size(dev, init_attr, &ucmd, rwq);
+	err = set_user_rq_size(mdev, init_attr, &ucmd, rwq);
 	if (err) {
 		mlx5_ib_dbg(dev, "err %d\n", err);
 		return err;
@@ -5677,6 +5702,8 @@ int mlx5_ib_create_rwq_ind_table(struct ib_rwq_ind_table *ib_rwq_ind_table,
 	struct mlx5_ib_rwq_ind_table *rwq_ind_tbl =
 		to_mrwq_ind_table(ib_rwq_ind_table);
 	struct mlx5_ib_dev *dev = to_dev(ib_rwq_ind_table->device);
+	struct ib_pd *pd = init_attr->ind_tbl[0]->pd;
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	int sz = 1 << init_attr->log_ind_tbl_size;
 	struct mlx5_ib_create_rwq_ind_tbl_resp resp = {};
 	size_t min_resp_len;
@@ -5691,10 +5718,10 @@ int mlx5_ib_create_rwq_ind_table(struct ib_rwq_ind_table *ib_rwq_ind_table,
 		return err;
 
 	if (init_attr->log_ind_tbl_size >
-	    MLX5_CAP_GEN(dev->mdev, log_max_rqt_size)) {
+	    MLX5_CAP_GEN(mdev, log_max_rqt_size)) {
 		mlx5_ib_dbg(dev, "log_ind_tbl_size = %d is bigger than supported = %d\n",
 			    init_attr->log_ind_tbl_size,
-			    MLX5_CAP_GEN(dev->mdev, log_max_rqt_size));
+			    MLX5_CAP_GEN(mdev, log_max_rqt_size));
 		return -EINVAL;
 	}
 
@@ -5716,10 +5743,10 @@ int mlx5_ib_create_rwq_ind_table(struct ib_rwq_ind_table *ib_rwq_ind_table,
 	for (i = 0; i < sz; i++)
 		MLX5_SET(rqtc, rqtc, rq_num[i], init_attr->ind_tbl[i]->wq_num);
 
-	rwq_ind_tbl->uid = to_mpd(init_attr->ind_tbl[0]->pd)->uid;
+	rwq_ind_tbl->uid = to_mpd(pd)->uid;
 	MLX5_SET(create_rqt_in, in, uid, rwq_ind_tbl->uid);
 
-	err = mlx5_core_create_rqt(dev->mdev, in, inlen, &rwq_ind_tbl->rqtn);
+	err = mlx5_core_create_rqt(mdev, in, inlen, &rwq_ind_tbl->rqtn);
 	kvfree(in);
 	if (err)
 		return err;
@@ -5737,21 +5764,23 @@ int mlx5_ib_create_rwq_ind_table(struct ib_rwq_ind_table *ib_rwq_ind_table,
 	return 0;
 
 err_copy:
-	mlx5_cmd_destroy_rqt(dev->mdev, rwq_ind_tbl->rqtn, rwq_ind_tbl->uid);
+	mlx5_cmd_destroy_rqt(mdev, rwq_ind_tbl->rqtn, rwq_ind_tbl->uid);
 	return err;
 }
 
 int mlx5_ib_destroy_rwq_ind_table(struct ib_rwq_ind_table *ib_rwq_ind_tbl)
 {
 	struct mlx5_ib_rwq_ind_table *rwq_ind_tbl = to_mrwq_ind_table(ib_rwq_ind_tbl);
-	struct mlx5_ib_dev *dev = to_dev(ib_rwq_ind_tbl->device);
+	struct ib_pd *pd = ib_rwq_ind_tbl->ind_tbl[0]->pd;
 
-	return mlx5_cmd_destroy_rqt(dev->mdev, rwq_ind_tbl->rqtn, rwq_ind_tbl->uid);
+	return mlx5_cmd_destroy_rqt(pd_to_mdev(pd), rwq_ind_tbl->rqtn,
+				    rwq_ind_tbl->uid);
 }
 
 int mlx5_ib_modify_wq(struct ib_wq *wq, struct ib_wq_attr *wq_attr,
 		      u32 wq_attr_mask, struct ib_udata *udata)
 {
+	struct mlx5_core_dev *mdev = pd_to_mdev(wq->pd);
 	struct mlx5_ib_dev *dev = to_dev(wq->device);
 	struct mlx5_ib_rwq *rwq = to_mrwq(wq);
 	struct mlx5_ib_modify_wq ucmd = {};
@@ -5788,8 +5817,8 @@ int mlx5_ib_modify_wq(struct ib_wq *wq, struct ib_wq_attr *wq_attr,
 
 	if (wq_attr_mask & IB_WQ_FLAGS) {
 		if (wq_attr->flags_mask & IB_WQ_FLAGS_CVLAN_STRIPPING) {
-			if (!(MLX5_CAP_GEN(dev->mdev, eth_net_offloads) &&
-			      MLX5_CAP_ETH(dev->mdev, vlan_cap))) {
+			if (!(MLX5_CAP_GEN(mdev, eth_net_offloads) &&
+			      MLX5_CAP_ETH(mdev, vlan_cap))) {
 				mlx5_ib_dbg(dev, "VLAN offloads are not supported\n");
 				err = -EOPNOTSUPP;
 				goto out;
@@ -5811,7 +5840,7 @@ int mlx5_ib_modify_wq(struct ib_wq *wq, struct ib_wq_attr *wq_attr,
 		u16 set_id;
 
 		set_id = mlx5_ib_get_counters_id(dev, 0);
-		if (MLX5_CAP_GEN(dev->mdev, modify_rq_counter_set_id)) {
+		if (MLX5_CAP_GEN(mdev, modify_rq_counter_set_id)) {
 			MLX5_SET64(modify_rq_in, in, modify_bitmask,
 				   MLX5_MODIFY_RQ_IN_MODIFY_BITMASK_RQ_COUNTER_SET_ID);
 			MLX5_SET(rqc, rqc, counter_set_id, set_id);
@@ -5821,7 +5850,7 @@ int mlx5_ib_modify_wq(struct ib_wq *wq, struct ib_wq_attr *wq_attr,
 				"Receive WQ counters are not supported on current FW\n");
 	}
 
-	err = mlx5_core_modify_rq(dev->mdev, rwq->core_qp.qpn, in);
+	err = mlx5_core_modify_rq(mdev, rwq->core_qp.qpn, in);
 	if (!err)
 		rwq->ibwq.state = (wq_state == MLX5_RQC_STATE_ERR) ? IB_WQS_ERR : wq_state;
 
@@ -5909,7 +5938,7 @@ void mlx5_ib_drain_sq(struct ib_qp *qp)
 	};
 	int ret;
 	struct mlx5_ib_dev *dev = to_dev(qp->device);
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 
 	ret = ib_modify_qp(qp, &attr, IB_QP_STATE);
 	if (ret && mdev->state != MLX5_DEVICE_STATE_INTERNAL_ERROR) {
@@ -5938,7 +5967,7 @@ void mlx5_ib_drain_rq(struct ib_qp *qp)
 	const struct ib_recv_wr *bad_rwr;
 	int ret;
 	struct mlx5_ib_dev *dev = to_dev(qp->device);
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 
 	ret = ib_modify_qp(qp, &attr, IB_QP_STATE);
 	if (ret && mdev->state != MLX5_DEVICE_STATE_INTERNAL_ERROR) {
@@ -5965,7 +5994,7 @@ void mlx5_ib_drain_rq(struct ib_qp *qp)
  */
 int mlx5_ib_qp_set_counter(struct ib_qp *qp, struct rdma_counter *counter)
 {
-	struct mlx5_ib_dev *dev = to_dev(qp->device);
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	struct mlx5_ib_qp *mqp = to_mqp(qp);
 	int err = 0;
 
@@ -5975,7 +6004,7 @@ int mlx5_ib_qp_set_counter(struct ib_qp *qp, struct rdma_counter *counter)
 		goto out;
 	}
 
-	if (!MLX5_CAP_GEN(dev->mdev, rts2rts_qp_counters_set_id)) {
+	if (!MLX5_CAP_GEN(mdev, rts2rts_qp_counters_set_id)) {
 		err = -EOPNOTSUPP;
 		goto out;
 	}
diff --git a/drivers/infiniband/hw/mlx5/wr.c b/drivers/infiniband/hw/mlx5/wr.c
index 7d1a64d24df181ad5b23580c00d68a3b48baf960..dda89cfb2c56be27e68a00f5da350a1f88f6b22a 100644
--- a/drivers/infiniband/hw/mlx5/wr.c
+++ b/drivers/infiniband/hw/mlx5/wr.c
@@ -1055,7 +1055,7 @@ int mlx5_ib_post_send(struct ib_qp *ibqp, const struct ib_send_wr *wr,
 {
 	struct mlx5_wqe_ctrl_seg *ctrl = NULL;  /* compiler warning */
 	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = qp_to_mdev(ibqp);
 	struct mlx5_ib_qp *qp = to_mqp(ibqp);
 	struct mlx5_wqe_xrc_seg *xrc;
 	void *cur_edge;
@@ -1212,7 +1212,7 @@ int mlx5_ib_post_recv(struct ib_qp *ibqp, const struct ib_recv_wr *wr,
 	struct mlx5_wqe_data_seg *scat;
 	struct mlx5_rwqe_sig *sig;
 	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = qp_to_mdev(ibqp);
 	unsigned long flags;
 	int err = 0;
 	int nreq;

-- 
2.49.0


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH rdma-next 08/11] RDMA/mlx5: Resolve core device from ucontext for DEVX resources
  2026-11-17 14:01 [PATCH rdma-next 00/11] RDMA/mlx5: Preparation for SD support Edward Srouji
                   ` (6 preceding siblings ...)
  2026-11-17 14:01 ` [PATCH rdma-next 07/11] RDMA/mlx5: Select the QP core device through its PD Edward Srouji
@ 2026-11-17 14:01 ` Edward Srouji
  2026-11-17 14:01 ` [PATCH rdma-next 09/11] RDMA/mlx5: Cache the CQ core device and resolve it via cq_to_mdev() Edward Srouji
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Edward Srouji @ 2026-11-17 14:01 UTC (permalink / raw)
  To: Leon Romanovsky, Jason Gunthorpe, Sabrina Dubroca
  Cc: linux-rdma, linux-kernel, netdev, Edward Srouji,
	Akiva Goldberger, Michael Gur

From: Akiva Goldberger <agoldberger@nvidia.com>

DEVX objects are all attached to a user context, which is tied to the
specific core device it was opened on. Resolve the core device from the
user context instead of through the IB dev. The DEVX UID of a user
context is created and destroyed on that same core device.

The DEVX umem and packet pacing objects kept their own copy of the core
device for cleanup. Drop it, and like the other DEVX objects resolve the
core device from the user context, which at cleanup is the one the
uobject was created in.

Introduces the uctx_to_mdev helper to easily translate between the user
context and the core device.

No functional change.

Signed-off-by: Akiva Goldberger <agoldberger@nvidia.com>
Reviewed-by: Michael Gur <michaelgur@nvidia.com>
Signed-off-by: Edward Srouji <edwards@nvidia.com>
---
 drivers/infiniband/hw/mlx5/devx.c      | 115 +++++++++++++++++----------------
 drivers/infiniband/hw/mlx5/devx.h      |  10 +--
 drivers/infiniband/hw/mlx5/dm.c        |   7 +-
 drivers/infiniband/hw/mlx5/dmah.c      |  10 ++-
 drivers/infiniband/hw/mlx5/main.c      |   7 +-
 drivers/infiniband/hw/mlx5/mlx5_ib.h   |   6 +-
 drivers/infiniband/hw/mlx5/qos.c       |  11 ++--
 drivers/infiniband/hw/mlx5/std_types.c |   6 +-
 8 files changed, 96 insertions(+), 76 deletions(-)

diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c
index 6d390e784b2f9eed524db40b8c9e2927c7de50a0..d0b1876f9e8afc6de57f7db1631327bb7c9b91ba 100644
--- a/drivers/infiniband/hw/mlx5/devx.c
+++ b/drivers/infiniband/hw/mlx5/devx.c
@@ -105,7 +105,6 @@ struct devx_async_event_file {
 };
 
 struct devx_umem {
-	struct mlx5_core_dev		*mdev;
 	struct ib_umem			*umem;
 	u32				dinlen;
 	u32				dinbox[MLX5_ST_SZ_DW(destroy_umem_in)];
@@ -123,17 +122,17 @@ devx_ufile2uctx(const struct uverbs_attr_bundle *attrs)
 	return to_mucontext(ib_uverbs_get_ucontext(attrs));
 }
 
-static int set_uctx_ucaps(struct mlx5_ib_dev *dev, u64 req_ucaps, u32 *cap)
+static int set_uctx_ucaps(struct mlx5_core_dev *mdev, u64 req_ucaps, u32 *cap)
 {
 	if (UCAP_ENABLED(req_ucaps, RDMA_UCAP_MLX5_CTRL_LOCAL)) {
-		if (MLX5_CAP_GEN(dev->mdev, uctx_cap) & MLX5_UCTX_CAP_RDMA_CTRL)
+		if (MLX5_CAP_GEN(mdev, uctx_cap) & MLX5_UCTX_CAP_RDMA_CTRL)
 			*cap |= MLX5_UCTX_CAP_RDMA_CTRL;
 		else
 			return -EOPNOTSUPP;
 	}
 
 	if (UCAP_ENABLED(req_ucaps, RDMA_UCAP_MLX5_CTRL_OTHER_VHCA)) {
-		if (MLX5_CAP_GEN(dev->mdev, uctx_cap) &
+		if (MLX5_CAP_GEN(mdev, uctx_cap) &
 		    MLX5_UCTX_CAP_RDMA_CTRL_OTHER_VHCA)
 			*cap |= MLX5_UCTX_CAP_RDMA_CTRL_OTHER_VHCA;
 		else
@@ -143,7 +142,8 @@ static int set_uctx_ucaps(struct mlx5_ib_dev *dev, u64 req_ucaps, u32 *cap)
 	return 0;
 }
 
-int mlx5_ib_devx_create(struct mlx5_ib_dev *dev, bool is_user, u64 req_ucaps)
+int mlx5_ib_devx_create(struct mlx5_ib_dev *dev, struct mlx5_core_dev *mdev,
+			bool is_user, u64 req_ucaps)
 {
 	u32 in[MLX5_ST_SZ_DW(create_uctx_in)] = {};
 	u32 out[MLX5_ST_SZ_DW(create_uctx_out)] = {};
@@ -153,22 +153,22 @@ int mlx5_ib_devx_create(struct mlx5_ib_dev *dev, bool is_user, u64 req_ucaps)
 	u32 cap = 0;
 
 	/* 0 means not supported */
-	if (!MLX5_CAP_GEN(dev->mdev, log_max_uctx))
+	if (!MLX5_CAP_GEN(mdev, log_max_uctx))
 		return -EINVAL;
 
 	uctx = MLX5_ADDR_OF(create_uctx_in, in, uctx);
 	if (is_user &&
-	    (MLX5_CAP_GEN(dev->mdev, uctx_cap) & MLX5_UCTX_CAP_RAW_TX) &&
+	    (MLX5_CAP_GEN(mdev, uctx_cap) & MLX5_UCTX_CAP_RAW_TX) &&
 	    rdma_dev_has_raw_cap(&dev->ib_dev))
 		cap |= MLX5_UCTX_CAP_RAW_TX;
 	if (is_user &&
-	    (MLX5_CAP_GEN(dev->mdev, uctx_cap) &
+	    (MLX5_CAP_GEN(mdev, uctx_cap) &
 	     MLX5_UCTX_CAP_INTERNAL_DEV_RES) &&
 	    capable(CAP_SYS_RAWIO))
 		cap |= MLX5_UCTX_CAP_INTERNAL_DEV_RES;
 
 	if (req_ucaps) {
-		err = set_uctx_ucaps(dev, req_ucaps, &cap);
+		err = set_uctx_ucaps(mdev, req_ucaps, &cap);
 		if (err)
 			return err;
 	}
@@ -176,7 +176,7 @@ int mlx5_ib_devx_create(struct mlx5_ib_dev *dev, bool is_user, u64 req_ucaps)
 	MLX5_SET(create_uctx_in, in, opcode, MLX5_CMD_OP_CREATE_UCTX);
 	MLX5_SET(uctx, uctx, cap, cap);
 
-	err = mlx5_cmd_exec(dev->mdev, in, sizeof(in), out, sizeof(out));
+	err = mlx5_cmd_exec(mdev, in, sizeof(in), out, sizeof(out));
 	if (err)
 		return err;
 
@@ -184,7 +184,7 @@ int mlx5_ib_devx_create(struct mlx5_ib_dev *dev, bool is_user, u64 req_ucaps)
 	return uid;
 }
 
-void mlx5_ib_devx_destroy(struct mlx5_ib_dev *dev, u16 uid)
+void mlx5_ib_devx_destroy(struct mlx5_core_dev *mdev, u16 uid)
 {
 	u32 in[MLX5_ST_SZ_DW(destroy_uctx_in)] = {};
 	u32 out[MLX5_ST_SZ_DW(destroy_uctx_out)] = {};
@@ -192,7 +192,7 @@ void mlx5_ib_devx_destroy(struct mlx5_ib_dev *dev, u16 uid)
 	MLX5_SET(destroy_uctx_in, in, opcode, MLX5_CMD_OP_DESTROY_UCTX);
 	MLX5_SET(destroy_uctx_in, in, uid, uid);
 
-	mlx5_cmd_exec(dev->mdev, in, sizeof(in), out, sizeof(out));
+	mlx5_cmd_exec(mdev, in, sizeof(in), out, sizeof(out));
 }
 
 static bool is_legacy_unaffiliated_event_num(u16 event_num)
@@ -631,10 +631,8 @@ static u64 devx_get_obj_id(const void *in)
 	return obj_id;
 }
 
-static bool devx_is_valid_obj_id(struct uverbs_attr_bundle *attrs,
-				 struct ib_uobject *uobj, const void *in)
+static bool devx_is_valid_obj_id(struct ib_uobject *uobj, const void *in)
 {
-	struct mlx5_ib_dev *dev = udata_to_dev(&attrs->driver_udata);
 	u64 obj_id = devx_get_obj_id(in);
 
 	if (!obj_id)
@@ -659,7 +657,7 @@ static bool devx_is_valid_obj_id(struct uverbs_attr_bundle *attrs,
 			opcode = MLX5_CMD_OP_CREATE_XRQ;
 			break;
 		default:
-			if (!dev->mdev->issi)
+			if (!srq_to_mdev(srq)->issi)
 				opcode = MLX5_CMD_OP_CREATE_SRQ;
 			else
 				opcode = MLX5_CMD_OP_CREATE_RMP;
@@ -992,12 +990,12 @@ static int devx_get_uid(struct mlx5_ib_ucontext *c, void *cmd_in)
 	return c->devx_uid;
 }
 
-static bool devx_is_general_cmd(void *in, struct mlx5_ib_dev *dev)
+static bool devx_is_general_cmd(void *in, struct mlx5_core_dev *mdev)
 {
 	u16 opcode = MLX5_GET(general_obj_in_cmd_hdr, in, opcode);
 
 	/* Pass all cmds for vhca_tunnel as general, tracking is done in FW */
-	if ((MLX5_CAP_GEN_64(dev->mdev, vhca_tunnel_commands) &&
+	if ((MLX5_CAP_GEN_64(mdev, vhca_tunnel_commands) &&
 	     MLX5_GET(general_obj_in_cmd_hdr, in, vhca_tunnel_id)) ||
 	    (opcode >= MLX5_CMD_OP_GENERAL_START &&
 	     opcode < MLX5_CMD_OP_GENERAL_END))
@@ -1031,7 +1029,6 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_QUERY_EQN)(
 	struct uverbs_attr_bundle *attrs)
 {
 	struct mlx5_ib_ucontext *c;
-	struct mlx5_ib_dev *dev;
 	int user_vector;
 	int dev_eqn;
 	int err;
@@ -1043,9 +1040,8 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_QUERY_EQN)(
 	c = devx_ufile2uctx(attrs);
 	if (IS_ERR(c))
 		return PTR_ERR(c);
-	dev = to_dev(c->ibucontext.device);
 
-	err = mlx5_comp_eqn_get(dev->mdev, user_vector, &dev_eqn);
+	err = mlx5_comp_eqn_get(uctx_to_mdev(c), user_vector, &dev_eqn);
 	if (err < 0)
 		return err;
 
@@ -1108,7 +1104,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OTHER)(
 	struct uverbs_attr_bundle *attrs)
 {
 	struct mlx5_ib_ucontext *c;
-	struct mlx5_ib_dev *dev;
+	struct mlx5_core_dev *mdev;
 	void *cmd_in = uverbs_attr_get_alloced_ptr(
 		attrs, MLX5_IB_ATTR_DEVX_OTHER_CMD_IN);
 	int cmd_out_len = uverbs_attr_get_len(attrs,
@@ -1120,14 +1116,14 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OTHER)(
 	c = devx_ufile2uctx(attrs);
 	if (IS_ERR(c))
 		return PTR_ERR(c);
-	dev = to_dev(c->ibucontext.device);
+	mdev = uctx_to_mdev(c);
 
 	uid = devx_get_uid(c, cmd_in);
 	if (uid < 0)
 		return uid;
 
 	/* Only white list of some general HCA commands are allowed for this method. */
-	if (!devx_is_general_cmd(cmd_in, dev))
+	if (!devx_is_general_cmd(cmd_in, mdev))
 		return -EINVAL;
 
 	cmd_out = uverbs_zalloc(attrs, cmd_out_len);
@@ -1135,7 +1131,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OTHER)(
 		return PTR_ERR(cmd_out);
 
 	MLX5_SET(general_obj_in_cmd_hdr, cmd_in, uid, uid);
-	err = mlx5_cmd_do(dev->mdev, cmd_in,
+	err = mlx5_cmd_do(mdev, cmd_in,
 			  uverbs_attr_get_len(attrs, MLX5_IB_ATTR_DEVX_OTHER_CMD_IN),
 			  cmd_out, cmd_out_len);
 	if (err && err != -EREMOTEIO)
@@ -1448,6 +1444,8 @@ static int devx_obj_cleanup(struct ib_uobject *uobject,
 			    enum rdma_remove_reason why,
 			    struct uverbs_attr_bundle *attrs)
 {
+	struct mlx5_core_dev *mdev =
+		uctx_to_mdev(to_mucontext(uobject->context));
 	u32 out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)];
 	struct mlx5_devx_event_table *devx_event_table;
 	struct devx_obj *obj = uobject->object;
@@ -1469,12 +1467,12 @@ static int devx_obj_cleanup(struct ib_uobject *uobject,
 	if (obj->flags & DEVX_OBJ_FLAGS_HW_FREED)
 		ret = 0;
 	else if (obj->flags & DEVX_OBJ_FLAGS_DCT)
-		ret = mlx5_core_destroy_dct(obj->ib_dev, obj->ib_dev->mdev,
+		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->ib_dev->mdev, &obj->core_cq);
+		ret = mlx5_core_destroy_cq(mdev, &obj->core_cq);
 	else
-		ret = mlx5_cmd_exec(obj->ib_dev->mdev, obj->dinbox,
+		ret = mlx5_cmd_exec(mdev, obj->dinbox,
 				    obj->dinlen, out, sizeof(out));
 	if (ret)
 		return ret;
@@ -1513,9 +1511,9 @@ static void devx_cq_comp(struct mlx5_core_cq *mcq, struct mlx5_eqe *eqe)
 	rcu_read_unlock();
 }
 
-static bool is_apu_cq(struct mlx5_ib_dev *dev, const void *in)
+static bool is_apu_cq(struct mlx5_core_dev *mdev, const void *in)
 {
-	if (!MLX5_CAP_GEN(dev->mdev, apu) ||
+	if (!MLX5_CAP_GEN(mdev, apu) ||
 	    !MLX5_GET(cqc, MLX5_ADDR_OF(create_cq_in, in, cq_context), apu_cq))
 		return false;
 
@@ -1536,6 +1534,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)(
 	struct mlx5_ib_ucontext *c = rdma_udata_to_drv_context(
 		&attrs->driver_udata, struct mlx5_ib_ucontext, ibucontext);
 	struct mlx5_ib_dev *dev = to_dev(c->ibucontext.device);
+	struct mlx5_core_dev *mdev = uctx_to_mdev(c);
 	u32 out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)];
 	struct devx_obj *obj;
 	u16 obj_type = 0;
@@ -1573,18 +1572,18 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)(
 
 	if (opcode == MLX5_CMD_OP_CREATE_DCT) {
 		obj->flags |= DEVX_OBJ_FLAGS_DCT;
-		err = mlx5_core_create_dct(dev, dev->mdev, &obj->core_dct,
+		err = mlx5_core_create_dct(dev, mdev, &obj->core_dct,
 					   cmd_in, cmd_in_len, cmd_out,
 					   cmd_out_len);
 	} else if (opcode == MLX5_CMD_OP_CREATE_CQ &&
-		   !is_apu_cq(dev, cmd_in)) {
+		   !is_apu_cq(mdev, cmd_in)) {
 		obj->flags |= DEVX_OBJ_FLAGS_CQ;
 		obj->core_cq.comp = devx_cq_comp;
-		err = mlx5_create_cq(dev->mdev, &obj->core_cq,
+		err = mlx5_create_cq(mdev, &obj->core_cq,
 				     cmd_in, cmd_in_len, cmd_out,
 				     cmd_out_len);
 	} else {
-		err = mlx5_cmd_do(dev->mdev, cmd_in, cmd_in_len,
+		err = mlx5_cmd_do(mdev, cmd_in, cmd_in_len,
 				  cmd_out, cmd_out_len);
 	}
 
@@ -1633,12 +1632,11 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)(
 
 obj_destroy:
 	if (obj->flags & DEVX_OBJ_FLAGS_DCT)
-		mlx5_core_destroy_dct(obj->ib_dev, obj->ib_dev->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->ib_dev->mdev, &obj->core_cq);
+		mlx5_core_destroy_cq(mdev, &obj->core_cq);
 	else
-		mlx5_cmd_exec(obj->ib_dev->mdev, obj->dinbox, obj->dinlen, out,
+		mlx5_cmd_exec(mdev, obj->dinbox, obj->dinlen, out,
 			      sizeof(out));
 obj_free:
 	kfree(obj);
@@ -1655,7 +1653,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_MODIFY)(
 							  MLX5_IB_ATTR_DEVX_OBJ_MODIFY_HANDLE);
 	struct mlx5_ib_ucontext *c = rdma_udata_to_drv_context(
 		&attrs->driver_udata, struct mlx5_ib_ucontext, ibucontext);
-	struct mlx5_ib_dev *dev = to_dev(c->ibucontext.device);
+	struct mlx5_core_dev *mdev = uctx_to_mdev(c);
 	void *cmd_out;
 	int err, err2;
 	int uid;
@@ -1670,7 +1668,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_MODIFY)(
 	if (!devx_is_obj_modify_cmd(cmd_in))
 		return -EINVAL;
 
-	if (!devx_is_valid_obj_id(attrs, uobj, cmd_in))
+	if (!devx_is_valid_obj_id(uobj, cmd_in))
 		return -EINVAL;
 
 	cmd_out = uverbs_zalloc(attrs, cmd_out_len);
@@ -1680,7 +1678,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_MODIFY)(
 	MLX5_SET(general_obj_in_cmd_hdr, cmd_in, uid, uid);
 	devx_set_umem_valid(cmd_in);
 
-	err = mlx5_cmd_do(dev->mdev, cmd_in,
+	err = mlx5_cmd_do(mdev, cmd_in,
 			  uverbs_attr_get_len(attrs, MLX5_IB_ATTR_DEVX_OBJ_MODIFY_CMD_IN),
 			  cmd_out, cmd_out_len);
 	if (err && err != -EREMOTEIO)
@@ -1705,7 +1703,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_QUERY)(
 	void *cmd_out;
 	int err, err2;
 	int uid;
-	struct mlx5_ib_dev *dev = to_dev(c->ibucontext.device);
+	struct mlx5_core_dev *mdev = uctx_to_mdev(c);
 
 	if (MLX5_GET(general_obj_in_cmd_hdr, cmd_in, vhca_tunnel_id))
 		return -EINVAL;
@@ -1717,7 +1715,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_QUERY)(
 	if (!devx_is_obj_query_cmd(cmd_in))
 		return -EINVAL;
 
-	if (!devx_is_valid_obj_id(attrs, uobj, cmd_in))
+	if (!devx_is_valid_obj_id(uobj, cmd_in))
 		return -EINVAL;
 
 	cmd_out = uverbs_zalloc(attrs, cmd_out_len);
@@ -1725,7 +1723,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_QUERY)(
 		return PTR_ERR(cmd_out);
 
 	MLX5_SET(general_obj_in_cmd_hdr, cmd_in, uid, uid);
-	err = mlx5_cmd_do(dev->mdev, cmd_in,
+	err = mlx5_cmd_do(mdev, cmd_in,
 			  uverbs_attr_get_len(attrs, MLX5_IB_ATTR_DEVX_OBJ_QUERY_CMD_IN),
 			  cmd_out, cmd_out_len);
 	if (err && err != -EREMOTEIO)
@@ -1767,12 +1765,14 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_ASYNC_CMD_FD_ALLOC)(
 
 	struct ib_uobject *uobj = uverbs_attr_get_uobject(
 		attrs, MLX5_IB_ATTR_DEVX_ASYNC_CMD_FD_ALLOC_HANDLE);
-	struct mlx5_ib_dev *dev = udata_to_dev(&attrs->driver_udata);
+	struct mlx5_ib_ucontext *c =
+		rdma_udata_to_drv_context(&attrs->driver_udata,
+					  struct mlx5_ib_ucontext, ibucontext);
 
 	ev_file = container_of(uobj, struct devx_async_cmd_event_file,
 			       uobj);
 	devx_init_event_queue(&ev_file->ev_queue);
-	mlx5_cmd_init_async_ctx(dev->mdev, &ev_file->async_ctx);
+	mlx5_cmd_init_async_ctx(uctx_to_mdev(c), &ev_file->async_ctx);
 	return 0;
 }
 
@@ -1863,7 +1863,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_ASYNC_QUERY)(
 	if (err)
 		return err;
 
-	if (!devx_is_valid_obj_id(attrs, uobj, cmd_in))
+	if (!devx_is_valid_obj_id(uobj, cmd_in))
 		return -EINVAL;
 
 	fd_uobj = uverbs_attr_get_uobject(attrs,
@@ -2148,7 +2148,8 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_SUBSCRIBE_EVENT)(
 	event_type_num_list = uverbs_attr_get_alloced_ptr(attrs,
 			MLX5_IB_ATTR_DEVX_SUBSCRIBE_EVENT_TYPE_NUM_LIST);
 
-	if (!is_valid_events(dev->mdev, num_events, event_type_num_list, obj))
+	if (!is_valid_events(uctx_to_mdev(c), num_events, event_type_num_list,
+			     obj))
 		return -EINVAL;
 
 	INIT_LIST_HEAD(&sub_list);
@@ -2329,7 +2330,7 @@ static unsigned int devx_umem_find_best_pgsize(struct ib_umem *umem,
 	return page_size;
 }
 
-static int devx_umem_reg_cmd_alloc(struct mlx5_ib_dev *dev,
+static int devx_umem_reg_cmd_alloc(struct mlx5_core_dev *mdev,
 				   struct uverbs_attr_bundle *attrs,
 				   struct devx_umem *obj,
 				   struct devx_umem_reg_cmd *cmd,
@@ -2382,7 +2383,7 @@ static int devx_umem_reg_cmd_alloc(struct mlx5_ib_dev *dev,
 	MLX5_SET(umem, umem, page_offset,
 		 ib_umem_dma_offset(obj->umem, page_size));
 
-	if (mlx5_umem_needs_ats(dev->mdev, obj->umem, access))
+	if (mlx5_umem_needs_ats(mdev, obj->umem, access))
 		MLX5_SET(umem, umem, ats, 1);
 
 	mlx5_ib_populate_pas(obj->umem, page_size, mtt,
@@ -2402,6 +2403,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_UMEM_REG)(
 	struct mlx5_ib_ucontext *c = rdma_udata_to_drv_context(
 		&attrs->driver_udata, struct mlx5_ib_ucontext, ibucontext);
 	struct mlx5_ib_dev *dev = to_dev(c->ibucontext.device);
+	struct mlx5_core_dev *mdev = uctx_to_mdev(c);
 	int access_flags;
 	int err;
 
@@ -2425,17 +2427,16 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_UMEM_REG)(
 	if (err)
 		goto err_obj_free;
 
-	err = devx_umem_reg_cmd_alloc(dev, attrs, obj, &cmd, access_flags);
+	err = devx_umem_reg_cmd_alloc(mdev, attrs, obj, &cmd, access_flags);
 	if (err)
 		goto err_umem_release;
 
 	MLX5_SET(create_umem_in, cmd.in, uid, c->devx_uid);
-	err = mlx5_cmd_exec(dev->mdev, cmd.in, cmd.inlen, cmd.out,
+	err = mlx5_cmd_exec(mdev, cmd.in, cmd.inlen, cmd.out,
 			    sizeof(cmd.out));
 	if (err)
 		goto err_umem_release;
 
-	obj->mdev = dev->mdev;
 	uobj->object = obj;
 	devx_obj_build_destroy_cmd(cmd.in, cmd.out, obj->dinbox, &obj->dinlen, &obj_id);
 	uverbs_finalize_uobj_create(attrs, MLX5_IB_ATTR_DEVX_UMEM_REG_HANDLE);
@@ -2455,11 +2456,13 @@ static int devx_umem_cleanup(struct ib_uobject *uobject,
 			     enum rdma_remove_reason why,
 			     struct uverbs_attr_bundle *attrs)
 {
+	struct mlx5_core_dev *mdev =
+		uctx_to_mdev(to_mucontext(uobject->context));
 	struct devx_umem *obj = uobject->object;
 	u32 out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)];
 	int err;
 
-	err = mlx5_cmd_exec(obj->mdev, obj->dinbox, obj->dinlen, out, sizeof(out));
+	err = mlx5_cmd_exec(mdev, obj->dinbox, obj->dinlen, out, sizeof(out));
 	if (err)
 		return err;
 
@@ -2645,7 +2648,7 @@ int mlx5_ib_devx_init(struct mlx5_ib_dev *dev)
 	struct mlx5_devx_event_table *table = &dev->devx_event_table;
 	int uid;
 
-	uid = mlx5_ib_devx_create(dev, false, 0);
+	uid = mlx5_ib_devx_create(dev, dev->mdev, false, 0);
 	if (uid > 0) {
 		dev->devx_whitelist_uid = uid;
 		xa_init(&table->event_xa);
@@ -2678,7 +2681,7 @@ void mlx5_ib_devx_cleanup(struct mlx5_ib_dev *dev)
 		mutex_unlock(&dev->devx_event_table.event_xa_lock);
 		xa_destroy(&table->event_xa);
 
-		mlx5_ib_devx_destroy(dev, dev->devx_whitelist_uid);
+		mlx5_ib_devx_destroy(dev->mdev, dev->devx_whitelist_uid);
 	}
 }
 
diff --git a/drivers/infiniband/hw/mlx5/devx.h b/drivers/infiniband/hw/mlx5/devx.h
index ee9e7d3af93ffcec1b7b6142e2e755075acbba1e..0fb2dcf6bafd1bfdd972051296acff4e0f944383 100644
--- a/drivers/infiniband/hw/mlx5/devx.h
+++ b/drivers/infiniband/hw/mlx5/devx.h
@@ -24,18 +24,20 @@ struct devx_obj {
 	struct list_head event_sub; /* holds devx_event_subscription entries */
 };
 #if IS_ENABLED(CONFIG_INFINIBAND_USER_ACCESS)
-int mlx5_ib_devx_create(struct mlx5_ib_dev *dev, bool is_user, u64 req_ucaps);
-void mlx5_ib_devx_destroy(struct mlx5_ib_dev *dev, u16 uid);
+int mlx5_ib_devx_create(struct mlx5_ib_dev *dev, struct mlx5_core_dev *mdev,
+			bool is_user, u64 req_ucaps);
+void mlx5_ib_devx_destroy(struct mlx5_core_dev *mdev, u16 uid);
 int mlx5_ib_devx_init(struct mlx5_ib_dev *dev);
 void mlx5_ib_devx_cleanup(struct mlx5_ib_dev *dev);
 void mlx5_ib_ufile_hw_cleanup(struct ib_uverbs_file *ufile);
 #else
-static inline int mlx5_ib_devx_create(struct mlx5_ib_dev *dev, bool is_user,
+static inline int mlx5_ib_devx_create(struct mlx5_ib_dev *dev,
+				      struct mlx5_core_dev *mdev, bool is_user,
 				      u64 req_ucaps)
 {
 	return -EOPNOTSUPP;
 }
-static inline void mlx5_ib_devx_destroy(struct mlx5_ib_dev *dev, u16 uid) {}
+static inline void mlx5_ib_devx_destroy(struct mlx5_core_dev *mdev, u16 uid) {}
 static inline int mlx5_ib_devx_init(struct mlx5_ib_dev *dev)
 {
 	return 0;
diff --git a/drivers/infiniband/hw/mlx5/dm.c b/drivers/infiniband/hw/mlx5/dm.c
index fbb46d821865b3f87602068431365c46a40c2bcf..31a7c0f72b40fe95c9393a45add6526a4747ae9b 100644
--- a/drivers/infiniband/hw/mlx5/dm.c
+++ b/drivers/infiniband/hw/mlx5/dm.c
@@ -209,6 +209,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DM_MAP_OP_ADDR)(
 {
 	struct ib_uobject *uobj = uverbs_attr_get_uobject(
 		attrs, MLX5_IB_ATTR_DM_MAP_OP_ADDR_REQ_HANDLE);
+	struct mlx5_ib_ucontext *c = to_mucontext(uobj->context);
 	struct mlx5_ib_dev *dev = to_dev(uobj->context->device);
 	struct ib_dm *ibdm = uobj->object;
 	struct mlx5_ib_dm_memic *dm = to_memic(ibdm);
@@ -223,7 +224,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DM_MAP_OP_ADDR)(
 	if (op >= BITS_PER_TYPE(u32))
 		return -EOPNOTSUPP;
 
-	if (!(MLX5_CAP_DEV_MEM(dev->mdev, memic_operations) & BIT(op)))
+	if (!(MLX5_CAP_DEV_MEM(uctx_to_mdev(c), memic_operations) & BIT(op)))
 		return -EOPNOTSUPP;
 
 	mutex_lock(&dm->ops_xa_lock);
@@ -357,7 +358,7 @@ static struct ib_dm *handle_alloc_dm_sw_icm(struct ib_ucontext *ctx,
 					    struct uverbs_attr_bundle *attrs,
 					    int type)
 {
-	struct mlx5_core_dev *mdev = to_dev(ctx->device)->mdev;
+	struct mlx5_core_dev *mdev = uctx_to_mdev(to_mucontext(ctx));
 	enum mlx5_sw_icm_type icm_type;
 	struct mlx5_ib_dm_icm *dm;
 	u64 act_size;
@@ -474,7 +475,7 @@ static int mlx5_dm_icm_dealloc(struct mlx5_ib_ucontext *ctx,
 			       struct mlx5_ib_dm_icm *dm)
 {
 	enum mlx5_sw_icm_type type = get_icm_type(dm->base.type);
-	struct mlx5_core_dev *mdev = to_dev(dm->base.ibdm.device)->mdev;
+	struct mlx5_core_dev *mdev = uctx_to_mdev(ctx);
 	int err;
 
 	err = mlx5_dm_sw_icm_dealloc(mdev, type, dm->base.size, ctx->devx_uid,
diff --git a/drivers/infiniband/hw/mlx5/dmah.c b/drivers/infiniband/hw/mlx5/dmah.c
index 84641e06d63c1ebc20ac57dbc11c36a46554b638..a9419324f03d5606e51b08ea372ce0fbe4b436fc 100644
--- a/drivers/infiniband/hw/mlx5/dmah.c
+++ b/drivers/infiniband/hw/mlx5/dmah.c
@@ -13,7 +13,10 @@
 static int mlx5_ib_alloc_dmah(struct ib_dmah *ibdmah,
 			      struct uverbs_attr_bundle *attrs)
 {
-	struct mlx5_core_dev *mdev = to_dev(ibdmah->device)->mdev;
+	struct mlx5_ib_ucontext *uctx =
+		rdma_udata_to_drv_context(&attrs->driver_udata,
+					  struct mlx5_ib_ucontext, ibucontext);
+	struct mlx5_core_dev *mdev = uctx_to_mdev(uctx);
 	struct mlx5_ib_dmah *dmah = to_mdmah(ibdmah);
 	u16 st_bits = BIT(IB_DMAH_CPU_ID_EXISTS) |
 		      BIT(IB_DMAH_MEM_TYPE_EXISTS);
@@ -39,8 +42,11 @@ static int mlx5_ib_alloc_dmah(struct ib_dmah *ibdmah,
 static int mlx5_ib_dealloc_dmah(struct ib_dmah *ibdmah,
 				struct uverbs_attr_bundle *attrs)
 {
+	struct mlx5_ib_ucontext *uctx =
+		rdma_udata_to_drv_context(&attrs->driver_udata,
+					  struct mlx5_ib_ucontext, ibucontext);
 	struct mlx5_ib_dmah *dmah = to_mdmah(ibdmah);
-	struct mlx5_core_dev *mdev = to_dev(ibdmah->device)->mdev;
+	struct mlx5_core_dev *mdev = uctx_to_mdev(uctx);
 
 	if (ibdmah->valid_fields & BIT(IB_DMAH_CPU_ID_EXISTS))
 		return mlx5_st_dealloc_index(mdev, dmah->st_index);
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 83b49f0fcdc06c9e7ccbad3c8765d2b6ca7d484d..0d9ef66765c6894b76067593420dab0350d9847c 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -2238,7 +2238,8 @@ static int mlx5_ib_alloc_ucontext(struct ib_ucontext *uctx,
 		return -EINVAL;
 
 	if (req.flags & MLX5_IB_ALLOC_UCTX_DEVX) {
-		err = mlx5_ib_devx_create(dev, true, uctx->enabled_caps);
+		err = mlx5_ib_devx_create(dev, uctx_to_mdev(context), true,
+					  uctx->enabled_caps);
 		if (err < 0)
 			goto out_ctx;
 		context->devx_uid = err;
@@ -2340,7 +2341,7 @@ static int mlx5_ib_alloc_ucontext(struct ib_ucontext *uctx,
 
 out_devx:
 	if (req.flags & MLX5_IB_ALLOC_UCTX_DEVX)
-		mlx5_ib_devx_destroy(dev, context->devx_uid);
+		mlx5_ib_devx_destroy(uctx_to_mdev(context), context->devx_uid);
 
 out_ctx:
 	return err;
@@ -2386,7 +2387,7 @@ static void mlx5_ib_dealloc_ucontext(struct ib_ucontext *ibcontext)
 		if (uctx_rdma_ctrl_is_enabled(ibcontext->enabled_caps))
 			mlx5_cmd_remove_privileged_uid(dev->mdev,
 						       context->devx_uid);
-		mlx5_ib_devx_destroy(dev, context->devx_uid);
+		mlx5_ib_devx_destroy(uctx_to_mdev(context), context->devx_uid);
 	}
 }
 
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index 48d5ab47b45c3d240409212f5ad18a68f1a14381..15d28cad7ea6c1778419e490ccc9c78c24920a06 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -276,7 +276,6 @@ struct mlx5_ib_steering_anchor {
 
 struct mlx5_ib_pp {
 	u16 index;
-	struct mlx5_core_dev *mdev;
 };
 
 enum mlx5_ib_optional_counter_type {
@@ -1301,6 +1300,11 @@ static inline struct mlx5_core_dev *mw_to_mdev(struct ib_mw *ibmw)
 	return pd_to_mdev(ibmw->pd);
 }
 
+static inline struct mlx5_core_dev *uctx_to_mdev(struct mlx5_ib_ucontext *uctx)
+{
+	return to_dev(uctx->ibucontext.device)->mdev;
+}
+
 static inline struct mlx5_ib_mw *to_mmw(struct ib_mw *ibmw)
 {
 	return container_of(ibmw, struct mlx5_ib_mw, ibmw);
diff --git a/drivers/infiniband/hw/mlx5/qos.c b/drivers/infiniband/hw/mlx5/qos.c
index fea229c29611d46dae2ecaa39f786f9063063233..420dfdc6f1fd3fd257f3c7ee6d7ef6d5ab3d3ed2 100644
--- a/drivers/infiniband/hw/mlx5/qos.c
+++ b/drivers/infiniband/hw/mlx5/qos.c
@@ -27,7 +27,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_PP_OBJ_ALLOC)(
 	u8 rl_raw[MLX5_ST_SZ_BYTES(set_pp_rate_limit_context)] = {};
 	struct ib_uobject *uobj = uverbs_attr_get_uobject(attrs,
 		MLX5_IB_ATTR_PP_OBJ_ALLOC_HANDLE);
-	struct mlx5_ib_dev *dev;
+	struct mlx5_core_dev *mdev;
 	struct mlx5_ib_ucontext *c;
 	struct mlx5_ib_pp *pp_entry;
 	void *in_ctx;
@@ -44,7 +44,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_PP_OBJ_ALLOC)(
 	if (!c->devx_uid)
 		return -EINVAL;
 
-	dev = to_dev(c->ibucontext.device);
+	mdev = uctx_to_mdev(c);
 	pp_entry = kzalloc_obj(*pp_entry);
 	if (!pp_entry)
 		return -ENOMEM;
@@ -63,13 +63,12 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_PP_OBJ_ALLOC)(
 	uid = (flags & MLX5_IB_UAPI_PP_ALLOC_FLAGS_DEDICATED_INDEX) ?
 		c->devx_uid : MLX5_SHARED_RESOURCE_UID;
 
-	err = mlx5_rl_add_rate_raw(dev->mdev, rl_raw, uid,
+	err = mlx5_rl_add_rate_raw(mdev, rl_raw, uid,
 			(flags & MLX5_IB_UAPI_PP_ALLOC_FLAGS_DEDICATED_INDEX),
 			&pp_entry->index);
 	if (err)
 		goto err;
 
-	pp_entry->mdev = dev->mdev;
 	uobj->object = pp_entry;
 	uverbs_finalize_uobj_create(attrs, MLX5_IB_ATTR_PP_OBJ_ALLOC_HANDLE);
 
@@ -86,9 +85,11 @@ static int pp_obj_cleanup(struct ib_uobject *uobject,
 			  enum rdma_remove_reason why,
 			  struct uverbs_attr_bundle *attrs)
 {
+	struct mlx5_core_dev *mdev =
+		uctx_to_mdev(to_mucontext(uobject->context));
 	struct mlx5_ib_pp *pp_entry = uobject->object;
 
-	mlx5_rl_remove_rate_raw(pp_entry->mdev, pp_entry->index);
+	mlx5_rl_remove_rate_raw(mdev, pp_entry->index);
 	kfree(pp_entry);
 	return 0;
 }
diff --git a/drivers/infiniband/hw/mlx5/std_types.c b/drivers/infiniband/hw/mlx5/std_types.c
index 3f15feca98b529fda3d2619a4c260b2398d895ee..40048a64f2a08dea48622562d473b1cbe9631b05 100644
--- a/drivers/infiniband/hw/mlx5/std_types.c
+++ b/drivers/infiniband/hw/mlx5/std_types.c
@@ -155,6 +155,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_QUERY_PORT)(
 {
 	struct mlx5_ib_uapi_query_port info = {};
 	struct mlx5_ib_ucontext *c;
+	struct mlx5_core_dev *mdev;
 	struct mlx5_ib_dev *dev;
 	u32 port_num;
 	int ret;
@@ -167,15 +168,16 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_QUERY_PORT)(
 	if (IS_ERR(c))
 		return PTR_ERR(c);
 	dev = to_dev(c->ibucontext.device);
+	mdev = uctx_to_mdev(c);
 
 	if (!rdma_is_port_valid(&dev->ib_dev, port_num))
 		return -EINVAL;
 
-	if (mlx5_eswitch_mode(dev->mdev) == MLX5_ESWITCH_OFFLOADS) {
+	if (mlx5_eswitch_mode(mdev) == MLX5_ESWITCH_OFFLOADS) {
 		ret = fill_switchdev_info(dev, port_num, &info);
 		if (ret)
 			return ret;
-	} else if (mlx5_core_mp_enabled(dev->mdev)) {
+	} else if (mlx5_core_mp_enabled(mdev)) {
 		ret = fill_multiport_info(dev, port_num, &info);
 		if (ret)
 			return ret;

-- 
2.49.0


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH rdma-next 09/11] RDMA/mlx5: Cache the CQ core device and resolve it via cq_to_mdev()
  2026-11-17 14:01 [PATCH rdma-next 00/11] RDMA/mlx5: Preparation for SD support Edward Srouji
                   ` (7 preceding siblings ...)
  2026-11-17 14:01 ` [PATCH rdma-next 08/11] RDMA/mlx5: Resolve core device from ucontext for DEVX resources Edward Srouji
@ 2026-11-17 14:01 ` Edward Srouji
  2026-11-17 14:01 ` [PATCH rdma-next 10/11] RDMA/mlx5: Resolve the bfreg UAR-index core device from the ucontext Edward Srouji
  2026-11-17 14:01 ` [PATCH rdma-next 11/11] RDMA/mlx5: Resolve UAR and mmap core devices via " Edward Srouji
  10 siblings, 0 replies; 12+ messages in thread
From: Edward Srouji @ 2026-11-17 14:01 UTC (permalink / raw)
  To: Leon Romanovsky, Jason Gunthorpe, Sabrina Dubroca
  Cc: linux-rdma, linux-kernel, netdev, Edward Srouji,
	Akiva Goldberger, Michael Gur

From: Akiva Goldberger <agoldberger@nvidia.com>

A CQ can be created by the user or the kernel, so it doesn't always have
a user context, and it has no attached PD. Therefore, it lacks a
reliable source for resolving the core device it was created on.  Cache
the core device in mlx5_ib_cq at create time and add the cq_to_mdev()
helper to resolve the core device instead of using the dev->mdev
reference.

No functional change.

Signed-off-by: Akiva Goldberger <agoldberger@nvidia.com>
Reviewed-by: Michael Gur <michaelgur@nvidia.com>
Signed-off-by: Edward Srouji <edwards@nvidia.com>
---
 drivers/infiniband/hw/mlx5/cq.c       | 102 ++++++++++++++++++----------------
 drivers/infiniband/hw/mlx5/mlx5_ib.h  |   6 ++
 drivers/infiniband/hw/mlx5/qp.c       |   2 +-
 drivers/infiniband/hw/mlx5/restrack.c |  14 ++---
 4 files changed, 66 insertions(+), 58 deletions(-)

diff --git a/drivers/infiniband/hw/mlx5/cq.c b/drivers/infiniband/hw/mlx5/cq.c
index b28ce05fab8f3d668d4e9b43c5562e7a88c37b4a..5eaf50fe7f540c3fb1c909f19589ece932bcb2b4 100644
--- a/drivers/infiniband/hw/mlx5/cq.c
+++ b/drivers/infiniband/hw/mlx5/cq.c
@@ -358,9 +358,9 @@ static void handle_atomics(struct mlx5_ib_qp *qp, struct mlx5_cqe64 *cqe64,
 	qp->sq.last_poll = tail;
 }
 
-static void free_cq_buf(struct mlx5_ib_dev *dev, struct mlx5_ib_cq_buf *buf)
+static void free_cq_buf(struct mlx5_core_dev *mdev, struct mlx5_ib_cq_buf *buf)
 {
-	mlx5_frag_buf_free(dev->mdev, &buf->frag_buf);
+	mlx5_frag_buf_free(mdev, &buf->frag_buf);
 }
 
 static void get_sig_err_item(struct mlx5_sig_err_cqe *cqe,
@@ -480,7 +480,7 @@ static int mlx5_poll_one(struct mlx5_ib_cq *cq,
 	opcode = get_cqe_opcode(cqe64);
 	if (unlikely(opcode == MLX5_CQE_RESIZE_CQ)) {
 		if (likely(cq->resize_buf)) {
-			free_cq_buf(dev, &cq->buf);
+			free_cq_buf(cq_to_mdev(cq), &cq->buf);
 			cq->buf = *cq->resize_buf;
 			kfree(cq->resize_buf);
 			cq->resize_buf = NULL;
@@ -612,8 +612,7 @@ int mlx5_ib_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc)
 {
 	struct mlx5_ib_cq *cq = to_mcq(ibcq);
 	struct mlx5_ib_qp *cur_qp = NULL;
-	struct mlx5_ib_dev *dev = to_dev(cq->ibcq.device);
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = cq_to_mdev(cq);
 	unsigned long flags;
 	int soft_polled = 0;
 	int npolled;
@@ -647,8 +646,8 @@ int mlx5_ib_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc)
 
 int mlx5_ib_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags flags)
 {
-	struct mlx5_core_dev *mdev = to_dev(ibcq->device)->mdev;
 	struct mlx5_ib_cq *cq = to_mcq(ibcq);
+	struct mlx5_core_dev *mdev = cq_to_mdev(cq);
 	void __iomem *uar_page = mdev->priv.bfreg.up->map;
 	unsigned long irq_flags;
 	int ret = 0;
@@ -669,7 +668,7 @@ int mlx5_ib_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags flags)
 	return ret;
 }
 
-static int alloc_cq_frag_buf(struct mlx5_ib_dev *dev,
+static int alloc_cq_frag_buf(struct mlx5_core_dev *mdev,
 			     struct mlx5_ib_cq_buf *buf,
 			     int nent,
 			     int cqe_size)
@@ -679,10 +678,10 @@ static int alloc_cq_frag_buf(struct mlx5_ib_dev *dev,
 	u8 log_wq_sz     = ilog2(cqe_size);
 	int err;
 
-	err = mlx5_frag_buf_alloc_node(dev->mdev,
+	err = mlx5_frag_buf_alloc_node(mdev,
 				       nent * cqe_size,
 				       frag_buf,
-				       dev->mdev->priv.numa_node);
+				       mdev->priv.numa_node);
 	if (err)
 		return err;
 
@@ -700,7 +699,7 @@ enum {
 	MLX5_CQE_RES_FORMAT_CSUM_STRIDX = 3,
 };
 
-static int mini_cqe_res_format_to_hw(struct mlx5_ib_dev *dev, u8 format)
+static int mini_cqe_res_format_to_hw(struct mlx5_core_dev *mdev, u8 format)
 {
 	switch (format) {
 	case MLX5_IB_CQE_RES_FORMAT_HASH:
@@ -708,7 +707,7 @@ static int mini_cqe_res_format_to_hw(struct mlx5_ib_dev *dev, u8 format)
 	case MLX5_IB_CQE_RES_FORMAT_CSUM:
 		return MLX5_CQE_RES_FORMAT_CSUM;
 	case MLX5_IB_CQE_RES_FORMAT_CSUM_STRIDX:
-		if (MLX5_CAP_GEN(dev->mdev, mini_cqe_resp_stride_index))
+		if (MLX5_CAP_GEN(mdev, mini_cqe_resp_stride_index))
 			return MLX5_CQE_RES_FORMAT_CSUM_STRIDX;
 		return -EOPNOTSUPP;
 	default:
@@ -807,9 +806,9 @@ static int create_cq_user(struct mlx5_ib_dev *dev, struct ib_udata *udata,
 		int mini_cqe_format;
 
 		if (!((*cqe_size == 128 &&
-		       MLX5_CAP_GEN(dev->mdev, cqe_compression_128)) ||
+		       MLX5_CAP_GEN(cq_to_mdev(cq), cqe_compression_128)) ||
 		      (*cqe_size == 64  &&
-		       MLX5_CAP_GEN(dev->mdev, cqe_compression)))) {
+		       MLX5_CAP_GEN(cq_to_mdev(cq), cqe_compression)))) {
 			err = -EOPNOTSUPP;
 			mlx5_ib_warn(dev, "CQE compression is not supported for size %d!\n",
 				     *cqe_size);
@@ -817,7 +816,7 @@ static int create_cq_user(struct mlx5_ib_dev *dev, struct ib_udata *udata,
 		}
 
 		mini_cqe_format =
-			mini_cqe_res_format_to_hw(dev,
+			mini_cqe_res_format_to_hw(cq_to_mdev(cq),
 						  ucmd.cqe_comp_res_format);
 		if (mini_cqe_format < 0) {
 			err = mini_cqe_format;
@@ -832,7 +831,7 @@ static int create_cq_user(struct mlx5_ib_dev *dev, struct ib_udata *udata,
 
 	if (ucmd.flags & MLX5_IB_CREATE_CQ_FLAGS_CQE_128B_PAD) {
 		if (*cqe_size != 128 ||
-		    !MLX5_CAP_GEN(dev->mdev, cqe_128_always)) {
+		    !MLX5_CAP_GEN(cq_to_mdev(cq), cqe_128_always)) {
 			err = -EOPNOTSUPP;
 			mlx5_ib_warn(dev,
 				     "CQE padding is not supported for CQE size of %dB!\n",
@@ -882,7 +881,7 @@ static void init_cq_frag_buf(struct mlx5_ib_cq_buf *buf)
 	}
 }
 
-static int create_cq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq,
+static int create_cq_kernel(struct mlx5_ib_cq *cq,
 			    int entries, int cqe_size,
 			    u32 **cqb, int *index, int *inlen)
 {
@@ -890,7 +889,7 @@ static int create_cq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq,
 	void *cqc;
 	int err;
 
-	err = mlx5_db_alloc(dev->mdev, &cq->db);
+	err = mlx5_db_alloc(cq_to_mdev(cq), &cq->db);
 	if (err)
 		return err;
 
@@ -898,7 +897,7 @@ static int create_cq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq,
 	cq->mcq.arm_db     = cq->db.db + 1;
 	cq->mcq.cqe_sz = cqe_size;
 
-	err = alloc_cq_frag_buf(dev, &cq->buf, entries, cqe_size);
+	err = alloc_cq_frag_buf(cq_to_mdev(cq), &cq->buf, entries, cqe_size);
 	if (err)
 		goto err_db;
 
@@ -921,22 +920,22 @@ static int create_cq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq,
 		 cq->buf.frag_buf.page_shift -
 		 MLX5_ADAPTER_PAGE_SHIFT);
 
-	*index = dev->mdev->priv.bfreg.up->index;
+	*index = cq_to_mdev(cq)->priv.bfreg.up->index;
 
 	return 0;
 
 err_buf:
-	free_cq_buf(dev, &cq->buf);
+	free_cq_buf(cq_to_mdev(cq), &cq->buf);
 
 err_db:
-	mlx5_db_free(dev->mdev, &cq->db);
+	mlx5_db_free(cq_to_mdev(cq), &cq->db);
 	return err;
 }
 
-static void destroy_cq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq)
+static void destroy_cq_kernel(struct mlx5_ib_cq *cq)
 {
-	free_cq_buf(dev, &cq->buf);
-	mlx5_db_free(dev->mdev, &cq->db);
+	free_cq_buf(cq_to_mdev(cq), &cq->buf);
+	mlx5_db_free(cq_to_mdev(cq), &cq->db);
 }
 
 static void notify_soft_wc_handler(struct work_struct *work)
@@ -967,14 +966,16 @@ int mlx5_ib_create_user_cq(struct ib_cq *ibcq,
 	int eqn;
 	int err;
 
-	if (attr->cqe > (1 << MLX5_CAP_GEN(dev->mdev, log_max_cq_sz)))
+	cq->mdev = dev->mdev;
+
+	if (attr->cqe > (1 << MLX5_CAP_GEN(cq_to_mdev(cq), log_max_cq_sz)))
 		return -EINVAL;
 
 	if (check_cq_create_flags(attr->flags))
 		return -EOPNOTSUPP;
 
 	entries = roundup_pow_of_two(entries + 1);
-	if (entries > (1 << MLX5_CAP_GEN(dev->mdev, log_max_cq_sz)))
+	if (entries > (1 << MLX5_CAP_GEN(cq_to_mdev(cq), log_max_cq_sz)))
 		return -EINVAL;
 
 	cq->ibcq.cqe = entries - 1;
@@ -990,7 +991,7 @@ int mlx5_ib_create_user_cq(struct ib_cq *ibcq,
 	if (err)
 		return err;
 
-	err = mlx5_comp_eqn_get(dev->mdev, vector, &eqn);
+	err = mlx5_comp_eqn_get(cq_to_mdev(cq), vector, &eqn);
 	if (err)
 		goto err_cqb;
 
@@ -1011,7 +1012,8 @@ int mlx5_ib_create_user_cq(struct ib_cq *ibcq,
 	cq->mcq.comp = mlx5_add_cq_to_tasklet;
 	cq->mcq.tasklet_ctx.comp = mlx5_ib_cq_comp;
 
-	err = mlx5_core_create_cq(dev->mdev, &cq->mcq, cqb, inlen, out, sizeof(out));
+	err = mlx5_core_create_cq(cq_to_mdev(cq), &cq->mcq, cqb, inlen, out,
+				  sizeof(out));
 	if (err)
 		goto err_cqb;
 
@@ -1029,7 +1031,7 @@ int mlx5_ib_create_user_cq(struct ib_cq *ibcq,
 	return 0;
 
 err_cmd:
-	mlx5_core_destroy_cq(dev->mdev, &cq->mcq);
+	mlx5_core_destroy_cq(cq_to_mdev(cq), &cq->mcq);
 
 err_cqb:
 	kvfree(cqb);
@@ -1055,11 +1057,13 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
 	int eqn;
 	int err;
 
-	if (attr->cqe > (1 << MLX5_CAP_GEN(dev->mdev, log_max_cq_sz)))
+	cq->mdev = dev->mdev;
+
+	if (attr->cqe > (1 << MLX5_CAP_GEN(cq_to_mdev(cq), log_max_cq_sz)))
 		return -EINVAL;
 
 	entries = roundup_pow_of_two(entries + 1);
-	if (entries > (1 << MLX5_CAP_GEN(dev->mdev, log_max_cq_sz)))
+	if (entries > (1 << MLX5_CAP_GEN(cq_to_mdev(cq), log_max_cq_sz)))
 		return -EINVAL;
 
 	cq->ibcq.cqe = entries - 1;
@@ -1069,14 +1073,14 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
 	INIT_LIST_HEAD(&cq->list_recv_qp);
 
 	cqe_size = cache_line_size() == 128 ? 128 : 64;
-	err = create_cq_kernel(dev, cq, entries, cqe_size, &cqb, &index,
+	err = create_cq_kernel(cq, entries, cqe_size, &cqb, &index,
 			       &inlen);
 	if (err)
 		return err;
 
 	INIT_WORK(&cq->notify_work, notify_soft_wc_handler);
 
-	err = mlx5_comp_eqn_get(dev->mdev, vector, &eqn);
+	err = mlx5_comp_eqn_get(cq_to_mdev(cq), vector, &eqn);
 	if (err)
 		goto err_cqb;
 
@@ -1094,7 +1098,7 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
 
 	cq->mcq.comp = mlx5_ib_cq_comp;
 
-	err = mlx5_core_create_cq(dev->mdev, &cq->mcq, cqb, inlen, out,
+	err = mlx5_core_create_cq(cq_to_mdev(cq), &cq->mcq, cqb, inlen, out,
 				  sizeof(out));
 	if (err)
 		goto err_cqb;
@@ -1108,25 +1112,24 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
 
 err_cqb:
 	kvfree(cqb);
-	destroy_cq_kernel(dev, cq);
+	destroy_cq_kernel(cq);
 	return err;
 }
 
 int mlx5_ib_pre_destroy_cq(struct ib_cq *cq)
 {
-	struct mlx5_ib_dev *dev = to_dev(cq->device);
 	struct mlx5_ib_cq *mcq = to_mcq(cq);
 
 	if (!cq->uobject)
 		cancel_work_sync(&mcq->notify_work);
 
-	return mlx5_core_destroy_cq(dev->mdev, &mcq->mcq);
+	return mlx5_core_destroy_cq(cq_to_mdev(mcq), &mcq->mcq);
 }
 
 void mlx5_ib_post_destroy_cq(struct ib_cq *cq)
 {
 	WARN_ON(!list_empty(&to_mcq(cq)->wc_list));
-	destroy_cq_kernel(to_dev(cq->device), to_mcq(cq));
+	destroy_cq_kernel(to_mcq(cq));
 }
 
 int mlx5_ib_destroy_cq(struct ib_cq *cq, struct ib_udata *udata)
@@ -1217,13 +1220,13 @@ int mlx5_ib_modify_cq(struct ib_cq *cq, u16 cq_count, u16 cq_period)
 	struct mlx5_ib_cq *mcq = to_mcq(cq);
 	int err;
 
-	if (!MLX5_CAP_GEN(dev->mdev, cq_moderation))
+	if (!MLX5_CAP_GEN(cq_to_mdev(mcq), cq_moderation))
 		return -EOPNOTSUPP;
 
 	if (cq_period > MLX5_MAX_CQ_PERIOD)
 		return -EINVAL;
 
-	err = mlx5_core_modify_cq_moderation(dev->mdev, &mcq->mcq,
+	err = mlx5_core_modify_cq_moderation(cq_to_mdev(mcq), &mcq->mcq,
 					     cq_period, cq_count);
 	if (err)
 		mlx5_ib_warn(dev, "modify cq 0x%x failed\n", mcq->mcq.cqn);
@@ -1264,7 +1267,7 @@ static int resize_user(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq,
 	return 0;
 }
 
-static int resize_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq,
+static int resize_kernel(struct mlx5_ib_cq *cq,
 			 int entries, int cqe_size)
 {
 	int err;
@@ -1273,7 +1276,8 @@ static int resize_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq,
 	if (!cq->resize_buf)
 		return -ENOMEM;
 
-	err = alloc_cq_frag_buf(dev, cq->resize_buf, entries, cqe_size);
+	err = alloc_cq_frag_buf(cq_to_mdev(cq), cq->resize_buf, entries,
+				cqe_size);
 	if (err)
 		goto ex;
 
@@ -1357,16 +1361,16 @@ int mlx5_ib_resize_cq(struct ib_cq *ibcq, unsigned int entries,
 	int cqe_size;
 	unsigned long flags;
 
-	if (!MLX5_CAP_GEN(dev->mdev, cq_resize)) {
+	if (!MLX5_CAP_GEN(cq_to_mdev(cq), cq_resize)) {
 		pr_info("Firmware does not support resize CQ\n");
 		return -ENOSYS;
 	}
 
-	if (entries > (1 << MLX5_CAP_GEN(dev->mdev, log_max_cq_sz)))
+	if (entries > (1 << MLX5_CAP_GEN(cq_to_mdev(cq), log_max_cq_sz)))
 		return -EINVAL;
 
 	entries = roundup_pow_of_two(entries + 1);
-	if (entries > (1 << MLX5_CAP_GEN(dev->mdev, log_max_cq_sz)) + 1)
+	if (entries > (1 << MLX5_CAP_GEN(cq_to_mdev(cq), log_max_cq_sz)) + 1)
 		return -EINVAL;
 
 	if (entries == ibcq->cqe + 1)
@@ -1394,7 +1398,7 @@ int mlx5_ib_resize_cq(struct ib_cq *ibcq, unsigned int entries,
 		struct mlx5_frag_buf *frag_buf;
 
 		cqe_size = 64;
-		err = resize_kernel(dev, cq, entries, cqe_size);
+		err = resize_kernel(cq, entries, cqe_size);
 		if (err)
 			goto ex;
 		frag_buf = &cq->resize_buf->frag_buf;
@@ -1438,7 +1442,7 @@ int mlx5_ib_resize_cq(struct ib_cq *ibcq, unsigned int entries,
 	MLX5_SET(modify_cq_in, in, op_mod, MLX5_CQ_OPMOD_RESIZE);
 	MLX5_SET(modify_cq_in, in, cqn, cq->mcq.cqn);
 
-	err = mlx5_core_modify_cq(dev->mdev, &cq->mcq, in, inlen);
+	err = mlx5_core_modify_cq(cq_to_mdev(cq), &cq->mcq, in, inlen);
 	if (err)
 		goto ex_alloc;
 
@@ -1465,7 +1469,7 @@ int mlx5_ib_resize_cq(struct ib_cq *ibcq, unsigned int entries,
 		cq->ibcq.cqe = entries - 1;
 		spin_unlock_irqrestore(&cq->lock, flags);
 		if (resized)
-			free_cq_buf(dev, &tbuf);
+			free_cq_buf(cq_to_mdev(cq), &tbuf);
 	}
 	mutex_unlock(&cq->resize_mutex);
 
@@ -1478,7 +1482,7 @@ int mlx5_ib_resize_cq(struct ib_cq *ibcq, unsigned int entries,
 ex_resize:
 	ib_umem_release(cq->resize_umem);
 	if (!udata) {
-		free_cq_buf(dev, cq->resize_buf);
+		free_cq_buf(cq_to_mdev(cq), cq->resize_buf);
 		cq->resize_buf = NULL;
 	}
 ex:
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index 15d28cad7ea6c1778419e490ccc9c78c24920a06..61c663c7bfc9cf20b3b40dbb8aa4f621fe1d8ea8 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -572,6 +572,7 @@ enum mlx5_ib_cq_pr_flags {
 struct mlx5_ib_cq {
 	struct ib_cq		ibcq;
 	struct mlx5_core_cq	mcq;
+	struct mlx5_core_dev	*mdev;
 	struct mlx5_ib_cq_buf	buf;
 	struct mlx5_db		db;
 
@@ -1305,6 +1306,11 @@ static inline struct mlx5_core_dev *uctx_to_mdev(struct mlx5_ib_ucontext *uctx)
 	return to_dev(uctx->ibucontext.device)->mdev;
 }
 
+static inline struct mlx5_core_dev *cq_to_mdev(struct mlx5_ib_cq *cq)
+{
+	return cq->mdev;
+}
+
 static inline struct mlx5_ib_mw *to_mmw(struct ib_mw *ibmw)
 {
 	return container_of(ibmw, struct mlx5_ib_mw, ibmw);
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 1135e710e339818aaa15f1077874561745ca6305..01babb9a0003abe2520200fcec2e9eb9224516e7 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -5878,7 +5878,7 @@ static void handle_drain_completion(struct ib_cq *cq,
 				    struct mlx5_ib_drain_cqe *sdrain,
 				    struct mlx5_ib_dev *dev)
 {
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = cq_to_mdev(to_mcq(cq));
 
 	if (cq->poll_ctx == IB_POLL_DIRECT) {
 		while (wait_for_completion_timeout(&sdrain->done, HZ / 10) <= 0)
diff --git a/drivers/infiniband/hw/mlx5/restrack.c b/drivers/infiniband/hw/mlx5/restrack.c
index 866252cdce52452968519c8e785068a27cd40a34..f38fe7f694bae29bf23b15dddc46aa541545f761 100644
--- a/drivers/infiniband/hw/mlx5/restrack.c
+++ b/drivers/infiniband/hw/mlx5/restrack.c
@@ -56,7 +56,7 @@ static int dump_rsc(struct mlx5_core_dev *mdev, enum mlx5_sgmt_type type,
 	return err;
 }
 
-static int fill_res_raw(struct sk_buff *msg, struct mlx5_ib_dev *dev,
+static int fill_res_raw(struct sk_buff *msg, struct mlx5_core_dev *mdev,
 			enum mlx5_sgmt_type type, u32 key)
 {
 	int len = 0;
@@ -67,7 +67,7 @@ static int fill_res_raw(struct sk_buff *msg, struct mlx5_ib_dev *dev,
 	if (!data)
 		return -ENOMEM;
 
-	err = dump_rsc(dev->mdev, type, key, data, &len);
+	err = dump_rsc(mdev, type, key, data, &len);
 	if (err)
 		goto out;
 
@@ -124,7 +124,7 @@ static int fill_res_mr_entry_raw(struct sk_buff *msg, struct ib_mr *ibmr)
 {
 	struct mlx5_ib_mr *mr = to_mmr(ibmr);
 
-	return fill_res_raw(msg, mr_to_dev(mr), MLX5_SGMT_TYPE_PRM_QUERY_MKEY,
+	return fill_res_raw(msg, mr_to_mdev(mr), MLX5_SGMT_TYPE_PRM_QUERY_MKEY,
 			    mlx5_mkey_to_idx(mr->mmkey.key));
 }
 
@@ -158,10 +158,10 @@ static int fill_res_mr_entry(struct sk_buff *msg, struct ib_mr *ibmr)
 
 static int fill_res_cq_entry_raw(struct sk_buff *msg, struct ib_cq *ibcq)
 {
-	struct mlx5_ib_dev *dev = to_dev(ibcq->device);
 	struct mlx5_ib_cq *cq = to_mcq(ibcq);
 
-	return fill_res_raw(msg, dev, MLX5_SGMT_TYPE_PRM_QUERY_CQ, cq->mcq.cqn);
+	return fill_res_raw(msg, cq_to_mdev(cq), MLX5_SGMT_TYPE_PRM_QUERY_CQ,
+			    cq->mcq.cqn);
 }
 
 static int fill_res_qp_entry(struct sk_buff *msg, struct ib_qp *ibqp)
@@ -191,9 +191,7 @@ static int fill_res_qp_entry(struct sk_buff *msg, struct ib_qp *ibqp)
 
 static int fill_res_qp_entry_raw(struct sk_buff *msg, struct ib_qp *ibqp)
 {
-	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
-
-	return fill_res_raw(msg, dev, MLX5_SGMT_TYPE_PRM_QUERY_QP,
+	return fill_res_raw(msg, qp_to_mdev(ibqp), MLX5_SGMT_TYPE_PRM_QUERY_QP,
 			    ibqp->qp_num);
 }
 

-- 
2.49.0


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH rdma-next 10/11] RDMA/mlx5: Resolve the bfreg UAR-index core device from the ucontext
  2026-11-17 14:01 [PATCH rdma-next 00/11] RDMA/mlx5: Preparation for SD support Edward Srouji
                   ` (8 preceding siblings ...)
  2026-11-17 14:01 ` [PATCH rdma-next 09/11] RDMA/mlx5: Cache the CQ core device and resolve it via cq_to_mdev() Edward Srouji
@ 2026-11-17 14:01 ` Edward Srouji
  2026-11-17 14:01 ` [PATCH rdma-next 11/11] RDMA/mlx5: Resolve UAR and mmap core devices via " Edward Srouji
  10 siblings, 0 replies; 12+ messages in thread
From: Edward Srouji @ 2026-11-17 14:01 UTC (permalink / raw)
  To: Leon Romanovsky, Jason Gunthorpe, Sabrina Dubroca
  Cc: linux-rdma, linux-kernel, netdev, Edward Srouji,
	Akiva Goldberger, Michael Gur

From: Akiva Goldberger <agoldberger@nvidia.com>

bfregn_to_uar_index() and its get_uars_per_sys_page() helper took an
mlx5_ib_dev only to reach dev->mdev. A bfreg is allocated on the owning
ucontext's core device, so take a struct mlx5_core_dev and have the QP and
DEVX callers resolve it from the ucontext via uctx_to_mdev().

No functional change.

Signed-off-by: Akiva Goldberger <agoldberger@nvidia.com>
Reviewed-by: Michael Gur <michaelgur@nvidia.com>
Signed-off-by: Edward Srouji <edwards@nvidia.com>
---
 drivers/infiniband/hw/mlx5/devx.c    |  5 ++--
 drivers/infiniband/hw/mlx5/main.c    |  5 ++--
 drivers/infiniband/hw/mlx5/mlx5_ib.h |  7 +++---
 drivers/infiniband/hw/mlx5/qp.c      | 49 ++++++++++++++++++++----------------
 4 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c
index d0b1876f9e8afc6de57f7db1631327bb7c9b91ba..c0314288c2a4f86bf9f7d3f2f314574c73d3bc63 100644
--- a/drivers/infiniband/hw/mlx5/devx.c
+++ b/drivers/infiniband/hw/mlx5/devx.c
@@ -1076,20 +1076,19 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_QUERY_UAR)(
 	struct uverbs_attr_bundle *attrs)
 {
 	struct mlx5_ib_ucontext *c;
-	struct mlx5_ib_dev *dev;
 	u32 user_idx;
 	s32 dev_idx;
 
 	c = devx_ufile2uctx(attrs);
 	if (IS_ERR(c))
 		return PTR_ERR(c);
-	dev = to_dev(c->ibucontext.device);
 
 	if (uverbs_copy_from(&user_idx, attrs,
 			     MLX5_IB_ATTR_DEVX_QUERY_UAR_USER_IDX))
 		return -EFAULT;
 
-	dev_idx = bfregn_to_uar_index(dev, &c->bfregi, user_idx, true);
+	dev_idx = bfregn_to_uar_index(uctx_to_mdev(c), &c->bfregi, user_idx,
+				      true);
 	if (dev_idx < 0)
 		return dev_idx;
 
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 0d9ef66765c6894b76067593420dab0350d9847c..50d0762db3d5a7007e6b44507fe56964b469d65b 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -1916,7 +1916,7 @@ static int calc_total_bfregs(struct mlx5_ib_dev *dev, bool lib_uar_4k,
 	if (req->total_num_bfregs > MLX5_MAX_BFREGS)
 		return -ENOMEM;
 
-	uars_per_sys_page = get_uars_per_sys_page(dev, lib_uar_4k);
+	uars_per_sys_page = get_uars_per_sys_page(dev->mdev, lib_uar_4k);
 	bfregs_per_sys_page = uars_per_sys_page * MLX5_NON_FP_BFREGS_PER_UAR;
 	/* This holds the required static allocation asked by the user */
 	req->total_num_bfregs = ALIGN(req->total_num_bfregs, bfregs_per_sys_page);
@@ -2630,7 +2630,8 @@ static int uar_mmap(struct mlx5_ib_dev *dev, enum mlx5_ib_mmap_cmd cmd,
 	if (dyn_uar) {
 		int uars_per_page;
 
-		uars_per_page = get_uars_per_sys_page(dev, bfregi->lib_uar_4k);
+		uars_per_page = get_uars_per_sys_page(dev->mdev,
+						      bfregi->lib_uar_4k);
 		bfreg_dyn_idx = idx * (uars_per_page * MLX5_NON_FP_BFREGS_PER_UAR);
 		if (bfreg_dyn_idx >= bfregi->total_num_bfregs) {
 			mlx5_ib_warn(dev, "invalid bfreg_dyn_idx %u, max=%u\n",
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index 61c663c7bfc9cf20b3b40dbb8aa4f621fe1d8ea8..b77a8eab6b9e672beafe55162b3cb75cdeb910c7 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -1648,15 +1648,16 @@ static inline int get_srq_user_index(struct mlx5_ib_ucontext *ucontext,
 	return verify_assign_uidx(cqe_version, ucmd->uidx, user_index);
 }
 
-static inline int get_uars_per_sys_page(struct mlx5_ib_dev *dev, bool lib_support)
+static inline int get_uars_per_sys_page(struct mlx5_core_dev *mdev,
+					bool lib_support)
 {
-	return lib_support && MLX5_CAP_GEN(dev->mdev, uar_4k) ?
+	return lib_support && MLX5_CAP_GEN(mdev, uar_4k) ?
 				MLX5_UARS_IN_PAGE : 1;
 }
 
 extern void *xlt_emergency_page;
 
-int bfregn_to_uar_index(struct mlx5_ib_dev *dev,
+int bfregn_to_uar_index(struct mlx5_core_dev *mdev,
 			struct mlx5_bfreg_info *bfregi, u32 bfregn,
 			bool dyn_bfreg);
 
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 01babb9a0003abe2520200fcec2e9eb9224516e7..98bceae575724ca7a25936a1b1094f5801ffbcae 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -715,40 +715,43 @@ enum {
 	NUM_NON_BLUE_FLAME_BFREGS = 1,
 };
 
-static int max_bfregs(struct mlx5_ib_dev *dev, struct mlx5_bfreg_info *bfregi)
+static int max_bfregs(struct mlx5_core_dev *mdev,
+		      struct mlx5_bfreg_info *bfregi)
 {
-	return get_uars_per_sys_page(dev, bfregi->lib_uar_4k) *
+	return get_uars_per_sys_page(mdev, bfregi->lib_uar_4k) *
 	       bfregi->num_static_sys_pages * MLX5_NON_FP_BFREGS_PER_UAR;
 }
 
-static int num_med_bfreg(struct mlx5_ib_dev *dev,
+static int num_med_bfreg(struct mlx5_core_dev *mdev,
 			 struct mlx5_bfreg_info *bfregi)
 {
-	return max(0, max_bfregs(dev, bfregi) - bfregi->num_low_latency_bfregs -
+	return max(0, max_bfregs(mdev, bfregi) -
+			      bfregi->num_low_latency_bfregs -
 			      NUM_NON_BLUE_FLAME_BFREGS);
 }
 
-static int first_med_bfreg(struct mlx5_ib_dev *dev,
+static int first_med_bfreg(struct mlx5_core_dev *mdev,
 			   struct mlx5_bfreg_info *bfregi)
 {
-	return num_med_bfreg(dev, bfregi) ? 1 : -ENOMEM;
+	return num_med_bfreg(mdev, bfregi) ? 1 : -ENOMEM;
 }
 
-static int first_hi_bfreg(struct mlx5_ib_dev *dev,
+static int first_hi_bfreg(struct mlx5_core_dev *mdev,
 			  struct mlx5_bfreg_info *bfregi)
 {
 	int med;
 
-	med = num_med_bfreg(dev, bfregi);
+	med = num_med_bfreg(mdev, bfregi);
 	return ++med;
 }
 
-static int alloc_high_class_bfreg(struct mlx5_ib_dev *dev,
+static int alloc_high_class_bfreg(struct mlx5_core_dev *mdev,
 				  struct mlx5_bfreg_info *bfregi)
 {
 	int i;
 
-	for (i = first_hi_bfreg(dev, bfregi); i < max_bfregs(dev, bfregi); i++) {
+	for (i = first_hi_bfreg(mdev, bfregi); i < max_bfregs(mdev, bfregi);
+	     i++) {
 		if (!bfregi->count[i]) {
 			bfregi->count[i]++;
 			return i;
@@ -758,16 +761,16 @@ static int alloc_high_class_bfreg(struct mlx5_ib_dev *dev,
 	return -ENOMEM;
 }
 
-static int alloc_med_class_bfreg(struct mlx5_ib_dev *dev,
+static int alloc_med_class_bfreg(struct mlx5_core_dev *mdev,
 				 struct mlx5_bfreg_info *bfregi)
 {
-	int minidx = first_med_bfreg(dev, bfregi);
+	int minidx = first_med_bfreg(mdev, bfregi);
 	int i;
 
 	if (minidx < 0)
 		return minidx;
 
-	for (i = minidx; i < first_hi_bfreg(dev, bfregi); i++) {
+	for (i = minidx; i < first_hi_bfreg(mdev, bfregi); i++) {
 		if (bfregi->count[i] < bfregi->count[minidx])
 			minidx = i;
 		if (!bfregi->count[minidx])
@@ -778,7 +781,7 @@ static int alloc_med_class_bfreg(struct mlx5_ib_dev *dev,
 	return minidx;
 }
 
-static int alloc_bfreg(struct mlx5_ib_dev *dev,
+static int alloc_bfreg(struct mlx5_core_dev *mdev,
 		       struct mlx5_bfreg_info *bfregi)
 {
 	int bfregn = -ENOMEM;
@@ -788,9 +791,9 @@ static int alloc_bfreg(struct mlx5_ib_dev *dev,
 
 	mutex_lock(&bfregi->lock);
 	if (bfregi->ver >= 2) {
-		bfregn = alloc_high_class_bfreg(dev, bfregi);
+		bfregn = alloc_high_class_bfreg(mdev, bfregi);
 		if (bfregn < 0)
-			bfregn = alloc_med_class_bfreg(dev, bfregi);
+			bfregn = alloc_med_class_bfreg(mdev, bfregi);
 	}
 
 	if (bfregn < 0) {
@@ -846,7 +849,7 @@ static void mlx5_ib_lock_cqs(struct mlx5_ib_cq *send_cq,
 static void mlx5_ib_unlock_cqs(struct mlx5_ib_cq *send_cq,
 			       struct mlx5_ib_cq *recv_cq);
 
-int bfregn_to_uar_index(struct mlx5_ib_dev *dev,
+int bfregn_to_uar_index(struct mlx5_core_dev *mdev,
 			struct mlx5_bfreg_info *bfregi, u32 bfregn,
 			bool dyn_bfreg)
 {
@@ -857,7 +860,7 @@ int bfregn_to_uar_index(struct mlx5_ib_dev *dev,
 	if (bfregi->lib_uar_dyn)
 		return -EINVAL;
 
-	bfregs_per_sys_page = get_uars_per_sys_page(dev, bfregi->lib_uar_4k) *
+	bfregs_per_sys_page = get_uars_per_sys_page(mdev, bfregi->lib_uar_4k) *
 				MLX5_NON_FP_BFREGS_PER_UAR;
 	index_of_sys_page = bfregn / bfregs_per_sys_page;
 
@@ -869,7 +872,7 @@ int bfregn_to_uar_index(struct mlx5_ib_dev *dev,
 
 		if (bfregn > bfregi->num_dyn_bfregs ||
 		    bfregi->sys_pages[index_of_sys_page] == MLX5_IB_INVALID_UAR_INDEX) {
-			mlx5_ib_dbg(dev, "Invalid dynamic uar index\n");
+			dev_dbg(mdev->device, "Invalid dynamic uar index\n");
 			return -EINVAL;
 		}
 	}
@@ -994,7 +997,8 @@ static int _create_user_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 		bfregn = MLX5_IB_INVALID_BFREG;
 		break;
 	case MLX5_QP_FLAG_BFREG_INDEX:
-		uar_index = bfregn_to_uar_index(dev, &context->bfregi,
+		uar_index = bfregn_to_uar_index(uctx_to_mdev(context),
+						&context->bfregi,
 						ucmd->bfreg_index, true);
 		if (uar_index < 0)
 			return uar_index;
@@ -1003,7 +1007,7 @@ static int _create_user_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	case 0:
 		if (qp->flags & IB_QP_CREATE_CROSS_CHANNEL)
 			return -EINVAL;
-		bfregn = alloc_bfreg(dev, &context->bfregi);
+		bfregn = alloc_bfreg(uctx_to_mdev(context), &context->bfregi);
 		if (bfregn < 0)
 			return bfregn;
 		break;
@@ -1013,7 +1017,8 @@ static int _create_user_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 
 	mlx5_ib_dbg(dev, "bfregn 0x%x, uar_index 0x%x\n", bfregn, uar_index);
 	if (bfregn != MLX5_IB_INVALID_BFREG)
-		uar_index = bfregn_to_uar_index(dev, &context->bfregi, bfregn,
+		uar_index = bfregn_to_uar_index(uctx_to_mdev(context),
+						&context->bfregi, bfregn,
 						false);
 
 	qp->rq.offset = 0;

-- 
2.49.0


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH rdma-next 11/11] RDMA/mlx5: Resolve UAR and mmap core devices via the ucontext
  2026-11-17 14:01 [PATCH rdma-next 00/11] RDMA/mlx5: Preparation for SD support Edward Srouji
                   ` (9 preceding siblings ...)
  2026-11-17 14:01 ` [PATCH rdma-next 10/11] RDMA/mlx5: Resolve the bfreg UAR-index core device from the ucontext Edward Srouji
@ 2026-11-17 14:01 ` Edward Srouji
  10 siblings, 0 replies; 12+ messages in thread
From: Edward Srouji @ 2026-11-17 14:01 UTC (permalink / raw)
  To: Leon Romanovsky, Jason Gunthorpe, Sabrina Dubroca
  Cc: linux-rdma, linux-kernel, netdev, Edward Srouji,
	Akiva Goldberger, Michael Gur

From: Akiva Goldberger <agoldberger@nvidia.com>

The ucontext is tied to one core device, so resolve the core device from
the ucontext instead of mlx5_ib_dev::mdev across the UAR allocation,
transport domain, ucontext response and mmap paths.

No functional change.

Signed-off-by: Akiva Goldberger <agoldberger@nvidia.com>
Reviewed-by: Michael Gur <michaelgur@nvidia.com>
Signed-off-by: Edward Srouji <edwards@nvidia.com>
---
 drivers/infiniband/hw/mlx5/main.c | 177 ++++++++++++++++++++------------------
 1 file changed, 94 insertions(+), 83 deletions(-)

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 50d0762db3d5a7007e6b44507fe56964b469d65b..e0305279793056a1bac0b6e335466f7fce2eed2c 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -1937,15 +1937,17 @@ static int calc_total_bfregs(struct mlx5_ib_dev *dev, bool lib_uar_4k,
 	return 0;
 }
 
-static int allocate_uars(struct mlx5_ib_dev *dev, struct mlx5_ib_ucontext *context)
+static int allocate_uars(struct mlx5_ib_ucontext *context)
 {
+	struct mlx5_ib_dev *dev = to_dev(context->ibucontext.device);
+	struct mlx5_core_dev *mdev = uctx_to_mdev(context);
 	struct mlx5_bfreg_info *bfregi;
 	int err;
 	int i;
 
 	bfregi = &context->bfregi;
 	for (i = 0; i < bfregi->num_static_sys_pages; i++) {
-		err = mlx5_cmd_uar_alloc(dev->mdev, &bfregi->sys_pages[i],
+		err = mlx5_cmd_uar_alloc(mdev, &bfregi->sys_pages[i],
 					 context->devx_uid);
 		if (err)
 			goto error;
@@ -1960,16 +1962,16 @@ static int allocate_uars(struct mlx5_ib_dev *dev, struct mlx5_ib_ucontext *conte
 
 error:
 	for (--i; i >= 0; i--)
-		if (mlx5_cmd_uar_dealloc(dev->mdev, bfregi->sys_pages[i],
+		if (mlx5_cmd_uar_dealloc(mdev, bfregi->sys_pages[i],
 					 context->devx_uid))
 			mlx5_ib_warn(dev, "failed to free uar %d\n", i);
 
 	return err;
 }
 
-static void deallocate_uars(struct mlx5_ib_dev *dev,
-			    struct mlx5_ib_ucontext *context)
+static void deallocate_uars(struct mlx5_ib_ucontext *context)
 {
+	struct mlx5_core_dev *mdev = uctx_to_mdev(context);
 	struct mlx5_bfreg_info *bfregi;
 	int i;
 
@@ -1977,7 +1979,7 @@ static void deallocate_uars(struct mlx5_ib_dev *dev,
 	for (i = 0; i < bfregi->num_sys_pages; i++)
 		if (i < bfregi->num_static_sys_pages ||
 		    bfregi->sys_pages[i] != MLX5_IB_INVALID_UAR_INDEX)
-			mlx5_cmd_uar_dealloc(dev->mdev, bfregi->sys_pages[i],
+			mlx5_cmd_uar_dealloc(mdev, bfregi->sys_pages[i],
 					     context->devx_uid);
 }
 
@@ -2072,41 +2074,48 @@ void mlx5_ib_disable_lb(struct mlx5_ib_dev *dev, bool td, bool qp)
 	mutex_unlock(&dev->lb.mutex);
 }
 
-static int mlx5_ib_alloc_transport_domain(struct mlx5_ib_dev *dev, u32 *tdn,
-					  u16 uid)
+static int mlx5_ib_alloc_transport_domain(struct mlx5_ib_ucontext *context)
 {
+	struct mlx5_ib_dev *dev = to_dev(context->ibucontext.device);
+	struct mlx5_core_dev *mdev = uctx_to_mdev(context);
+	u32 *tdn = &context->tdn;
+	u16 uid = context->devx_uid;
 	int err;
 
-	if (!MLX5_CAP_GEN(dev->mdev, log_max_transport_domain))
+	if (!MLX5_CAP_GEN(mdev, log_max_transport_domain))
 		return 0;
 
-	err = mlx5_cmd_alloc_transport_domain(dev->mdev, tdn, uid);
+	err = mlx5_cmd_alloc_transport_domain(mdev, tdn, uid);
 	if (err)
 		return err;
 
-	if ((MLX5_CAP_GEN(dev->mdev, port_type) != MLX5_CAP_PORT_TYPE_ETH) ||
-	    (!MLX5_CAP_GEN(dev->mdev, disable_local_lb_uc) &&
-	     !MLX5_CAP_GEN(dev->mdev, disable_local_lb_mc)))
+	if ((MLX5_CAP_GEN(mdev, port_type) != MLX5_CAP_PORT_TYPE_ETH) ||
+	    (!MLX5_CAP_GEN(mdev, disable_local_lb_uc) &&
+	     !MLX5_CAP_GEN(mdev, disable_local_lb_mc)))
 		return 0;
 
 	err = mlx5_ib_enable_lb(dev, true, false);
 	if (err)
-		mlx5_cmd_dealloc_transport_domain(dev->mdev, *tdn, uid);
+		mlx5_cmd_dealloc_transport_domain(mdev, *tdn, uid);
 
 	return err;
 }
 
-static void mlx5_ib_dealloc_transport_domain(struct mlx5_ib_dev *dev, u32 tdn,
-					     u16 uid)
+static void mlx5_ib_dealloc_transport_domain(struct mlx5_ib_ucontext *context)
 {
-	if (!MLX5_CAP_GEN(dev->mdev, log_max_transport_domain))
+	struct mlx5_ib_dev *dev = to_dev(context->ibucontext.device);
+	struct mlx5_core_dev *mdev = uctx_to_mdev(context);
+	u32 tdn = context->tdn;
+	u16 uid = context->devx_uid;
+
+	if (!MLX5_CAP_GEN(mdev, log_max_transport_domain))
 		return;
 
-	mlx5_cmd_dealloc_transport_domain(dev->mdev, tdn, uid);
+	mlx5_cmd_dealloc_transport_domain(mdev, tdn, uid);
 
-	if ((MLX5_CAP_GEN(dev->mdev, port_type) != MLX5_CAP_PORT_TYPE_ETH) ||
-	    (!MLX5_CAP_GEN(dev->mdev, disable_local_lb_uc) &&
-	     !MLX5_CAP_GEN(dev->mdev, disable_local_lb_mc)))
+	if ((MLX5_CAP_GEN(mdev, port_type) != MLX5_CAP_PORT_TYPE_ETH) ||
+	    (!MLX5_CAP_GEN(mdev, disable_local_lb_uc) &&
+	     !MLX5_CAP_GEN(mdev, disable_local_lb_mc)))
 		return;
 
 	mlx5_ib_disable_lb(dev, true, false);
@@ -2118,29 +2127,29 @@ static int set_ucontext_resp(struct ib_ucontext *uctx,
 	struct ib_device *ibdev = uctx->device;
 	struct mlx5_ib_dev *dev = to_dev(ibdev);
 	struct mlx5_ib_ucontext *context = to_mucontext(uctx);
+	struct mlx5_core_dev *mdev = uctx_to_mdev(context);
 	struct mlx5_bfreg_info *bfregi = &context->bfregi;
 
-	if (MLX5_CAP_GEN(dev->mdev, dump_fill_mkey)) {
+	if (MLX5_CAP_GEN(mdev, dump_fill_mkey)) {
 		resp->dump_fill_mkey = dev->mkeys.dump_fill_mkey;
 		resp->comp_mask |=
 			MLX5_IB_ALLOC_UCONTEXT_RESP_MASK_DUMP_FILL_MKEY;
 	}
 
-	resp->qp_tab_size = 1 << MLX5_CAP_GEN(dev->mdev, log_max_qp);
-	if (mlx5_wc_support_get(dev->mdev))
-		resp->bf_reg_size = 1 << MLX5_CAP_GEN(dev->mdev,
-						      log_bf_reg_size);
+	resp->qp_tab_size = 1 << MLX5_CAP_GEN(mdev, log_max_qp);
+	if (mlx5_wc_support_get(mdev))
+		resp->bf_reg_size = 1 << MLX5_CAP_GEN(mdev, log_bf_reg_size);
 	resp->cache_line_size = cache_line_size();
-	resp->max_sq_desc_sz = MLX5_CAP_GEN(dev->mdev, max_wqe_sz_sq);
-	resp->max_rq_desc_sz = MLX5_CAP_GEN(dev->mdev, max_wqe_sz_rq);
-	resp->max_send_wqebb = 1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz);
-	resp->max_recv_wr = 1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz);
-	resp->max_srq_recv_wr = 1 << MLX5_CAP_GEN(dev->mdev, log_max_srq_sz);
+	resp->max_sq_desc_sz = MLX5_CAP_GEN(mdev, max_wqe_sz_sq);
+	resp->max_rq_desc_sz = MLX5_CAP_GEN(mdev, max_wqe_sz_rq);
+	resp->max_send_wqebb = 1 << MLX5_CAP_GEN(mdev, log_max_qp_sz);
+	resp->max_recv_wr = 1 << MLX5_CAP_GEN(mdev, log_max_qp_sz);
+	resp->max_srq_recv_wr = 1 << MLX5_CAP_GEN(mdev, log_max_srq_sz);
 	resp->cqe_version = context->cqe_version;
-	resp->log_uar_size = MLX5_CAP_GEN(dev->mdev, uar_4k) ?
+	resp->log_uar_size = MLX5_CAP_GEN(mdev, uar_4k) ?
 				MLX5_ADAPTER_PAGE_SHIFT : PAGE_SHIFT;
-	resp->num_uars_per_page = MLX5_CAP_GEN(dev->mdev, uar_4k) ?
-					MLX5_CAP_GEN(dev->mdev,
+	resp->num_uars_per_page = MLX5_CAP_GEN(mdev, uar_4k) ?
+					MLX5_CAP_GEN(mdev,
 						     num_of_uars_per_page) : 1;
 	resp->tot_bfregs = bfregi->lib_uar_dyn ? 0 :
 			bfregi->total_num_bfregs - bfregi->num_dyn_bfregs;
@@ -2149,11 +2158,11 @@ static int set_ucontext_resp(struct ib_ucontext *uctx,
 				      MLX5_USER_CMDS_SUPP_UHW_CREATE_AH;
 
 	if (mlx5_ib_port_link_layer(ibdev, 1) == IB_LINK_LAYER_ETHERNET) {
-		mlx5_query_min_inline(dev->mdev, &resp->eth_min_inline);
+		mlx5_query_min_inline(mdev, &resp->eth_min_inline);
 		resp->eth_min_inline++;
 	}
 
-	if (dev->mdev->clock_info)
+	if (mdev->clock_info)
 		resp->clock_info_versions = BIT(MLX5_IB_CLOCK_INFO_V1);
 
 	/*
@@ -2170,18 +2179,18 @@ static int set_ucontext_resp(struct ib_ucontext *uctx,
 				 internal_timer_h) % PAGE_SIZE;
 	}
 
-	if (MLX5_CAP_GEN(dev->mdev, ece_support))
+	if (MLX5_CAP_GEN(mdev, ece_support))
 		resp->comp_mask |= MLX5_IB_ALLOC_UCONTEXT_RESP_MASK_ECE;
 
-	if (rt_supported(MLX5_CAP_GEN(dev->mdev, sq_ts_format)) &&
-	    rt_supported(MLX5_CAP_GEN(dev->mdev, rq_ts_format)) &&
-	    rt_supported(MLX5_CAP_ROCE(dev->mdev, qp_ts_format)))
+	if (rt_supported(MLX5_CAP_GEN(mdev, sq_ts_format)) &&
+	    rt_supported(MLX5_CAP_GEN(mdev, rq_ts_format)) &&
+	    rt_supported(MLX5_CAP_ROCE(mdev, qp_ts_format)))
 		resp->comp_mask |=
 			MLX5_IB_ALLOC_UCONTEXT_RESP_MASK_REAL_TIME_TS;
 
 	resp->num_dyn_bfregs = bfregi->num_dyn_bfregs;
 
-	if (MLX5_CAP_GEN(dev->mdev, drain_sigerr))
+	if (MLX5_CAP_GEN(mdev, drain_sigerr))
 		resp->comp_mask |= MLX5_IB_ALLOC_UCONTEXT_RESP_MASK_SQD2RTS;
 
 	resp->comp_mask |=
@@ -2204,6 +2213,7 @@ static int mlx5_ib_alloc_ucontext(struct ib_ucontext *uctx,
 	struct mlx5_ib_alloc_ucontext_req_v2 req;
 	struct mlx5_ib_alloc_ucontext_resp resp = {};
 	struct mlx5_ib_ucontext *context = to_mucontext(uctx);
+	struct mlx5_core_dev *mdev = uctx_to_mdev(context);
 	struct mlx5_bfreg_info *bfregi;
 	int ver;
 	int err;
@@ -2245,7 +2255,7 @@ static int mlx5_ib_alloc_ucontext(struct ib_ucontext *uctx,
 		context->devx_uid = err;
 
 		if (uctx_rdma_ctrl_is_enabled(uctx->enabled_caps)) {
-			err = mlx5_cmd_add_privileged_uid(dev->mdev,
+			err = mlx5_cmd_add_privileged_uid(mdev,
 							  context->devx_uid);
 			if (err)
 				goto out_devx;
@@ -2281,13 +2291,12 @@ static int mlx5_ib_alloc_ucontext(struct ib_ucontext *uctx,
 		goto out_count;
 	}
 
-	err = allocate_uars(dev, context);
+	err = allocate_uars(context);
 	if (err)
 		goto out_sys_pages;
 
 uar_done:
-	err = mlx5_ib_alloc_transport_domain(dev, &context->tdn,
-					     context->devx_uid);
+	err = mlx5_ib_alloc_transport_domain(context);
 	if (err)
 		goto out_uars;
 
@@ -2295,7 +2304,7 @@ static int mlx5_ib_alloc_ucontext(struct ib_ucontext *uctx,
 	mutex_init(&context->db_page_mutex);
 
 	context->cqe_version = min_t(__u8,
-				 (__u8)MLX5_CAP_GEN(dev->mdev, cqe_version),
+				 (__u8)MLX5_CAP_GEN(mdev, cqe_version),
 				 req.max_cqe_version);
 
 	err = set_ucontext_resp(uctx, &resp);
@@ -2312,7 +2321,7 @@ static int mlx5_ib_alloc_ucontext(struct ib_ucontext *uctx,
 	context->lib_caps = req.lib_caps;
 	print_lib_caps(dev, context->lib_caps);
 
-	if (mlx5_ib_lag_should_assign_affinity(dev, dev->mdev)) {
+	if (mlx5_ib_lag_should_assign_affinity(dev, mdev)) {
 		u32 port = mlx5_core_native_port_num(dev->mdev) - 1;
 
 		atomic_set(&context->tx_port_affinity,
@@ -2323,10 +2332,10 @@ static int mlx5_ib_alloc_ucontext(struct ib_ucontext *uctx,
 	return 0;
 
 out_mdev:
-	mlx5_ib_dealloc_transport_domain(dev, context->tdn, context->devx_uid);
+	mlx5_ib_dealloc_transport_domain(context);
 
 out_uars:
-	deallocate_uars(dev, context);
+	deallocate_uars(context);
 
 out_sys_pages:
 	kfree(bfregi->sys_pages);
@@ -2337,7 +2346,7 @@ static int mlx5_ib_alloc_ucontext(struct ib_ucontext *uctx,
 out_ucap:
 	if (req.flags & MLX5_IB_ALLOC_UCTX_DEVX &&
 	    uctx_rdma_ctrl_is_enabled(uctx->enabled_caps))
-		mlx5_cmd_remove_privileged_uid(dev->mdev, context->devx_uid);
+		mlx5_cmd_remove_privileged_uid(mdev, context->devx_uid);
 
 out_devx:
 	if (req.flags & MLX5_IB_ALLOC_UCTX_DEVX)
@@ -2373,43 +2382,42 @@ static int mlx5_ib_query_ucontext(struct ib_ucontext *ibcontext,
 static void mlx5_ib_dealloc_ucontext(struct ib_ucontext *ibcontext)
 {
 	struct mlx5_ib_ucontext *context = to_mucontext(ibcontext);
-	struct mlx5_ib_dev *dev = to_dev(ibcontext->device);
+	struct mlx5_core_dev *mdev = uctx_to_mdev(context);
 	struct mlx5_bfreg_info *bfregi;
 
 	bfregi = &context->bfregi;
-	mlx5_ib_dealloc_transport_domain(dev, context->tdn, context->devx_uid);
+	mlx5_ib_dealloc_transport_domain(context);
 
-	deallocate_uars(dev, context);
+	deallocate_uars(context);
 	kfree(bfregi->sys_pages);
 	kfree(bfregi->count);
 
 	if (context->devx_uid) {
 		if (uctx_rdma_ctrl_is_enabled(ibcontext->enabled_caps))
-			mlx5_cmd_remove_privileged_uid(dev->mdev,
+			mlx5_cmd_remove_privileged_uid(mdev,
 						       context->devx_uid);
 		mlx5_ib_devx_destroy(uctx_to_mdev(context), context->devx_uid);
 	}
 }
 
-static phys_addr_t uar_index2pfn(struct mlx5_ib_dev *dev,
+static phys_addr_t uar_index2pfn(struct mlx5_core_dev *mdev,
 				 int uar_idx)
 {
 	int fw_uars_per_page;
 
-	fw_uars_per_page = MLX5_CAP_GEN(dev->mdev, uar_4k) ? MLX5_UARS_IN_PAGE : 1;
+	fw_uars_per_page = MLX5_CAP_GEN(mdev, uar_4k) ? MLX5_UARS_IN_PAGE : 1;
 
-	return (dev->mdev->bar_addr >> PAGE_SHIFT) + uar_idx / fw_uars_per_page;
+	return (mdev->bar_addr >> PAGE_SHIFT) + uar_idx / fw_uars_per_page;
 }
 
-static u64 uar_index2paddress(struct mlx5_ib_dev *dev,
-				 int uar_idx)
+static u64 uar_index2paddress(struct mlx5_core_dev *mdev, int uar_idx)
 {
 	unsigned int fw_uars_per_page;
 
-	fw_uars_per_page = MLX5_CAP_GEN(dev->mdev, uar_4k) ?
+	fw_uars_per_page = MLX5_CAP_GEN(mdev, uar_4k) ?
 				MLX5_UARS_IN_PAGE : 1;
 
-	return (dev->mdev->bar_addr + (uar_idx / fw_uars_per_page) * PAGE_SIZE);
+	return (mdev->bar_addr + (uar_idx / fw_uars_per_page) * PAGE_SIZE);
 }
 
 static int get_command(unsigned long offset)
@@ -2454,10 +2462,11 @@ static inline char *mmap_cmd2str(enum mlx5_ib_mmap_cmd cmd)
 	}
 }
 
-static int mlx5_ib_mmap_clock_info_page(struct mlx5_ib_dev *dev,
-					struct vm_area_struct *vma,
+static int mlx5_ib_mmap_clock_info_page(struct vm_area_struct *vma,
 					struct mlx5_ib_ucontext *context)
 {
+	struct mlx5_core_dev *mdev = uctx_to_mdev(context);
+
 	if ((vma->vm_end - vma->vm_start != PAGE_SIZE) ||
 	    !(vma->vm_flags & VM_SHARED))
 		return -EINVAL;
@@ -2469,11 +2478,11 @@ static int mlx5_ib_mmap_clock_info_page(struct mlx5_ib_dev *dev,
 		return -EPERM;
 	vm_flags_clear(vma, VM_MAYWRITE);
 
-	if (!dev->mdev->clock_info)
+	if (!mdev->clock_info)
 		return -EOPNOTSUPP;
 
 	return vm_insert_page(vma, vma->vm_start,
-			      virt_to_page(dev->mdev->clock_info));
+			      virt_to_page(mdev->clock_info));
 }
 
 static int phys_addr_to_bar(struct pci_dev *pdev, phys_addr_t pa)
@@ -2504,7 +2513,9 @@ static int mlx5_ib_mmap_get_pfns(struct rdma_user_mmap_entry *entry,
 				 struct p2pdma_provider **provider)
 {
 	struct mlx5_user_mmap_entry *mentry = to_mmmap(entry);
-	struct pci_dev *pdev = to_dev(entry->ucontext->device)->mdev->pdev;
+	struct mlx5_core_dev *mdev =
+		uctx_to_mdev(to_mucontext(entry->ucontext));
+	struct pci_dev *pdev = mdev->pdev;
 	int bar;
 
 	phys_vec->paddr = mentry->address;
@@ -2572,7 +2583,7 @@ static void mlx5_ib_mmap_free(struct rdma_user_mmap_entry *entry)
 		break;
 	case MLX5_IB_MMAP_TYPE_UAR_WC:
 	case MLX5_IB_MMAP_TYPE_UAR_NC:
-		mlx5_cmd_uar_dealloc(dev->mdev, mentry->page_idx,
+		mlx5_cmd_uar_dealloc(uctx_to_mdev(context), mentry->page_idx,
 				     context->devx_uid);
 		kfree(mentry);
 		break;
@@ -2586,6 +2597,7 @@ static int uar_mmap(struct mlx5_ib_dev *dev, enum mlx5_ib_mmap_cmd cmd,
 		    struct mlx5_ib_ucontext *context)
 {
 	struct mlx5_bfreg_info *bfregi = &context->bfregi;
+	struct mlx5_core_dev *mdev = uctx_to_mdev(context);
 	int err;
 	unsigned long idx;
 	phys_addr_t pfn;
@@ -2630,8 +2642,7 @@ static int uar_mmap(struct mlx5_ib_dev *dev, enum mlx5_ib_mmap_cmd cmd,
 	if (dyn_uar) {
 		int uars_per_page;
 
-		uars_per_page = get_uars_per_sys_page(dev->mdev,
-						      bfregi->lib_uar_4k);
+		uars_per_page = get_uars_per_sys_page(mdev, bfregi->lib_uar_4k);
 		bfreg_dyn_idx = idx * (uars_per_page * MLX5_NON_FP_BFREGS_PER_UAR);
 		if (bfreg_dyn_idx >= bfregi->total_num_bfregs) {
 			mlx5_ib_warn(dev, "invalid bfreg_dyn_idx %u, max=%u\n",
@@ -2652,7 +2663,7 @@ static int uar_mmap(struct mlx5_ib_dev *dev, enum mlx5_ib_mmap_cmd cmd,
 		bfregi->count[bfreg_dyn_idx]++;
 		mutex_unlock(&bfregi->lock);
 
-		err = mlx5_cmd_uar_alloc(dev->mdev, &uar_index,
+		err = mlx5_cmd_uar_alloc(mdev, &uar_index,
 					 context->devx_uid);
 		if (err) {
 			mlx5_ib_warn(dev, "UAR alloc failed\n");
@@ -2662,7 +2673,7 @@ static int uar_mmap(struct mlx5_ib_dev *dev, enum mlx5_ib_mmap_cmd cmd,
 		uar_index = bfregi->sys_pages[idx];
 	}
 
-	pfn = uar_index2pfn(dev, uar_index);
+	pfn = uar_index2pfn(mdev, uar_index);
 	mlx5_ib_dbg(dev, "uar idx 0x%lx, pfn %pa\n", idx, &pfn);
 
 	err = rdma_user_mmap_io(&context->ibucontext, vma, pfn, PAGE_SIZE,
@@ -2682,7 +2693,7 @@ static int uar_mmap(struct mlx5_ib_dev *dev, enum mlx5_ib_mmap_cmd cmd,
 	if (!dyn_uar)
 		return err;
 
-	mlx5_cmd_uar_dealloc(dev->mdev, uar_index, context->devx_uid);
+	mlx5_cmd_uar_dealloc(mdev, uar_index, context->devx_uid);
 
 free_bfreg:
 	mlx5_ib_free_bfreg(dev, bfregi, bfreg_dyn_idx);
@@ -2746,6 +2757,7 @@ static int mlx5_ib_mmap(struct ib_ucontext *ibcontext, struct vm_area_struct *vm
 {
 	struct mlx5_ib_ucontext *context = to_mucontext(ibcontext);
 	struct mlx5_ib_dev *dev = to_dev(ibcontext->device);
+	struct mlx5_core_dev *mdev = uctx_to_mdev(context);
 	unsigned long command;
 	phys_addr_t pfn;
 
@@ -2753,7 +2765,7 @@ static int mlx5_ib_mmap(struct ib_ucontext *ibcontext, struct vm_area_struct *vm
 	switch (command) {
 	case MLX5_IB_MMAP_WC_PAGE:
 	case MLX5_IB_MMAP_ALLOC_WC:
-		if (!mlx5_wc_support_get(dev->mdev))
+		if (!mlx5_wc_support_get(mdev))
 			return -EPERM;
 		fallthrough;
 	case MLX5_IB_MMAP_NC_PAGE:
@@ -2775,7 +2787,7 @@ static int mlx5_ib_mmap(struct ib_ucontext *ibcontext, struct vm_area_struct *vm
 		if (PAGE_SIZE > 4096)
 			return -EOPNOTSUPP;
 
-		pfn = (dev->mdev->bar_addr +
+		pfn = (mdev->bar_addr +
 		       offsetof(struct mlx5_init_seg, internal_timer_h)) >>
 			PAGE_SHIFT;
 		return rdma_user_mmap_io(&context->ibucontext, vma, pfn,
@@ -2783,7 +2795,7 @@ static int mlx5_ib_mmap(struct ib_ucontext *ibcontext, struct vm_area_struct *vm
 					 pgprot_noncached(vma->vm_page_prot),
 					 NULL);
 	case MLX5_IB_MMAP_CLOCK_INFO:
-		return mlx5_ib_mmap_clock_info_page(dev, vma, context);
+		return mlx5_ib_mmap_clock_info_page(vma, context);
 
 	default:
 		return mlx5_ib_mmap_offset(dev, vma, ibcontext);
@@ -4187,11 +4199,11 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_VAR_OBJ_ALLOC)(
 		return err;
 
 	if (flags & MLX5_IB_UAPI_VAR_ALLOC_FLAG_TLP) {
-		if (!MLX5_CAP_GEN(to_dev(c->ibucontext.device)->mdev,
+		if (!MLX5_CAP_GEN(uctx_to_mdev(c),
 				  tlp_device_emulation_manager))
 			return -EOPNOTSUPP;
 	} else {
-		if (!(MLX5_CAP_GEN_64(to_dev(c->ibucontext.device)->mdev,
+		if (!(MLX5_CAP_GEN_64(uctx_to_mdev(c),
 				      general_obj_types) &
 		      MLX5_GENERAL_OBJ_TYPES_CAP_VIRTIO_NET_Q))
 			return -EOPNOTSUPP;
@@ -4265,8 +4277,8 @@ static struct mlx5_user_mmap_entry *
 alloc_uar_entry(struct mlx5_ib_ucontext *c,
 		enum mlx5_ib_uapi_uar_alloc_type alloc_type)
 {
+	struct mlx5_core_dev *mdev = uctx_to_mdev(c);
 	struct mlx5_user_mmap_entry *entry;
-	struct mlx5_ib_dev *dev;
 	u32 uar_index;
 	int err;
 
@@ -4274,13 +4286,12 @@ alloc_uar_entry(struct mlx5_ib_ucontext *c,
 	if (!entry)
 		return ERR_PTR(-ENOMEM);
 
-	dev = to_dev(c->ibucontext.device);
-	err = mlx5_cmd_uar_alloc(dev->mdev, &uar_index, c->devx_uid);
+	err = mlx5_cmd_uar_alloc(mdev, &uar_index, c->devx_uid);
 	if (err)
 		goto end;
 
 	entry->page_idx = uar_index;
-	entry->address = uar_index2paddress(dev, uar_index);
+	entry->address = uar_index2paddress(mdev, uar_index);
 	if (alloc_type == MLX5_IB_UAPI_UAR_ALLOC_TYPE_BF)
 		entry->mmap_flag = MLX5_IB_MMAP_TYPE_UAR_WC;
 	else
@@ -4293,7 +4304,7 @@ alloc_uar_entry(struct mlx5_ib_ucontext *c,
 	return entry;
 
 err_insert:
-	mlx5_cmd_uar_dealloc(dev->mdev, uar_index, c->devx_uid);
+	mlx5_cmd_uar_dealloc(mdev, uar_index, c->devx_uid);
 end:
 	kfree(entry);
 	return ERR_PTR(err);
@@ -4324,7 +4335,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_UAR_OBJ_ALLOC)(
 	    alloc_type != MLX5_IB_UAPI_UAR_ALLOC_TYPE_NC)
 		return -EOPNOTSUPP;
 
-	if (!mlx5_wc_support_get(to_dev(c->ibucontext.device)->mdev) &&
+	if (!mlx5_wc_support_get(uctx_to_mdev(c)) &&
 	    alloc_type == MLX5_IB_UAPI_UAR_ALLOC_TYPE_BF)
 		return -EOPNOTSUPP;
 

-- 
2.49.0


^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2026-11-17 14:04 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-17 14:01 [PATCH rdma-next 00/11] RDMA/mlx5: Preparation for SD support Edward Srouji
2026-11-17 14:01 ` [PATCH rdma-next 01/11] RDMA/mlx5: Enforce dev/mdev naming for device pointers Edward Srouji
2026-11-17 14:01 ` [PATCH rdma-next 02/11] RDMA/mlx5: Rename to_mdev() helpers that return an IB device Edward Srouji
2026-11-17 14:01 ` [PATCH rdma-next 03/11] RDMA/mlx5: Select the PD and SRQ core device through the PD Edward Srouji
2026-11-17 14:01 ` [PATCH rdma-next 04/11] RDMA/mlx5: Select the core device through PD for QP commands Edward Srouji
2026-11-17 14:01 ` [PATCH rdma-next 05/11] RDMA/mlx5: Cache the MR core device and resolve the MW's via its PD Edward Srouji
2026-11-17 14:01 ` [PATCH rdma-next 06/11] RDMA/mlx5: Select the AH core device through their PD Edward Srouji
2026-11-17 14:01 ` [PATCH rdma-next 07/11] RDMA/mlx5: Select the QP core device through its PD Edward Srouji
2026-11-17 14:01 ` [PATCH rdma-next 08/11] RDMA/mlx5: Resolve core device from ucontext for DEVX resources Edward Srouji
2026-11-17 14:01 ` [PATCH rdma-next 09/11] RDMA/mlx5: Cache the CQ core device and resolve it via cq_to_mdev() Edward Srouji
2026-11-17 14:01 ` [PATCH rdma-next 10/11] RDMA/mlx5: Resolve the bfreg UAR-index core device from the ucontext Edward Srouji
2026-11-17 14:01 ` [PATCH rdma-next 11/11] RDMA/mlx5: Resolve UAR and mmap core devices via " Edward Srouji

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®