diff mbox series

net/mlx5: fix domains selection for meter policy

Message ID 20211011024048.28165-1-lizh@nvidia.com (mailing list archive)
State Accepted, archived
Delegated to: Raslan Darawsheh
Headers
Series net/mlx5: fix domains selection for meter policy |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/github-robot: build success github build: passed
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-aarch64-unit-testing success Testing PASS

Commit Message

Li Zhang Oct. 11, 2021, 2:40 a.m. UTC 
  Fate actions are different per domain.
When all the domains, ingress, egress and FDB (transfer),
can support all the policy actions, i.e. [SET_TAG],
the policy prepares resources for all the domains and
failure happens if one of the domains misses its fate action
in the policy action list.

Remove the domains missing their fate action
from the meter policy preparation.

Now, the policy will prepare a domain only when the domain supports
all the actions and when one of the domain fate actions is on the list.

Fixes: afb4aa4f ("net/mlx5: support meter policy operations")
Cc: stable@dpdk.org

Signed-off-by: Li Zhang <lizh@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Comments

Raslan Darawsheh Oct. 14, 2021, 12:17 p.m. UTC | #1 
Hi,

> -----Original Message-----
> From: Li Zhang <lizh@nvidia.com>
> Sent: Monday, October 11, 2021 5:41 AM
> To: dekelp@nvidia.com; Ori Kam <orika@nvidia.com>; Slava Ovsiienko
> <viacheslavo@nvidia.com>; Matan Azrad <matan@nvidia.com>
> Cc: dev@dpdk.org; NBU-Contact-Thomas Monjalon
> <thomas@monjalon.net>; Raslan Darawsheh <rasland@nvidia.com>;
> stable@dpdk.org
> Subject: [PATCH] net/mlx5: fix domains selection for meter policy
> 
> Fate actions are different per domain.
> When all the domains, ingress, egress and FDB (transfer),
> can support all the policy actions, i.e. [SET_TAG],
> the policy prepares resources for all the domains and
> failure happens if one of the domains misses its fate action
> in the policy action list.
> 
> Remove the domains missing their fate action
> from the meter policy preparation.
> 
> Now, the policy will prepare a domain only when the domain supports
> all the actions and when one of the domain fate actions is on the list.
> 
> Fixes: afb4aa4f ("net/mlx5: support meter policy operations")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Li Zhang <lizh@nvidia.com>
> Acked-by: Matan Azrad <matan@nvidia.com>
> ---

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh
diff mbox series

Patch

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index c6370cd1d6..ea737e3e35 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -17856,18 +17856,23 @@  flow_dv_validate_mtr_policy_acts(struct rte_eth_dev *dev,
 					"Doesn't support optional action");
 			}
 		}
-		if (action_flags[i] & MLX5_FLOW_ACTION_PORT_ID)
+		if (action_flags[i] & MLX5_FLOW_ACTION_PORT_ID) {
 			domain_color[i] = MLX5_MTR_DOMAIN_TRANSFER_BIT;
-		else if ((action_flags[i] &
+		} else if ((action_flags[i] &
 			  (MLX5_FLOW_ACTION_RSS | MLX5_FLOW_ACTION_QUEUE)) ||
-			 (action_flags[i] & MLX5_FLOW_ACTION_MARK))
+			  (action_flags[i] & MLX5_FLOW_ACTION_MARK)) {
 			/*
 			 * Only support MLX5_XMETA_MODE_LEGACY
 			 * so MARK action is only in ingress domain.
 			 */
 			domain_color[i] = MLX5_MTR_DOMAIN_INGRESS_BIT;
-		else
+		} else {
 			domain_color[i] = def_domain;
+			if (action_flags[i] &&
+			    !(action_flags[i] & MLX5_FLOW_FATE_ESWITCH_ACTIONS))
+				domain_color[i] &=
+				~MLX5_MTR_DOMAIN_TRANSFER_BIT;
+		}
 		if (action_flags[i] &
 		    MLX5_FLOW_ACTION_METER_WITH_TERMINATED_POLICY)
 			domain_color[i] &= hierarchy_domain;