Commit b055ecf5 authored by Mark Bloch's avatar Mark Bloch Committed by Saeed Mahameed
Browse files

net/mlx5: E-Switch, Refactor setting source port 



Setting the source port requires only the E-Switch and vport number.
Refactor the function to get those parameters instead of passing the full
attribute.

Signed-off-by: default avatarMark Bloch <mbloch@nvidia.com>
Reviewed-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 4d469ec8

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

+12 −7
Original line number Diff line number Diff line
@@ -257,7 +257,8 @@ mlx5_eswitch_set_rule_flow_source(struct mlx5_eswitch *esw, 
static void

mlx5_eswitch_set_rule_source_port(struct mlx5_eswitch *esw,

				  struct mlx5_flow_spec *spec,

				  struct mlx5_esw_flow_attr *attr)

				  struct mlx5_eswitch *src_esw,

				  u16 vport)

{

	void *misc2;

	void *misc;
@@ -268,8 +269,8 @@ mlx5_eswitch_set_rule_source_port(struct mlx5_eswitch *esw, 
	if (mlx5_eswitch_vport_match_metadata_enabled(esw)) {

		misc2 = MLX5_ADDR_OF(fte_match_param, spec->match_value, misc_parameters_2);

		MLX5_SET(fte_match_set_misc2, misc2, metadata_reg_c_0,

			 mlx5_eswitch_get_vport_metadata_for_match(attr->in_mdev->priv.eswitch,

								   attr->in_rep->vport));

			 mlx5_eswitch_get_vport_metadata_for_match(src_esw,

								   vport));



		misc2 = MLX5_ADDR_OF(fte_match_param, spec->match_criteria, misc_parameters_2);

		MLX5_SET(fte_match_set_misc2, misc2, metadata_reg_c_0,
@@ -278,12 +279,12 @@ mlx5_eswitch_set_rule_source_port(struct mlx5_eswitch *esw, 
		spec->match_criteria_enable |= MLX5_MATCH_MISC_PARAMETERS_2;

	} else {

		misc = MLX5_ADDR_OF(fte_match_param, spec->match_value, misc_parameters);

		MLX5_SET(fte_match_set_misc, misc, source_port, attr->in_rep->vport);

		MLX5_SET(fte_match_set_misc, misc, source_port, vport);



		if (MLX5_CAP_ESW(esw->dev, merged_eswitch))

			MLX5_SET(fte_match_set_misc, misc,

				 source_eswitch_owner_vhca_id,

				 MLX5_CAP_GEN(attr->in_mdev, vhca_id));

				 MLX5_CAP_GEN(src_esw->dev, vhca_id));



		misc = MLX5_ADDR_OF(fte_match_param, spec->match_criteria, misc_parameters);

		MLX5_SET_TO_ONES(fte_match_set_misc, misc, source_port);
@@ -407,7 +408,9 @@ mlx5_eswitch_add_offloaded_rule(struct mlx5_eswitch *esw, 
			fdb = attr->ft;



		if (!(attr->flags & MLX5_ESW_ATTR_FLAG_NO_IN_PORT))

			mlx5_eswitch_set_rule_source_port(esw, spec, esw_attr);

			mlx5_eswitch_set_rule_source_port(esw, spec,

							  esw_attr->in_mdev->priv.eswitch,

							  esw_attr->in_rep->vport);

	}

	if (IS_ERR(fdb)) {

		rule = ERR_CAST(fdb);
@@ -487,7 +490,9 @@ mlx5_eswitch_add_fwd_rule(struct mlx5_eswitch *esw, 
	dest[i].ft = fwd_fdb;

	i++;



	mlx5_eswitch_set_rule_source_port(esw, spec, esw_attr);

	mlx5_eswitch_set_rule_source_port(esw, spec,

					  esw_attr->in_mdev->priv.eswitch,

					  esw_attr->in_rep->vport);



	if (attr->outer_match_level != MLX5_MATCH_NONE)

		spec->match_criteria_enable |= MLX5_MATCH_OUTER_HEADERS;