Commit 67d62ee7 authored by Roi Dayan's avatar Roi Dayan Committed by Saeed Mahameed
Browse files

net/mlx5e: Add goto to tc action infra 



Add parsing support by implementing struct mlx5e_tc_act
for this action.

Signed-off-by: default avatarRoi Dayan <roid@nvidia.com>
Reviewed-by: default avatarOz Shlomo <ozsh@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent fad54790

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

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ mlx5_core-$(CONFIG_MLX5_CLS_ACT) += en_tc.o en/rep/tc.o en/rep/neigh.o \ 
					en/tc/post_act.o en/tc/int_port.o



mlx5_core-$(CONFIG_MLX5_CLS_ACT)     += en/tc/act/act.o en/tc/act/drop.o en/tc/act/trap.o \

					en/tc/act/accept.o en/tc/act/mark.o

					en/tc/act/accept.o en/tc/act/mark.o en/tc/act/goto.o



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

mlx5_core-$(CONFIG_MLX5_TC_SAMPLE)   += en/tc/sample.o

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

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ static struct mlx5e_tc_act *tc_acts_fdb[NUM_FLOW_ACTIONS] = { 
	&mlx5e_tc_act_accept,

	&mlx5e_tc_act_drop,

	&mlx5e_tc_act_trap,

	&mlx5e_tc_act_goto,

};



/* Must be aligned with enum flow_action_id. */
@@ -17,7 +18,7 @@ static struct mlx5e_tc_act *tc_acts_nic[NUM_FLOW_ACTIONS] = { 
	&mlx5e_tc_act_accept,

	&mlx5e_tc_act_drop,

	NULL, /* FLOW_ACTION_TRAP, */

	NULL, /* FLOW_ACTION_GOTO, */

	&mlx5e_tc_act_goto,

	NULL, /* FLOW_ACTION_REDIRECT, */

	NULL, /* FLOW_ACTION_MIRRED, */

	NULL, /* FLOW_ACTION_REDIRECT_INGRESS, */

drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ extern struct mlx5e_tc_act mlx5e_tc_act_drop; 
extern struct mlx5e_tc_act mlx5e_tc_act_trap;

extern struct mlx5e_tc_act mlx5e_tc_act_accept;

extern struct mlx5e_tc_act mlx5e_tc_act_mark;

extern struct mlx5e_tc_act mlx5e_tc_act_goto;



struct mlx5e_tc_act *

mlx5e_tc_act_get(enum flow_action_id act_id,

drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/goto.c

0 → 100644
+87 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB

// Copyright (c) 2021, NVIDIA CORPORATION & AFFILIATES. All rights reserved.



#include "act.h"

#include "en/tc_priv.h"

#include "eswitch.h"



static int

validate_goto_chain(struct mlx5e_priv *priv,

		    struct mlx5e_tc_flow *flow,

		    const struct flow_action_entry *act,

		    struct netlink_ext_ack *extack)

{

	bool is_esw = mlx5e_is_eswitch_flow(flow);

	bool ft_flow = mlx5e_is_ft_flow(flow);

	u32 dest_chain = act->chain_index;

	struct mlx5_fs_chains *chains;

	struct mlx5_eswitch *esw;

	u32 reformat_and_fwd;

	u32 max_chain;



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

	chains = is_esw ? esw_chains(esw) : mlx5e_nic_chains(priv);

	max_chain = mlx5_chains_get_chain_range(chains);

	reformat_and_fwd = is_esw ?

			   MLX5_CAP_ESW_FLOWTABLE_FDB(priv->mdev, reformat_and_fwd_to_table) :

			   MLX5_CAP_FLOWTABLE_NIC_RX(priv->mdev, reformat_and_fwd_to_table);



	if (ft_flow) {

		NL_SET_ERR_MSG_MOD(extack, "Goto action is not supported");

		return -EOPNOTSUPP;

	}



	if (!mlx5_chains_backwards_supported(chains) &&

	    dest_chain <= flow->attr->chain) {

		NL_SET_ERR_MSG_MOD(extack, "Goto lower numbered chain isn't supported");

		return -EOPNOTSUPP;

	}



	if (dest_chain > max_chain) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Requested destination chain is out of supported range");

		return -EOPNOTSUPP;

	}



	if (flow->attr->action & (MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT |

				  MLX5_FLOW_CONTEXT_ACTION_DECAP) &&

	    !reformat_and_fwd) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Goto chain is not allowed if action has reformat or decap");

		return -EOPNOTSUPP;

	}



	return 0;

}



static bool

tc_act_can_offload_goto(struct mlx5e_tc_act_parse_state *parse_state,

			const struct flow_action_entry *act,

			int act_index)

{

	struct netlink_ext_ack *extack = parse_state->extack;

	struct mlx5e_tc_flow *flow = parse_state->flow;



	if (validate_goto_chain(flow->priv, flow, act, extack))

		return false;



	return true;

}



static int

tc_act_parse_goto(struct mlx5e_tc_act_parse_state *parse_state,

		  const struct flow_action_entry *act,

		  struct mlx5e_priv *priv,

		  struct mlx5_flow_attr *attr)

{

	attr->action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |

			MLX5_FLOW_CONTEXT_ACTION_COUNT;

	attr->dest_chain = act->chain_index;



	return 0;

}



struct mlx5e_tc_act mlx5e_tc_act_goto = {

	.can_offload = tc_act_can_offload_goto,

	.parse_action = tc_act_parse_goto,

};

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

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 


#define MLX5E_TC_MAX_SPLITS 1



#define mlx5e_nic_chains(priv) ((priv)->fs.tc.chains)



enum {

	MLX5E_TC_FLOW_FLAG_INGRESS               = MLX5E_TC_FLAG_INGRESS_BIT,

	MLX5E_TC_FLOW_FLAG_EGRESS                = MLX5E_TC_FLAG_EGRESS_BIT,
@@ -117,6 +119,8 @@ mlx5e_tc_offload_fdb_rules(struct mlx5_eswitch *esw, 
			   struct mlx5_flow_spec *spec,

			   struct mlx5_flow_attr *attr);



bool mlx5e_is_eswitch_flow(struct mlx5e_tc_flow *flow);

bool mlx5e_is_ft_flow(struct mlx5e_tc_flow *flow);

bool mlx5e_is_offloaded_flow(struct mlx5e_tc_flow *flow);



static inline void __flow_flag_set(struct mlx5e_tc_flow *flow, unsigned long flag)