From: Chris Mi <cmi@nvidia.com>

Date: Thu, 17 Nov 2022 07:45:45 +0200

Subject: net/mlx5e: Offload rule only when all encaps are valid

Patch-mainline: v6.1-rc7

Git-commit: f377422044b2093c835e5f3717f8c8c58da1db1f

References: jsc#PED-1549

The cited commit adds a for loop to support multiple encapsulations.

But it only checks if the last encap is valid.

Fix it by setting slow path flag when one of the encap is invalid.

Fixes: f493f15534ec ("net/mlx5e: Move flow attr reformat action bit to per dest flags")

Signed-off-by: Chris Mi <cmi@nvidia.com>

Reviewed-by: Roi Dayan <roid@nvidia.com>

Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c |    6 +---

 drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.h |    3 --

 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c           |   17 ++++----------

 3 files changed, 9 insertions(+), 17 deletions(-)

--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c

+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c

@@ -764,8 +764,7 @@ int mlx5e_attach_encap(struct mlx5e_priv

 		       struct net_device *mirred_dev,

 		       int out_index,

 		       struct netlink_ext_ack *extack,

-		       struct net_device **encap_dev,

-		       bool *encap_valid)

+		       struct net_device **encap_dev)

 {

 	struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;

 	struct mlx5e_tc_flow_parse_attr *parse_attr;

@@ -880,9 +879,8 @@ attach_flow:

 	if (e->flags & MLX5_ENCAP_ENTRY_VALID) {

 		attr->esw_attr->dests[out_index].pkt_reformat = e->pkt_reformat;

 		attr->esw_attr->dests[out_index].flags |= MLX5_ESW_DEST_ENCAP_VALID;

-		*encap_valid = true;

 	} else {

-		*encap_valid = false;

+		flow_flag_set(flow, SLOW);

 	}

 	mutex_unlock(&esw->offloads.encap_tbl_lock);

--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.h

+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.h

@@ -17,8 +17,7 @@ int mlx5e_attach_encap(struct mlx5e_priv

 		       struct net_device *mirred_dev,

 		       int out_index,

 		       struct netlink_ext_ack *extack,

-		       struct net_device **encap_dev,

-		       bool *encap_valid);

+		       struct net_device **encap_dev);

 int mlx5e_attach_decap(struct mlx5e_priv *priv,

 		       struct mlx5e_tc_flow *flow,

--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

@@ -1634,7 +1634,6 @@ set_encap_dests(struct mlx5e_priv *priv,

 		struct mlx5e_tc_flow *flow,

 		struct mlx5_flow_attr *attr,

 		struct netlink_ext_ack *extack,

-		bool *encap_valid,

 		bool *vf_tun)

 {

 	struct mlx5e_tc_flow_parse_attr *parse_attr;

@@ -1651,7 +1650,6 @@ set_encap_dests(struct mlx5e_priv *priv,

 	parse_attr = attr->parse_attr;

 	esw_attr = attr->esw_attr;

 	*vf_tun = false;

-	*encap_valid = true;

 	for (out_index = 0; out_index < MLX5_MAX_FLOW_FWD_VPORTS; out_index++) {

 		struct net_device *out_dev;

@@ -1668,7 +1666,7 @@ set_encap_dests(struct mlx5e_priv *priv,

 			goto out;

 		}

 		err = mlx5e_attach_encap(priv, flow, attr, out_dev, out_index,

-					 extack, &encap_dev, encap_valid);

+					 extack, &encap_dev);

 		dev_put(out_dev);

 		if (err)

 			goto out;

@@ -1732,8 +1730,8 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv

 	struct mlx5e_tc_flow_parse_attr *parse_attr;

 	struct mlx5_flow_attr *attr = flow->attr;

 	struct mlx5_esw_flow_attr *esw_attr;

-	bool vf_tun, encap_valid;

 	u32 max_prio, max_chain;

+	bool vf_tun;

 	int err = 0;

 	parse_attr = attr->parse_attr;

@@ -1823,7 +1821,7 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv

 		esw_attr->int_port = int_port;

 	}

-	err = set_encap_dests(priv, flow, attr, extack, &encap_valid, &vf_tun);

+	err = set_encap_dests(priv, flow, attr, extack, &vf_tun);

 	if (err)

 		goto err_out;

@@ -1853,7 +1851,7 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv

 	 * (1) there's no error

 	 * (2) there's an encap action and we don't have valid neigh

 	 */

-	if (!encap_valid || flow_flag_test(flow, SLOW))

+	if (flow_flag_test(flow, SLOW))

 		flow->rule[0] = mlx5e_tc_offload_to_slow_path(esw, flow, &parse_attr->spec);

 	else

 		flow->rule[0] = mlx5e_tc_offload_fdb_rules(esw, flow, &parse_attr->spec, attr);

@@ -3759,7 +3757,7 @@ alloc_flow_post_acts(struct mlx5e_tc_flo

 	struct mlx5e_post_act *post_act = get_post_action(flow->priv);

 	struct mlx5_flow_attr *attr, *next_attr = NULL;

 	struct mlx5e_post_act_handle *handle;

-	bool vf_tun, encap_valid = true;

+	bool vf_tun;

 	int err;

 	/* This is going in reverse order as needed.

@@ -3781,13 +3779,10 @@ alloc_flow_post_acts(struct mlx5e_tc_flo

 		if (list_is_last(&attr->list, &flow->attrs))

 			break;

-		err = set_encap_dests(flow->priv, flow, attr, extack, &encap_valid, &vf_tun);

+		err = set_encap_dests(flow->priv, flow, attr, extack, &vf_tun);

 		if (err)

 			goto out_free;

-		if (!encap_valid)

-			flow_flag_set(flow, SLOW);

-

 		err = actions_prepare_mod_hdr_actions(flow->priv, flow, attr, extack);

 		if (err)

 			goto out_free;