diff mbox series

[v5,2/3] net/mlx5: add support to compare random value

Message ID	20240214073015.2060103-3-michaelba@nvidia.com (mailing list archive)
State	Superseded, archived
Delegated to:	Raslan Darawsheh
Headers	Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C From: Michael Baum <michaelba@nvidia.com> To: <dev@dpdk.org> CC: Matan Azrad <matan@nvidia.com>, Dariusz Sosnowski <dsosnowski@nvidia.com>, Raslan Darawsheh <rasland@nvidia.com>, Viacheslav Ovsiienko <viacheslavo@nvidia.com>, Ori Kam <orika@nvidia.com>, Suanming Mou <suanmingm@nvidia.com> Subject: [PATCH v5 2/3] net/mlx5: add support to compare random value Date: Wed, 14 Feb 2024 09:30:14 +0200 Message-ID: <20240214073015.2060103-3-michaelba@nvidia.com> In-Reply-To: <20240214073015.2060103-1-michaelba@nvidia.com> References: <20240207161414.1583125-1-michaelba@nvidia.com> <20240214073015.2060103-1-michaelba@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Precedence: list Errors-To: dev-bounces@dpdk.org
Series	net/mlx5: add compare item support \| [v5,0/3] net/mlx5: add compare item support [v5,1/3] net/mlx5/hws: add support for compare matcher [v5,2/3] net/mlx5: add support to compare random value [v5,3/3] net/mlx5/hws: add compare ESP sequence number support

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Michael Baum Feb. 14, 2024, 7:30 a.m. UTC

  Add support to use "RTE_FLOW_ITEM_TYPE_COMPARE" with
"RTE_FLOW_FIELD_RAMDOM" as an argument.
The random field is supported only when base is an immediate value,
random field cannot be compared with enother field.

Signed-off-by: Michael Baum <michaelba@nvidia.com>
---
 doc/guides/nics/mlx5.rst        |  9 ++++-
 drivers/net/mlx5/mlx5_flow_hw.c | 70 ++++++++++++++++++++++++---------
 2 files changed, 59 insertions(+), 20 deletions(-)

Comments

Suanming Mou Feb. 19, 2024, 3 a.m. UTC | #1

> -----Original Message-----
> From: Michael Baum <michaelba@nvidia.com>
> Sent: Wednesday, February 14, 2024 3:30 PM
> To: dev@dpdk.org
> Cc: Matan Azrad <matan@nvidia.com>; Dariusz Sosnowski
> <dsosnowski@nvidia.com>; Raslan Darawsheh <rasland@nvidia.com>; Slava
> Ovsiienko <viacheslavo@nvidia.com>; Ori Kam <orika@nvidia.com>; Suanming
> Mou <suanmingm@nvidia.com>
> Subject: [PATCH v5 2/3] net/mlx5: add support to compare random value
> 
> Add support to use "RTE_FLOW_ITEM_TYPE_COMPARE" with
> "RTE_FLOW_FIELD_RAMDOM" as an argument.
> The random field is supported only when base is an immediate value, random
> field cannot be compared with enother field.
> 
> Signed-off-by: Michael Baum <michaelba@nvidia.com>
Acked-by: Suanming Mou <suanmingm@nvidia.com>

> ---
>  doc/guides/nics/mlx5.rst        |  9 ++++-
>  drivers/net/mlx5/mlx5_flow_hw.c | 70 ++++++++++++++++++++++++---------
>  2 files changed, 59 insertions(+), 20 deletions(-)
> 
> diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index
> fa013b03bb..43ef8a99dc 100644
> --- a/doc/guides/nics/mlx5.rst
> +++ b/doc/guides/nics/mlx5.rst
> @@ -820,8 +820,13 @@ Limitations
> 
>    - Only supported in HW steering(``dv_flow_en`` = 2) mode.
>    - Only single flow is supported to the flow table.
> -  - Only 32-bit comparison is supported.
> -  - Only match with compare result between packet fields is supported.
> +  - Only single item is supported per pattern template.
> +  - Only 32-bit comparison is supported or 16-bits for random field.
> +  - Only supported for ``RTE_FLOW_FIELD_META``, ``RTE_FLOW_FIELD_TAG``,
> +    ``RTE_FLOW_FIELD_RANDOM`` and ``RTE_FLOW_FIELD_VALUE``.
> +  - The field type ``RTE_FLOW_FIELD_VALUE`` must be the base (``b``) field.
> +  - The field type ``RTE_FLOW_FIELD_RANDOM`` can only be compared with
> +    ``RTE_FLOW_FIELD_VALUE``.
> 
> 
>  Statistics
> diff --git a/drivers/net/mlx5/mlx5_flow_hw.c
> b/drivers/net/mlx5/mlx5_flow_hw.c index 3af5e1f160..b5741f0817 100644
> --- a/drivers/net/mlx5/mlx5_flow_hw.c
> +++ b/drivers/net/mlx5/mlx5_flow_hw.c
> @@ -6717,18 +6717,55 @@ flow_hw_prepend_item(const struct rte_flow_item
> *items,
>  	return copied_items;
>  }
> 
> -static inline bool
> -flow_hw_item_compare_field_supported(enum rte_flow_field_id field)
> +static int
> +flow_hw_item_compare_field_validate(enum rte_flow_field_id arg_field,
> +				    enum rte_flow_field_id base_field,
> +				    struct rte_flow_error *error)
>  {
> -	switch (field) {
> +	switch (arg_field) {
> +	case RTE_FLOW_FIELD_TAG:
> +	case RTE_FLOW_FIELD_META:
> +		break;
> +	case RTE_FLOW_FIELD_RANDOM:
> +		if (base_field == RTE_FLOW_FIELD_VALUE)
> +			return 0;
> +		return rte_flow_error_set(error, EINVAL,
> +
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> +					  NULL,
> +					  "compare random is supported only
> with immediate value");
> +	default:
> +		return rte_flow_error_set(error, ENOTSUP,
> +
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> +					  NULL,
> +					  "compare item argument field is not
> supported");
> +	}
> +	switch (base_field) {
>  	case RTE_FLOW_FIELD_TAG:
>  	case RTE_FLOW_FIELD_META:
>  	case RTE_FLOW_FIELD_VALUE:
> -		return true;
> +		break;
> +	default:
> +		return rte_flow_error_set(error, ENOTSUP,
> +
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> +					  NULL,
> +					  "compare item base field is not
> supported");
> +	}
> +	return 0;
> +}
> +
> +static inline uint32_t
> +flow_hw_item_compare_width_supported(enum rte_flow_field_id field) {
> +	switch (field) {
> +	case RTE_FLOW_FIELD_TAG:
> +	case RTE_FLOW_FIELD_META:
> +		return 32;
> +	case RTE_FLOW_FIELD_RANDOM:
> +		return 16;
>  	default:
>  		break;
>  	}
> -	return false;
> +	return 0;
>  }
> 
>  static int
> @@ -6737,6 +6774,7 @@ flow_hw_validate_item_compare(const struct
> rte_flow_item *item,  {
>  	const struct rte_flow_item_compare *comp_m = item->mask;
>  	const struct rte_flow_item_compare *comp_v = item->spec;
> +	int ret;
> 
>  	if (unlikely(!comp_m))
>  		return rte_flow_error_set(error, EINVAL, @@ -6748,19 +6786,13
> @@ flow_hw_validate_item_compare(const struct rte_flow_item *item,
>  				   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
>  				   NULL,
>  				   "compare item only support full mask");
> -	if (!flow_hw_item_compare_field_supported(comp_m->a.field) ||
> -	    !flow_hw_item_compare_field_supported(comp_m->b.field))
> -		return rte_flow_error_set(error, ENOTSUP,
> -				   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> -				   NULL,
> -				   "compare item field not support");
> -	if (comp_m->a.field == RTE_FLOW_FIELD_VALUE &&
> -	    comp_m->b.field == RTE_FLOW_FIELD_VALUE)
> -		return rte_flow_error_set(error, EINVAL,
> -				   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> -				   NULL,
> -				   "compare between value is not valid");
> +	ret = flow_hw_item_compare_field_validate(comp_m->a.field,
> +						  comp_m->b.field, error);
> +	if (ret < 0)
> +		return ret;
>  	if (comp_v) {
> +		uint32_t width;
> +
>  		if (comp_v->operation != comp_m->operation ||
>  		    comp_v->a.field != comp_m->a.field ||
>  		    comp_v->b.field != comp_m->b.field) @@ -6768,7 +6800,9
> @@ flow_hw_validate_item_compare(const struct rte_flow_item *item,
> 
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
>  					   NULL,
>  					   "compare item spec/mask not
> matching");
> -		if ((comp_v->width & comp_m->width) != 32)
> +		width = flow_hw_item_compare_width_supported(comp_v-
> >a.field);
> +		MLX5_ASSERT(width > 0);
> +		if ((comp_v->width & comp_m->width) != width)
>  			return rte_flow_error_set(error, EINVAL,
> 
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
>  					   NULL,
> --
> 2.25.1

diff mbox series

Patch

diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index fa013b03bb..43ef8a99dc 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -820,8 +820,13 @@  Limitations
 
   - Only supported in HW steering(``dv_flow_en`` = 2) mode.
   - Only single flow is supported to the flow table.
-  - Only 32-bit comparison is supported.
-  - Only match with compare result between packet fields is supported.
+  - Only single item is supported per pattern template.
+  - Only 32-bit comparison is supported or 16-bits for random field.
+  - Only supported for ``RTE_FLOW_FIELD_META``, ``RTE_FLOW_FIELD_TAG``,
+    ``RTE_FLOW_FIELD_RANDOM`` and ``RTE_FLOW_FIELD_VALUE``.
+  - The field type ``RTE_FLOW_FIELD_VALUE`` must be the base (``b``) field.
+  - The field type ``RTE_FLOW_FIELD_RANDOM`` can only be compared with
+    ``RTE_FLOW_FIELD_VALUE``.
 
 
 Statistics
diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index 3af5e1f160..b5741f0817 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -6717,18 +6717,55 @@  flow_hw_prepend_item(const struct rte_flow_item *items,
 	return copied_items;
 }
 
-static inline bool
-flow_hw_item_compare_field_supported(enum rte_flow_field_id field)
+static int
+flow_hw_item_compare_field_validate(enum rte_flow_field_id arg_field,
+				    enum rte_flow_field_id base_field,
+				    struct rte_flow_error *error)
 {
-	switch (field) {
+	switch (arg_field) {
+	case RTE_FLOW_FIELD_TAG:
+	case RTE_FLOW_FIELD_META:
+		break;
+	case RTE_FLOW_FIELD_RANDOM:
+		if (base_field == RTE_FLOW_FIELD_VALUE)
+			return 0;
+		return rte_flow_error_set(error, EINVAL,
+					  RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+					  NULL,
+					  "compare random is supported only with immediate value");
+	default:
+		return rte_flow_error_set(error, ENOTSUP,
+					  RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+					  NULL,
+					  "compare item argument field is not supported");
+	}
+	switch (base_field) {
 	case RTE_FLOW_FIELD_TAG:
 	case RTE_FLOW_FIELD_META:
 	case RTE_FLOW_FIELD_VALUE:
-		return true;
+		break;
+	default:
+		return rte_flow_error_set(error, ENOTSUP,
+					  RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+					  NULL,
+					  "compare item base field is not supported");
+	}
+	return 0;
+}
+
+static inline uint32_t
+flow_hw_item_compare_width_supported(enum rte_flow_field_id field)
+{
+	switch (field) {
+	case RTE_FLOW_FIELD_TAG:
+	case RTE_FLOW_FIELD_META:
+		return 32;
+	case RTE_FLOW_FIELD_RANDOM:
+		return 16;
 	default:
 		break;
 	}
-	return false;
+	return 0;
 }
 
 static int
@@ -6737,6 +6774,7 @@  flow_hw_validate_item_compare(const struct rte_flow_item *item,
 {
 	const struct rte_flow_item_compare *comp_m = item->mask;
 	const struct rte_flow_item_compare *comp_v = item->spec;
+	int ret;
 
 	if (unlikely(!comp_m))
 		return rte_flow_error_set(error, EINVAL,
@@ -6748,19 +6786,13 @@  flow_hw_validate_item_compare(const struct rte_flow_item *item,
 				   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
 				   NULL,
 				   "compare item only support full mask");
-	if (!flow_hw_item_compare_field_supported(comp_m->a.field) ||
-	    !flow_hw_item_compare_field_supported(comp_m->b.field))
-		return rte_flow_error_set(error, ENOTSUP,
-				   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-				   NULL,
-				   "compare item field not support");
-	if (comp_m->a.field == RTE_FLOW_FIELD_VALUE &&
-	    comp_m->b.field == RTE_FLOW_FIELD_VALUE)
-		return rte_flow_error_set(error, EINVAL,
-				   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-				   NULL,
-				   "compare between value is not valid");
+	ret = flow_hw_item_compare_field_validate(comp_m->a.field,
+						  comp_m->b.field, error);
+	if (ret < 0)
+		return ret;
 	if (comp_v) {
+		uint32_t width;
+
 		if (comp_v->operation != comp_m->operation ||
 		    comp_v->a.field != comp_m->a.field ||
 		    comp_v->b.field != comp_m->b.field)
@@ -6768,7 +6800,9 @@  flow_hw_validate_item_compare(const struct rte_flow_item *item,
 					   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
 					   NULL,
 					   "compare item spec/mask not matching");
-		if ((comp_v->width & comp_m->width) != 32)
+		width = flow_hw_item_compare_width_supported(comp_v->a.field);
+		MLX5_ASSERT(width > 0);
+		if ((comp_v->width & comp_m->width) != width)
 			return rte_flow_error_set(error, EINVAL,
 					   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
 					   NULL,