Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c966f7d5 authored by Gavi Teitz's avatar Gavi Teitz Committed by Saeed Mahameed
Browse files

net/mlx5: E-Switch, Provide flow dest when creating vport rx rule 



Currently the destination for the representor e-switch rx rule is
a TIR number. Towards changing that to potentially be a flow table,
as part of enabling RSS for representors, modify the signature of
the related e-switch API to get a flow destination.

Signed-off-by: default avatarGavi Teitz <gavi@mellanox.com>
Reviewed-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 092297e0

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

+4 −1
Original line number Diff line number Diff line
@@ -1009,10 +1009,13 @@ static int mlx5e_create_rep_vport_rx_rule(struct mlx5e_priv *priv) 
	struct mlx5e_rep_priv *rpriv = priv->ppriv;

	struct mlx5_eswitch_rep *rep = rpriv->rep;

	struct mlx5_flow_handle *flow_rule;

	struct mlx5_flow_destination dest;



	dest.type = MLX5_FLOW_DESTINATION_TYPE_TIR;

	dest.tir_num = priv->direct_tir[0].tirn;

	flow_rule = mlx5_eswitch_create_vport_rx_rule(esw,

						      rep->vport,

						      priv->direct_tir[0].tirn);

						      &dest);

	if (IS_ERR(flow_rule))

		return PTR_ERR(flow_rule);

	rpriv->vport_rx_rule = flow_rule;

drivers/net/ethernet/mellanox/mlx5/core/eswitch.h

+2 −1
Original line number Diff line number Diff line
@@ -230,7 +230,8 @@ mlx5_eswitch_del_offloaded_rule(struct mlx5_eswitch *esw, 
				struct mlx5_esw_flow_attr *attr);



struct mlx5_flow_handle *

mlx5_eswitch_create_vport_rx_rule(struct mlx5_eswitch *esw, int vport, u32 tirn);

mlx5_eswitch_create_vport_rx_rule(struct mlx5_eswitch *esw, int vport,

				  struct mlx5_flow_destination *dest);



enum {

	SET_VLAN_STRIP	= BIT(0),

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

+3 −5
Original line number Diff line number Diff line
@@ -775,10 +775,10 @@ static void esw_destroy_vport_rx_group(struct mlx5_eswitch *esw) 
}



struct mlx5_flow_handle *

mlx5_eswitch_create_vport_rx_rule(struct mlx5_eswitch *esw, int vport, u32 tirn)

mlx5_eswitch_create_vport_rx_rule(struct mlx5_eswitch *esw, int vport,

				  struct mlx5_flow_destination *dest)

{

	struct mlx5_flow_act flow_act = {0};

	struct mlx5_flow_destination dest = {};

	struct mlx5_flow_handle *flow_rule;

	struct mlx5_flow_spec *spec;

	void *misc;
@@ -796,12 +796,10 @@ mlx5_eswitch_create_vport_rx_rule(struct mlx5_eswitch *esw, int vport, u32 tirn) 
	MLX5_SET_TO_ONES(fte_match_set_misc, misc, source_port);



	spec->match_criteria_enable = MLX5_MATCH_MISC_PARAMETERS;

	dest.type = MLX5_FLOW_DESTINATION_TYPE_TIR;

	dest.tir_num = tirn;



	flow_act.action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;

	flow_rule = mlx5_add_flow_rules(esw->offloads.ft_offloads, spec,

					&flow_act, &dest, 1);

					&flow_act, dest, 1);

	if (IS_ERR(flow_rule)) {

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

		goto out;