* [PATCH v2 2/6] app/testpmd: add modify IPv4 next protocol command line
2024-02-07 12:13 [PATCH v2 1/6] ethdev: add modify IPv4 next protocol field Viacheslav Ovsiienko
@ 2024-02-07 12:13 ` Viacheslav Ovsiienko
2024-02-07 12:13 ` [PATCH v2 3/6] net/mlx5: add modify IPv4 protocol implementation Viacheslav Ovsiienko
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Viacheslav Ovsiienko @ 2024-02-07 12:13 UTC (permalink / raw)
To: dev; +Cc: matan, rasland, orika, dsosnowski
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 4062879552..03b418a5d8 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -962,6 +962,7 @@ static const char *const modify_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
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2 3/6] net/mlx5: add modify IPv4 protocol implementation
2024-02-07 12:13 [PATCH v2 1/6] ethdev: add modify IPv4 next protocol field Viacheslav Ovsiienko
2024-02-07 12:13 ` [PATCH v2 2/6] app/testpmd: add modify IPv4 next protocol command line Viacheslav Ovsiienko
@ 2024-02-07 12:13 ` Viacheslav Ovsiienko
2024-02-07 12:13 ` [PATCH v2 4/6] ethdev: add modify action support for IPsec fields Viacheslav Ovsiienko
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Viacheslav Ovsiienko @ 2024-02-07 12:13 UTC (permalink / raw)
To: dev; +Cc: matan, rasland, orika, dsosnowski
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 1e9134cc81..140f7b0ac5 100644
--- a/doc/guides/rel_notes/release_24_03.rst
+++ b/doc/guides/rel_notes/release_24_03.rst
@@ -94,6 +94,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 f64f25dbb7..44413517d0 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 6998be107f..764940b700 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
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2 4/6] ethdev: add modify action support for IPsec fields
2024-02-07 12:13 [PATCH v2 1/6] ethdev: add modify IPv4 next protocol field Viacheslav Ovsiienko
2024-02-07 12:13 ` [PATCH v2 2/6] app/testpmd: add modify IPv4 next protocol command line Viacheslav Ovsiienko
2024-02-07 12:13 ` [PATCH v2 3/6] net/mlx5: add modify IPv4 protocol implementation Viacheslav Ovsiienko
@ 2024-02-07 12:13 ` Viacheslav Ovsiienko
2024-02-07 12:13 ` [PATCH v2 5/6] app/testpmd: add modify ESP related fields command line Viacheslav Ovsiienko
2024-02-07 12:13 ` [PATCH v2 6/6] net/mlx5: add modify field action IPsec support Viacheslav Ovsiienko
4 siblings, 0 replies; 6+ messages in thread
From: Viacheslav Ovsiienko @ 2024-02-07 12:13 UTC (permalink / raw)
To: dev; +Cc: matan, rasland, orika, dsosnowski
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 140f7b0ac5..0403157202 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 84af730dc7..6efba67f12 100644
--- a/lib/ethdev/rte_flow.h
+++ b/lib/ethdev/rte_flow.h
@@ -3934,7 +3934,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
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2 5/6] app/testpmd: add modify ESP related fields command line
2024-02-07 12:13 [PATCH v2 1/6] ethdev: add modify IPv4 next protocol field Viacheslav Ovsiienko
` (2 preceding siblings ...)
2024-02-07 12:13 ` [PATCH v2 4/6] ethdev: add modify action support for IPsec fields Viacheslav Ovsiienko
@ 2024-02-07 12:13 ` Viacheslav Ovsiienko
2024-02-07 12:13 ` [PATCH v2 6/6] net/mlx5: add modify field action IPsec support Viacheslav Ovsiienko
4 siblings, 0 replies; 6+ messages in thread
From: Viacheslav Ovsiienko @ 2024-02-07 12:13 UTC (permalink / raw)
To: dev; +Cc: matan, rasland, orika, dsosnowski
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 03b418a5d8..9e1048f945 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -963,6 +963,7 @@ static const char *const modify_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
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2 6/6] net/mlx5: add modify field action IPsec support
2024-02-07 12:13 [PATCH v2 1/6] ethdev: add modify IPv4 next protocol field Viacheslav Ovsiienko
` (3 preceding siblings ...)
2024-02-07 12:13 ` [PATCH v2 5/6] app/testpmd: add modify ESP related fields command line Viacheslav Ovsiienko
@ 2024-02-07 12:13 ` Viacheslav Ovsiienko
4 siblings, 0 replies; 6+ messages in thread
From: Viacheslav Ovsiienko @ 2024-02-07 12:13 UTC (permalink / raw)
To: dev; +Cc: matan, rasland, orika, dsosnowski
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 0403157202..189724f660 100644
--- a/doc/guides/rel_notes/release_24_03.rst
+++ b/doc/guides/rel_notes/release_24_03.rst
@@ -98,6 +98,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 44413517d0..3150412580 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 764940b700..90413f4a38 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
^ permalink raw reply [flat|nested] 6+ messages in thread