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

{net, RDMA}/mlx5: Extend send to vport rules 



In shared FDB there is only one eswitch which is active and it receives
traffic from all representors and all vports in the HCA.

While the Ethernet representor will always reside on its native PF
the IB representor will not. Extend send to vport rule creation to
support such flows. Need to account for source vport that sends the
traffic (on which the representors resides) and the target eswitch
the traffic which reach.

Signed-off-by: default avatarMark Bloch <mbloch@nvidia.com>
Reviewed-by: default avatarMark Zhang <markzhang@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 6aeb16a1

drivers/infiniband/hw/mlx5/ib_rep.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +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, sq->base.mqp.qpn);

	return mlx5_eswitch_add_send_to_vport_rule(esw, 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 −1
Original line number Diff line number Diff line
@@ -337,7 +337,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,

		flow_rule = mlx5_eswitch_add_send_to_vport_rule(esw, esw, rep,

								sqns_array[i]);

		if (IS_ERR(flow_rule)) {

			err = PTR_ERR(flow_rule);

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

+3 −2
Original line number Diff line number Diff line
@@ -925,6 +925,7 @@ int mlx5_eswitch_del_vlan_action(struct mlx5_eswitch *esw, 


struct mlx5_flow_handle *

mlx5_eswitch_add_send_to_vport_rule(struct mlx5_eswitch *on_esw,

				    struct mlx5_eswitch *from_esw,

				    struct mlx5_eswitch_rep *rep,

				    u32 sqn)

{
@@ -943,10 +944,10 @@ mlx5_eswitch_add_send_to_vport_rule(struct mlx5_eswitch *on_esw, 
	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, rep->esw->manager_vport);

	MLX5_SET(fte_match_set_misc, misc, source_port, from_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(rep->esw->dev, vhca_id));

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

include/linux/mlx5/eswitch.h

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ struct mlx5_eswitch_rep *mlx5_eswitch_vport_rep(struct mlx5_eswitch *esw, 
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 *on_esw,

				    struct mlx5_eswitch *from_esw,

				    struct mlx5_eswitch_rep *rep, u32 sqn);



#ifdef CONFIG_MLX5_ESWITCH