[PATCH v3 1/6] ethdev: add modify IPv4 next protocol field

[PATCH v3 1/6] ethdev: add modify IPv4 next protocol field

[Viacheslav Ovsiienko]

Add IPv4 next protocol modify field definition.

Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
Acked-by: Ori Kam <orika@nvidia.com>
Acked-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
---
 doc/guides/rel_notes/release_24_03.rst | 4 ++++
 lib/ethdev/rte_flow.h                  | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/guides/rel_notes/release_24_03.rst b/doc/guides/rel_notes/release_24_03.rst
index 80db117206..99981ae2ea 100644
--- a/doc/guides/rel_notes/release_24_03.rst
+++ b/doc/guides/rel_notes/release_24_03.rst
@@ -65,6 +65,10 @@ New Features
   * Added ``RTE_FLOW_ITEM_TYPE_RANDOM`` to match random value.
   * Added ``RTE_FLOW_FIELD_RANDOM`` to represent it in field ID struct.
 
+* **Added new field IDs in the experimental ``enum rte_flow_field_id``:
+
+  * Added ``RTE_FLOW_FIELD_IPV4_PROTO`` to represent it in field ID struct.
+
 * ** Support for getting the number of used descriptors of a Tx queue. **
 
   * Added a fath path function ``rte_eth_tx_queue_count`` to get the number of used
diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h
index 09c1b13381..9e76e53905 100644
--- a/lib/ethdev/rte_flow.h
+++ b/lib/ethdev/rte_flow.h
@@ -2421,7 +2421,8 @@ enum rte_flow_field_id {
 	RTE_FLOW_FIELD_IPV4_IHL,        /**< IPv4 IHL. */
 	RTE_FLOW_FIELD_IPV4_TOTAL_LEN,  /**< IPv4 total length. */
 	RTE_FLOW_FIELD_IPV6_PAYLOAD_LEN,/**< IPv6 payload length. */
-	RTE_FLOW_FIELD_RANDOM           /**< Random value. */
+	RTE_FLOW_FIELD_RANDOM,          /**< Random value. */
+	RTE_FLOW_FIELD_IPV4_PROTO	/**< IPv4 next protocol. */
 };
 
 /**
-- 
2.18.1

[PATCH v3 2/6] app/testpmd: add modify IPv4 next protocol command line

[Viacheslav Ovsiienko]

Add new modify field action type string: "ipv4_proto".

Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
Acked-by: Ori Kam <orika@nvidia.com>
Acked-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
---
 app/test-pmd/cmdline_flow.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index a4131e1b39..1b5919dd18 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -990,6 +990,7 @@ static const char *const flow_field_ids[] = {
 	"geneve_opt_type", "geneve_opt_class", "geneve_opt_data", "mpls",
 	"tcp_data_off", "ipv4_ihl", "ipv4_total_len", "ipv6_payload_len",
 	"random",
+	"ipv4_proto",
 	NULL
 };
 
-- 
2.18.1

[PATCH v3 3/6] net/mlx5: add modify IPv4 protocol implementation

[Viacheslav Ovsiienko]

Add modify IPv4 protocol implementation for mlx5 PMD.

Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
Acked-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
---
 doc/guides/rel_notes/release_24_03.rst | 1 +
 drivers/common/mlx5/mlx5_prm.h         | 1 +
 drivers/net/mlx5/mlx5_flow_dv.c        | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/guides/rel_notes/release_24_03.rst b/doc/guides/rel_notes/release_24_03.rst
index 99981ae2ea..c9a4809254 100644
--- a/doc/guides/rel_notes/release_24_03.rst
+++ b/doc/guides/rel_notes/release_24_03.rst
@@ -108,6 +108,7 @@ New Features
   * Added HW steering support for modify field ``RTE_FLOW_FIELD_GENEVE_OPT_TYPE`` flow action.
   * Added HW steering support for modify field ``RTE_FLOW_FIELD_GENEVE_OPT_CLASS`` flow action.
   * Added HW steering support for modify field ``RTE_FLOW_FIELD_GENEVE_OPT_DATA`` flow action.
+  * Added HW steering support for modify field ``RTE_FLOW_FIELD_IPV4_PROTO`` flow action.
 
 
 Removed Items
diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h
index abff8e4dc3..3168ce76a5 100644
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -839,6 +839,7 @@ enum mlx5_modification_field {
 	MLX5_MODI_IN_MPLS_LABEL_2,
 	MLX5_MODI_IN_MPLS_LABEL_3,
 	MLX5_MODI_IN_MPLS_LABEL_4,
+	MLX5_MODI_OUT_IP_PROTOCOL = 0x4A,
 	MLX5_MODI_OUT_IPV6_NEXT_HDR = 0x4A,
 	MLX5_MODI_META_REG_C_8 = 0x8F,
 	MLX5_MODI_META_REG_C_9 = 0x90,
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index a4ed7b1444..eb7cbf808c 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1384,6 +1384,7 @@ mlx5_flow_item_field_width(struct rte_eth_dev *dev,
 	case RTE_FLOW_FIELD_IPV4_DSCP:
 		return 6;
 	case RTE_FLOW_FIELD_IPV4_TTL:
+	case RTE_FLOW_FIELD_IPV4_PROTO:
 		return 8;
 	case RTE_FLOW_FIELD_IPV4_SRC:
 	case RTE_FLOW_FIELD_IPV4_DST:
@@ -2194,10 +2195,11 @@ mlx5_flow_field_id_to_modify_info
 				info[idx].offset = data->offset;
 		}
 		break;
+	case RTE_FLOW_FIELD_IPV4_PROTO: /* Fall-through. */
 	case RTE_FLOW_FIELD_IPV6_PROTO:
 		MLX5_ASSERT(data->offset + width <= 8);
 		off_be = 8 - (data->offset + width);
-		info[idx] = (struct field_modify_info){1, 0, MLX5_MODI_OUT_IPV6_NEXT_HDR};
+		info[idx] = (struct field_modify_info){1, 0, MLX5_MODI_OUT_IP_PROTOCOL};
 		if (mask)
 			mask[idx] = flow_modify_info_mask_8(width, off_be);
 		else
-- 
2.18.1

[PATCH v3 4/6] ethdev: add modify action support for IPsec fields

[Viacheslav Ovsiienko]

The following IPsec related field definitions added:

 - RTE_FLOW_FIELD_ESP_SPI - SPI value in IPsec header
 - RTE_FLOW_FIELD_ESP_SEQ_NUM - sequence number in header
 - RTE_FLOW_FIELD_ESP_PROTO - next protocol value in trailer

Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
Acked-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
---
 doc/guides/rel_notes/release_24_03.rst | 3 +++
 lib/ethdev/rte_flow.h                  | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/guides/rel_notes/release_24_03.rst b/doc/guides/rel_notes/release_24_03.rst
index c9a4809254..d0c3389287 100644
--- a/doc/guides/rel_notes/release_24_03.rst
+++ b/doc/guides/rel_notes/release_24_03.rst
@@ -68,6 +68,9 @@ New Features
 * **Added new field IDs in the experimental ``enum rte_flow_field_id``:
 
   * Added ``RTE_FLOW_FIELD_IPV4_PROTO`` to represent it in field ID struct.
+  * Added ``RTE_FLOW_FIELD_ESP_SPI`` to represent it in field ID struct.
+  * Added ``RTE_FLOW_FIELD_ESP_SEQ_NUM`` to represent it in field ID struct.
+  * Added ``RTE_FLOW_FIELD_ESP_PROTO`` to represent it in field ID struct.
 
 * ** Support for getting the number of used descriptors of a Tx queue. **
 
diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h
index 9e76e53905..627a856537 100644
--- a/lib/ethdev/rte_flow.h
+++ b/lib/ethdev/rte_flow.h
@@ -2422,7 +2422,10 @@ enum rte_flow_field_id {
 	RTE_FLOW_FIELD_IPV4_TOTAL_LEN,  /**< IPv4 total length. */
 	RTE_FLOW_FIELD_IPV6_PAYLOAD_LEN,/**< IPv6 payload length. */
 	RTE_FLOW_FIELD_RANDOM,          /**< Random value. */
-	RTE_FLOW_FIELD_IPV4_PROTO	/**< IPv4 next protocol. */
+	RTE_FLOW_FIELD_IPV4_PROTO,	/**< IPv4 next protocol. */
+	RTE_FLOW_FIELD_ESP_SPI,		/**< ESP SPI. */
+	RTE_FLOW_FIELD_ESP_SEQ_NUM,	/**< ESP Sequence Number. */
+	RTE_FLOW_FIELD_ESP_PROTO	/**< ESP next protocol value. */
 };
 
 /**
-- 
2.18.1

[PATCH v3 5/6] app/testpmd: add modify ESP related fields command line

[Viacheslav Ovsiienko]

Add new modify field destination type strings:

  - "esp_spi", to modify Security Parameter Index field
  - "esp_seq_num", to modify Sequence Number field
  - "esp_proto", to modify next protocol field in ESP trailer

Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
Acked-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
---
 app/test-pmd/cmdline_flow.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 1b5919dd18..102b4d67c9 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -991,6 +991,7 @@ static const char *const flow_field_ids[] = {
 	"tcp_data_off", "ipv4_ihl", "ipv4_total_len", "ipv6_payload_len",
 	"random",
 	"ipv4_proto",
+	"esp_spi", "esp_seq_num", "esp_proto",
 	NULL
 };
 
-- 
2.18.1

[PATCH v3 6/6] net/mlx5: add modify field action IPsec support

[Viacheslav Ovsiienko]

Add mlx5 PMD support for the IPsec fields:

  - RTE_FLOW_FIELD_ESP_SPI - SPI value in IPsec header
  - RTE_FLOW_FIELD_ESP_SEQ_NUM - sequence number in header
  - RTE_FLOW_FIELD_ESP_PROTO - next protocol value in trailer

Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
Acked-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
---
 doc/guides/rel_notes/release_24_03.rst |  3 +++
 drivers/common/mlx5/mlx5_prm.h         |  3 +++
 drivers/net/mlx5/mlx5_flow_dv.c        | 31 ++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/doc/guides/rel_notes/release_24_03.rst b/doc/guides/rel_notes/release_24_03.rst
index d0c3389287..0f8d2fd81c 100644
--- a/doc/guides/rel_notes/release_24_03.rst
+++ b/doc/guides/rel_notes/release_24_03.rst
@@ -112,6 +112,9 @@ New Features
   * Added HW steering support for modify field ``RTE_FLOW_FIELD_GENEVE_OPT_CLASS`` flow action.
   * Added HW steering support for modify field ``RTE_FLOW_FIELD_GENEVE_OPT_DATA`` flow action.
   * Added HW steering support for modify field ``RTE_FLOW_FIELD_IPV4_PROTO`` flow action.
+  * Added HW steering support for modify field ``RTE_FLOW_FIELD_ESP_SPI`` flow action.
+  * Added HW steering support for modify field ``RTE_FLOW_FIELD_ESP_SEQ_NUM`` flow action.
+  * Added HW steering support for modify field ``RTE_FLOW_FIELD_ESP_PROTO`` flow action.
 
 
 Removed Items
diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h
index 3168ce76a5..0035a1e616 100644
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -854,6 +854,9 @@ enum mlx5_modification_field {
 	MLX5_MODI_OUT_IPV6_PAYLOAD_LEN = 0x11E,
 	MLX5_MODI_OUT_IPV4_IHL = 0x11F,
 	MLX5_MODI_OUT_TCP_DATA_OFFSET = 0x120,
+	MLX5_MODI_OUT_ESP_SPI = 0x5E,
+	MLX5_MODI_OUT_ESP_SEQ_NUM = 0x82,
+	MLX5_MODI_OUT_IPSEC_NEXT_HDR = 0x126,
 	MLX5_MODI_INVALID = INT_MAX,
 };
 
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index eb7cbf808c..6fded15d91 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1414,7 +1414,11 @@ mlx5_flow_item_field_width(struct rte_eth_dev *dev,
 	case RTE_FLOW_FIELD_GTP_TEID:
 	case RTE_FLOW_FIELD_MPLS:
 	case RTE_FLOW_FIELD_TAG:
+	case RTE_FLOW_FIELD_ESP_SPI:
+	case RTE_FLOW_FIELD_ESP_SEQ_NUM:
 		return 32;
+	case RTE_FLOW_FIELD_ESP_PROTO:
+		return 8;
 	case RTE_FLOW_FIELD_MARK:
 		return rte_popcount32(priv->sh->dv_mark_mask);
 	case RTE_FLOW_FIELD_META:
@@ -2205,6 +2209,33 @@ mlx5_flow_field_id_to_modify_info
 		else
 			info[idx].offset = off_be;
 		break;
+	case RTE_FLOW_FIELD_ESP_PROTO:
+		MLX5_ASSERT(data->offset + width <= 8);
+		off_be = 8 - (data->offset + width);
+		info[idx] = (struct field_modify_info){1, 0, MLX5_MODI_OUT_IPSEC_NEXT_HDR};
+		if (mask)
+			mask[idx] = flow_modify_info_mask_8(width, off_be);
+		else
+			info[idx].offset = off_be;
+		break;
+	case RTE_FLOW_FIELD_ESP_SPI:
+		MLX5_ASSERT(data->offset + width <= 32);
+		off_be = 32 - (data->offset + width);
+		info[idx] = (struct field_modify_info){4, 0, MLX5_MODI_OUT_ESP_SPI};
+		if (mask)
+			mask[idx] = flow_modify_info_mask_32(width, off_be);
+		else
+			info[idx].offset = off_be;
+		break;
+	case RTE_FLOW_FIELD_ESP_SEQ_NUM:
+		MLX5_ASSERT(data->offset + width <= 32);
+		off_be = 32 - (data->offset + width);
+		info[idx] = (struct field_modify_info){4, 0, MLX5_MODI_OUT_ESP_SEQ_NUM};
+		if (mask)
+			mask[idx] = flow_modify_info_mask_32(width, off_be);
+		else
+			info[idx].offset = off_be;
+		break;
 	case RTE_FLOW_FIELD_FLEX_ITEM:
 		MLX5_ASSERT(data->flex_handle != NULL && !(data->offset & 0x7));
 		mlx5_modify_flex_item(dev, (const struct mlx5_flex_item *)data->flex_handle,
-- 
2.18.1

RE: [PATCH v3 4/6] ethdev: add modify action support for IPsec fields

[Ori Kam]

Hi Slava

> -----Original Message-----
> From: Slava Ovsiienko <viacheslavo@nvidia.com>
> Sent: Wednesday, February 7, 2024 2:29 PM
> 
> The following IPsec related field definitions added:
> 
>  - RTE_FLOW_FIELD_ESP_SPI - SPI value in IPsec header
>  - RTE_FLOW_FIELD_ESP_SEQ_NUM - sequence number in header
>  - RTE_FLOW_FIELD_ESP_PROTO - next protocol value in trailer
> 
> Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
> Acked-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
> ---
>  doc/guides/rel_notes/release_24_03.rst | 3 +++
>  lib/ethdev/rte_flow.h                  | 5 ++++-
>  2 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/doc/guides/rel_notes/release_24_03.rst
> b/doc/guides/rel_notes/release_24_03.rst
> index c9a4809254..d0c3389287 100644
> --- a/doc/guides/rel_notes/release_24_03.rst
> +++ b/doc/guides/rel_notes/release_24_03.rst
> @@ -68,6 +68,9 @@ New Features
>  * **Added new field IDs in the experimental ``enum rte_flow_field_id``:
> 
>    * Added ``RTE_FLOW_FIELD_IPV4_PROTO`` to represent it in field ID struct.
> +  * Added ``RTE_FLOW_FIELD_ESP_SPI`` to represent it in field ID struct.
> +  * Added ``RTE_FLOW_FIELD_ESP_SEQ_NUM`` to represent it in field ID
> struct.
> +  * Added ``RTE_FLOW_FIELD_ESP_PROTO`` to represent it in field ID struct.
> 
>  * ** Support for getting the number of used descriptors of a Tx queue. **
> 
> diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h
> index 9e76e53905..627a856537 100644
> --- a/lib/ethdev/rte_flow.h
> +++ b/lib/ethdev/rte_flow.h
> @@ -2422,7 +2422,10 @@ enum rte_flow_field_id {
>  	RTE_FLOW_FIELD_IPV4_TOTAL_LEN,  /**< IPv4 total length. */
>  	RTE_FLOW_FIELD_IPV6_PAYLOAD_LEN,/**< IPv6 payload length. */
>  	RTE_FLOW_FIELD_RANDOM,          /**< Random value. */
> -	RTE_FLOW_FIELD_IPV4_PROTO	/**< IPv4 next protocol. */
> +	RTE_FLOW_FIELD_IPV4_PROTO,	/**< IPv4 next protocol. */
> +	RTE_FLOW_FIELD_ESP_SPI,		/**< ESP SPI. */
> +	RTE_FLOW_FIELD_ESP_SEQ_NUM,	/**< ESP Sequence Number.
> */
> +	RTE_FLOW_FIELD_ESP_PROTO	/**< ESP next protocol value. */
>  };
> 
>  /**
> --
> 2.18.1

Acked-by: Ori Kam <orika@nvidia.com>
Best,
Ori

Re: [PATCH v3 1/6] ethdev: add modify IPv4 next protocol field

[Ferruh Yigit]

On 2/7/2024 12:29 PM, Viacheslav Ovsiienko wrote:
> Add IPv4 next protocol modify field definition.
> 
> Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
> Acked-by: Ori Kam <orika@nvidia.com>
> Acked-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
>

Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>

Re: [PATCH v3 2/6] app/testpmd: add modify IPv4 next protocol command line

[Ferruh Yigit]

On 2/7/2024 12:29 PM, Viacheslav Ovsiienko wrote:
> Add new modify field action type string: "ipv4_proto".
> 
> Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
> Acked-by: Ori Kam <orika@nvidia.com>
> Acked-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
> 

Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>

Re: [PATCH v3 4/6] ethdev: add modify action support for IPsec fields

[Ferruh Yigit]

On 2/7/2024 12:29 PM, Viacheslav Ovsiienko wrote:
> The following IPsec related field definitions added:
> 
>  - RTE_FLOW_FIELD_ESP_SPI - SPI value in IPsec header
>  - RTE_FLOW_FIELD_ESP_SEQ_NUM - sequence number in header
>  - RTE_FLOW_FIELD_ESP_PROTO - next protocol value in trailer
> 
> Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
> Acked-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
>

Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>

Re: [PATCH v3 5/6] app/testpmd: add modify ESP related fields command line

[Ferruh Yigit]

On 2/7/2024 12:29 PM, Viacheslav Ovsiienko wrote:
> Add new modify field destination type strings:
> 
>   - "esp_spi", to modify Security Parameter Index field
>   - "esp_seq_num", to modify Sequence Number field
>   - "esp_proto", to modify next protocol field in ESP trailer
> 
> Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
> Acked-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
>

Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>

Re: [PATCH v3 1/6] ethdev: add modify IPv4 next protocol field

[Raslan Darawsheh]

[-- Attachment #1: Type: text/plain, Size: 633 bytes --]


Hi,

From: Slava Ovsiienko <viacheslavo@nvidia.com>
Sent: Wednesday, February 7, 2024 2:29 PM
To: dev@dpdk.org <dev@dpdk.org>
Cc: Matan Azrad <matan@nvidia.com>; Raslan Darawsheh <rasland@nvidia.com>; Ori Kam <orika@nvidia.com>; Dariusz Sosnowski <dsosnowski@nvidia.com>
Subject: [PATCH v3 1/6] ethdev: add modify IPv4 next protocol field

Add IPv4 next protocol modify field definition.

Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
Acked-by: Ori Kam <orika@nvidia.com>
Acked-by: Dariusz Sosnowski <dsosnowski@nvidia.com>

Series applied to next-net-mlx,

Kindest regards,

Raslan Darawsheh



[-- Attachment #2: Type: text/html, Size: 2550 bytes --]