Commit c9355682 authored by Chris Mi's avatar Chris Mi Committed by Saeed Mahameed
Browse files

net/mlx5: Instantiate separate mapping objects for FDB and NIC tables 



Currently, the u32 chain id is mapped to u16 value which is stored on
the lower 16 bits of reg_c0 for FDB and reg_b for NIC tables. The
mapping is internally maintained by the chains object. However, with
the introduction of reg_c0 objects the fdb may store more than just
the chain id on reg_c0. This is not relevant for NIC tables.

Separate the chains mapping instantiation for FDB and NIC tables.
Remove the mapping from the chains object. For FDB tables, create
the mapping per eswitch. For NIC tables, create the mapping per tc
table. Pass the corresponding mapping pointer when creating the
chains object.

Signed-off-by: default avatarChris Mi <cmi@nvidia.com>
Reviewed-by: default avatarOz Shlomo <ozsh@nvidia.com>
Reviewed-by: default avatarMark Bloch <mbloch@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent a91d98a0

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -37,9 +37,10 @@ mlx5_core-$(CONFIG_MLX5_EN_RXNFC) += en_fs_ethtool.o 
mlx5_core-$(CONFIG_MLX5_CORE_EN_DCB) += en_dcbnl.o en/port_buffer.o

mlx5_core-$(CONFIG_PCI_HYPERV_INTERFACE) += en/hv_vhca_stats.o

mlx5_core-$(CONFIG_MLX5_ESWITCH)     += lag_mp.o lib/geneve.o lib/port_tun.o \

					en_rep.o en/rep/bond.o en/mod_hdr.o

					en_rep.o en/rep/bond.o en/mod_hdr.o \

					en/mapping.o

mlx5_core-$(CONFIG_MLX5_CLS_ACT)     += en_tc.o en/rep/tc.o en/rep/neigh.o \

					en/mapping.o lib/fs_chains.o en/tc_tun.o \

					lib/fs_chains.o en/tc_tun.o \

					esw/indir_table.o en/tc_tun_encap.o \

					en/tc_tun_vxlan.o en/tc_tun_gre.o en/tc_tun_geneve.o \

					en/tc_tun_mplsoudp.o diag/en_tc_tracepoint.o

drivers/net/ethernet/mellanox/mlx5/core/en/fs.h

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ struct mlx5e_tc_table { 
	struct netdev_net_notifier	netdevice_nn;



	struct mlx5_tc_ct_priv         *ct;

	struct mapping_ctx             *mapping;

};



struct mlx5e_flow_table {

drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c

+1 −1
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ bool mlx5e_rep_tc_update_skb(struct mlx5_cqe64 *cqe, 
	priv = netdev_priv(skb->dev);

	esw = priv->mdev->priv.eswitch;



	err = mlx5_get_mapped_object(esw_chains(esw), reg_c0, &mapped_obj);

	err = mapping_find(esw->offloads.reg_c0_obj_pool, reg_c0, &mapped_obj);

	if (err) {

		netdev_dbg(priv->netdev,

			   "Couldn't find mapped object for reg_c0: %d, err: %d\n",

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

+15 −4
Original line number Diff line number Diff line
@@ -4731,6 +4731,7 @@ int mlx5e_tc_nic_init(struct mlx5e_priv *priv) 
{

	struct mlx5e_tc_table *tc = &priv->fs.tc;

	struct mlx5_core_dev *dev = priv->mdev;

	struct mapping_ctx *chains_mapping;

	struct mlx5_chains_attr attr = {};

	int err;
@@ -4745,15 +4746,22 @@ int mlx5e_tc_nic_init(struct mlx5e_priv *priv) 


	lockdep_set_class(&tc->ht.mutex, &tc_ht_lock_key);



	if (MLX5_CAP_FLOWTABLE_NIC_RX(priv->mdev, ignore_flow_level)) {

	chains_mapping = mapping_create(sizeof(struct mlx5_mapped_obj),

					MLX5E_TC_TABLE_CHAIN_TAG_MASK, true);

	if (IS_ERR(chains_mapping)) {

		err = PTR_ERR(chains_mapping);

		goto err_mapping;

	}

	tc->mapping = chains_mapping;



	if (MLX5_CAP_FLOWTABLE_NIC_RX(priv->mdev, ignore_flow_level))

		attr.flags = MLX5_CHAINS_AND_PRIOS_SUPPORTED |

			MLX5_CHAINS_IGNORE_FLOW_LEVEL_SUPPORTED;

		attr.max_restore_tag = MLX5E_TC_TABLE_CHAIN_TAG_MASK;

	}

	attr.ns = MLX5_FLOW_NAMESPACE_KERNEL;

	attr.max_ft_sz = mlx5e_tc_nic_get_ft_size(dev);

	attr.max_grp_num = MLX5E_TC_TABLE_NUM_GROUPS;

	attr.default_ft = mlx5e_vlan_get_flowtable(priv->fs.vlan);

	attr.mapping = chains_mapping;



	tc->chains = mlx5_chains_create(dev, &attr);

	if (IS_ERR(tc->chains)) {
@@ -4780,6 +4788,8 @@ int mlx5e_tc_nic_init(struct mlx5e_priv *priv) 
	mlx5_tc_ct_clean(tc->ct);

	mlx5_chains_destroy(tc->chains);

err_chains:

	mapping_destroy(chains_mapping);

err_mapping:

	rhashtable_destroy(&tc->ht);

	return err;

}
@@ -4814,6 +4824,7 @@ void mlx5e_tc_nic_cleanup(struct mlx5e_priv *priv) 
	mutex_destroy(&tc->t_lock);



	mlx5_tc_ct_clean(tc->ct);

	mapping_destroy(tc->mapping);

	mlx5_chains_destroy(tc->chains);

}
@@ -4981,7 +4992,7 @@ bool mlx5e_tc_update_skb(struct mlx5_cqe64 *cqe, 


	chain_tag = reg_b & MLX5E_TC_TABLE_CHAIN_TAG_MASK;



	err = mlx5_get_mapped_object(nic_chains(priv), chain_tag, &mapped_obj);

	err = mapping_find(tc->mapping, chain_tag, &mapped_obj);

	if (err) {

		netdev_dbg(priv->netdev,

			   "Couldn't find chain for chain tag: %d, err: %d\n",

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

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ struct mlx5_esw_offload { 
	struct mlx5_flow_table *ft_offloads_restore;

	struct mlx5_flow_group *restore_group;

	struct mlx5_modify_hdr *restore_copy_hdr_id;

	struct mapping_ctx *reg_c0_obj_pool;



	struct mlx5_flow_table *ft_offloads;

	struct mlx5_flow_group *vport_rx_group;