Commit 35c8de16 authored by Paul Blakey's avatar Paul Blakey Committed by Saeed Mahameed
Browse files

net/mlx5e: TC, Remove sample and ct limitation 



Sample action before a ct nat action was not supported when only
chain was restored on misses. As to work around that limitation,
ct action was reordered to be first (so if hw misses on ct
action, packet wasn't modified). This reordering wasn't possible
if there was a sample action before the ct nat action, as we had to
sample the packet before the nat operation.

Now that the misses continue from the relevant tc ct action
in software and ct action is no longer reordered, this case
is supported.

Remove this limitation.

Signed-off-by: default avatarPaul Blakey <paulb@nvidia.com>
Reviewed-by: default avatarRoi Dayan <roid@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent dc614025

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

+0 −20
Original line number Diff line number Diff line
@@ -6,25 +6,6 @@ 
#include "en/tc_priv.h"

#include "en/tc/act/sample.h"



static bool

tc_act_can_offload_sample(struct mlx5e_tc_act_parse_state *parse_state,

			  const struct flow_action_entry *act,

			  int act_index,

			  struct mlx5_flow_attr *attr)

{

	struct netlink_ext_ack *extack = parse_state->extack;

	bool ct_nat;



	ct_nat = attr->ct_attr.ct_action & TCA_CT_ACT_NAT;



	if (flow_flag_test(parse_state->flow, CT) && ct_nat) {

		NL_SET_ERR_MSG_MOD(extack, "Sample action with CT NAT is not supported");

		return false;

	}



	return true;

}



static int

tc_act_parse_sample(struct mlx5e_tc_act_parse_state *parse_state,

		    const struct flow_action_entry *act,
@@ -65,7 +46,6 @@ tc_act_is_multi_table_act_sample(struct mlx5e_priv *priv, 
}



struct mlx5e_tc_act mlx5e_tc_act_sample = {

	.can_offload = tc_act_can_offload_sample,

	.parse_action = tc_act_parse_sample,

	.is_multi_table_act = tc_act_is_multi_table_act_sample,

};

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

+5 −6
Original line number Diff line number Diff line
@@ -25,12 +25,11 @@ enum { 
	MLX5E_TC_FLOW_FLAG_DUP                   = MLX5E_TC_FLOW_BASE + 4,

	MLX5E_TC_FLOW_FLAG_NOT_READY             = MLX5E_TC_FLOW_BASE + 5,

	MLX5E_TC_FLOW_FLAG_DELETED               = MLX5E_TC_FLOW_BASE + 6,

	MLX5E_TC_FLOW_FLAG_CT                    = MLX5E_TC_FLOW_BASE + 7,

	MLX5E_TC_FLOW_FLAG_L3_TO_L2_DECAP        = MLX5E_TC_FLOW_BASE + 8,

	MLX5E_TC_FLOW_FLAG_TUN_RX                = MLX5E_TC_FLOW_BASE + 9,

	MLX5E_TC_FLOW_FLAG_FAILED                = MLX5E_TC_FLOW_BASE + 10,

	MLX5E_TC_FLOW_FLAG_SAMPLE                = MLX5E_TC_FLOW_BASE + 11,

	MLX5E_TC_FLOW_FLAG_USE_ACT_STATS	 = MLX5E_TC_FLOW_BASE + 12,

	MLX5E_TC_FLOW_FLAG_L3_TO_L2_DECAP        = MLX5E_TC_FLOW_BASE + 7,

	MLX5E_TC_FLOW_FLAG_TUN_RX                = MLX5E_TC_FLOW_BASE + 8,

	MLX5E_TC_FLOW_FLAG_FAILED                = MLX5E_TC_FLOW_BASE + 9,

	MLX5E_TC_FLOW_FLAG_SAMPLE                = MLX5E_TC_FLOW_BASE + 10,

	MLX5E_TC_FLOW_FLAG_USE_ACT_STATS         = MLX5E_TC_FLOW_BASE + 11,

};



struct mlx5e_tc_flow_parse_attr {