Commit 2c5fc6cd authored by Maor Dickman's avatar Maor Dickman Committed by Saeed Mahameed
Browse files

net/mlx5: DR, Fix missing flow_source when creating multi-destination FW table 



In order to support multiple destination FTEs with SW steering
FW table is created with single FTE with multiple actions and
SW steering rule forward to it. When creating this table, flow
source isn't set according to the original FTE.

Fix this by passing the original FTE flow source to the created
FW table.

Fixes: 34583bee ("net/mlx5: DR, Create multi-destination table for SW-steering use")
Signed-off-by: default avatarMaor Dickman <maord@nvidia.com>
Reviewed-by: default avatarYevgeny Kliteynik <kliteyn@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 23dd4581

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

+4 −2
Original line number Diff line number Diff line
@@ -842,7 +842,8 @@ struct mlx5dr_action * 
mlx5dr_action_create_mult_dest_tbl(struct mlx5dr_domain *dmn,

				   struct mlx5dr_action_dest *dests,

				   u32 num_of_dests,

				   bool ignore_flow_level)

				   bool ignore_flow_level,

				   u32 flow_source)

{

	struct mlx5dr_cmd_flow_destination_hw_info *hw_dests;

	struct mlx5dr_action **ref_actions;
@@ -914,7 +915,8 @@ mlx5dr_action_create_mult_dest_tbl(struct mlx5dr_domain *dmn, 
				      reformat_req,

				      &action->dest_tbl->fw_tbl.id,

				      &action->dest_tbl->fw_tbl.group_id,

				      ignore_flow_level);

				      ignore_flow_level,

				      flow_source);

	if (ret)

		goto free_action;

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

+3 −1
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ int mlx5dr_fw_create_md_tbl(struct mlx5dr_domain *dmn, 
			    bool reformat_req,

			    u32 *tbl_id,

			    u32 *group_id,

			    bool ignore_flow_level)

			    bool ignore_flow_level,

			    u32 flow_source)

{

	struct mlx5dr_cmd_create_flow_table_attr ft_attr = {};

	struct mlx5dr_cmd_fte_info fte_info = {};
@@ -139,6 +140,7 @@ int mlx5dr_fw_create_md_tbl(struct mlx5dr_domain *dmn, 
	fte_info.val = val;

	fte_info.dest_arr = dest;

	fte_info.ignore_flow_level = ignore_flow_level;

	fte_info.flow_context.flow_source = flow_source;



	ret = mlx5dr_cmd_set_fte(dmn->mdev, 0, 0, &ft_info, *group_id, &fte_info);

	if (ret) {

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h

+2 −1
Original line number Diff line number Diff line
@@ -1461,7 +1461,8 @@ int mlx5dr_fw_create_md_tbl(struct mlx5dr_domain *dmn, 
			    bool reformat_req,

			    u32 *tbl_id,

			    u32 *group_id,

			    bool ignore_flow_level);

			    bool ignore_flow_level,

			    u32 flow_source);

void mlx5dr_fw_destroy_md_tbl(struct mlx5dr_domain *dmn, u32 tbl_id,

			      u32 group_id);

#endif  /* _DR_TYPES_H_ */

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

+3 −1
Original line number Diff line number Diff line
@@ -520,6 +520,7 @@ static int mlx5_cmd_dr_create_fte(struct mlx5_flow_root_namespace *ns, 
	} else if (num_term_actions > 1) {

		bool ignore_flow_level =

			!!(fte->action.flags & FLOW_ACT_IGNORE_FLOW_LEVEL);

		u32 flow_source = fte->flow_context.flow_source;



		if (num_actions == MLX5_FLOW_CONTEXT_ACTION_MAX ||

		    fs_dr_num_actions == MLX5_FLOW_CONTEXT_ACTION_MAX) {
@@ -529,7 +530,8 @@ static int mlx5_cmd_dr_create_fte(struct mlx5_flow_root_namespace *ns, 
		tmp_action = mlx5dr_action_create_mult_dest_tbl(domain,

								term_actions,

								num_term_actions,

								ignore_flow_level);

								ignore_flow_level,

								flow_source);

		if (!tmp_action) {

			err = -EOPNOTSUPP;

			goto free_actions;

drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h

+2 −1
Original line number Diff line number Diff line
@@ -99,7 +99,8 @@ struct mlx5dr_action * 
mlx5dr_action_create_mult_dest_tbl(struct mlx5dr_domain *dmn,

				   struct mlx5dr_action_dest *dests,

				   u32 num_of_dests,

				   bool ignore_flow_level);

				   bool ignore_flow_level,

				   u32 flow_source);



struct mlx5dr_action *mlx5dr_action_create_drop(void);