Commit b2064909 authored by Alex Vesker's avatar Alex Vesker Committed by Saeed Mahameed
Browse files

net/mlx5: DR, Change push vlan action sequence 



The DR TX state machine supports the following order:
modify header, push vlan and encapsulation.
Instead fs_dr would pass:
push vlan, modify header and encapsulation.

The above caused the rule creation to fail on invalid action
sequence provided error.

Fixes: 6a48faee ("net/mlx5: Add direct rule fs_cmd implementation")
Signed-off-by: default avatarAlex Vesker <valex@mellanox.com>
Reviewed-by: default avatarMaor Gottlieb <maorg@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 45d252ca

drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.c

+21 −21
Original line number Diff line number Diff line
@@ -279,29 +279,9 @@ static int mlx5_cmd_dr_create_fte(struct mlx5_flow_root_namespace *ns, 


	/* The order of the actions are must to be keep, only the following

	 * order is supported by SW steering:

	 * TX: push vlan -> modify header -> encap

	 * TX: modify header -> push vlan -> encap

	 * RX: decap -> pop vlan -> modify header

	 */

	if (fte->action.action & MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH) {

		tmp_action = create_action_push_vlan(domain, &fte->action.vlan[0]);

		if (!tmp_action) {

			err = -ENOMEM;

			goto free_actions;

		}

		fs_dr_actions[fs_dr_num_actions++] = tmp_action;

		actions[num_actions++] = tmp_action;

	}



	if (fte->action.action & MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH_2) {

		tmp_action = create_action_push_vlan(domain, &fte->action.vlan[1]);

		if (!tmp_action) {

			err = -ENOMEM;

			goto free_actions;

		}

		fs_dr_actions[fs_dr_num_actions++] = tmp_action;

		actions[num_actions++] = tmp_action;

	}



	if (fte->action.action & MLX5_FLOW_CONTEXT_ACTION_DECAP) {

		enum mlx5dr_action_reformat_type decap_type =

			DR_ACTION_REFORMAT_TYP_TNL_L2_TO_L2;
@@ -354,6 +334,26 @@ static int mlx5_cmd_dr_create_fte(struct mlx5_flow_root_namespace *ns, 
		actions[num_actions++] =

			fte->action.modify_hdr->action.dr_action;



	if (fte->action.action & MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH) {

		tmp_action = create_action_push_vlan(domain, &fte->action.vlan[0]);

		if (!tmp_action) {

			err = -ENOMEM;

			goto free_actions;

		}

		fs_dr_actions[fs_dr_num_actions++] = tmp_action;

		actions[num_actions++] = tmp_action;

	}



	if (fte->action.action & MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH_2) {

		tmp_action = create_action_push_vlan(domain, &fte->action.vlan[1]);

		if (!tmp_action) {

			err = -ENOMEM;

			goto free_actions;

		}

		fs_dr_actions[fs_dr_num_actions++] = tmp_action;

		actions[num_actions++] = tmp_action;

	}



	if (delay_encap_set)

		actions[num_actions++] =

			fte->action.pkt_reformat->action.dr_action;

CRA Git | Maintained and supported by SUSTech CRA and CCSE