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

Commit b5ca15ad authored by Mark Bloch's avatar Mark Bloch Committed by Saeed Mahameed
Browse files

IB/mlx5: Add proper representors support 



This commit adds full support for IB representor:

1) Representors profile, We add two new profiles:
   nic_rep_profile - This profile will be used to create an IB device that
   represents the PF/UPLINK.
   rep_profile - This profile will be used to create an IB device that
   represents VFs. Each VF will be its own representor.
2) Proper load/unload callbacks, Those are called by the E-Switch when
   moving to/from switchdev mode.
3) Different flow DB handling for when we in switchdev mode.

Signed-off-by: default avatarMark Bloch <markb@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent b96c9dde

drivers/infiniband/hw/mlx5/ib_rep.c

+65 −0
Original line number Diff line number Diff line
@@ -5,6 +5,42 @@ 


#include "ib_rep.h"



static const struct mlx5_ib_profile rep_profile = {

	STAGE_CREATE(MLX5_IB_STAGE_INIT,

		     mlx5_ib_stage_init_init,

		     mlx5_ib_stage_init_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_FLOW_DB,

		     mlx5_ib_stage_rep_flow_db_init,

		     NULL),

	STAGE_CREATE(MLX5_IB_STAGE_CAPS,

		     mlx5_ib_stage_caps_init,

		     NULL),

	STAGE_CREATE(MLX5_IB_STAGE_NON_DEFAULT_CB,

		     mlx5_ib_stage_rep_non_default_cb,

		     NULL),

	STAGE_CREATE(MLX5_IB_STAGE_ROCE,

		     mlx5_ib_stage_rep_roce_init,

		     mlx5_ib_stage_rep_roce_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_DEVICE_RESOURCES,

		     mlx5_ib_stage_dev_res_init,

		     mlx5_ib_stage_dev_res_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_COUNTERS,

		     mlx5_ib_stage_counters_init,

		     mlx5_ib_stage_counters_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_BFREG,

		     mlx5_ib_stage_bfrag_init,

		     mlx5_ib_stage_bfrag_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_IB_REG,

		     mlx5_ib_stage_ib_reg_init,

		     mlx5_ib_stage_ib_reg_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_UMR_RESOURCES,

		     mlx5_ib_stage_umr_res_init,

		     mlx5_ib_stage_umr_res_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_CLASS_ATTR,

		     mlx5_ib_stage_class_attr_init,

		     NULL),

};



static int

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

{
@@ -14,17 +50,41 @@ mlx5_ib_nic_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep) 
static void

mlx5_ib_nic_rep_unload(struct mlx5_eswitch_rep *rep)

{

	rep->rep_if[REP_IB].priv = NULL;

}



static int

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

{

	struct mlx5_ib_dev *ibdev;



	ibdev = (struct mlx5_ib_dev *)ib_alloc_device(sizeof(*ibdev));

	if (!ibdev)

		return -ENOMEM;



	ibdev->rep = rep;

	ibdev->mdev = dev;

	ibdev->num_ports = max(MLX5_CAP_GEN(dev, num_ports),

			       MLX5_CAP_GEN(dev, num_vhca_ports));

	if (!__mlx5_ib_add(ibdev, &rep_profile))

		return -EINVAL;



	rep->rep_if[REP_IB].priv = ibdev;



	return 0;

}



static void

mlx5_ib_vport_rep_unload(struct mlx5_eswitch_rep *rep)

{

	struct mlx5_ib_dev *dev;



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

		return;



	dev = mlx5_ib_rep_to_dev(rep);

	__mlx5_ib_remove(dev, dev->profile, MLX5_IB_STAGE_MAX);

	rep->rep_if[REP_IB].priv = NULL;

}



static void *mlx5_ib_vport_get_proto_dev(struct mlx5_eswitch_rep *rep)
@@ -98,6 +158,11 @@ struct net_device *mlx5_ib_get_rep_netdev(struct mlx5_eswitch *esw, 
	return mlx5_eswitch_get_proto_dev(esw, vport_index, REP_ETH);

}



struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev(struct mlx5_eswitch *esw)

{

	return mlx5_eswitch_uplink_get_proto_dev(esw, REP_IB);

}



struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw, int vport)

{

	return mlx5_eswitch_vport_rep(esw, vport);

drivers/infiniband/hw/mlx5/ib_rep.h

+7 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw);

struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev(struct mlx5_eswitch *esw,

					  int vport_index);

struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev(struct mlx5_eswitch *esw);

struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw,

					   int vport_index);

void mlx5_ib_register_vport_reps(struct mlx5_ib_dev *dev);
@@ -34,6 +35,12 @@ struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev(struct mlx5_eswitch *esw, 
	return NULL;

}



static inline

struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev(struct mlx5_eswitch *esw)

{

	return NULL;

}



static inline

struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw,

					   int vport_index)

drivers/infiniband/hw/mlx5/main.c

+95 −30
Original line number Diff line number Diff line
@@ -4554,7 +4554,7 @@ static void mlx5_ib_cleanup_multiport_master(struct mlx5_ib_dev *dev) 
	mlx5_nic_vport_disable_roce(dev->mdev);

}



static void mlx5_ib_stage_init_cleanup(struct mlx5_ib_dev *dev)

void mlx5_ib_stage_init_cleanup(struct mlx5_ib_dev *dev)

{

	mlx5_ib_cleanup_multiport_master(dev);

#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
@@ -4563,7 +4563,7 @@ static void mlx5_ib_stage_init_cleanup(struct mlx5_ib_dev *dev) 
	kfree(dev->port);

}



static int mlx5_ib_stage_init_init(struct mlx5_ib_dev *dev)

int mlx5_ib_stage_init_init(struct mlx5_ib_dev *dev)

{

	struct mlx5_core_dev *mdev = dev->mdev;

	const char *name;
@@ -4647,12 +4647,26 @@ static int mlx5_ib_stage_flow_db_init(struct mlx5_ib_dev *dev) 
	return 0;

}



int mlx5_ib_stage_rep_flow_db_init(struct mlx5_ib_dev *dev)

{

	struct mlx5_ib_dev *nic_dev;



	nic_dev = mlx5_ib_get_uplink_ibdev(dev->mdev->priv.eswitch);



	if (!nic_dev)

		return -EINVAL;



	dev->flow_db = nic_dev->flow_db;



	return 0;

}



static void mlx5_ib_stage_flow_db_cleanup(struct mlx5_ib_dev *dev)

{

	kfree(dev->flow_db);

}



static int mlx5_ib_stage_caps_init(struct mlx5_ib_dev *dev)

int mlx5_ib_stage_caps_init(struct mlx5_ib_dev *dev)

{

	struct mlx5_core_dev *mdev = dev->mdev;

	int err;
@@ -4793,7 +4807,7 @@ static int mlx5_ib_stage_non_default_cb(struct mlx5_ib_dev *dev) 
	return 0;

}



static int mlx5_ib_stage_rep_non_default_cb(struct mlx5_ib_dev *dev)

int mlx5_ib_stage_rep_non_default_cb(struct mlx5_ib_dev *dev)

{

	dev->ib_dev.get_port_immutable  = mlx5_port_rep_immutable;

	dev->ib_dev.query_port		= mlx5_ib_rep_query_port;
@@ -4905,12 +4919,12 @@ static void mlx5_ib_stage_roce_cleanup(struct mlx5_ib_dev *dev) 
	}

}



static int mlx5_ib_stage_dev_res_init(struct mlx5_ib_dev *dev)

int mlx5_ib_stage_dev_res_init(struct mlx5_ib_dev *dev)

{

	return create_dev_resources(&dev->devr);

}



static void mlx5_ib_stage_dev_res_cleanup(struct mlx5_ib_dev *dev)

void mlx5_ib_stage_dev_res_cleanup(struct mlx5_ib_dev *dev)

{

	destroy_dev_resources(&dev->devr);

}
@@ -4922,7 +4936,7 @@ static int mlx5_ib_stage_odp_init(struct mlx5_ib_dev *dev) 
	return mlx5_ib_odp_init_one(dev);

}



static int mlx5_ib_stage_counters_init(struct mlx5_ib_dev *dev)

int mlx5_ib_stage_counters_init(struct mlx5_ib_dev *dev)

{

	if (MLX5_CAP_GEN(dev->mdev, max_qp_cnt)) {

		dev->ib_dev.get_hw_stats	= mlx5_ib_get_hw_stats;
@@ -4934,7 +4948,7 @@ static int mlx5_ib_stage_counters_init(struct mlx5_ib_dev *dev) 
	return 0;

}



static void mlx5_ib_stage_counters_cleanup(struct mlx5_ib_dev *dev)

void mlx5_ib_stage_counters_cleanup(struct mlx5_ib_dev *dev)

{

	if (MLX5_CAP_GEN(dev->mdev, max_qp_cnt))

		mlx5_ib_dealloc_counters(dev);
@@ -4965,7 +4979,7 @@ static void mlx5_ib_stage_uar_cleanup(struct mlx5_ib_dev *dev) 
	mlx5_put_uars_page(dev->mdev, dev->mdev->priv.uar);

}



static int mlx5_ib_stage_bfrag_init(struct mlx5_ib_dev *dev)

int mlx5_ib_stage_bfrag_init(struct mlx5_ib_dev *dev)

{

	int err;
@@ -4980,28 +4994,28 @@ static int mlx5_ib_stage_bfrag_init(struct mlx5_ib_dev *dev) 
	return err;

}



static void mlx5_ib_stage_bfrag_cleanup(struct mlx5_ib_dev *dev)

void mlx5_ib_stage_bfrag_cleanup(struct mlx5_ib_dev *dev)

{

	mlx5_free_bfreg(dev->mdev, &dev->fp_bfreg);

	mlx5_free_bfreg(dev->mdev, &dev->bfreg);

}



static int mlx5_ib_stage_ib_reg_init(struct mlx5_ib_dev *dev)

int mlx5_ib_stage_ib_reg_init(struct mlx5_ib_dev *dev)

{

	return ib_register_device(&dev->ib_dev, NULL);

}



static void mlx5_ib_stage_ib_reg_cleanup(struct mlx5_ib_dev *dev)

void mlx5_ib_stage_ib_reg_cleanup(struct mlx5_ib_dev *dev)

{

	ib_unregister_device(&dev->ib_dev);

}



static int mlx5_ib_stage_umr_res_init(struct mlx5_ib_dev *dev)

int mlx5_ib_stage_umr_res_init(struct mlx5_ib_dev *dev)

{

	return create_umr_res(dev);

}



static void mlx5_ib_stage_umr_res_cleanup(struct mlx5_ib_dev *dev)

void mlx5_ib_stage_umr_res_cleanup(struct mlx5_ib_dev *dev)

{

	destroy_umrc_res(dev);

}
@@ -5018,7 +5032,7 @@ static void mlx5_ib_stage_delay_drop_cleanup(struct mlx5_ib_dev *dev) 
	cancel_delay_drop(dev);

}



static int mlx5_ib_stage_class_attr_init(struct mlx5_ib_dev *dev)

int mlx5_ib_stage_class_attr_init(struct mlx5_ib_dev *dev)

{

	int err;

	int i;
@@ -5045,7 +5059,7 @@ static void mlx5_ib_stage_rep_reg_cleanup(struct mlx5_ib_dev *dev) 
	mlx5_ib_unregister_vport_reps(dev);

}



static void __mlx5_ib_remove(struct mlx5_ib_dev *dev,

void __mlx5_ib_remove(struct mlx5_ib_dev *dev,

		      const struct mlx5_ib_profile *profile,

		      int stage)

{
@@ -5061,23 +5075,14 @@ static void __mlx5_ib_remove(struct mlx5_ib_dev *dev, 


static void *mlx5_ib_add_slave_port(struct mlx5_core_dev *mdev, u8 port_num);



static void *__mlx5_ib_add(struct mlx5_core_dev *mdev,

void *__mlx5_ib_add(struct mlx5_ib_dev *dev,

		    const struct mlx5_ib_profile *profile)

{

	struct mlx5_ib_dev *dev;

	int err;

	int i;



	printk_once(KERN_INFO "%s", mlx5_version);



	dev = (struct mlx5_ib_dev *)ib_alloc_device(sizeof(*dev));

	if (!dev)

		return NULL;



	dev->mdev = mdev;

	dev->num_ports = max(MLX5_CAP_GEN(mdev, num_ports),

			     MLX5_CAP_GEN(mdev, num_vhca_ports));



	for (i = 0; i < MLX5_IB_STAGE_MAX; i++) {

		if (profile->stage[i].init) {

			err = profile->stage[i].init(dev);
@@ -5145,6 +5150,48 @@ static const struct mlx5_ib_profile pf_profile = { 
		     NULL),

};



static const struct mlx5_ib_profile nic_rep_profile = {

	STAGE_CREATE(MLX5_IB_STAGE_INIT,

		     mlx5_ib_stage_init_init,

		     mlx5_ib_stage_init_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_FLOW_DB,

		     mlx5_ib_stage_flow_db_init,

		     mlx5_ib_stage_flow_db_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_CAPS,

		     mlx5_ib_stage_caps_init,

		     NULL),

	STAGE_CREATE(MLX5_IB_STAGE_NON_DEFAULT_CB,

		     mlx5_ib_stage_rep_non_default_cb,

		     NULL),

	STAGE_CREATE(MLX5_IB_STAGE_ROCE,

		     mlx5_ib_stage_rep_roce_init,

		     mlx5_ib_stage_rep_roce_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_DEVICE_RESOURCES,

		     mlx5_ib_stage_dev_res_init,

		     mlx5_ib_stage_dev_res_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_COUNTERS,

		     mlx5_ib_stage_counters_init,

		     mlx5_ib_stage_counters_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_UAR,

		     mlx5_ib_stage_uar_init,

		     mlx5_ib_stage_uar_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_BFREG,

		     mlx5_ib_stage_bfrag_init,

		     mlx5_ib_stage_bfrag_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_IB_REG,

		     mlx5_ib_stage_ib_reg_init,

		     mlx5_ib_stage_ib_reg_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_UMR_RESOURCES,

		     mlx5_ib_stage_umr_res_init,

		     mlx5_ib_stage_umr_res_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_CLASS_ATTR,

		     mlx5_ib_stage_class_attr_init,

		     NULL),

	STAGE_CREATE(MLX5_IB_STAGE_REP_REG,

		     mlx5_ib_stage_rep_reg_init,

		     mlx5_ib_stage_rep_reg_cleanup),

};



static void *mlx5_ib_add_slave_port(struct mlx5_core_dev *mdev, u8 port_num)

{

	struct mlx5_ib_multiport_info *mpi;
@@ -5190,8 +5237,11 @@ static void *mlx5_ib_add_slave_port(struct mlx5_core_dev *mdev, u8 port_num) 
static void *mlx5_ib_add(struct mlx5_core_dev *mdev)

{

	enum rdma_link_layer ll;

	struct mlx5_ib_dev *dev;

	int port_type_cap;



	printk_once(KERN_INFO "%s", mlx5_version);



	port_type_cap = MLX5_CAP_GEN(mdev, port_type);

	ll = mlx5_port_type_cap_to_rdma_ll(port_type_cap);
@@ -5201,7 +5251,22 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) 
		return mlx5_ib_add_slave_port(mdev, port_num);

	}



	return __mlx5_ib_add(mdev, &pf_profile);

	dev = (struct mlx5_ib_dev *)ib_alloc_device(sizeof(*dev));

	if (!dev)

		return NULL;



	dev->mdev = mdev;

	dev->num_ports = max(MLX5_CAP_GEN(mdev, num_ports),

			     MLX5_CAP_GEN(mdev, num_vhca_ports));



	if (MLX5_VPORT_MANAGER(mdev) &&

	    mlx5_ib_eswitch_mode(mdev->priv.eswitch) == SRIOV_OFFLOADS) {

		dev->rep = mlx5_ib_vport_rep(mdev->priv.eswitch, 0);



		return __mlx5_ib_add(dev, &nic_rep_profile);

	}



	return __mlx5_ib_add(dev, &pf_profile);

}



static void mlx5_ib_remove(struct mlx5_core_dev *mdev, void *context)

drivers/infiniband/hw/mlx5/mlx5_ib.h

+25 −0
Original line number Diff line number Diff line
@@ -1054,6 +1054,31 @@ static inline void mlx5_odp_populate_klm(struct mlx5_klm *pklm, size_t offset, 


#endif /* CONFIG_INFINIBAND_ON_DEMAND_PAGING */



/* Needed for rep profile */

int mlx5_ib_stage_init_init(struct mlx5_ib_dev *dev);

void mlx5_ib_stage_init_cleanup(struct mlx5_ib_dev *dev);

int mlx5_ib_stage_rep_flow_db_init(struct mlx5_ib_dev *dev);

int mlx5_ib_stage_caps_init(struct mlx5_ib_dev *dev);

int mlx5_ib_stage_rep_non_default_cb(struct mlx5_ib_dev *dev);

int mlx5_ib_stage_rep_roce_init(struct mlx5_ib_dev *dev);

void mlx5_ib_stage_rep_roce_cleanup(struct mlx5_ib_dev *dev);

int mlx5_ib_stage_dev_res_init(struct mlx5_ib_dev *dev);

void mlx5_ib_stage_dev_res_cleanup(struct mlx5_ib_dev *dev);

int mlx5_ib_stage_counters_init(struct mlx5_ib_dev *dev);

void mlx5_ib_stage_counters_cleanup(struct mlx5_ib_dev *dev);

int mlx5_ib_stage_bfrag_init(struct mlx5_ib_dev *dev);

void mlx5_ib_stage_bfrag_cleanup(struct mlx5_ib_dev *dev);

int mlx5_ib_stage_ib_reg_init(struct mlx5_ib_dev *dev);

void mlx5_ib_stage_ib_reg_cleanup(struct mlx5_ib_dev *dev);

int mlx5_ib_stage_umr_res_init(struct mlx5_ib_dev *dev);

void mlx5_ib_stage_umr_res_cleanup(struct mlx5_ib_dev *dev);

int mlx5_ib_stage_class_attr_init(struct mlx5_ib_dev *dev);

void __mlx5_ib_remove(struct mlx5_ib_dev *dev,

		      const struct mlx5_ib_profile *profile,

		      int stage);

void *__mlx5_ib_add(struct mlx5_ib_dev *dev,

		    const struct mlx5_ib_profile *profile);



int mlx5_ib_get_vf_config(struct ib_device *device, int vf,

			  u8 port, struct ifla_vf_info *info);

int mlx5_ib_set_vf_link_state(struct ib_device *device, int vf,