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

Commit b3ba5149 authored by Erez Shitrit's avatar Erez Shitrit Committed by David S. Miller
Browse files

net/mlx5: Refactor create flow table method to accept underlay QP 



IB flow tables need the underlay qp to perform flow steering.
Here we change the API of the flow tables creation to accept the
underlay QP number as a parameter in order to support IB (IPoIB) flow
steering.

Signed-off-by: default avatarErez Shitrit <erezsh@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 500a3d0d

drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c

+8 −2
Original line number Diff line number Diff line
@@ -321,10 +321,16 @@ static int arfs_create_table(struct mlx5e_priv *priv, 
{

	struct mlx5e_arfs_tables *arfs = &priv->fs.arfs;

	struct mlx5e_flow_table *ft = &arfs->arfs_tables[type].ft;

	struct mlx5_flow_table_attr ft_attr = {};

	int err;



	ft->t = mlx5_create_flow_table(priv->fs.ns, MLX5E_NIC_PRIO,

				       MLX5E_ARFS_TABLE_SIZE, MLX5E_ARFS_FT_LEVEL, 0);

	ft->num_groups = 0;



	ft_attr.max_fte = MLX5E_ARFS_TABLE_SIZE;

	ft_attr.level = MLX5E_ARFS_FT_LEVEL;

	ft_attr.prio = MLX5E_NIC_PRIO;



	ft->t = mlx5_create_flow_table(priv->fs.ns, &ft_attr);

	if (IS_ERR(ft->t)) {

		err = PTR_ERR(ft->t);

		ft->t = NULL;

drivers/net/ethernet/mellanox/mlx5/core/en_fs.c

+19 −6
Original line number Diff line number Diff line
@@ -803,11 +803,15 @@ static void mlx5e_destroy_ttc_table(struct mlx5e_priv *priv) 
static int mlx5e_create_ttc_table(struct mlx5e_priv *priv)

{

	struct mlx5e_ttc_table *ttc = &priv->fs.ttc;

	struct mlx5_flow_table_attr ft_attr = {};

	struct mlx5e_flow_table *ft = &ttc->ft;

	int err;



	ft->t = mlx5_create_flow_table(priv->fs.ns, MLX5E_NIC_PRIO,

				       MLX5E_TTC_TABLE_SIZE, MLX5E_TTC_FT_LEVEL, 0);

	ft_attr.max_fte = MLX5E_TTC_TABLE_SIZE;

	ft_attr.level = MLX5E_TTC_FT_LEVEL;

	ft_attr.prio = MLX5E_NIC_PRIO;



	ft->t = mlx5_create_flow_table(priv->fs.ns, &ft_attr);

	if (IS_ERR(ft->t)) {

		err = PTR_ERR(ft->t);

		ft->t = NULL;
@@ -973,12 +977,16 @@ static int mlx5e_create_l2_table(struct mlx5e_priv *priv) 
{

	struct mlx5e_l2_table *l2_table = &priv->fs.l2;

	struct mlx5e_flow_table *ft = &l2_table->ft;

	struct mlx5_flow_table_attr ft_attr = {};

	int err;



	ft->num_groups = 0;

	ft->t = mlx5_create_flow_table(priv->fs.ns, MLX5E_NIC_PRIO,

				       MLX5E_L2_TABLE_SIZE, MLX5E_L2_FT_LEVEL, 0);



	ft_attr.max_fte = MLX5E_L2_TABLE_SIZE;

	ft_attr.level = MLX5E_L2_FT_LEVEL;

	ft_attr.prio = MLX5E_NIC_PRIO;



	ft->t = mlx5_create_flow_table(priv->fs.ns, &ft_attr);

	if (IS_ERR(ft->t)) {

		err = PTR_ERR(ft->t);

		ft->t = NULL;
@@ -1076,11 +1084,16 @@ static int mlx5e_create_vlan_table_groups(struct mlx5e_flow_table *ft) 
static int mlx5e_create_vlan_table(struct mlx5e_priv *priv)

{

	struct mlx5e_flow_table *ft = &priv->fs.vlan.ft;

	struct mlx5_flow_table_attr ft_attr = {};

	int err;



	ft->num_groups = 0;

	ft->t = mlx5_create_flow_table(priv->fs.ns, MLX5E_NIC_PRIO,

				       MLX5E_VLAN_TABLE_SIZE, MLX5E_VLAN_FT_LEVEL, 0);



	ft_attr.max_fte = MLX5E_VLAN_TABLE_SIZE;

	ft_attr.level = MLX5E_VLAN_FT_LEVEL;

	ft_attr.prio = MLX5E_NIC_PRIO;



	ft->t = mlx5_create_flow_table(priv->fs.ns, &ft_attr);



	if (IS_ERR(ft->t)) {

		err = PTR_ERR(ft->t);

drivers/net/ethernet/mellanox/mlx5/core/eswitch.c

+4 −1
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ esw_fdb_set_vport_promisc_rule(struct mlx5_eswitch *esw, u32 vport) 
static int esw_create_legacy_fdb_table(struct mlx5_eswitch *esw, int nvports)

{

	int inlen = MLX5_ST_SZ_BYTES(create_flow_group_in);

	struct mlx5_flow_table_attr ft_attr = {};

	struct mlx5_core_dev *dev = esw->dev;

	struct mlx5_flow_namespace *root_ns;

	struct mlx5_flow_table *fdb;
@@ -362,7 +363,9 @@ static int esw_create_legacy_fdb_table(struct mlx5_eswitch *esw, int nvports) 
	memset(flow_group_in, 0, inlen);



	table_size = BIT(MLX5_CAP_ESW_FLOWTABLE_FDB(dev, log_max_ft_size));

	fdb = mlx5_create_flow_table(root_ns, 0, table_size, 0, 0);



	ft_attr.max_fte = table_size;

	fdb = mlx5_create_flow_table(root_ns, &ft_attr);

	if (IS_ERR(fdb)) {

		err = PTR_ERR(fdb);

		esw_warn(dev, "Failed to create FDB Table err %d\n", err);

drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c

+12 −4
Original line number Diff line number Diff line
@@ -432,6 +432,7 @@ static int esw_add_fdb_miss_rule(struct mlx5_eswitch *esw) 
static int esw_create_offloads_fdb_table(struct mlx5_eswitch *esw, int nvports)

{

	int inlen = MLX5_ST_SZ_BYTES(create_flow_group_in);

	struct mlx5_flow_table_attr ft_attr = {};

	int table_size, ix, esw_size, err = 0;

	struct mlx5_core_dev *dev = esw->dev;

	struct mlx5_flow_namespace *root_ns;
@@ -475,7 +476,11 @@ static int esw_create_offloads_fdb_table(struct mlx5_eswitch *esw, int nvports) 
	esw->fdb_table.fdb = fdb;



	table_size = nvports + MAX_PF_SQ + 1;

	fdb = mlx5_create_flow_table(root_ns, FDB_SLOW_PATH, table_size, 0, 0);



	ft_attr.max_fte = table_size;

	ft_attr.prio = FDB_SLOW_PATH;



	fdb = mlx5_create_flow_table(root_ns, &ft_attr);

	if (IS_ERR(fdb)) {

		err = PTR_ERR(fdb);

		esw_warn(dev, "Failed to create slow path FDB Table err %d\n", err);
@@ -556,9 +561,10 @@ static void esw_destroy_offloads_fdb_table(struct mlx5_eswitch *esw) 


static int esw_create_offloads_table(struct mlx5_eswitch *esw)

{

	struct mlx5_flow_namespace *ns;

	struct mlx5_flow_table *ft_offloads;

	struct mlx5_flow_table_attr ft_attr = {};

	struct mlx5_core_dev *dev = esw->dev;

	struct mlx5_flow_table *ft_offloads;

	struct mlx5_flow_namespace *ns;

	int err = 0;



	ns = mlx5_get_flow_namespace(dev, MLX5_FLOW_NAMESPACE_OFFLOADS);
@@ -567,7 +573,9 @@ static int esw_create_offloads_table(struct mlx5_eswitch *esw) 
		return -EOPNOTSUPP;

	}



	ft_offloads = mlx5_create_flow_table(ns, 0, dev->priv.sriov.num_vfs + 2, 0, 0);

	ft_attr.max_fte = dev->priv.sriov.num_vfs + 2;



	ft_offloads = mlx5_create_flow_table(ns, &ft_attr);

	if (IS_ERR(ft_offloads)) {

		err = PTR_ERR(ft_offloads);

		esw_warn(esw->dev, "Failed to create offloads table, err %d\n", err);

drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c

+8 −0
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ int mlx5_cmd_update_root_ft(struct mlx5_core_dev *dev, 
	u32 in[MLX5_ST_SZ_DW(set_flow_table_root_in)]   = {0};

	u32 out[MLX5_ST_SZ_DW(set_flow_table_root_out)] = {0};



	if ((MLX5_CAP_GEN(dev, port_type) == MLX5_CAP_PORT_TYPE_IB) &&

	    ft->underlay_qpn == 0)

		return 0;



	MLX5_SET(set_flow_table_root_in, in, opcode,

		 MLX5_CMD_OP_SET_FLOW_TABLE_ROOT);

	MLX5_SET(set_flow_table_root_in, in, table_type, ft->type);
@@ -54,6 +58,10 @@ int mlx5_cmd_update_root_ft(struct mlx5_core_dev *dev, 
		MLX5_SET(set_flow_table_root_in, in, other_vport, 1);

	}



	if ((MLX5_CAP_GEN(dev, port_type) == MLX5_CAP_PORT_TYPE_IB) &&

	    ft->underlay_qpn != 0)

		MLX5_SET(set_flow_table_root_in, in, underlay_qpn, ft->underlay_qpn);



	return mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

}