diff mbox series

net/mlx5: allow meta modifications in legacy mode

Message ID 20211026151013.1349796-1-akozyrev@nvidia.com (mailing list archive)
State Superseded, archived
Headers
Series net/mlx5: allow meta modifications in legacy mode |

Checks

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

Commit Message

Alexander Kozyrev Oct. 26, 2021, 3:10 p.m. UTC 
  The MODIFY_FIELD RTE action rejects copy to/from metadata
in case of the legacy mode extensive flow metadata support.
It is not consistent with SET_META action that has no such
restriction imposed. Registers A or B are used for META in
legacy mode. Allow meta modifications in legacy mode as well.

On other hand, SET_META rejects actions in case register C
is not available even though it is not needed in legacy mode.
Skip this check for legacy mode and allow setting META.

Fixes: edf325d421 ("net/mlx5: check extended metadata for meta modification")
Cc: stable@dpdk.org

Signed-off-by: Alexander Kozyrev <akozyrev@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

Comments

Raslan Darawsheh Oct. 31, 2021, 12:33 p.m. UTC | #1 
Hi,

> -----Original Message-----
> From: Alexander Kozyrev <akozyrev@nvidia.com>
> Sent: Tuesday, October 26, 2021 6:10 PM
> To: dev@dpdk.org
> Cc: stable@dpdk.org; Raslan Darawsheh <rasland@nvidia.com>; Slava
> Ovsiienko <viacheslavo@nvidia.com>; Matan Azrad <matan@nvidia.com>
> Subject: [PATCH] net/mlx5: allow meta modifications in legacy mode
> 
> The MODIFY_FIELD RTE action rejects copy to/from metadata in case of the
> legacy mode extensive flow metadata support.
> It is not consistent with SET_META action that has no such restriction
> imposed. Registers A or B are used for META in legacy mode. Allow meta
> modifications in legacy mode as well.
> 
> On other hand, SET_META rejects actions in case register C is not available
> even though it is not needed in legacy mode.
> Skip this check for legacy mode and allow setting META.
> 
> Fixes: edf325d421 ("net/mlx5: check extended metadata for meta
> modification")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Alexander Kozyrev <akozyrev@nvidia.com>
> Acked-by: Viacheslav Ovsiienko <viacheslavo@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 9cba22ca2d..2c5cbec71b 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -3199,7 +3199,8 @@  flow_dv_validate_action_set_meta(struct rte_eth_dev *dev,
 	uint32_t nic_mask = UINT32_MAX;
 	int reg;
 
-	if (!mlx5_flow_ext_mreg_supported(dev))
+	if (config->dv_xmeta_en != MLX5_XMETA_MODE_LEGACY &&
+	    !mlx5_flow_ext_mreg_supported(dev))
 		return rte_flow_error_set(error, ENOTSUP,
 					  RTE_FLOW_ERROR_TYPE_ACTION, action,
 					  "extended metadata register"
@@ -4929,15 +4930,27 @@  flow_dv_validate_action_modify_field(struct rte_eth_dev *dev,
 				"modifications of the GENEVE Network"
 				" Identifier is not supported");
 	if (action_modify_field->dst.field == RTE_FLOW_FIELD_MARK ||
-	    action_modify_field->src.field == RTE_FLOW_FIELD_MARK ||
-	    action_modify_field->dst.field == RTE_FLOW_FIELD_META ||
-	    action_modify_field->src.field == RTE_FLOW_FIELD_META) {
+	    action_modify_field->src.field == RTE_FLOW_FIELD_MARK)
 		if (config->dv_xmeta_en == MLX5_XMETA_MODE_LEGACY ||
 		    !mlx5_flow_ext_mreg_supported(dev))
 			return rte_flow_error_set(error, ENOTSUP,
 					RTE_FLOW_ERROR_TYPE_ACTION, action,
-					"cannot modify mark or metadata without"
-					" extended metadata register support");
+					"cannot modify mark in legacy mode"
+					" or without extensive registers");
+	if (action_modify_field->dst.field == RTE_FLOW_FIELD_META ||
+	    action_modify_field->src.field == RTE_FLOW_FIELD_META) {
+		if (config->dv_xmeta_en != MLX5_XMETA_MODE_LEGACY &&
+		    !mlx5_flow_ext_mreg_supported(dev))
+			return rte_flow_error_set(error, ENOTSUP,
+					RTE_FLOW_ERROR_TYPE_ACTION, action,
+					"cannot modify meta without"
+					" extensive registers support");
+		ret = flow_dv_get_metadata_reg(dev, attr, error);
+		if (ret < 0 || ret == REG_NON)
+			return rte_flow_error_set(error, ENOTSUP,
+					RTE_FLOW_ERROR_TYPE_ACTION, action,
+					"cannot modify meta without"
+					" extensive registers available");
 	}
 	if (action_modify_field->operation != RTE_FLOW_MODIFY_SET)
 		return rte_flow_error_set(error, ENOTSUP,