RDMA/mlx5: Fill port info based on the relevant eswitch

In shared FDB a single RDMA device can have representors that are
connected to two different eswitches. Use the right eswitch when
preparing the response to userspace.

Signed-off-by: Mark Bloch <mbloch@nvidia.com>
Reviewed-by: Mark Zhang <markzhang@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/infiniband/hw/mlx5/std_types.c b/drivers/infiniband/hw/mlx5/std_types.c
index c0ddf7b..bbfcce3 100644 (file)
--- a/drivers/infiniband/hw/mlx5/std_types.c
+++ b/drivers/infiniband/hw/mlx5/std_types.c
@@ -114,14 +114,18 @@ out:
 static int fill_switchdev_info(struct mlx5_ib_dev *dev, u32 port_num,
                               struct mlx5_ib_uapi_query_port *info)
 {
-       struct mlx5_core_dev *mdev = dev->mdev;
        struct mlx5_eswitch_rep *rep;
+       struct mlx5_core_dev *mdev;
        int err;
 
        rep = dev->port[port_num - 1].rep;
        if (!rep)
                return -EOPNOTSUPP;
 
+       mdev = mlx5_eswitch_get_core_dev(rep->esw);
+       if (!mdev)
+               return -EINVAL;
+
        info->vport = rep->vport;
        info->flags |= MLX5_IB_UAPI_QUERY_PORT_VPORT;
 
@@ -138,9 +142,9 @@ static int fill_switchdev_info(struct mlx5_ib_dev *dev, u32 port_num,
        if (err)
                return err;
 
-       if (mlx5_eswitch_vport_match_metadata_enabled(mdev->priv.eswitch)) {
+       if (mlx5_eswitch_vport_match_metadata_enabled(rep->esw)) {
                info->reg_c0.value = mlx5_eswitch_get_vport_metadata_for_match(
-                       mdev->priv.eswitch, rep->vport);
+                       rep->esw, rep->vport);
                info->reg_c0.mask = mlx5_eswitch_get_vport_metadata_mask();
                info->flags |= MLX5_IB_UAPI_QUERY_PORT_VPORT_REG_C0;
        }