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

net/mlx5: E-Switch, Refactor send to vport to be more generic 



Now that each representor stores a pointer to the managing E-Switch
use that information when creating the send-to-vport rules.

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 658cfceb

drivers/infiniband/hw/mlx5/ib_rep.c

+1 −2
Original line number Diff line number Diff line
@@ -123,8 +123,7 @@ struct mlx5_flow_handle *create_flow_rule_vport_sq(struct mlx5_ib_dev *dev, 


	rep = dev->port[port - 1].rep;



	return mlx5_eswitch_add_send_to_vport_rule(esw, rep->vport,

						   sq->base.mqp.qpn);

	return mlx5_eswitch_add_send_to_vport_rule(esw, rep, sq->base.mqp.qpn);

}



static int mlx5r_rep_probe(struct auxiliary_device *adev,

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

+1 −2
Original line number Diff line number Diff line
@@ -411,8 +411,7 @@ static int mlx5e_sqs2vport_start(struct mlx5_eswitch *esw, 
		}



		/* Add re-inject rule to the PF/representor sqs */

		flow_rule = mlx5_eswitch_add_send_to_vport_rule(esw,

								rep->vport,

		flow_rule = mlx5_eswitch_add_send_to_vport_rule(esw, rep,

								sqns_array[i]);

		if (IS_ERR(flow_rule)) {

			err = PTR_ERR(flow_rule);

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

+12 −8
Original line number Diff line number Diff line
@@ -1036,7 +1036,8 @@ int mlx5_eswitch_del_vlan_action(struct mlx5_eswitch *esw, 
}



struct mlx5_flow_handle *

mlx5_eswitch_add_send_to_vport_rule(struct mlx5_eswitch *esw, u16 vport,

mlx5_eswitch_add_send_to_vport_rule(struct mlx5_eswitch *on_esw,

				    struct mlx5_eswitch_rep *rep,

				    u32 sqn)

{

	struct mlx5_flow_act flow_act = {0};
@@ -1054,27 +1055,30 @@ mlx5_eswitch_add_send_to_vport_rule(struct mlx5_eswitch *esw, u16 vport, 
	misc = MLX5_ADDR_OF(fte_match_param, spec->match_value, misc_parameters);

	MLX5_SET(fte_match_set_misc, misc, source_sqn, sqn);

	/* source vport is the esw manager */

	MLX5_SET(fte_match_set_misc, misc, source_port, esw->manager_vport);

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

	MLX5_SET(fte_match_set_misc, misc, source_port, rep->esw->manager_vport);

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

		MLX5_SET(fte_match_set_misc, misc, source_eswitch_owner_vhca_id,

			 MLX5_CAP_GEN(esw->dev, vhca_id));

			 MLX5_CAP_GEN(rep->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_sqn);

	MLX5_SET_TO_ONES(fte_match_set_misc, misc, source_port);

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

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

		MLX5_SET_TO_ONES(fte_match_set_misc, misc,

				 source_eswitch_owner_vhca_id);



	spec->match_criteria_enable = MLX5_MATCH_MISC_PARAMETERS;

	dest.type = MLX5_FLOW_DESTINATION_TYPE_VPORT;

	dest.vport.num = vport;

	dest.vport.num = rep->vport;

	dest.vport.vhca_id = MLX5_CAP_GEN(rep->esw->dev, vhca_id);

	dest.vport.flags |= MLX5_FLOW_DEST_VPORT_VHCA_ID;

	flow_act.action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;



	flow_rule = mlx5_add_flow_rules(esw->fdb_table.offloads.slow_fdb,

	flow_rule = mlx5_add_flow_rules(on_esw->fdb_table.offloads.slow_fdb,

					spec, &flow_act, &dest, 1);

	if (IS_ERR(flow_rule))

		esw_warn(esw->dev, "FDB: Failed to add send to vport rule err %ld\n", PTR_ERR(flow_rule));

		esw_warn(on_esw->dev, "FDB: Failed to add send to vport rule err %ld\n",

			 PTR_ERR(flow_rule));

out:

	kvfree(spec);

	return flow_rule;

include/linux/mlx5/eswitch.h

+2 −2
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ struct mlx5_eswitch_rep *mlx5_eswitch_vport_rep(struct mlx5_eswitch *esw, 
						u16 vport_num);

void *mlx5_eswitch_uplink_get_proto_dev(struct mlx5_eswitch *esw, u8 rep_type);

struct mlx5_flow_handle *

mlx5_eswitch_add_send_to_vport_rule(struct mlx5_eswitch *esw,

				    u16 vport_num, u32 sqn);

mlx5_eswitch_add_send_to_vport_rule(struct mlx5_eswitch *on_esw,

				    struct mlx5_eswitch_rep *rep, u32 sqn);



u16 mlx5_eswitch_get_total_vports(const struct mlx5_core_dev *dev);