Commit ae430332 authored by Ariel Levkovich's avatar Ariel Levkovich Committed by Saeed Mahameed
Browse files

net/mlx5: Refactor multi chains and prios support 



Decouple the chains infrastructure from eswitch and make
it generic to support other steering namespaces.

The change defines an agnostic data structure to keep
all the relevant information for maintaining flow table
chaining in any steering namespace. Each namespace that
requires table chaining will be required to allocate
such data structure.

The chains creation code will receive the steering namespace
and flow table parameters from the caller so it will operate
agnosticly when creating the required resources to
maintain the table chaining function while Parts of the code
that are relevant to eswitch specific functionality are moved
to eswitch files.

Signed-off-by: default avatarAriel Levkovich <lariel@mellanox.com>
Reviewed-by: default avatarRoi Dayan <roid@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 748d1c8a

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

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 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

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

					en/mapping.o esw/chains.o en/tc_tun.o \

					en/mapping.o lib/fs_chains.o en/tc_tun.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

mlx5_core-$(CONFIG_MLX5_TC_CT)	     += en/tc_ct.o

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

+8 −8
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include "neigh.h"

#include "en_rep.h"

#include "eswitch.h"

#include "esw/chains.h"

#include "lib/fs_chains.h"

#include "en/tc_ct.h"

#include "en/mapping.h"

#include "en/tc_tun.h"
@@ -191,7 +191,7 @@ static int mlx5e_rep_setup_ft_cb(enum tc_setup_type type, void *type_data, 
	case TC_SETUP_CLSFLOWER:

		memcpy(&tmp, f, sizeof(*f));



		if (!mlx5_esw_chains_prios_supported(esw))

		if (!mlx5_chains_prios_supported(esw_chains(esw)))

			return -EOPNOTSUPP;



		/* Re-use tc offload path by moving the ft flow to the
@@ -203,12 +203,12 @@ static int mlx5e_rep_setup_ft_cb(enum tc_setup_type type, void *type_data, 
		 *

		 * We only support chain 0 of FT offload.

		 */

		if (tmp.common.prio >= mlx5_esw_chains_get_prio_range(esw))

		if (tmp.common.prio >= mlx5_chains_get_prio_range(esw_chains(esw)))

			return -EOPNOTSUPP;

		if (tmp.common.chain_index != 0)

			return -EOPNOTSUPP;



		tmp.common.chain_index = mlx5_esw_chains_get_ft_chain(esw);

		tmp.common.chain_index = mlx5_chains_get_nf_ft_chain(esw_chains(esw));

		tmp.common.prio++;

		err = mlx5e_rep_setup_tc_cls_flower(priv, &tmp, flags);

		memcpy(&f->stats, &tmp.stats, sizeof(f->stats));
@@ -378,12 +378,12 @@ static int mlx5e_rep_indr_setup_ft_cb(enum tc_setup_type type, 
		 *

		 * We only support chain 0 of FT offload.

		 */

		if (!mlx5_esw_chains_prios_supported(esw) ||

		    tmp.common.prio >= mlx5_esw_chains_get_prio_range(esw) ||

		if (!mlx5_chains_prios_supported(esw_chains(esw)) ||

		    tmp.common.prio >= mlx5_chains_get_prio_range(esw_chains(esw)) ||

		    tmp.common.chain_index)

			return -EOPNOTSUPP;



		tmp.common.chain_index = mlx5_esw_chains_get_ft_chain(esw);

		tmp.common.chain_index = mlx5_chains_get_nf_ft_chain(esw_chains(esw));

		tmp.common.prio++;

		err = mlx5e_rep_indr_offload(priv->netdev, &tmp, priv, flags);

		memcpy(&f->stats, &tmp.stats, sizeof(f->stats));
@@ -626,7 +626,7 @@ bool mlx5e_rep_tc_update_skb(struct mlx5_cqe64 *cqe, 
	priv = netdev_priv(skb->dev);

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



	err = mlx5_eswitch_get_chain_for_tag(esw, reg_c0, &chain);

	err = mlx5_get_chain_for_tag(esw_chains(esw), reg_c0, &chain);

	if (err) {

		netdev_dbg(priv->netdev,

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

drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c

+18 −13
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/workqueue.h>

#include <linux/xarray.h>



#include "esw/chains.h"

#include "lib/fs_chains.h"

#include "en/tc_ct.h"

#include "en/mod_hdr.h"

#include "en/mapping.h"
@@ -1485,7 +1485,7 @@ __mlx5_tc_ct_flow_offload(struct mlx5e_priv *priv, 
	 * don't go though all prios of this chain as normal tc rules

	 * miss.

	 */

	err = mlx5_esw_chains_get_chain_mapping(esw, attr->chain,

	err = mlx5_chains_get_chain_mapping(esw_chains(esw), attr->chain,

					    &chain_mapping);

	if (err) {

		ct_dbg("Failed to get chain register mapping for chain");
@@ -1582,7 +1582,7 @@ err_insert_post_ct: 
	mlx5_modify_header_dealloc(priv->mdev, pre_ct_attr->modify_hdr);

err_mapping:

	dealloc_mod_hdr_actions(&pre_mod_acts);

	mlx5_esw_chains_put_chain_mapping(esw, ct_flow->chain_mapping);

	mlx5_chains_put_chain_mapping(esw_chains(esw), ct_flow->chain_mapping);

err_get_chain:

	idr_remove(&ct_priv->fte_ids, fte_id);

err_idr:
@@ -1694,7 +1694,7 @@ __mlx5_tc_ct_delete_flow(struct mlx5_tc_ct_priv *ct_priv, 
	if (ct_flow->post_ct_rule) {

		mlx5_eswitch_del_offloaded_rule(esw, ct_flow->post_ct_rule,

						&ct_flow->post_ct_attr);

		mlx5_esw_chains_put_chain_mapping(esw, ct_flow->chain_mapping);

		mlx5_chains_put_chain_mapping(esw_chains(esw), ct_flow->chain_mapping);

		idr_remove(&ct_priv->fte_ids, ct_flow->fte_id);

		mlx5_tc_ct_del_ft_cb(ct_priv, ct_flow->ft);

	}
@@ -1817,14 +1817,14 @@ mlx5_tc_ct_init(struct mlx5_rep_uplink_priv *uplink_priv) 


	ct_priv->esw = esw;

	ct_priv->netdev = rpriv->netdev;

	ct_priv->ct = mlx5_esw_chains_create_global_table(esw);

	ct_priv->ct = mlx5_chains_create_global_table(esw_chains(esw));

	if (IS_ERR(ct_priv->ct)) {

		err = PTR_ERR(ct_priv->ct);

		mlx5_tc_ct_init_err(rpriv, "failed to create ct table", err);

		goto err_ct_tbl;

	}



	ct_priv->ct_nat = mlx5_esw_chains_create_global_table(esw);

	ct_priv->ct_nat = mlx5_chains_create_global_table(esw_chains(esw));

	if (IS_ERR(ct_priv->ct_nat)) {

		err = PTR_ERR(ct_priv->ct_nat);

		mlx5_tc_ct_init_err(rpriv, "failed to create ct nat table",
@@ -1832,7 +1832,7 @@ mlx5_tc_ct_init(struct mlx5_rep_uplink_priv *uplink_priv) 
		goto err_ct_nat_tbl;

	}



	ct_priv->post_ct = mlx5_esw_chains_create_global_table(esw);

	ct_priv->post_ct = mlx5_chains_create_global_table(esw_chains(esw));

	if (IS_ERR(ct_priv->post_ct)) {

		err = PTR_ERR(ct_priv->post_ct);

		mlx5_tc_ct_init_err(rpriv, "failed to create post ct table",
@@ -1852,9 +1852,9 @@ mlx5_tc_ct_init(struct mlx5_rep_uplink_priv *uplink_priv) 
	return 0;



err_post_ct_tbl:

	mlx5_esw_chains_destroy_global_table(esw, ct_priv->ct_nat);

	mlx5_chains_destroy_global_table(esw_chains(esw), ct_priv->ct_nat);

err_ct_nat_tbl:

	mlx5_esw_chains_destroy_global_table(esw, ct_priv->ct);

	mlx5_chains_destroy_global_table(esw_chains(esw), ct_priv->ct);

err_ct_tbl:

	mapping_destroy(ct_priv->labels_mapping);

err_mapping_labels:
@@ -1871,13 +1871,18 @@ void 
mlx5_tc_ct_clean(struct mlx5_rep_uplink_priv *uplink_priv)

{

	struct mlx5_tc_ct_priv *ct_priv = uplink_priv->ct_priv;

	struct mlx5_fs_chains *chains;

	struct mlx5_eswitch *esw;



	if (!ct_priv)

		return;



	mlx5_esw_chains_destroy_global_table(ct_priv->esw, ct_priv->post_ct);

	mlx5_esw_chains_destroy_global_table(ct_priv->esw, ct_priv->ct_nat);

	mlx5_esw_chains_destroy_global_table(ct_priv->esw, ct_priv->ct);

	esw = ct_priv->esw;

	chains = esw_chains(esw);



	mlx5_chains_destroy_global_table(chains, ct_priv->post_ct);

	mlx5_chains_destroy_global_table(chains, ct_priv->ct_nat);

	mlx5_chains_destroy_global_table(chains, ct_priv->ct);

	mapping_destroy(ct_priv->zone_mapping);

	mapping_destroy(ct_priv->labels_mapping);

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

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include <net/ipv6_stubs.h>



#include "eswitch.h"

#include "esw/chains.h"

#include "en.h"

#include "en_rep.h"

#include "en/txrx.h"

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

+6 −6
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ 
#include "en/rep/neigh.h"

#include "en_tc.h"

#include "eswitch.h"

#include "esw/chains.h"

#include "fs_core.h"

#include "en/port.h"

#include "en/tc_tun.h"
@@ -66,6 +65,7 @@ 
#include "en/mod_hdr.h"

#include "lib/devcom.h"

#include "lib/geneve.h"

#include "lib/fs_chains.h"

#include "diag/en_tc_tracepoint.h"



#define MLX5_MH_ACT_SZ MLX5_UN_SZ_BYTES(set_add_copy_action_in_auto)
@@ -1180,7 +1180,7 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv, 
	int err = 0;

	int out_index;



	if (!mlx5_esw_chains_prios_supported(esw) && attr->prio != 1) {

	if (!mlx5_chains_prios_supported(esw_chains(esw)) && attr->prio != 1) {

		NL_SET_ERR_MSG_MOD(extack,

				   "E-switch priorities unsupported, upgrade FW");

		return -EOPNOTSUPP;
@@ -1191,14 +1191,14 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv, 
	 * FDB_FT_CHAIN which is outside tc range.

	 * See mlx5e_rep_setup_ft_cb().

	 */

	max_chain = mlx5_esw_chains_get_chain_range(esw);

	max_chain = mlx5_chains_get_chain_range(esw_chains(esw));

	if (!mlx5e_is_ft_flow(flow) && attr->chain > max_chain) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Requested chain is out of supported range");

		return -EOPNOTSUPP;

	}



	max_prio = mlx5_esw_chains_get_prio_range(esw);

	max_prio = mlx5_chains_get_prio_range(esw_chains(esw));

	if (attr->prio > max_prio) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Requested priority is out of supported range");
@@ -3845,7 +3845,7 @@ static int mlx5_validate_goto_chain(struct mlx5_eswitch *esw, 
				    u32 actions,

				    struct netlink_ext_ack *extack)

{

	u32 max_chain = mlx5_esw_chains_get_chain_range(esw);

	u32 max_chain = mlx5_chains_get_chain_range(esw_chains(esw));

	struct mlx5_esw_flow_attr *attr = flow->esw_attr;

	bool ft_flow = mlx5e_is_ft_flow(flow);

	u32 dest_chain = act->chain_index;
@@ -3855,7 +3855,7 @@ static int mlx5_validate_goto_chain(struct mlx5_eswitch *esw, 
		return -EOPNOTSUPP;

	}



	if (!mlx5_esw_chains_backwards_supported(esw) &&

	if (!mlx5_chains_backwards_supported(esw_chains(esw)) &&

	    dest_chain <= attr->chain) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Goto lower numbered chain isn't supported");

CRA Git | Maintained and supported by SUSTech CRA and CCSE