Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26628e2d authored by Mark Bloch's avatar Mark Bloch Committed by Jason Gunthorpe
Browse files

RDMA/mlx5: Move to single device multiport ports in switchdev mode 



Move from IB device (representor) per virtual function to single IB device
with port per virtual function (port 1 represents the uplink). As number
of ports is a static property of an IB device, declare the IB device with
as many port as the possible according to the PCI bus.

Signed-off-by: default avatarMark Bloch <markb@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent a989ea01

drivers/infiniband/hw/mlx5/ib_rep.c

+26 −5
Original line number Diff line number Diff line
@@ -46,17 +46,36 @@ static const struct mlx5_ib_profile vf_rep_profile = { 
		     NULL),

};



static int

mlx5_ib_set_vport_rep(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep)

{

	struct mlx5_ib_dev *ibdev;

	int vport_index;



	ibdev = mlx5_ib_get_uplink_ibdev(dev->priv.eswitch);

	vport_index = ibdev->free_port++;



	ibdev->port[vport_index].rep = rep;

	write_lock(&ibdev->port[vport_index].roce.netdev_lock);

	ibdev->port[vport_index].roce.netdev =

		mlx5_ib_get_rep_netdev(dev->priv.eswitch, rep->vport);

	write_unlock(&ibdev->port[vport_index].roce.netdev_lock);



	return 0;

}



static int

mlx5_ib_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep)

{

	int num_ports = MLX5_TOTAL_VPORTS(dev);

	const struct mlx5_ib_profile *profile;

	struct mlx5_ib_dev *ibdev;

	int num_ports = 1;

	int vport_index;



	if (rep->vport == MLX5_VPORT_UPLINK)

		profile = &uplink_rep_profile;

	else

		profile = &vf_rep_profile;

		return mlx5_ib_set_vport_rep(dev, rep);



	ibdev = ib_alloc_device(mlx5_ib_dev, ib_dev);

	if (!ibdev)
@@ -70,8 +89,9 @@ mlx5_ib_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep) 
	}



	ibdev->is_rep = true;

	ibdev->port[0].rep = rep;

	ibdev->port[0].roce.netdev =

	vport_index = ibdev->free_port++;

	ibdev->port[vport_index].rep = rep;

	ibdev->port[vport_index].roce.netdev =

		mlx5_ib_get_rep_netdev(dev->priv.eswitch, rep->vport);

	ibdev->mdev = dev;

	ibdev->num_ports = num_ports;
@@ -89,7 +109,8 @@ mlx5_ib_vport_rep_unload(struct mlx5_eswitch_rep *rep) 
{

	struct mlx5_ib_dev *dev;



	if (!rep->rep_if[REP_IB].priv)

	if (!rep->rep_if[REP_IB].priv ||

	    rep->vport != MLX5_VPORT_UPLINK)

		return;



	dev = mlx5_ib_rep_to_dev(rep);

drivers/infiniband/hw/mlx5/main.c

+22 −4
Original line number Diff line number Diff line
@@ -506,7 +506,12 @@ static int mlx5_query_port_roce(struct ib_device *device, u8 port_num, 


	/* Possible bad flows are checked before filling out props so in case

	 * of an error it will still be zeroed out.

	 * Use native port in case of reps

	 */

	if (dev->is_rep)

		err = mlx5_query_port_ptys(mdev, out, sizeof(out), MLX5_PTYS_EN,

					   1);

	else

		err = mlx5_query_port_ptys(mdev, out, sizeof(out), MLX5_PTYS_EN,

					   mdev_port_num);

	if (err)
@@ -1432,7 +1437,9 @@ static int mlx5_ib_rep_query_port(struct ib_device *ibdev, u8 port, 
{

	int ret;



	/* Only link layer == ethernet is valid for representors */

	/* Only link layer == ethernet is valid for representors

	 * and we always use port 1

	 */

	ret = mlx5_query_port_roce(ibdev, port, props);

	if (ret || !props)

		return ret;
@@ -4569,7 +4576,7 @@ static void get_ext_port_caps(struct mlx5_ib_dev *dev) 
		mlx5_query_ext_port_caps(dev, port);

}



static int get_port_caps(struct mlx5_ib_dev *dev, u8 port)

static int __get_port_caps(struct mlx5_ib_dev *dev, u8 port)

{

	struct ib_device_attr *dprops = NULL;

	struct ib_port_attr *pprops = NULL;
@@ -4612,6 +4619,16 @@ static int get_port_caps(struct mlx5_ib_dev *dev, u8 port) 
	return err;

}



static int get_port_caps(struct mlx5_ib_dev *dev, u8 port)

{

	/* For representors use port 1, is this is the only native

	 * port

	 */

	if (dev->is_rep)

		return __get_port_caps(dev, 1);

	return __get_port_caps(dev, port);

}



static void destroy_umrc_res(struct mlx5_ib_dev *dev)

{

	int err;
@@ -6198,6 +6215,7 @@ static int mlx5_ib_stage_common_roce_init(struct mlx5_ib_dev *dev) 


	port_num = mlx5_core_native_port_num(dev->mdev) - 1;



	/* Register only for native ports */

	return mlx5_add_netdev_notifier(dev, port_num);

}

drivers/infiniband/hw/mlx5/mlx5_ib.h

+1 −0
Original line number Diff line number Diff line
@@ -952,6 +952,7 @@ struct mlx5_ib_dev { 
	u16			devx_whitelist_uid;

	struct mlx5_srq_table   srq_table;

	struct mlx5_async_ctx   async_ctx;

	int			free_port;

};



static inline struct mlx5_ib_cq *to_mibcq(struct mlx5_core_cq *mcq)