Commit 7ce6095e authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Jason Gunthorpe
Browse files

RDMA/mlx5: Don't add slave port to unaffiliated list 

The mlx5_ib_bind_slave_port() doesn't remove multiport device from the
unaffiliated list, but mlx5_ib_unbind_slave_port() did it. This unbalanced
flow caused to the situation where mlx5_ib_unaffiliated_port_list was
changed during iteration.

Fixes: 32f69e4b ("{net, IB}/mlx5: Manage port association for multiport RoCE")
Link: https://lore.kernel.org/r/2726e6603b1e6ecfe76aa5a12a063af72173bcf7.1622477058.git.leonro@nvidia.com


Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 2db7b2ea

drivers/infiniband/hw/mlx5/main.c

+2 −2
Original line number Diff line number Diff line
@@ -3182,8 +3182,6 @@ static void mlx5_ib_unbind_slave_port(struct mlx5_ib_dev *ibdev, 


	port->mp.mpi = NULL;



	list_add_tail(&mpi->list, &mlx5_ib_unaffiliated_port_list);



	spin_unlock(&port->mp.mpi_lock);



	err = mlx5_nic_vport_unaffiliate_multiport(mpi->mdev);
@@ -3332,6 +3330,8 @@ static void mlx5_ib_cleanup_multiport_master(struct mlx5_ib_dev *dev) 
				mlx5_ib_dbg(dev, "unbinding port_num: %u\n",

					    i + 1);

				mlx5_ib_unbind_slave_port(dev, dev->port[i].mp.mpi);

				list_add_tail(&dev->port[i].mp.mpi->list,

					      &mlx5_ib_unaffiliated_port_list);

			}

		}

	}