RDMA/mlx5: Enforce same type port association for multiport RoCE

[ Upstream commit e05feab22fd7dabcd6d272c4e2401ec1acdfdb9b ]

Different core device types such as PFs and VFs shouldn't be affiliated
together since they have different capabilities, fix that by enforcing
type check before doing the affiliation.

Fixes: 32f69e4be269 ("{net, IB}/mlx5: Manage port association for multiport RoCE")
Reviewed-by: Mark Bloch <mbloch@nvidia.com>
Signed-off-by: Patrisious Haddad <phaddad@nvidia.com>
Link: https://patch.msgid.link/88699500f690dff1c1852c1ddb71f8a1cc8b956e.1733233480.git.leonro@nvidia.com
Reviewed-by: Mateusz Polchlopek <mateusz.polchlopek@intel.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index bce31e28eb3037e32966a8b7a9ba06c122e6abc0..45a414e8d35faff90dd770897fc54ac35465890d 100644 (file)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -3265,7 +3265,8 @@ static int mlx5_ib_init_multiport_master(struct mlx5_ib_dev *dev)
                list_for_each_entry(mpi, &mlx5_ib_unaffiliated_port_list,
                                    list) {
                        if (dev->sys_image_guid == mpi->sys_image_guid &&
-                           (mlx5_core_native_port_num(mpi->mdev) - 1) == i) {
+                           (mlx5_core_native_port_num(mpi->mdev) - 1) == i &&
+                           mlx5_core_same_coredev_type(dev->mdev, mpi->mdev)) {
                                bound = mlx5_ib_bind_slave_port(dev, mpi);
                        }
 
@@ -4280,7 +4281,8 @@ static int mlx5r_mp_probe(struct auxiliary_device *adev,
 
        mutex_lock(&mlx5_ib_multiport_mutex);
        list_for_each_entry(dev, &mlx5_ib_dev_list, ib_dev_list) {
-               if (dev->sys_image_guid == mpi->sys_image_guid)
+               if (dev->sys_image_guid == mpi->sys_image_guid &&
+                   mlx5_core_same_coredev_type(dev->mdev, mpi->mdev))
                        bound = mlx5_ib_bind_slave_port(dev, mpi);
 
                if (bound) {

diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 1cae12185cf046ba5604842822c6a400b4558a22..2588ddd3512b1307659c408e2d063b3ac5e6f1d4 100644 (file)
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -1212,6 +1212,12 @@ static inline bool mlx5_core_is_vf(const struct mlx5_core_dev *dev)
        return dev->coredev_type == MLX5_COREDEV_VF;
 }
 
+static inline bool mlx5_core_same_coredev_type(const struct mlx5_core_dev *dev1,
+                                              const struct mlx5_core_dev *dev2)
+{
+       return dev1->coredev_type == dev2->coredev_type;
+}
+
 static inline bool mlx5_core_is_ecpf(const struct mlx5_core_dev *dev)
 {
        return dev->caps.embedded_cpu;