net/mlx5: support match on L3 fragmented packets

PATCH Superseded Dekel Peled 2 participants 13 messages Oct 13, 2020 – Oct 18, 2020 Network drivers

Share & tools

Dekel Peled

author

2020-10-13 14:17 UTC #0 lore raw

cover net/mlx5: support match on L3 fragmented packets

Patch series [1] adds to ethdev and testpmd the support of matching on fragmented/non-fragmented packets.
Following [1], this patch series adds to MLX5 PMD the support of matching on IPv4 fragmented packets, IPv6 fragmented packets, and IPv6 fragment extension header item.

[1] https://mails.dpdk.org/archives/dev/2020-October/186177.html

Dekel Peled (5):
net/mlx5: remove handling of ICMP fragmented packets net/mlx5: support match on IPv4 fragment packets net/mlx5: support match on IPv6 fragment packets net/mlx5: support match on IPv6 fragment ext. item net/mlx5: enforce limitation on IPv6 next proto

 doc/guides/nics/mlx5.rst               |   7 +
 doc/guides/rel_notes/release_20_11.rst |   5 +
 drivers/net/mlx5/mlx5_flow.c           |  62 ++++--
 drivers/net/mlx5/mlx5_flow.h           |  14 ++
 drivers/net/mlx5/mlx5_flow_dv.c        | 382 +++++++++++++++++++++++++++++----
 drivers/net/mlx5/mlx5_flow_verbs.c     |   9 +-
 6 files changed, 420 insertions(+), 59 deletions(-)

Signature · 1 line

1.8.3.1

Dekel Peled

author

2020-10-13 14:17 UTC #1 lore raw

PATCH 1/5 net/mlx5: remove handling of ICMP fragmented packets

Commit [1] forced setting of match on 'frag' bit mask 1 and value 0. Previous patch in this series added support of match on fragmented and non-fragmented packets on L3 items, so this setting is now redundant.

This patch removes the changes done in [1].

[1] commit 85407db9f60d ("net/mlx5: fix matching for ICMP fragments")

Signed-off-by Dekel Peled <[email protected]>

Acked-by Ori Kam <[email protected]>

---
 drivers/net/mlx5/mlx5_flow_dv.c | 12 ------------
 1 file changed, 12 deletions(-)

drivers/net/mlx5/mlx5_flow_dv.c +0 ~~-12~~

index 2bbfcea..c0fb311 100644
@@ -7345,12 +7345,6 @@ struct field_modify_info modify_tcp[] = {
 		return;
 	if (!icmp6_m)
 		icmp6_m = &rte_flow_item_icmp6_mask;
-	/*
-	 * Force flow only to match the non-fragmented IPv6 ICMPv6 packets.
-	 * If only the protocol is specified, no need to match the frag.
-	 */
-	MLX5_SET(fte_match_set_lyr_2_4, headers_m, frag, 1);
-	MLX5_SET(fte_match_set_lyr_2_4, headers_v, frag, 0);
 	MLX5_SET(fte_match_set_misc3, misc3_m, icmpv6_type, icmp6_m->type);
 	MLX5_SET(fte_match_set_misc3, misc3_v, icmpv6_type,
 		 icmp6_v->type & icmp6_m->type);

@@ -7400,12 +7394,6 @@ struct field_modify_info modify_tcp[] = {
 		return;
 	if (!icmp_m)
 		icmp_m = &rte_flow_item_icmp_mask;
-	/*
-	 * Force flow only to match the non-fragmented IPv4 ICMP packets.
-	 * If only the protocol is specified, no need to match the frag.
-	 */
-	MLX5_SET(fte_match_set_lyr_2_4, headers_m, frag, 1);
-	MLX5_SET(fte_match_set_lyr_2_4, headers_v, frag, 0);
 	MLX5_SET(fte_match_set_misc3, misc3_m, icmp_type,
 		 icmp_m->hdr.icmp_type);
 	MLX5_SET(fte_match_set_misc3, misc3_v, icmp_type,

Signature · 1 line

1.8.3.1

Dekel Peled

author

2020-10-13 14:18 UTC #2 lore raw

PATCH 2/5 net/mlx5: support match on IPv4 fragment packets

In reply to Dekel Peled

This patch adds to MLX5 PMD the support of matching on IPv4 fragmented and non-fragmented packets, using the IPv4 header fragment_offset field.

Signed-off-by Dekel Peled <[email protected]>

Acked-by Ori Kam <[email protected]>

---
 doc/guides/rel_notes/release_20_11.rst |   5 ++
 drivers/net/mlx5/mlx5_flow.c           |  48 ++++++----
 drivers/net/mlx5/mlx5_flow.h           |  10 +++
 drivers/net/mlx5/mlx5_flow_dv.c        | 156 ++++++++++++++++++++++++++++-----
 drivers/net/mlx5/mlx5_flow_verbs.c     |   9 +-
 5 files changed, 183 insertions(+), 45 deletions(-)

doc/guides/rel_notes/release_20_11.rst +5 -0

index a01552c..792d547 100644
@@ -148,6 +148,11 @@ New Features
   * Extern objects and functions can be plugged into the pipeline.
   * Transaction-oriented table updates.
 
+* **Updated Mellanox mlx5 driver.**
+
+  Updated Mellanox mlx5 driver with new features and improvements, including:
+
+  * Added support for matching on fragmented/non-fragmented IPv4 packets.
 
 Removed Items
 -------------

drivers/net/mlx5/mlx5_flow.c +31 ~~-17~~

174 lines not on this page · raw message

drivers/net/mlx5/mlx5_flow.h +10 -0

index 279daf2..1e30c93 100644
@@ -330,6 +330,14 @@ enum mlx5_feature_name {
 #define MLX5_ENCAPSULATION_DECISION_SIZE (sizeof(struct rte_flow_item_eth) + \
 					  sizeof(struct rte_flow_item_ipv4))
 
+/* IPv4 fragment_offset field contains relevant data in bits 2 to 15. */
+#define MLX5_IPV4_FRAG_OFFSET_MASK \
+		(RTE_IPV4_HDR_OFFSET_MASK | RTE_IPV4_HDR_MF_FLAG)
+
+/* Specific item's fields can accept a range of values (using spec and last). */
+#define MLX5_ITEM_RANGE_NOT_ACCEPTED	false
+#define MLX5_ITEM_RANGE_ACCEPTED	true
+
 /* Software header modify action numbers of a flow. */
 #define MLX5_ACT_NUM_MDF_IPV4		1
 #define MLX5_ACT_NUM_MDF_IPV6		4

@@ -985,6 +993,7 @@ int mlx5_flow_item_acceptable(const struct rte_flow_item *item,
 			      const uint8_t *mask,
 			      const uint8_t *nic_mask,
 			      unsigned int size,
+			      bool range_accepted,
 			      struct rte_flow_error *error);
 int mlx5_flow_validate_item_eth(const struct rte_flow_item *item,
 				uint64_t item_flags,

@@ -1002,6 +1011,7 @@ int mlx5_flow_validate_item_ipv4(const struct rte_flow_item *item,
 				 uint64_t last_item,
 				 uint16_t ether_type,
 				 const struct rte_flow_item_ipv4 *acc_mask,
+				 bool range_accepted,
 				 struct rte_flow_error *error);
 int mlx5_flow_validate_item_ipv6(const struct rte_flow_item *item,
 				 uint64_t item_flags,

drivers/net/mlx5/mlx5_flow_dv.c +132 ~~-24~~

210 lines not on this page · raw message

drivers/net/mlx5/mlx5_flow_verbs.c +5 -4

index 62c18b8..276bcb5 100644
@@ -1312,10 +1312,11 @@
 			}
 			break;
 		case RTE_FLOW_ITEM_TYPE_IPV4:
-			ret = mlx5_flow_validate_item_ipv4(items, item_flags,
-							   last_item,
-							   ether_type, NULL,
-							   error);
+			ret = mlx5_flow_validate_item_ipv4
+						(items, item_flags,
+						 last_item, ether_type, NULL,
+						 MLX5_ITEM_RANGE_NOT_ACCEPTED,
+						 error);
 			if (ret < 0)
 				return ret;
 			last_item = tunnel ? MLX5_FLOW_LAYER_INNER_L3_IPV4 :

Signature · 1 line

1.8.3.1

Dekel Peled

author

2020-10-13 14:18 UTC #3 lore raw

PATCH 3/5 net/mlx5: support match on IPv6 fragment packets

In reply to Dekel Peled

This patch adds to MLX5 PMD the support of matching on IPv6 fragmented and non-fragmented packets, using the new field has_frag_ext, added to rte_flow following RFC [1].

[1] https://mails.dpdk.org/archives/dev/2020-August/177257.html

Signed-off-by Dekel Peled <[email protected]>

Acked-by Ori Kam <[email protected]>

---
 doc/guides/rel_notes/release_20_11.rst | 2 +-
 drivers/net/mlx5/mlx5_flow_dv.c        | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

doc/guides/rel_notes/release_20_11.rst +1 -1

index 792d547..ceb4770 100644
@@ -152,7 +152,7 @@ New Features
 
   Updated Mellanox mlx5 driver with new features and improvements, including:
 
-  * Added support for matching on fragmented/non-fragmented IPv4 packets.
+  * Added support for matching on fragmented/non-fragmented IPv4/IPv6 packets.
 
 Removed Items
 -------------

drivers/net/mlx5/mlx5_flow_dv.c +5 -0

index 08e6f74..6f7377b 100644
@@ -5211,6 +5211,7 @@ struct field_modify_info modify_tcp[] = {
 			.proto = 0xff,
 			.hop_limits = 0xff,
 		},
+		.has_frag_ext = 1,
 	};
 	const struct rte_flow_item_ecpri nic_ecpri_mask = {
 		.hdr = {

@@ -6519,6 +6520,10 @@ struct field_modify_info modify_tcp[] = {
 		 ipv6_m->hdr.hop_limits);
 	MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_ttl_hoplimit,
 		 ipv6_v->hdr.hop_limits & ipv6_m->hdr.hop_limits);
+	MLX5_SET(fte_match_set_lyr_2_4, headers_m, frag,
+		 !!(ipv6_m->has_frag_ext));
+	MLX5_SET(fte_match_set_lyr_2_4, headers_v, frag,
+		 !!(ipv6_v->has_frag_ext & ipv6_m->has_frag_ext));
 }
 
 /**

Signature · 1 line

1.8.3.1

Dekel Peled

author

2020-10-13 14:18 UTC #4 lore raw

PATCH 4/5 net/mlx5: support match on IPv6 fragment ext. item

In reply to Dekel Peled

rte_flow update, following RFC [1], added to ethdev the rte_flow item ipv6_frag_ext.
This patch adds to MLX5 PMD the option to match on this item type.

[1] http://mails.dpdk.org/archives/dev/2020-March/160255.html

Signed-off-by Dekel Peled <[email protected]>

Acked-by Ori Kam <[email protected]>

---
 drivers/net/mlx5/mlx5_flow.h    |   4 +
 drivers/net/mlx5/mlx5_flow_dv.c | 209 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 213 insertions(+)

drivers/net/mlx5/mlx5_flow.h +4 -0

index 1e30c93..376519f 100644
@@ -122,6 +122,10 @@ enum mlx5_feature_name {
 /* Pattern eCPRI Layer bit. */
 #define MLX5_FLOW_LAYER_ECPRI (UINT64_C(1) << 29)
 
+/* IPv6 Fragment Extension Header bit. */
+#define MLX5_FLOW_LAYER_OUTER_L3_IPV6_FRAG_EXT (1u << 30)
+#define MLX5_FLOW_LAYER_INNER_L3_IPV6_FRAG_EXT (1u << 31)
+
 /* Outer Masks. */
 #define MLX5_FLOW_LAYER_OUTER_L3 \
 	(MLX5_FLOW_LAYER_OUTER_L3_IPV4 | MLX5_FLOW_LAYER_OUTER_L3_IPV6)

drivers/net/mlx5/mlx5_flow_dv.c +209 -0

233 lines not on this page · raw message

Signature · 1 line

1.8.3.1

Dekel Peled

author

2020-10-13 14:19 UTC #5 lore raw

PATCH 5/5 net/mlx5: enforce limitation on IPv6 next proto

In reply to Dekel Peled

Due to PRM requirement, the IPv6 header item 'proto' field, indicating the next header protocol, should not be set as extension header. This patch adds the relevant validation, and documents the limitation.

Signed-off-by Dekel Peled <[email protected]>

Acked-by Ori Kam <[email protected]>

---
 doc/guides/nics/mlx5.rst     |  7 +++++++
 drivers/net/mlx5/mlx5_flow.c | 14 ++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

doc/guides/nics/mlx5.rst +7 -0

index a174cdd..b7a4dce 100644
@@ -311,6 +311,13 @@ Limitations
     for some NICs (such as ConnectX-6 Dx and BlueField 2).
     The capability bit ``scatter_fcs_w_decap_disable`` shows NIC support.
 
+- IPv6 header item 'proto' field, indicating the next header protocol, should
+  not be set as extension header.
+  In case the next header is an extension header, it should not be specified in
+  IPv6 header item 'proto' field.
+  The last extension header item 'next header' field can specify the following
+  header protocol type.
+
 Statistics
 ----------

drivers/net/mlx5/mlx5_flow.c +12 -2

index 38cfd0f..84931a3 100644
@@ -1977,9 +1977,9 @@ struct mlx5_flow_tunnel_info {
 					  RTE_FLOW_ERROR_TYPE_ITEM, item,
 					  "IPv6 cannot follow L2/VLAN layer "
 					  "which ether type is not IPv6");
+	if (mask && spec)
+		next_proto = mask->hdr.proto & spec->hdr.proto;
 	if (item_flags & MLX5_FLOW_LAYER_IPV6_ENCAP) {
-		if (mask && spec)
-			next_proto = mask->hdr.proto & spec->hdr.proto;
 		if (next_proto == IPPROTO_IPIP || next_proto == IPPROTO_IPV6)
 			return rte_flow_error_set(error, EINVAL,
 						  RTE_FLOW_ERROR_TYPE_ITEM,

@@ -1987,6 +1987,16 @@ struct mlx5_flow_tunnel_info {
 						  "multiple tunnel "
 						  "not supported");
 	}
+	if (next_proto == IPPROTO_HOPOPTS  ||
+	    next_proto == IPPROTO_ROUTING  ||
+	    next_proto == IPPROTO_FRAGMENT ||
+	    next_proto == IPPROTO_ESP	   ||
+	    next_proto == IPPROTO_AH	   ||
+	    next_proto == IPPROTO_DSTOPTS)
+		return rte_flow_error_set(error, EINVAL,
+					  RTE_FLOW_ERROR_TYPE_ITEM, item,
+					  "IPv6 proto (next header) should "
+					  "not be set as extension header");
 	if (item_flags & MLX5_FLOW_LAYER_IPIP)
 		return rte_flow_error_set(error, EINVAL,
 					  RTE_FLOW_ERROR_TYPE_ITEM, item,

Signature · 1 line

1.8.3.1

Dekel Peled

author

2020-10-15 14:07 UTC #6 lore raw

v2 cover net/mlx5: support match on L3 fragmented packets

In reply to Dekel Peled

[1] https://mails.dpdk.org/archives/dev/2020-October/186177.html

---
v2: rebase on top of latest commits.
---

 doc/guides/nics/mlx5.rst               |   7 +
 doc/guides/rel_notes/release_20_11.rst |   5 +
 drivers/net/mlx5/mlx5_flow.c           |  62 ++++--
 drivers/net/mlx5/mlx5_flow.h           |  14 ++
 drivers/net/mlx5/mlx5_flow_dv.c        | 382 +++++++++++++++++++++++++++++----
 drivers/net/mlx5/mlx5_flow_verbs.c     |   9 +-
 6 files changed, 420 insertions(+), 59 deletions(-)

Signature · 1 line

1.8.3.1

Dekel Peled

author

2020-10-15 14:06 UTC #7 lore raw

PATCH v2 1/5 net/mlx5: remove handling of ICMP fragmented packets

This patch removes the changes done in [1].

[1] commit 85407db9f60d ("net/mlx5: fix matching for ICMP fragments")

Signed-off-by Dekel Peled <[email protected]>

Acked-by Ori Kam <[email protected]>

---
 drivers/net/mlx5/mlx5_flow_dv.c | 12 ------------
 1 file changed, 12 deletions(-)

drivers/net/mlx5/mlx5_flow_dv.c +0 ~~-12~~

index 361c32d..3fa51c3 100644
@@ -7560,12 +7560,6 @@ struct field_modify_info modify_tcp[] = {
 		return;
 	if (!icmp6_m)
 		icmp6_m = &rte_flow_item_icmp6_mask;
-	/*
-	 * Force flow only to match the non-fragmented IPv6 ICMPv6 packets.
-	 * If only the protocol is specified, no need to match the frag.
-	 */
-	MLX5_SET(fte_match_set_lyr_2_4, headers_m, frag, 1);
-	MLX5_SET(fte_match_set_lyr_2_4, headers_v, frag, 0);
 	MLX5_SET(fte_match_set_misc3, misc3_m, icmpv6_type, icmp6_m->type);
 	MLX5_SET(fte_match_set_misc3, misc3_v, icmpv6_type,
 		 icmp6_v->type & icmp6_m->type);

@@ -7615,12 +7609,6 @@ struct field_modify_info modify_tcp[] = {
 		return;
 	if (!icmp_m)
 		icmp_m = &rte_flow_item_icmp_mask;
-	/*
-	 * Force flow only to match the non-fragmented IPv4 ICMP packets.
-	 * If only the protocol is specified, no need to match the frag.
-	 */
-	MLX5_SET(fte_match_set_lyr_2_4, headers_m, frag, 1);
-	MLX5_SET(fte_match_set_lyr_2_4, headers_v, frag, 0);
 	MLX5_SET(fte_match_set_misc3, misc3_m, icmp_type,
 		 icmp_m->hdr.icmp_type);
 	MLX5_SET(fte_match_set_misc3, misc3_v, icmp_type,

Signature · 1 line

1.8.3.1

Dekel Peled

author

2020-10-15 14:07 UTC #8 lore raw

PATCH v2 2/5 net/mlx5: support match on IPv4 fragment packets

In reply to Dekel Peled

This patch adds to MLX5 PMD the support of matching on IPv4 fragmented and non-fragmented packets, using the IPv4 header fragment_offset field.

Signed-off-by Dekel Peled <[email protected]>

Acked-by Ori Kam <[email protected]>

---
 doc/guides/rel_notes/release_20_11.rst |   5 ++
 drivers/net/mlx5/mlx5_flow.c           |  48 ++++++----
 drivers/net/mlx5/mlx5_flow.h           |  10 +++
 drivers/net/mlx5/mlx5_flow_dv.c        | 156 ++++++++++++++++++++++++++++-----
 drivers/net/mlx5/mlx5_flow_verbs.c     |   9 +-
 5 files changed, 183 insertions(+), 45 deletions(-)

doc/guides/rel_notes/release_20_11.rst +5 -0

index f8686a5..18e2c5e 100644
@@ -214,6 +214,11 @@ New Features
   * Added new ``RTE_ACL_CLASSIFY_AVX512X32`` vector implementation,
     which can process up to 32 flows in parallel. Requires AVX512 support.
 
+* **Updated Mellanox mlx5 driver.**
+
+  Updated Mellanox mlx5 driver with new features and improvements, including:
+
+  * Added support for matching on fragmented/non-fragmented IPv4 packets.
 
 Removed Items
 -------------

drivers/net/mlx5/mlx5_flow.c +31 ~~-17~~

174 lines not on this page · raw message

drivers/net/mlx5/mlx5_flow.h +10 -0

index 0dc76c4..b6efbff 100644
@@ -331,6 +331,14 @@ enum mlx5_feature_name {
 #define MLX5_ENCAPSULATION_DECISION_SIZE (sizeof(struct rte_flow_item_eth) + \
 					  sizeof(struct rte_flow_item_ipv4))
 
+/* IPv4 fragment_offset field contains relevant data in bits 2 to 15. */
+#define MLX5_IPV4_FRAG_OFFSET_MASK \
+		(RTE_IPV4_HDR_OFFSET_MASK | RTE_IPV4_HDR_MF_FLAG)
+
+/* Specific item's fields can accept a range of values (using spec and last). */
+#define MLX5_ITEM_RANGE_NOT_ACCEPTED	false
+#define MLX5_ITEM_RANGE_ACCEPTED	true
+
 /* Software header modify action numbers of a flow. */
 #define MLX5_ACT_NUM_MDF_IPV4		1
 #define MLX5_ACT_NUM_MDF_IPV6		4

@@ -1046,6 +1054,7 @@ int mlx5_flow_item_acceptable(const struct rte_flow_item *item,
 			      const uint8_t *mask,
 			      const uint8_t *nic_mask,
 			      unsigned int size,
+			      bool range_accepted,
 			      struct rte_flow_error *error);
 int mlx5_flow_validate_item_eth(const struct rte_flow_item *item,
 				uint64_t item_flags,

@@ -1063,6 +1072,7 @@ int mlx5_flow_validate_item_ipv4(const struct rte_flow_item *item,
 				 uint64_t last_item,
 				 uint16_t ether_type,
 				 const struct rte_flow_item_ipv4 *acc_mask,
+				 bool range_accepted,
 				 struct rte_flow_error *error);
 int mlx5_flow_validate_item_ipv6(const struct rte_flow_item *item,
 				 uint64_t item_flags,

drivers/net/mlx5/mlx5_flow_dv.c +132 ~~-24~~

210 lines not on this page · raw message

drivers/net/mlx5/mlx5_flow_verbs.c +5 -4

index 62c18b8..276bcb5 100644
@@ -1312,10 +1312,11 @@
 			}
 			break;
 		case RTE_FLOW_ITEM_TYPE_IPV4:
-			ret = mlx5_flow_validate_item_ipv4(items, item_flags,
-							   last_item,
-							   ether_type, NULL,
-							   error);
+			ret = mlx5_flow_validate_item_ipv4
+						(items, item_flags,
+						 last_item, ether_type, NULL,
+						 MLX5_ITEM_RANGE_NOT_ACCEPTED,
+						 error);
 			if (ret < 0)
 				return ret;
 			last_item = tunnel ? MLX5_FLOW_LAYER_INNER_L3_IPV4 :

Signature · 1 line

1.8.3.1

Dekel Peled

author

2020-10-15 14:08 UTC #9 lore raw

PATCH v2 3/5 net/mlx5: support match on IPv6 fragment packets

In reply to Dekel Peled

This patch adds to MLX5 PMD the support of matching on IPv6 fragmented and non-fragmented packets, using the new field has_frag_ext, added to rte_flow following RFC [1].

[1] https://mails.dpdk.org/archives/dev/2020-August/177257.html

Signed-off-by Dekel Peled <[email protected]>

Acked-by Ori Kam <[email protected]>

---
 doc/guides/rel_notes/release_20_11.rst | 2 +-
 drivers/net/mlx5/mlx5_flow_dv.c        | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

doc/guides/rel_notes/release_20_11.rst +1 -1

index 18e2c5e..097117e 100644
@@ -218,7 +218,7 @@ New Features
 
   Updated Mellanox mlx5 driver with new features and improvements, including:
 
-  * Added support for matching on fragmented/non-fragmented IPv4 packets.
+  * Added support for matching on fragmented/non-fragmented IPv4/IPv6 packets.
 
 Removed Items
 -------------

drivers/net/mlx5/mlx5_flow_dv.c +5 -0

index ff97f78..b61a361 100644
@@ -5417,6 +5417,7 @@ struct field_modify_info modify_tcp[] = {
 			.proto = 0xff,
 			.hop_limits = 0xff,
 		},
+		.has_frag_ext = 1,
 	};
 	const struct rte_flow_item_ecpri nic_ecpri_mask = {
 		.hdr = {

@@ -6734,6 +6735,10 @@ struct field_modify_info modify_tcp[] = {
 		 ipv6_m->hdr.hop_limits);
 	MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_ttl_hoplimit,
 		 ipv6_v->hdr.hop_limits & ipv6_m->hdr.hop_limits);
+	MLX5_SET(fte_match_set_lyr_2_4, headers_m, frag,
+		 !!(ipv6_m->has_frag_ext));
+	MLX5_SET(fte_match_set_lyr_2_4, headers_v, frag,
+		 !!(ipv6_v->has_frag_ext & ipv6_m->has_frag_ext));
 }
 
 /**

Signature · 1 line

1.8.3.1

Dekel Peled

author

2020-10-15 14:08 UTC #10 lore raw

PATCH v2 4/5 net/mlx5: support match on IPv6 fragment ext. item

In reply to Dekel Peled

rte_flow update, following RFC [1], added to ethdev the rte_flow item ipv6_frag_ext.
This patch adds to MLX5 PMD the option to match on this item type.

[1] http://mails.dpdk.org/archives/dev/2020-March/160255.html

Signed-off-by Dekel Peled <[email protected]>

Acked-by Ori Kam <[email protected]>

---
 drivers/net/mlx5/mlx5_flow.h    |   4 +
 drivers/net/mlx5/mlx5_flow_dv.c | 209 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 213 insertions(+)

drivers/net/mlx5/mlx5_flow.h +4 -0

index b6efbff..ec6aa19 100644
@@ -122,6 +122,10 @@ enum mlx5_feature_name {
 /* Pattern eCPRI Layer bit. */
 #define MLX5_FLOW_LAYER_ECPRI (UINT64_C(1) << 29)
 
+/* IPv6 Fragment Extension Header bit. */
+#define MLX5_FLOW_LAYER_OUTER_L3_IPV6_FRAG_EXT (1u << 30)
+#define MLX5_FLOW_LAYER_INNER_L3_IPV6_FRAG_EXT (1u << 31)
+
 /* Outer Masks. */
 #define MLX5_FLOW_LAYER_OUTER_L3 \
 	(MLX5_FLOW_LAYER_OUTER_L3_IPV4 | MLX5_FLOW_LAYER_OUTER_L3_IPV6)

drivers/net/mlx5/mlx5_flow_dv.c +209 -0

233 lines not on this page · raw message

Signature · 1 line

1.8.3.1

Dekel Peled

author

2020-10-15 14:08 UTC #11 lore raw

PATCH v2 5/5 net/mlx5: enforce limitation on IPv6 next proto

In reply to Dekel Peled

Signed-off-by Dekel Peled <[email protected]>

Acked-by Ori Kam <[email protected]>

---
 doc/guides/nics/mlx5.rst     |  7 +++++++
 drivers/net/mlx5/mlx5_flow.c | 14 ++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

doc/guides/nics/mlx5.rst +7 -0

index a071db2..c2bd737 100644
@@ -317,6 +317,13 @@ Limitations
   - The E-Switch Sample flow must have the eswitch_manager VPORT destination (PF or ECPF) and no additional actions.
   - For ConnectX-5, the ``RTE_FLOW_ACTION_TYPE_SAMPLE`` is typically used as first action in the E-Switch egress flow if with header modify or encapsulation actions.
 
+- IPv6 header item 'proto' field, indicating the next header protocol, should
+  not be set as extension header.
+  In case the next header is an extension header, it should not be specified in
+  IPv6 header item 'proto' field.
+  The last extension header item 'next header' field can specify the following
+  header protocol type.
+
 Statistics
 ----------

drivers/net/mlx5/mlx5_flow.c +12 -2

index 1116ebb..2922cae 100644
@@ -1977,9 +1977,9 @@ struct mlx5_flow_tunnel_info {
 					  RTE_FLOW_ERROR_TYPE_ITEM, item,
 					  "IPv6 cannot follow L2/VLAN layer "
 					  "which ether type is not IPv6");
+	if (mask && spec)
+		next_proto = mask->hdr.proto & spec->hdr.proto;
 	if (item_flags & MLX5_FLOW_LAYER_IPV6_ENCAP) {
-		if (mask && spec)
-			next_proto = mask->hdr.proto & spec->hdr.proto;
 		if (next_proto == IPPROTO_IPIP || next_proto == IPPROTO_IPV6)
 			return rte_flow_error_set(error, EINVAL,
 						  RTE_FLOW_ERROR_TYPE_ITEM,

@@ -1987,6 +1987,16 @@ struct mlx5_flow_tunnel_info {
 						  "multiple tunnel "
 						  "not supported");
 	}
+	if (next_proto == IPPROTO_HOPOPTS  ||
+	    next_proto == IPPROTO_ROUTING  ||
+	    next_proto == IPPROTO_FRAGMENT ||
+	    next_proto == IPPROTO_ESP	   ||
+	    next_proto == IPPROTO_AH	   ||
+	    next_proto == IPPROTO_DSTOPTS)
+		return rte_flow_error_set(error, EINVAL,
+					  RTE_FLOW_ERROR_TYPE_ITEM, item,
+					  "IPv6 proto (next header) should "
+					  "not be set as extension header");
 	if (item_flags & MLX5_FLOW_LAYER_IPIP)
 		return rte_flow_error_set(error, EINVAL,
 					  RTE_FLOW_ERROR_TYPE_ITEM, item,

Signature · 1 line

1.8.3.1

Raslan Darawsheh

2020-10-18 15:14 UTC #12 lore raw

In reply to Dekel Peled

Hi,

Quoted 43 lines

-----Original Message-----
From: dev <[email protected]> On Behalf Of Dekel Peled
Sent: Thursday, October 15, 2020 5:06 PM
To: Matan Azrad <[email protected]>; Shahaf Shuler <[email protected]>; Slava Ovsiienko <[email protected]>
Cc: [email protected]
Subject: [dpdk-dev] [PATCH v2 0/5] net/mlx5: support match on L3 fragmented packets
Patch series [1] adds to ethdev and testpmd the support of matching on fragmented/non-fragmented packets.
Following [1], this patch series adds to MLX5 PMD the support of matching on IPv4 fragmented packets, IPv6 fragmented packets, and IPv6 fragment extension header item.
[1]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fmail
s.dpdk.org%2Farchives%2Fdev%2F2020- October%2F186177.html&data=02%7C01%7Crasland%40nvidia.com%7C f93dfbbfe11f463a132408d87113be17%7C43083d15727340c1b7db39efd9ccc17 a%7C0%7C0%7C637383676888432962&sdata=owqbu4vFkga0jijb87wjtx2 WQ1I2xuhrGLr1NDcISw8%3D&reserved=0
---
v2: rebase on top of latest commits.
---
Dekel Peled (5):
net/mlx5: remove handling of ICMP fragmented packets net/mlx5: support match on IPv4 fragment packets net/mlx5: support match on IPv6 fragment packets net/mlx5: support match on IPv6 fragment ext. item net/mlx5: enforce limitation on IPv6 next proto
 doc/guides/nics/mlx5.rst               |   7 +
 doc/guides/rel_notes/release_20_11.rst |   5 +
 drivers/net/mlx5/mlx5_flow.c           |  62 ++++--
 drivers/net/mlx5/mlx5_flow.h           |  14 ++
 drivers/net/mlx5/mlx5_flow_dv.c        | 382
+++++++++++++++++++++++++++++----
 drivers/net/mlx5/mlx5_flow_verbs.c     |   9 +-
 6 files changed, 420 insertions(+), 59 deletions(-)

Quoted 2 lines

--
1.8.3.1

Series applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh