patch 'net/mlx5: fix check in count action validation' has been queued to stable release 21.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/14/22. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/e28e67f7d2b3c0f1ffc46da2943c86669a85fade

Thanks.

Kevin

---
>From e28e67f7d2b3c0f1ffc46da2943c86669a85fade Mon Sep 17 00:00:00 2001
From: Michael Baum <michaelba at nvidia.com>
Date: Mon, 28 Feb 2022 09:09:54 +0200
Subject: [PATCH] net/mlx5: fix check in count action validation

[ upstream commit 57461cab161ac2c8cc1a96711efba9a8fa519358 ]

The AGE action can be implemented by either counters or ASO mechanism.
ASO is more efficient than generating counters just for the purpose of
aging, so when ASO is supported its use is preferable. On the other
hand, when there is count in the list of actions, the counter is already
generated, and it is best to use it for aging even if ASO is supported.
On the other hand, when the count action is "indirect", it cannot be
used for aging since it may be updated from other flow rules in which it
participates.

Checking whether ASO is supported depends on both the capability of the
device and the flow rule group number, ASO is not supported for group 0.
However, the flow_dv_validate() function only checks the capability and
ignores the group, allowing inadmissible flow rules.
For example, when the device supports ASO and a flow rule is set that
combines an indirect counter with aging for group 0, the rule should be
rejected, but it is created and does not function properly.

This patch updates the counter validation which will also consider the
group number when deciding if there is ASO support.

Fixes: daed4b6e3db2 ("net/mlx5: use aging by counter when counter exists")

Signed-off-by: Michael Baum <michaelba at nvidia.com>
Acked-by: Matan Azrad <matan at nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 41 +++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 268673a265..7d22ac388e 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -3282,4 +3282,23 @@ flow_dv_validate_action_set_tag(struct rte_eth_dev *dev,
 }
 
+/**
+ * Indicates whether ASO aging is supported.
+ *
+ * @param[in] sh
+ *   Pointer to shared device context structure.
+ * @param[in] attr
+ *   Attributes of flow that includes AGE action.
+ *
+ * @return
+ *   True when ASO aging is supported, false otherwise.
+ */
+static inline bool
+flow_hit_aso_supported(const struct mlx5_dev_ctx_shared *sh,
+		const struct rte_flow_attr *attr)
+{
+	MLX5_ASSERT(sh && attr);
+	return (sh->flow_hit_aso_en && (attr->transfer || attr->group));
+}
+
 /**
  * Validate count action.
@@ -3291,4 +3310,6 @@ flow_dv_validate_action_set_tag(struct rte_eth_dev *dev,
  * @param[in] action_flags
  *   Holds the actions detected until now.
+ * @param[in] attr
+ *   Attributes of flow that includes this action.
  * @param[out] error
  *   Pointer to error structure.
@@ -3300,4 +3321,5 @@ static int
 flow_dv_validate_action_count(struct rte_eth_dev *dev, bool shared,
 			      uint64_t action_flags,
+			      const struct rte_flow_attr *attr,
 			      struct rte_flow_error *error)
 {
@@ -3311,8 +3333,8 @@ flow_dv_validate_action_count(struct rte_eth_dev *dev, bool shared,
 					  "duplicate count actions set");
 	if (shared && (action_flags & MLX5_FLOW_ACTION_AGE) &&
-	    !priv->sh->flow_hit_aso_en)
+	    !flow_hit_aso_supported(priv->sh, attr))
 		return rte_flow_error_set(error, EINVAL,
 					  RTE_FLOW_ERROR_TYPE_ACTION, NULL,
-					  "old age and shared count combination is not supported");
+					  "old age and indirect count combination is not supported");
 #ifdef HAVE_IBV_FLOW_DEVX_COUNTERS
 	return 0;
@@ -5682,5 +5704,5 @@ flow_dv_validate_action_sample(uint64_t *action_flags,
 			ret = flow_dv_validate_action_count
 				(dev, false, *action_flags | sub_action_flags,
-				 error);
+				 attr, error);
 			if (ret < 0)
 				return ret;
@@ -7443,5 +7465,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
 			ret = flow_dv_validate_action_count(dev, shared_count,
 							    action_flags,
-							    error);
+							    attr, error);
 			if (ret < 0)
 				return ret;
@@ -7758,7 +7780,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
 			/*
 			 * Validate the regular AGE action (using counter)
-			 * mutual exclusion with share counter actions.
+			 * mutual exclusion with indirect counter actions.
 			 */
-			if (!priv->sh->flow_hit_aso_en) {
+			if (!flow_hit_aso_supported(priv->sh, attr)) {
 				if (shared_count)
 					return rte_flow_error_set
@@ -7766,5 +7788,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
 						RTE_FLOW_ERROR_TYPE_ACTION,
 						NULL,
-						"old age and shared count combination is not supported");
+						"old age and indirect count combination is not supported");
 				if (sample_count)
 					return rte_flow_error_set
@@ -13313,6 +13335,5 @@ flow_dv_translate(struct rte_eth_dev *dev,
 			if (action_flags & MLX5_FLOW_ACTION_AGE) {
 				if ((non_shared_age && count) ||
-				    !(priv->sh->flow_hit_aso_en &&
-				      (attr->group || attr->transfer))) {
+				    !flow_hit_aso_supported(priv->sh, attr)) {
 					/* Creates age by counters. */
 					cnt_act = flow_dv_prepare_counter
@@ -17646,5 +17667,5 @@ flow_dv_action_validate(struct rte_eth_dev *dev,
 		return flow_dv_validate_action_age(0, action, dev, err);
 	case RTE_FLOW_ACTION_TYPE_COUNT:
-		return flow_dv_validate_action_count(dev, true, 0, err);
+		return flow_dv_validate_action_count(dev, true, 0, NULL, err);
 	case RTE_FLOW_ACTION_TYPE_CONNTRACK:
 		if (!priv->sh->ct_aso_en)
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-08 13:55:28.936425822 +0000
+++ 0020-net-mlx5-fix-check-in-count-action-validation.patch	2022-03-08 13:55:28.457315056 +0000
@@ -1 +1 @@
-From 57461cab161ac2c8cc1a96711efba9a8fa519358 Mon Sep 17 00:00:00 2001
+From e28e67f7d2b3c0f1ffc46da2943c86669a85fade Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 57461cab161ac2c8cc1a96711efba9a8fa519358 ]
+
@@ -27 +28,0 @@
-Cc: stable at dpdk.org
@@ -36 +37 @@
-index 20e0af29c8..0b9df5f6f1 100644
+index 268673a265..7d22ac388e 100644
@@ -39 +40 @@
-@@ -3278,4 +3278,23 @@ flow_dv_validate_action_set_tag(struct rte_eth_dev *dev,
+@@ -3282,4 +3282,23 @@ flow_dv_validate_action_set_tag(struct rte_eth_dev *dev,
@@ -63 +64 @@
-@@ -3287,4 +3306,6 @@ flow_dv_validate_action_set_tag(struct rte_eth_dev *dev,
+@@ -3291,4 +3310,6 @@ flow_dv_validate_action_set_tag(struct rte_eth_dev *dev,
@@ -70 +71 @@
-@@ -3296,4 +3317,5 @@ static int
+@@ -3300,4 +3321,5 @@ static int
@@ -76 +77 @@
-@@ -3307,8 +3329,8 @@ flow_dv_validate_action_count(struct rte_eth_dev *dev, bool shared,
+@@ -3311,8 +3333,8 @@ flow_dv_validate_action_count(struct rte_eth_dev *dev, bool shared,
@@ -87 +88 @@
-@@ -5680,5 +5702,5 @@ flow_dv_validate_action_sample(uint64_t *action_flags,
+@@ -5682,5 +5704,5 @@ flow_dv_validate_action_sample(uint64_t *action_flags,
@@ -94 +95 @@
-@@ -7442,5 +7464,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
+@@ -7443,5 +7465,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
@@ -101 +102 @@
-@@ -7757,7 +7779,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
+@@ -7758,7 +7780,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
@@ -111 +112 @@
-@@ -7765,5 +7787,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
+@@ -7766,5 +7788,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
@@ -118 +119 @@
-@@ -13417,6 +13439,5 @@ flow_dv_translate(struct rte_eth_dev *dev,
+@@ -13313,6 +13335,5 @@ flow_dv_translate(struct rte_eth_dev *dev,
@@ -126 +127 @@
-@@ -17711,5 +17732,5 @@ flow_dv_action_validate(struct rte_eth_dev *dev,
+@@ -17646,5 +17667,5 @@ flow_dv_action_validate(struct rte_eth_dev *dev,