[PATCH] net/mlx5: fix drop action validation

[PATCH] net/mlx5: fix drop action validation

[Shun Hao]

Currently there's limitation for Drop action that can only co-exist with
Count action.

Sample and Age actions are also able to exist with Drop within the same
flow, and this patch includes them in the Drop action validation.

Fixes: acb67cc8 ("net/mlx5: fix action flag data type")
Cc: stable@dpdk.org

Signed-off-by: Shun Hao <shunh@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
---
 drivers/net/mlx5/mlx5_flow.h    | 3 +++
 drivers/net/mlx5/mlx5_flow_dv.c | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 187e9a23bf..4375ad33bd 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -304,6 +304,9 @@ enum mlx5_feature_name {
 #define MLX5_FLOW_ACTION_INDIRECT_COUNT (1ull << 43)
 #define MLX5_FLOW_ACTION_INDIRECT_AGE (1ull << 44)
 
+#define MLX5_FLOW_DROP_INCLUSIVE_ACTIONS \
+	(MLX5_FLOW_ACTION_COUNT | MLX5_FLOW_ACTION_SAMPLE | MLX5_FLOW_ACTION_AGE)
+
 #define MLX5_FLOW_FATE_ACTIONS \
 	(MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE | \
 	 MLX5_FLOW_ACTION_RSS | MLX5_FLOW_ACTION_JUMP | \
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index d79dd8d5f0..bc9a75f225 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -8103,18 +8103,18 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
 	/*
 	 * Validate the drop action mutual exclusion with other actions.
 	 * Drop action is mutually-exclusive with any other action, except for
-	 * Count action.
+	 * Count/Sample/Age actions.
 	 * Drop action compatibility with tunnel offload was already validated.
 	 */
 	if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_MATCH |
 			    MLX5_FLOW_ACTION_TUNNEL_MATCH));
 	else if ((action_flags & MLX5_FLOW_ACTION_DROP) &&
-	    (action_flags & ~(MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_COUNT)))
+	    (action_flags & ~(MLX5_FLOW_ACTION_DROP | MLX5_FLOW_DROP_INCLUSIVE_ACTIONS)))
 		return rte_flow_error_set(error, EINVAL,
 					  RTE_FLOW_ERROR_TYPE_ACTION, NULL,
 					  "Drop action is mutually-exclusive "
 					  "with any other action, except for "
-					  "Count action");
+					  "Count/Sample/Age action");
 	/* Eswitch has few restrictions on using items and actions */
 	if (attr->transfer) {
 		if (!mlx5_flow_ext_mreg_supported(dev) &&
-- 
2.20.0

RE: [PATCH] net/mlx5: fix drop action validation

[Raslan Darawsheh]

Hi,

> -----Original Message-----
> From: Shun Hao <shunh@nvidia.com>
> Sent: Thursday, November 10, 2022 8:59 AM
> To: Slava Ovsiienko <viacheslavo@nvidia.com>; Matan Azrad
> <matan@nvidia.com>; Ori Kam <orika@nvidia.com>
> Cc: dev@dpdk.org; Raslan Darawsheh <rasland@nvidia.com>;
> stable@dpdk.org
> Subject: [PATCH] net/mlx5: fix drop action validation
> 
> Currently there's limitation for Drop action that can only co-exist with
> Count action.
> 
> Sample and Age actions are also able to exist with Drop within the same
> flow, and this patch includes them in the Drop action validation.
> 
> Fixes: acb67cc8 ("net/mlx5: fix action flag data type")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Shun Hao <shunh@nvidia.com>
> Acked-by: Matan Azrad <matan@nvidia.com>

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh

Re: [PATCH] net/mlx5: fix drop action validation

[Thomas Monjalon]

10/11/2022 13:18, Raslan Darawsheh:
> From: Shun Hao <shunh@nvidia.com>
> > Currently there's limitation for Drop action that can only co-exist with
> > Count action.
> > 
> > Sample and Age actions are also able to exist with Drop within the same
> > flow, and this patch includes them in the Drop action validation.
> > 
> > Fixes: acb67cc8 ("net/mlx5: fix action flag data type")
> > Cc: stable@dpdk.org
> > 
> > Signed-off-by: Shun Hao <shunh@nvidia.com>
> > Acked-by: Matan Azrad <matan@nvidia.com>
> 
> Patch applied to next-net-mlx,

Fixed the root cause while pulling:

Fixes: 70faf9ae0a29 ("net/mlx5: unify validation of drop action")

Please check the "Fixes" reference while reviewing.
Also, the commit ID should be 12 characters long.