Skip to contentSkip to conversation

net/mlx5: support match ICMP identifier fields

PATCH Superseded Li Zhang 2 participants 9 messages Sep 23, 2020 – Oct 2, 2020 Network drivers

v1 of 9 Superseded Latest is v9 →

lore
Share & tools
lore

Li Zhang

author
#0 lore raw

PATCH 1/1 net/mlx5: support match ICMP identifier fields

PRM expose fields "Icmp_header_data" in ICMP.
Update ICMP mask parameter with ICMP identifier and sequence number fields. ICMP sequence number spec with mask, Icmp_header_data low 16 bits are set. ICMP identifier spec with mask, Icmp_header_data high 16 bits are set.

---
 drivers/net/mlx5/mlx5_flow.c    |  9 +++++++--
 drivers/net/mlx5/mlx5_flow_dv.c | 16 +++++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)
drivers/net/mlx5/mlx5_flow.c +7 -2
index 4c29898203..e3c765950e 100644
@@ -1310,6 +1310,7 @@ mlx5_flow_validate_item_icmp(const struct rte_flow_item *item,
 			     struct rte_flow_error *error)
 {
 	const struct rte_flow_item_icmp *mask = item->mask;
+	struct rte_flow_item_icmp default_mask;
 	const int tunnel = !!(item_flags & MLX5_FLOW_LAYER_TUNNEL);
 	const uint64_t l3m = tunnel ? MLX5_FLOW_LAYER_INNER_L3_IPV4 :
 				      MLX5_FLOW_LAYER_OUTER_L3_IPV4;
@@ -1331,11 +1332,15 @@ mlx5_flow_validate_item_icmp(const struct rte_flow_item *item,
 		return rte_flow_error_set(error, EINVAL,
 					  RTE_FLOW_ERROR_TYPE_ITEM, item,
 					  "multiple L4 layers not supported");
+	memcpy(&default_mask, &rte_flow_item_icmp_mask,
+	       sizeof(struct rte_flow_item_icmp));
+	default_mask.hdr.icmp_ident = RTE_BE16(0xFFFF);
+	default_mask.hdr.icmp_seq_nb = RTE_BE16(0xFFFF);
 	if (!mask)
-		mask = &rte_flow_item_icmp_mask;
+		mask = &default_mask;
 	ret = mlx5_flow_item_acceptable
 		(item, (const uint8_t *)mask,
-		 (const uint8_t *)&rte_flow_item_icmp_mask,
+		 (const uint8_t *)&default_mask,
 		 sizeof(struct rte_flow_item_icmp), error);
 	if (ret < 0)
 		return ret;
drivers/net/mlx5/mlx5_flow_dv.c +15 -1
index 58358ce366..23400fecdd 100644
@@ -7328,6 +7328,8 @@ flow_dv_translate_item_icmp(void *matcher, void *key,
 {
 	const struct rte_flow_item_icmp *icmp_m = item->mask;
 	const struct rte_flow_item_icmp *icmp_v = item->spec;
+	uint32_t icmp_header_data_m = 0;
+	uint32_t icmp_header_data_v = 0;
 	void *headers_m;
 	void *headers_v;
 	void *misc3_m = MLX5_ADDR_OF(fte_match_param, matcher,
@@ -7346,8 +7348,14 @@ flow_dv_translate_item_icmp(void *matcher, void *key,
 	MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol, IPPROTO_ICMP);
 	if (!icmp_v)
 		return;
-	if (!icmp_m)
+	if (!icmp_m) {
 		icmp_m = &rte_flow_item_icmp_mask;
+		icmp_header_data_m = RTE_BE32(UINT32_MAX);
+	} else {
+		icmp_header_data_m = rte_cpu_to_be_16(icmp_m->hdr.icmp_seq_nb);
+		icmp_header_data_m |=
+			rte_cpu_to_be_16(icmp_m->hdr.icmp_ident) << 16;
+	}
 	/*
 	 * Force flow only to match the non-fragmented IPv4 ICMP packets.
 	 * If only the protocol is specified, no need to match the frag.
@@ -7362,6 +7370,12 @@ flow_dv_translate_item_icmp(void *matcher, void *key,
 		 icmp_m->hdr.icmp_code);
 	MLX5_SET(fte_match_set_misc3, misc3_v, icmp_code,
 		 icmp_v->hdr.icmp_code & icmp_m->hdr.icmp_code);
+	icmp_header_data_v = rte_cpu_to_be_16(icmp_v->hdr.icmp_seq_nb);
+	icmp_header_data_v |= rte_cpu_to_be_16(icmp_v->hdr.icmp_ident) << 16;
+	MLX5_SET(fte_match_set_misc3, misc3_m, icmp_header_data,
+		 icmp_header_data_m);
+	MLX5_SET(fte_match_set_misc3, misc3_v, icmp_header_data,
+		 icmp_header_data_v & icmp_header_data_m);
 }
 
 /**
Signature · 1 line
2.21.0
author
#1 lore raw

PATCH v2 1/1 net/mlx5: support match ICMP identifier fields

PRM expose fields "Icmp_header_data" in ICMP.
Update ICMP mask parameter with ICMP identifier and sequence number fields. ICMP sequence number spec with mask, Icmp_header_data low 16 bits are set. ICMP identifier spec with mask, Icmp_header_data high 16 bits are set.

---
 doc/guides/nics/mlx5.rst               |  4 ++--
 doc/guides/rel_notes/release_20_11.rst |  2 +-
 drivers/net/mlx5/mlx5_flow.c           |  9 +++++++--
 drivers/net/mlx5/mlx5_flow_dv.c        | 16 +++++++++++++++-
 4 files changed, 25 insertions(+), 6 deletions(-)
doc/guides/nics/mlx5.rst +2 -2
index 211c0c5a6c..576dbe5efd 100644
@@ -288,7 +288,7 @@ Limitations
   - The input buffer, providing the removal size, is not validated.
   - The buffer size must match the length of the headers to be removed.
 
-- ICMP/ICMP6 code/type matching, IP-in-IP and MPLS flow matching are all
+- ICMP(code/type/identifier/sequence number) / ICMP6(code/type) matching, IP-in-IP and MPLS flow matching are all
   mutually exclusive features which cannot be supported together
   (see :ref:`mlx5_firmware_config`).
 
@@ -1009,7 +1009,7 @@ Below are some firmware configurations listed.
 
     FLEX_PARSER_PROFILE_ENABLE=1
 
-- enable ICMP/ICMP6 code/type fields matching::
+- enable ICMP(code/type/identifier/sequence number) / ICMP6(code/type) fields matching::
 
     FLEX_PARSER_PROFILE_ENABLE=2
 
doc/guides/rel_notes/release_20_11.rst +1 -1
index c6642f5f94..791f133d8f 100644
@@ -73,7 +73,7 @@ New Features
   * Added flag action.
   * Added raw encap/decap actions.
   * Added VXLAN encap/decap actions.
-  * Added ICMP and ICMP6 matching items.
+  * Added ICMP(code/type/identifier/sequence number) and ICMP6(code/type) matching items.
   * Added option to set port mask for insertion/deletion:
     ``--portmask=N``
     where N represents the hexadecimal bitmask of ports used.
drivers/net/mlx5/mlx5_flow.c +7 -2
index 416505f1c8..7bd5c5da94 100644
@@ -1303,6 +1303,7 @@ mlx5_flow_validate_item_icmp(const struct rte_flow_item *item,
 			     struct rte_flow_error *error)
 {
 	const struct rte_flow_item_icmp *mask = item->mask;
+	struct rte_flow_item_icmp default_mask;
 	const int tunnel = !!(item_flags & MLX5_FLOW_LAYER_TUNNEL);
 	const uint64_t l3m = tunnel ? MLX5_FLOW_LAYER_INNER_L3_IPV4 :
 				      MLX5_FLOW_LAYER_OUTER_L3_IPV4;
@@ -1324,11 +1325,15 @@ mlx5_flow_validate_item_icmp(const struct rte_flow_item *item,
 		return rte_flow_error_set(error, EINVAL,
 					  RTE_FLOW_ERROR_TYPE_ITEM, item,
 					  "multiple L4 layers not supported");
+	memcpy(&default_mask, &rte_flow_item_icmp_mask,
+	       sizeof(struct rte_flow_item_icmp));
+	default_mask.hdr.icmp_ident = RTE_BE16(0xFFFF);
+	default_mask.hdr.icmp_seq_nb = RTE_BE16(0xFFFF);
 	if (!mask)
-		mask = &rte_flow_item_icmp_mask;
+		mask = &default_mask;
 	ret = mlx5_flow_item_acceptable
 		(item, (const uint8_t *)mask,
-		 (const uint8_t *)&rte_flow_item_icmp_mask,
+		 (const uint8_t *)&default_mask,
 		 sizeof(struct rte_flow_item_icmp), error);
 	if (ret < 0)
 		return ret;
drivers/net/mlx5/mlx5_flow_dv.c +15 -1
index 3819cdb266..b5d6455067 100644
@@ -7378,6 +7378,8 @@ flow_dv_translate_item_icmp(void *matcher, void *key,
 {
 	const struct rte_flow_item_icmp *icmp_m = item->mask;
 	const struct rte_flow_item_icmp *icmp_v = item->spec;
+	uint32_t icmp_header_data_m = 0;
+	uint32_t icmp_header_data_v = 0;
 	void *headers_m;
 	void *headers_v;
 	void *misc3_m = MLX5_ADDR_OF(fte_match_param, matcher,
@@ -7396,8 +7398,14 @@ flow_dv_translate_item_icmp(void *matcher, void *key,
 	MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol, IPPROTO_ICMP);
 	if (!icmp_v)
 		return;
-	if (!icmp_m)
+	if (!icmp_m) {
 		icmp_m = &rte_flow_item_icmp_mask;
+		icmp_header_data_m = RTE_BE32(UINT32_MAX);
+	} else {
+		icmp_header_data_m = rte_cpu_to_be_16(icmp_m->hdr.icmp_seq_nb);
+		icmp_header_data_m |=
+			rte_cpu_to_be_16(icmp_m->hdr.icmp_ident) << 16;
+	}
 	/*
 	 * Force flow only to match the non-fragmented IPv4 ICMP packets.
 	 * If only the protocol is specified, no need to match the frag.
@@ -7412,6 +7420,12 @@ flow_dv_translate_item_icmp(void *matcher, void *key,
 		 icmp_m->hdr.icmp_code);
 	MLX5_SET(fte_match_set_misc3, misc3_v, icmp_code,
 		 icmp_v->hdr.icmp_code & icmp_m->hdr.icmp_code);
+	icmp_header_data_v = rte_cpu_to_be_16(icmp_v->hdr.icmp_seq_nb);
+	icmp_header_data_v |= rte_cpu_to_be_16(icmp_v->hdr.icmp_ident) << 16;
+	MLX5_SET(fte_match_set_misc3, misc3_m, icmp_header_data,
+		 icmp_header_data_m);
+	MLX5_SET(fte_match_set_misc3, misc3_v, icmp_header_data,
+		 icmp_header_data_v & icmp_header_data_m);
 }
 
 /**
Signature · 1 line
2.21.0
#2 lore raw

Hi Li,

PSB,

Thanks,
Ori

Quoted 11 lines

-----Original Message-----
From: Li Zhang <[email protected]>
Sent: Monday, September 28, 2020 6:38 AM
Subject: [PATCH v2 1/1] net/mlx5: support match ICMP identifier fields

PRM expose fields "Icmp_header_data" in ICMP.
Update ICMP mask parameter with ICMP identifier and sequence number fields.
ICMP sequence number spec with mask, Icmp_header_data low 16 bits are set. ICMP identifier spec with mask, Icmp_header_data high 16 bits are set.

Is it relevant only for ipv4 ICMP?

Quoted 52 lines
---
 doc/guides/nics/mlx5.rst               |  4 ++--
 doc/guides/rel_notes/release_20_11.rst |  2 +-
 drivers/net/mlx5/mlx5_flow.c           |  9 +++++++--
 drivers/net/mlx5/mlx5_flow_dv.c        | 16 +++++++++++++++-
 4 files changed, 25 insertions(+), 6 deletions(-)
doc/guides/nics/mlx5.rst +1 -1
index 211c0c5a6c..576dbe5efd 100644
@@ -288,7 +288,7 @@ Limitations
   - The input buffer, providing the removal size, is not validated.
   - The buffer size must match the length of the headers to be removed.
 
-- ICMP/ICMP6 code/type matching, IP-in-IP and MPLS flow matching are all
+- ICMP(code/type/identifier/sequence number) / ICMP6(code/type) matching,

IP-in-IP and MPLS flow matching are all
mutually exclusive features which cannot be supported together (see :ref:mlx5_firmware_config).

doc/guides/nics/mlx5.rst +1 -1
@@ -1009,7 +1009,7 @@ Below are some firmware configurations listed.
 
     FLEX_PARSER_PROFILE_ENABLE=1
 
-- enable ICMP/ICMP6 code/type fields matching::
+- enable ICMP(code/type/identifier/sequence number) / ICMP6(code/type)

fields matching::

FLEX_PARSER_PROFILE_ENABLE=2

doc/guides/rel_notes/release_20_11.rst +1 -1
index c6642f5f94..791f133d8f 100644
@@ -73,7 +73,7 @@ New Features
   * Added flag action.
   * Added raw encap/decap actions.
   * Added VXLAN encap/decap actions.
-  * Added ICMP and ICMP6 matching items.
+  * Added ICMP(code/type/identifier/sequence number) and

ICMP6(code/type) matching items.
* Added option to set port mask for insertion/deletion:
``--portmask=N``
where N represents the hexadecimal bitmask of ports used.

drivers/net/mlx5/mlx5_flow.c +0 -0
index 416505f1c8..7bd5c5da94 100644

drivers/net/mlx5/mlx5_flow.c mlx5_flow_validate_item_icmp(const struct · line 1304

Quoted 2 lines
drivers/net/mlx5/mlx5_flow.c +0 -0
@@ -1303,6 +1303,7 @@ mlx5_flow_validate_item_icmp(const struct
 rte_flow_item *item,
 			     struct rte_flow_error *error)

This function is shared between the dv and the verbs.
I think we can support this only in dv, so we need to split this function.

drivers/net/mlx5/mlx5_flow.c mlx5_flow_validate_item_icmp(const struct rte_flow_item *item, · line 1306

Quoted 3 lines
drivers/net/mlx5/mlx5_flow.c +1 -0
 {
 	const struct rte_flow_item_icmp *mask = item->mask;
+	struct rte_flow_item_icmp default_mask;

I think the correct name is nic_mask.

drivers/net/mlx5/mlx5_flow.c mlx5_flow_validate_item_icmp(const struct · line 1333

Quoted 13 lines
drivers/net/mlx5/mlx5_flow.c +0 -0
 	const int tunnel = !!(item_flags & MLX5_FLOW_LAYER_TUNNEL);
 	const uint64_t l3m = tunnel ? MLX5_FLOW_LAYER_INNER_L3_IPV4 :
drivers/net/mlx5/mlx5_flow.c +4 -0
 				      MLX5_FLOW_LAYER_OUTER_L3_IPV4;
@@ -1324,11 +1325,15 @@ mlx5_flow_validate_item_icmp(const struct
 rte_flow_item *item,
 		return rte_flow_error_set(error, EINVAL,
 					  RTE_FLOW_ERROR_TYPE_ITEM,
 item,
 					  "multiple L4 layers not supported");
+	memcpy(&default_mask, &rte_flow_item_icmp_mask,
+	       sizeof(struct rte_flow_item_icmp));
+	default_mask.hdr.icmp_ident = RTE_BE16(0xFFFF);
+	default_mask.hdr.icmp_seq_nb = RTE_BE16(0xFFFF);

You don't need to mem copy just init this structure when you declare it.

Quoted 26 lines
drivers/net/mlx5/mlx5_flow.c +2 -2
 	if (!mask)
-		mask = &rte_flow_item_icmp_mask;
+		mask = &default_mask;
 	ret = mlx5_flow_item_acceptable
 		(item, (const uint8_t *)mask,
-		 (const uint8_t *)&rte_flow_item_icmp_mask,
+		 (const uint8_t *)&default_mask,
 		 sizeof(struct rte_flow_item_icmp), error);
drivers/net/mlx5/mlx5_flow.c +0 -0
 	if (ret < 0)
 		return ret;
drivers/net/mlx5/mlx5_flow_dv.c +2 -0
index 3819cdb266..b5d6455067 100644
@@ -7378,6 +7378,8 @@ flow_dv_translate_item_icmp(void *matcher, void
 *key,
 {
 	const struct rte_flow_item_icmp *icmp_m = item->mask;
 	const struct rte_flow_item_icmp *icmp_v = item->spec;
+	uint32_t icmp_header_data_m = 0;
+	uint32_t icmp_header_data_v = 0;
 	void *headers_m;
 	void *headers_v;
drivers/net/mlx5/mlx5_flow_dv.c +0 -0
 	void *misc3_m = MLX5_ADDR_OF(fte_match_param, matcher,

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, void · line 7405

Quoted 9 lines
drivers/net/mlx5/mlx5_flow_dv.c +2 -1
@@ -7396,8 +7398,14 @@ flow_dv_translate_item_icmp(void *matcher, void
 *key,
 	MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol,
 IPPROTO_ICMP);
 	if (!icmp_v)
 		return;
-	if (!icmp_m)
+	if (!icmp_m) {
 		icmp_m = &rte_flow_item_icmp_mask;
+		icmp_header_data_m = RTE_BE32(UINT32_MAX);

Why are you setting the data as default mask?

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, void · line 7408

Quoted 3 lines
drivers/net/mlx5/mlx5_flow_dv.c +2 -0
+	} else {
+		icmp_header_data_m = rte_cpu_to_be_16(icmp_m-
 >hdr.icmp_seq_nb);

Isn't the icmp_seq_nb already in BE?

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, void *key, · line 7407

Quoted 2 lines
drivers/net/mlx5/mlx5_flow_dv.c +2 -0
+		icmp_header_data_m |=
+			rte_cpu_to_be_16(icmp_m->hdr.icmp_ident) << 16;

Again the icmp_ident is already in BE

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, void · line 7426

Quoted 12 lines
drivers/net/mlx5/mlx5_flow_dv.c +1 -0
+	}
drivers/net/mlx5/mlx5_flow_dv.c +2 -0
 	/*
 	 * Force flow only to match the non-fragmented IPv4 ICMP packets.
 	 * If only the protocol is specified, no need to match the frag.
@@ -7412,6 +7420,12 @@ flow_dv_translate_item_icmp(void *matcher, void
 *key,
 		 icmp_m->hdr.icmp_code);
 	MLX5_SET(fte_match_set_misc3, misc3_v, icmp_code,
 		 icmp_v->hdr.icmp_code & icmp_m->hdr.icmp_code);
+	icmp_header_data_v = rte_cpu_to_be_16(icmp_v->hdr.icmp_seq_nb);
+	icmp_header_data_v |= rte_cpu_to_be_16(icmp_v->hdr.icmp_ident)
 << 16;

The BE issue again,

Quoted 9 lines
drivers/net/mlx5/mlx5_flow_dv.c +4 -0
+	MLX5_SET(fte_match_set_misc3, misc3_m, icmp_header_data,
+		 icmp_header_data_m);
+	MLX5_SET(fte_match_set_misc3, misc3_v, icmp_header_data,
+		 icmp_header_data_v & icmp_header_data_m);
 }

/**
--
2.21.0

author
#3 lore raw

Hi Ori,

Thanks for your comments, please take a look my reply inline.

Regards,
Li Zhang

Quoted 21 lines

-----Original Message-----
From: Ori Kam <[email protected]>
Sent: Wednesday, September 30, 2020 10:46 PM
To: Li Zhang <[email protected]>; Dekel Peled <[email protected]>; Slava Ovsiienko <[email protected]>; Matan Azrad <[email protected]>
Cc: [email protected]; NBU-Contact-Thomas Monjalon <[email protected]>; Raslan Darawsheh <[email protected]>
Subject: RE: [PATCH v2 1/1] net/mlx5: support match ICMP identifier fields

Hi Li,

PSB,

Thanks,
Ori

Quoted 5 lines

-----Original Message-----
From: Li Zhang <[email protected]>
Sent: Monday, September 28, 2020 6:38 AM
Subject: [PATCH v2 1/1] net/mlx5: support match ICMP identifier fields

Quoted 8 lines
Quoted 4 lines

PRM expose fields "Icmp_header_data" in ICMP.
Update ICMP mask parameter with ICMP identifier and sequence number fields.
ICMP sequence number spec with mask, Icmp_header_data low 16 bits are

set.

Quoted 2 lines

ICMP identifier spec with mask, Icmp_header_data high 16 bits are set.

Is it relevant only for ipv4 ICMP?

Yes it is only for ipv4 ICMP. For Ipv6 ICMP, it is icmpv6_header_data.

Quoted 53 lines
Quoted 53 lines
---
 doc/guides/nics/mlx5.rst               |  4 ++--
 doc/guides/rel_notes/release_20_11.rst |  2 +-
 drivers/net/mlx5/mlx5_flow.c           |  9 +++++++--
 drivers/net/mlx5/mlx5_flow_dv.c        | 16 +++++++++++++++-
 4 files changed, 25 insertions(+), 6 deletions(-)
doc/guides/nics/mlx5.rst index renamed from doc/guides/nics/mlx5.rst +0 -0

211c0c5a6c..576dbe5efd 100644

doc/guides/nics/mlx5.rst +0 -1
@@ -288,7 +288,7 @@ Limitations
   - The input buffer, providing the removal size, is not validated.
   - The buffer size must match the length of the headers to be removed.
 
-- ICMP/ICMP6 code/type matching, IP-in-IP and MPLS flow matching are

all
+- ICMP(code/type/identifier/sequence number) / ICMP6(code/type) +matching,
IP-in-IP and MPLS flow matching are all
mutually exclusive features which cannot be supported together (see :ref:mlx5_firmware_config).

doc/guides/nics/mlx5.rst +2 -1
@@ -1009,7 +1009,7 @@ Below are some firmware configurations listed.
 
     FLEX_PARSER_PROFILE_ENABLE=1
 
-- enable ICMP/ICMP6 code/type fields matching::
+- enable ICMP(code/type/identifier/sequence number) /
+ICMP6(code/type)

fields matching::

FLEX_PARSER_PROFILE_ENABLE=2

doc/guides/rel_notes/release_20_11.rst +1 -1
index c6642f5f94..791f133d8f 100644
@@ -73,7 +73,7 @@ New Features
   * Added flag action.
   * Added raw encap/decap actions.
   * Added VXLAN encap/decap actions.
-  * Added ICMP and ICMP6 matching items.
+  * Added ICMP(code/type/identifier/sequence number) and

ICMP6(code/type) matching items.
* Added option to set port mask for insertion/deletion:
``--portmask=N``
where N represents the hexadecimal bitmask of ports used.

(quoted diff) +0 -0

b/drivers/net/mlx5/mlx5_flow.c index 416505f1c8..7bd5c5da94 100644

Quoted 8 lines

drivers/net/mlx5/mlx5_flow.c mlx5_flow_validate_item_icmp(const struct · line 1304

Quoted 5 lines
drivers/net/mlx5/mlx5_flow.c +0 -0
@@ -1303,6 +1303,7 @@ mlx5_flow_validate_item_icmp(const struct
 rte_flow_item *item,
 			     struct rte_flow_error *error)

This function is shared between the dv and the verbs.
I think we can support this only in dv, so we need to split this function.

Thanks, I will split this function in v3 patch.

Quoted 6 lines

drivers/net/mlx5/mlx5_flow.c mlx5_flow_validate_item_icmp(const struct rte_flow_item *item, · line 1306

Quoted 4 lines
drivers/net/mlx5/mlx5_flow.c +1 -0
 {
 	const struct rte_flow_item_icmp *mask = item->mask;
+	struct rte_flow_item_icmp default_mask;

I think the correct name is nic_mask.

Thanks, I will change in v3 patch.

Quoted 15 lines
Quoted 4 lines
drivers/net/mlx5/mlx5_flow.c +0 -0
 	const int tunnel = !!(item_flags & MLX5_FLOW_LAYER_TUNNEL);
 	const uint64_t l3m = tunnel ? MLX5_FLOW_LAYER_INNER_L3_IPV4 :

MLX5_FLOW_LAYER_OUTER_L3_IPV4;

(quoted diff) +0 -0
@@ -1324,11 +1325,15 @@
 > mlx5_flow_validate_item_icmp(const struct rte_flow_item *item,
 >  		return rte_flow_error_set(error, EINVAL,
 >  					  RTE_FLOW_ERROR_TYPE_ITEM,
 > item,
 >  					  "multiple L4 layers not supported");
 > +	memcpy(&default_mask, &rte_flow_item_icmp_mask,
 > +	       sizeof(struct rte_flow_item_icmp));
 > +	default_mask.hdr.icmp_ident = RTE_BE16(0xFFFF);
 > +	default_mask.hdr.icmp_seq_nb = RTE_BE16(0xFFFF);
 
Quoted 1 line

You don't need to mem copy just init this structure when you declare it.

Thanks, I will change in v3 patch.

Quoted 27 lines
Quoted 12 lines
drivers/net/mlx5/mlx5_flow.c +2 -2
 	if (!mask)
-		mask = &rte_flow_item_icmp_mask;
+		mask = &default_mask;
 	ret = mlx5_flow_item_acceptable
 		(item, (const uint8_t *)mask,
-		 (const uint8_t *)&rte_flow_item_icmp_mask,
+		 (const uint8_t *)&default_mask,
 		 sizeof(struct rte_flow_item_icmp), error);
 	if (ret < 0)
 		return ret;
(quoted diff) +0 -0
Quoted 1 line

b/drivers/net/mlx5/mlx5_flow_dv.c index 3819cdb266..b5d6455067

100644

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher,

Quoted 3 lines
drivers/net/mlx5/mlx5_flow_dv.c +0 -0
@@ -7378,6 +7378,8 @@ flow_dv_translate_item_icmp(void *matcher,

void

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, void *key,

Quoted 8 lines
drivers/net/mlx5/mlx5_flow_dv.c +2 -0
 *key,  {
 	const struct rte_flow_item_icmp *icmp_m = item->mask;
 	const struct rte_flow_item_icmp *icmp_v = item->spec;
+	uint32_t icmp_header_data_m = 0;
+	uint32_t icmp_header_data_v = 0;
 	void *headers_m;
 	void *headers_v;
 	void *misc3_m = MLX5_ADDR_OF(fte_match_param, matcher, @@ -

7396,8

Quoted 12 lines

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, void *key, · line 7403

Quoted 9 lines

+7398,14 @@ flow_dv_translate_item_icmp(void *matcher, void *key,
MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol,
IPPROTO_ICMP);

drivers/net/mlx5/mlx5_flow_dv.c +2 -1
 	if (!icmp_v)
 		return;
-	if (!icmp_m)
+	if (!icmp_m) {
 		icmp_m = &rte_flow_item_icmp_mask;
+		icmp_header_data_m = RTE_BE32(UINT32_MAX);

Why are you setting the data as default mask?

Because icmp_code and icmp_type still need the default mask. We do not need to change the old one.
We just add the new one for our new match fields.

Quoted 5 lines
Quoted 3 lines
drivers/net/mlx5/mlx5_flow_dv.c +2 -0
+	} else {
+		icmp_header_data_m = rte_cpu_to_be_16(icmp_m-
Quoted 1 line

hdr.icmp_seq_nb);

Isn't the icmp_seq_nb already in BE?

No, it is not BE and need use rte_cpu_to_be_16

Quoted 6 lines

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, void *key, · line 7407

Quoted 3 lines
drivers/net/mlx5/mlx5_flow_dv.c +2 -0
+		icmp_header_data_m |=
+			rte_cpu_to_be_16(icmp_m->hdr.icmp_ident) << 16;

Again the icmp_ident is already in BE

It is not BE and need use rte_cpu_to_be_16

Quoted 6 lines

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher,

Quoted 5 lines
drivers/net/mlx5/mlx5_flow_dv.c +1 -0
+	}
 	/*
 	 * Force flow only to match the non-fragmented IPv4 ICMP packets.
 	 * If only the protocol is specified, no need to match the frag.
@@ -7412,6 +7420,12 @@ flow_dv_translate_item_icmp(void *matcher,

void

Quoted 10 lines

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, · line 7427

Quoted 8 lines
drivers/net/mlx5/mlx5_flow_dv.c +2 -0
 *key,
 		 icmp_m->hdr.icmp_code);
 	MLX5_SET(fte_match_set_misc3, misc3_v, icmp_code,
 		 icmp_v->hdr.icmp_code & icmp_m->hdr.icmp_code);
+	icmp_header_data_v = rte_cpu_to_be_16(icmp_v-
 hdr.icmp_seq_nb);
+	icmp_header_data_v |= rte_cpu_to_be_16(icmp_v->hdr.icmp_ident)
 << 16;

The BE issue again,

It is not BE and need use rte_cpu_to_be_16

Quoted 9 lines
Quoted 9 lines
drivers/net/mlx5/mlx5_flow_dv.c +4 -0
+	MLX5_SET(fte_match_set_misc3, misc3_m, icmp_header_data,
+		 icmp_header_data_m);
+	MLX5_SET(fte_match_set_misc3, misc3_v, icmp_header_data,
+		 icmp_header_data_v & icmp_header_data_m);

}

/**
--
2.21.0

author
#4 lore raw

Hi Ori,

Update my reply about split mlx5_flow_validate_item_icmp function inline

Regards,
Li Zhang

Quoted 111 lines

-----Original Message-----
From: Li Zhang
Sent: Wednesday, September 30, 2020 11:20 PM
To: Ori Kam <[email protected]>; Dekel Peled <[email protected]>; Slava Ovsiienko <[email protected]>; Matan Azrad <[email protected]>
Cc: [email protected]; NBU-Contact-Thomas Monjalon <[email protected]>; Raslan Darawsheh <[email protected]>
Subject: RE: [PATCH v2 1/1] net/mlx5: support match ICMP identifier fields

Hi Ori,

Thanks for your comments, please take a look my reply inline.

Regards,
Li Zhang

Quoted 6 lines

-----Original Message-----
From: Ori Kam <[email protected]>
Sent: Wednesday, September 30, 2020 10:46 PM
To: Li Zhang <[email protected]>; Dekel Peled <[email protected]>; Slava Ovsiienko <[email protected]>; Matan Azrad <[email protected]>
Cc: [email protected]; NBU-Contact-Thomas Monjalon

<[email protected]>;

Quoted 4 lines

Raslan Darawsheh <[email protected]>
Subject: RE: [PATCH v2 1/1] net/mlx5: support match ICMP identifier fields

Quoted 15 lines

Hi Li,

PSB,

Thanks,
Ori

Quoted 8 lines

-----Original Message-----
From: Li Zhang <[email protected]>
Sent: Monday, September 28, 2020 6:38 AM
Subject: [PATCH v2 1/1] net/mlx5: support match ICMP identifier fields

PRM expose fields "Icmp_header_data" in ICMP. Update ICMP mask parameter with ICMP identifier and sequence

number

Quoted 7 lines
Quoted 3 lines

fields.
ICMP sequence number spec with mask, Icmp_header_data low 16 bits are

set.

Quoted 2 lines

ICMP identifier spec with mask, Icmp_header_data high 16 bits are set.

Is it relevant only for ipv4 ICMP?

Yes it is only for ipv4 ICMP. For Ipv6 ICMP, it is icmpv6_header_data.

Quoted 53 lines
Quoted 53 lines
---
 doc/guides/nics/mlx5.rst               |  4 ++--
 doc/guides/rel_notes/release_20_11.rst |  2 +-
 drivers/net/mlx5/mlx5_flow.c           |  9 +++++++--
 drivers/net/mlx5/mlx5_flow_dv.c        | 16 +++++++++++++++-
 4 files changed, 25 insertions(+), 6 deletions(-)
doc/guides/nics/mlx5.rst +0 -1
index 211c0c5a6c..576dbe5efd 100644
@@ -288,7 +288,7 @@ Limitations
   - The input buffer, providing the removal size, is not validated.
   - The buffer size must match the length of the headers to be removed.
 
-- ICMP/ICMP6 code/type matching, IP-in-IP and MPLS flow matching

are all
+- ICMP(code/type/identifier/sequence number) / ICMP6(code/type) +matching,
IP-in-IP and MPLS flow matching are all
mutually exclusive features which cannot be supported together (see :ref:mlx5_firmware_config).

doc/guides/nics/mlx5.rst +2 -1
@@ -1009,7 +1009,7 @@ Below are some firmware configurations listed.
 
     FLEX_PARSER_PROFILE_ENABLE=1
 
-- enable ICMP/ICMP6 code/type fields matching::
+- enable ICMP(code/type/identifier/sequence number) /
+ICMP6(code/type)

fields matching::

FLEX_PARSER_PROFILE_ENABLE=2

doc/guides/rel_notes/release_20_11.rst +1 -1
index c6642f5f94..791f133d8f 100644
@@ -73,7 +73,7 @@ New Features
   * Added flag action.
   * Added raw encap/decap actions.
   * Added VXLAN encap/decap actions.
-  * Added ICMP and ICMP6 matching items.
+  * Added ICMP(code/type/identifier/sequence number) and

ICMP6(code/type) matching items.
* Added option to set port mask for insertion/deletion:
``--portmask=N``
where N represents the hexadecimal bitmask of ports used.

(quoted diff) +0 -0

b/drivers/net/mlx5/mlx5_flow.c index 416505f1c8..7bd5c5da94 100644

Quoted 8 lines

drivers/net/mlx5/mlx5_flow.c mlx5_flow_validate_item_icmp(const struct · line 1304

Quoted 5 lines
drivers/net/mlx5/mlx5_flow.c +0 -0
@@ -1303,6 +1303,7 @@ mlx5_flow_validate_item_icmp(const struct
 rte_flow_item *item,
 			     struct rte_flow_error *error)

This function is shared between the dv and the verbs.
I think we can support this only in dv, so we need to split this function.

Quoted 1 line

Thanks, I will split this function in v3 patch.

The mlx5_flow_validate_item_icmp is only called by dv now, also it does not need split it since verbs not use it.

Quoted 106 lines
Quoted 6 lines

drivers/net/mlx5/mlx5_flow.c mlx5_flow_validate_item_icmp(const struct rte_flow_item *item, · line 1306

Quoted 4 lines
drivers/net/mlx5/mlx5_flow.c +1 -0
 {
 	const struct rte_flow_item_icmp *mask = item->mask;
+	struct rte_flow_item_icmp default_mask;

I think the correct name is nic_mask.

Thanks, I will change in v3 patch.

Quoted 15 lines
Quoted 4 lines
drivers/net/mlx5/mlx5_flow.c +0 -0
 	const int tunnel = !!(item_flags & MLX5_FLOW_LAYER_TUNNEL);
 	const uint64_t l3m = tunnel ? MLX5_FLOW_LAYER_INNER_L3_IPV4 :

MLX5_FLOW_LAYER_OUTER_L3_IPV4;

(quoted diff) +0 -0
@@ -1324,11 +1325,15 @@
 > mlx5_flow_validate_item_icmp(const struct rte_flow_item *item,
 >  		return rte_flow_error_set(error, EINVAL,
 >  					  RTE_FLOW_ERROR_TYPE_ITEM,
 > item,
 >  					  "multiple L4 layers not supported");
 > +	memcpy(&default_mask, &rte_flow_item_icmp_mask,
 > +	       sizeof(struct rte_flow_item_icmp));
 > +	default_mask.hdr.icmp_ident = RTE_BE16(0xFFFF);
 > +	default_mask.hdr.icmp_seq_nb = RTE_BE16(0xFFFF);
 
Quoted 1 line

You don't need to mem copy just init this structure when you declare it.

Thanks, I will change in v3 patch.

Quoted 27 lines
Quoted 12 lines
drivers/net/mlx5/mlx5_flow.c +2 -2
 	if (!mask)
-		mask = &rte_flow_item_icmp_mask;
+		mask = &default_mask;
 	ret = mlx5_flow_item_acceptable
 		(item, (const uint8_t *)mask,
-		 (const uint8_t *)&rte_flow_item_icmp_mask,
+		 (const uint8_t *)&default_mask,
 		 sizeof(struct rte_flow_item_icmp), error);
 	if (ret < 0)
 		return ret;
(quoted diff) +0 -0
Quoted 1 line

b/drivers/net/mlx5/mlx5_flow_dv.c index 3819cdb266..b5d6455067

100644

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher,

Quoted 3 lines
drivers/net/mlx5/mlx5_flow_dv.c +0 -0
@@ -7378,6 +7378,8 @@ flow_dv_translate_item_icmp(void *matcher,

void

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, void *key,

Quoted 8 lines
drivers/net/mlx5/mlx5_flow_dv.c +2 -0
 *key,  {
 	const struct rte_flow_item_icmp *icmp_m = item->mask;
 	const struct rte_flow_item_icmp *icmp_v = item->spec;
+	uint32_t icmp_header_data_m = 0;
+	uint32_t icmp_header_data_v = 0;
 	void *headers_m;
 	void *headers_v;
 	void *misc3_m = MLX5_ADDR_OF(fte_match_param, matcher, @@ -

7396,8

Quoted 12 lines

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, void *key, · line 7403

Quoted 9 lines

+7398,14 @@ flow_dv_translate_item_icmp(void *matcher, void *key,
MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol,
IPPROTO_ICMP);

drivers/net/mlx5/mlx5_flow_dv.c +2 -1
 	if (!icmp_v)
 		return;
-	if (!icmp_m)
+	if (!icmp_m) {
 		icmp_m = &rte_flow_item_icmp_mask;
+		icmp_header_data_m = RTE_BE32(UINT32_MAX);

Why are you setting the data as default mask?

Because icmp_code and icmp_type still need the default mask. We do not need to change the old one.
We just add the new one for our new match fields.

Quoted 5 lines
Quoted 3 lines
drivers/net/mlx5/mlx5_flow_dv.c +2 -0
+	} else {
+		icmp_header_data_m = rte_cpu_to_be_16(icmp_m-
Quoted 1 line

hdr.icmp_seq_nb);

Isn't the icmp_seq_nb already in BE?

No, it is not BE and need use rte_cpu_to_be_16

Quoted 6 lines

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, void *key, · line 7407

Quoted 3 lines
drivers/net/mlx5/mlx5_flow_dv.c +2 -0
+		icmp_header_data_m |=
+			rte_cpu_to_be_16(icmp_m->hdr.icmp_ident) << 16;

Again the icmp_ident is already in BE

It is not BE and need use rte_cpu_to_be_16

Quoted 14 lines

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher,

Quoted 5 lines
drivers/net/mlx5/mlx5_flow_dv.c +1 -0
+	}
 	/*
 	 * Force flow only to match the non-fragmented IPv4 ICMP packets.
 	 * If only the protocol is specified, no need to match the frag.
@@ -7412,6 +7420,12 @@ flow_dv_translate_item_icmp(void *matcher,

void

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, · line 7426

Quoted 7 lines
drivers/net/mlx5/mlx5_flow_dv.c +2 -0
 *key,
 		 icmp_m->hdr.icmp_code);
 	MLX5_SET(fte_match_set_misc3, misc3_v, icmp_code,
 		 icmp_v->hdr.icmp_code & icmp_m->hdr.icmp_code);
+	icmp_header_data_v = rte_cpu_to_be_16(icmp_v-
 hdr.icmp_seq_nb);
+	icmp_header_data_v |= rte_cpu_to_be_16(icmp_v-

hdr.icmp_ident)

Quoted 3 lines

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, · line 7427

Quoted 1 line
drivers/net/mlx5/mlx5_flow_dv.c +0 -0
 << 16;

The BE issue again,

It is not BE and need use rte_cpu_to_be_16

Quoted 9 lines
Quoted 9 lines
drivers/net/mlx5/mlx5_flow_dv.c +4 -0
+	MLX5_SET(fte_match_set_misc3, misc3_m, icmp_header_data,
+		 icmp_header_data_m);
+	MLX5_SET(fte_match_set_misc3, misc3_v, icmp_header_data,
+		 icmp_header_data_v & icmp_header_data_m);

}

/**
--
2.21.0

#5 lore raw

Hi,
PSB I also addressed other response in this mail to avoid threading of this mail.

Best,
Ori

Quoted 5 lines

-----Original Message-----
From: Li Zhang <[email protected]>
Sent: Wednesday, September 30, 2020 6:42 PM
Subject: RE: [PATCH v2 1/1] net/mlx5: support match ICMP identifier fields

Quoted 52 lines

Hi Ori,

Update my reply about split mlx5_flow_validate_item_icmp function inline

Regards,
Li Zhang

Quoted 46 lines

-----Original Message-----
From: Li Zhang
Sent: Wednesday, September 30, 2020 11:20 PM
Subject: RE: [PATCH v2 1/1] net/mlx5: support match ICMP identifier fields

Hi Ori,

Thanks for your comments, please take a look my reply inline.

Regards,
Li Zhang

Quoted 6 lines

-----Original Message-----
From: Ori Kam <[email protected]>
Sent: Wednesday, September 30, 2020 10:46 PM
To: Li Zhang <[email protected]>; Dekel Peled <[email protected]>; Slava Ovsiienko <[email protected]>; Matan Azrad <[email protected]>
Cc: [email protected]; NBU-Contact-Thomas Monjalon

<[email protected]>;

Quoted 4 lines

Raslan Darawsheh <[email protected]>
Subject: RE: [PATCH v2 1/1] net/mlx5: support match ICMP identifier fields

Quoted 15 lines

Hi Li,

PSB,

Thanks,
Ori

Quoted 8 lines

-----Original Message-----
From: Li Zhang <[email protected]>
Sent: Monday, September 28, 2020 6:38 AM
Subject: [PATCH v2 1/1] net/mlx5: support match ICMP identifier fields

PRM expose fields "Icmp_header_data" in ICMP. Update ICMP mask parameter with ICMP identifier and sequence

number

Quoted 7 lines
Quoted 3 lines

fields.
ICMP sequence number spec with mask, Icmp_header_data low 16 bits are

set.

Quoted 2 lines

ICMP identifier spec with mask, Icmp_header_data high 16 bits are set.

Is it relevant only for ipv4 ICMP?

Yes it is only for ipv4 ICMP. For Ipv6 ICMP, it is icmpv6_header_data.

Thanks.

Quoted 61 lines
Quoted 61 lines
Quoted 61 lines
Quoted 56 lines
---
 doc/guides/nics/mlx5.rst               |  4 ++--
 doc/guides/rel_notes/release_20_11.rst |  2 +-
 drivers/net/mlx5/mlx5_flow.c           |  9 +++++++--
 drivers/net/mlx5/mlx5_flow_dv.c        | 16 +++++++++++++++-
 4 files changed, 25 insertions(+), 6 deletions(-)
doc/guides/nics/mlx5.rst +0 -1
index 211c0c5a6c..576dbe5efd 100644
@@ -288,7 +288,7 @@ Limitations
   - The input buffer, providing the removal size, is not validated.
   - The buffer size must match the length of the headers to be removed.
 
-- ICMP/ICMP6 code/type matching, IP-in-IP and MPLS flow matching

are all
+- ICMP(code/type/identifier/sequence number) / ICMP6(code/type) +matching,
IP-in-IP and MPLS flow matching are all
mutually exclusive features which cannot be supported together (see :ref:mlx5_firmware_config).

doc/guides/nics/mlx5.rst +2 -1
@@ -1009,7 +1009,7 @@ Below are some firmware configurations listed.
 
     FLEX_PARSER_PROFILE_ENABLE=1
 
-- enable ICMP/ICMP6 code/type fields matching::
+- enable ICMP(code/type/identifier/sequence number) /
+ICMP6(code/type)

fields matching::

FLEX_PARSER_PROFILE_ENABLE=2

doc/guides/rel_notes/release_20_11.rst +1 -1
index c6642f5f94..791f133d8f 100644
@@ -73,7 +73,7 @@ New Features
   * Added flag action.
   * Added raw encap/decap actions.
   * Added VXLAN encap/decap actions.
-  * Added ICMP and ICMP6 matching items.
+  * Added ICMP(code/type/identifier/sequence number) and

ICMP6(code/type) matching items.
* Added option to set port mask for insertion/deletion:
``--portmask=N``
where N represents the hexadecimal bitmask of ports used.

(quoted diff) +0 -0

b/drivers/net/mlx5/mlx5_flow.c index 416505f1c8..7bd5c5da94 100644

drivers/net/mlx5/mlx5_flow.c mlx5_flow_validate_item_icmp(const struct · line 1304

Quoted 2 lines
drivers/net/mlx5/mlx5_flow.c +0 -0
@@ -1303,6 +1303,7 @@ mlx5_flow_validate_item_icmp(const struct
 rte_flow_item *item,
 			     struct rte_flow_error *error)

This function is shared between the dv and the verbs.
I think we can support this only in dv, so we need to split this function.

Quoted 3 lines
Quoted 1 line

Thanks, I will split this function in v3 patch.

The mlx5_flow_validate_item_icmp is only called by dv now, also it does not need split it since verbs not use it.

Strange so why is it in shared place and not DV but never mind.

Quoted 63 lines
Quoted 63 lines
Quoted 6 lines

drivers/net/mlx5/mlx5_flow.c mlx5_flow_validate_item_icmp(const struct rte_flow_item *item, · line 1306

Quoted 4 lines
drivers/net/mlx5/mlx5_flow.c +1 -0
 {
 	const struct rte_flow_item_icmp *mask = item->mask;
+	struct rte_flow_item_icmp default_mask;

I think the correct name is nic_mask.

Thanks, I will change in v3 patch.

Quoted 15 lines
Quoted 4 lines
drivers/net/mlx5/mlx5_flow.c +0 -0
 	const int tunnel = !!(item_flags & MLX5_FLOW_LAYER_TUNNEL);
 	const uint64_t l3m = tunnel ? MLX5_FLOW_LAYER_INNER_L3_IPV4 :

MLX5_FLOW_LAYER_OUTER_L3_IPV4;

(quoted diff) +0 -0
@@ -1324,11 +1325,15 @@
 > mlx5_flow_validate_item_icmp(const struct rte_flow_item *item,
 >  		return rte_flow_error_set(error, EINVAL,
 >  					  RTE_FLOW_ERROR_TYPE_ITEM,
 > item,
 >  					  "multiple L4 layers not supported");
 > +	memcpy(&default_mask, &rte_flow_item_icmp_mask,
 > +	       sizeof(struct rte_flow_item_icmp));
 > +	default_mask.hdr.icmp_ident = RTE_BE16(0xFFFF);
 > +	default_mask.hdr.icmp_seq_nb = RTE_BE16(0xFFFF);
 
Quoted 1 line

You don't need to mem copy just init this structure when you declare it.

Thanks, I will change in v3 patch.

Quoted 39 lines
Quoted 12 lines
drivers/net/mlx5/mlx5_flow.c +2 -2
 	if (!mask)
-		mask = &rte_flow_item_icmp_mask;
+		mask = &default_mask;
 	ret = mlx5_flow_item_acceptable
 		(item, (const uint8_t *)mask,
-		 (const uint8_t *)&rte_flow_item_icmp_mask,
+		 (const uint8_t *)&default_mask,
 		 sizeof(struct rte_flow_item_icmp), error);
 	if (ret < 0)
 		return ret;
(quoted diff) +0 -0
Quoted 1 line

b/drivers/net/mlx5/mlx5_flow_dv.c index 3819cdb266..b5d6455067

100644

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher,

Quoted 3 lines
drivers/net/mlx5/mlx5_flow_dv.c +0 -0
@@ -7378,6 +7378,8 @@ flow_dv_translate_item_icmp(void *matcher,

void

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, void *key,

Quoted 8 lines
drivers/net/mlx5/mlx5_flow_dv.c +2 -0
 *key,  {
 	const struct rte_flow_item_icmp *icmp_m = item->mask;
 	const struct rte_flow_item_icmp *icmp_v = item->spec;
+	uint32_t icmp_header_data_m = 0;
+	uint32_t icmp_header_data_v = 0;
 	void *headers_m;
 	void *headers_v;
 	void *misc3_m = MLX5_ADDR_OF(fte_match_param, matcher, @@ -

7396,8

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, void *key, · line 7403

Quoted 9 lines

+7398,14 @@ flow_dv_translate_item_icmp(void *matcher, void *key,
MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol,
IPPROTO_ICMP);

drivers/net/mlx5/mlx5_flow_dv.c +2 -1
 	if (!icmp_v)
 		return;
-	if (!icmp_m)
+	if (!icmp_m) {
 		icmp_m = &rte_flow_item_icmp_mask;
+		icmp_header_data_m = RTE_BE32(UINT32_MAX);

Why are you setting the data as default mask?

Quoted 3 lines
Quoted 3 lines

Because icmp_code and icmp_type still need the default mask. We do not need to change the old one.
We just add the new one for our new match fields.

Yes but there is no need to add new fields to the mask, it will break existing applications. So please remove it.

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 3 lines
drivers/net/mlx5/mlx5_flow_dv.c +2 -0
+	} else {
+		icmp_header_data_m = rte_cpu_to_be_16(icmp_m-
Quoted 1 line

hdr.icmp_seq_nb);

Isn't the icmp_seq_nb already in BE?

Quoted 8 lines
Quoted 8 lines

No, it is not BE and need use rte_cpu_to_be_16

Quoted 6 lines

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, void *key, · line 7407

Quoted 3 lines
drivers/net/mlx5/mlx5_flow_dv.c +2 -0
+		icmp_header_data_m |=
+			rte_cpu_to_be_16(icmp_m->hdr.icmp_ident) << 16;

Again the icmp_ident is already in BE

It is not BE and need use rte_cpu_to_be_16

Why is it not BE? From the structure definition:
struct rte_icmp_hdr {

	uint8_t  icmp_type;     /* ICMP packet type. */
	uint8_t  icmp_code;     /* ICMP packet code. */
	rte_be16_t icmp_cksum;  /* ICMP packet checksum. */
	rte_be16_t icmp_ident;  /* ICMP packet identifier. */

rte_be16_t icmp_seq_nb; /* ICMP packet sequence number. */
} __rte_packed;
Also you are setting cpu value with BE.
Maybe you want to rte_be_to_cpu?

Quoted 14 lines
Quoted 14 lines
Quoted 14 lines

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher,

Quoted 5 lines
drivers/net/mlx5/mlx5_flow_dv.c +1 -0
+	}
 	/*
 	 * Force flow only to match the non-fragmented IPv4 ICMP packets.
 	 * If only the protocol is specified, no need to match the frag.
@@ -7412,6 +7420,12 @@ flow_dv_translate_item_icmp(void *matcher,

void

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, · line 7426

Quoted 7 lines
drivers/net/mlx5/mlx5_flow_dv.c +2 -0
 *key,
 		 icmp_m->hdr.icmp_code);
 	MLX5_SET(fte_match_set_misc3, misc3_v, icmp_code,
 		 icmp_v->hdr.icmp_code & icmp_m->hdr.icmp_code);
+	icmp_header_data_v = rte_cpu_to_be_16(icmp_v-
 hdr.icmp_seq_nb);
+	icmp_header_data_v |= rte_cpu_to_be_16(icmp_v-

hdr.icmp_ident)

Quoted 4 lines
Quoted 4 lines
Quoted 3 lines

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, · line 7427

Quoted 1 line
drivers/net/mlx5/mlx5_flow_dv.c +0 -0
 << 16;

The BE issue again,

It is not BE and need use rte_cpu_to_be_16

See above comment.

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
drivers/net/mlx5/mlx5_flow_dv.c +4 -0
+	MLX5_SET(fte_match_set_misc3, misc3_m, icmp_header_data,
+		 icmp_header_data_m);
+	MLX5_SET(fte_match_set_misc3, misc3_v, icmp_header_data,
+		 icmp_header_data_v & icmp_header_data_m);

}

/**
--
2.21.0

author
#6 lore raw

PATCH v3 1/1 net/mlx5: support match ICMP identifier fields

In reply to Li Zhang

PRM expose fields "Icmp_header_data" in IPv4 ICMP.
Update ICMP mask parameter with ICMP identifier and sequence number fields. ICMP sequence number spec with mask, Icmp_header_data low 16 bits are set. ICMP identifier spec with mask, Icmp_header_data high 16 bits are set.

---
 doc/guides/nics/mlx5.rst               |  4 ++--
 doc/guides/rel_notes/release_20_11.rst |  2 +-
 drivers/net/mlx5/mlx5_flow.c           | 10 ++++++++--
 drivers/net/mlx5/mlx5_flow_dv.c        | 16 +++++++++++++++-
 4 files changed, 26 insertions(+), 6 deletions(-)
doc/guides/nics/mlx5.rst +2 -2
index 211c0c5a6c..576dbe5efd 100644
@@ -288,7 +288,7 @@ Limitations
   - The input buffer, providing the removal size, is not validated.
   - The buffer size must match the length of the headers to be removed.
 
-- ICMP/ICMP6 code/type matching, IP-in-IP and MPLS flow matching are all
+- ICMP(code/type/identifier/sequence number) / ICMP6(code/type) matching, IP-in-IP and MPLS flow matching are all
   mutually exclusive features which cannot be supported together
   (see :ref:`mlx5_firmware_config`).
 
@@ -1009,7 +1009,7 @@ Below are some firmware configurations listed.
 
     FLEX_PARSER_PROFILE_ENABLE=1
 
-- enable ICMP/ICMP6 code/type fields matching::
+- enable ICMP(code/type/identifier/sequence number) / ICMP6(code/type) fields matching::
 
     FLEX_PARSER_PROFILE_ENABLE=2
 
doc/guides/rel_notes/release_20_11.rst +1 -1
index c6642f5f94..791f133d8f 100644
@@ -73,7 +73,7 @@ New Features
   * Added flag action.
   * Added raw encap/decap actions.
   * Added VXLAN encap/decap actions.
-  * Added ICMP and ICMP6 matching items.
+  * Added ICMP(code/type/identifier/sequence number) and ICMP6(code/type) matching items.
   * Added option to set port mask for insertion/deletion:
     ``--portmask=N``
     where N represents the hexadecimal bitmask of ports used.
drivers/net/mlx5/mlx5_flow.c +8 -2
index 416505f1c8..3cabfd4627 100644
@@ -1303,6 +1303,12 @@ mlx5_flow_validate_item_icmp(const struct rte_flow_item *item,
 			     struct rte_flow_error *error)
 {
 	const struct rte_flow_item_icmp *mask = item->mask;
+	const struct rte_flow_item_icmp nic_mask = {
+		.hdr.icmp_type = 0xff,
+		.hdr.icmp_code = 0xff,
+		.hdr.icmp_ident = RTE_BE16(0xffff),
+		.hdr.icmp_seq_nb = RTE_BE16(0xffff),
+	};
 	const int tunnel = !!(item_flags & MLX5_FLOW_LAYER_TUNNEL);
 	const uint64_t l3m = tunnel ? MLX5_FLOW_LAYER_INNER_L3_IPV4 :
 				      MLX5_FLOW_LAYER_OUTER_L3_IPV4;
@@ -1325,10 +1331,10 @@ mlx5_flow_validate_item_icmp(const struct rte_flow_item *item,
 					  RTE_FLOW_ERROR_TYPE_ITEM, item,
 					  "multiple L4 layers not supported");
 	if (!mask)
-		mask = &rte_flow_item_icmp_mask;
+		mask = &nic_mask;
 	ret = mlx5_flow_item_acceptable
 		(item, (const uint8_t *)mask,
-		 (const uint8_t *)&rte_flow_item_icmp_mask,
+		 (const uint8_t *)&nic_mask,
 		 sizeof(struct rte_flow_item_icmp), error);
 	if (ret < 0)
 		return ret;
drivers/net/mlx5/mlx5_flow_dv.c +15 -1
index 3819cdb266..b5d6455067 100644
@@ -7378,6 +7378,8 @@ flow_dv_translate_item_icmp(void *matcher, void *key,
 {
 	const struct rte_flow_item_icmp *icmp_m = item->mask;
 	const struct rte_flow_item_icmp *icmp_v = item->spec;
+	uint32_t icmp_header_data_m = 0;
+	uint32_t icmp_header_data_v = 0;
 	void *headers_m;
 	void *headers_v;
 	void *misc3_m = MLX5_ADDR_OF(fte_match_param, matcher,
@@ -7396,8 +7398,14 @@ flow_dv_translate_item_icmp(void *matcher, void *key,
 	MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol, IPPROTO_ICMP);
 	if (!icmp_v)
 		return;
-	if (!icmp_m)
+	if (!icmp_m) {
 		icmp_m = &rte_flow_item_icmp_mask;
+		icmp_header_data_m = RTE_BE32(UINT32_MAX);
+	} else {
+		icmp_header_data_m = rte_cpu_to_be_16(icmp_m->hdr.icmp_seq_nb);
+		icmp_header_data_m |=
+			rte_cpu_to_be_16(icmp_m->hdr.icmp_ident) << 16;
+	}
 	/*
 	 * Force flow only to match the non-fragmented IPv4 ICMP packets.
 	 * If only the protocol is specified, no need to match the frag.
@@ -7412,6 +7420,12 @@ flow_dv_translate_item_icmp(void *matcher, void *key,
 		 icmp_m->hdr.icmp_code);
 	MLX5_SET(fte_match_set_misc3, misc3_v, icmp_code,
 		 icmp_v->hdr.icmp_code & icmp_m->hdr.icmp_code);
+	icmp_header_data_v = rte_cpu_to_be_16(icmp_v->hdr.icmp_seq_nb);
+	icmp_header_data_v |= rte_cpu_to_be_16(icmp_v->hdr.icmp_ident) << 16;
+	MLX5_SET(fte_match_set_misc3, misc3_m, icmp_header_data,
+		 icmp_header_data_m);
+	MLX5_SET(fte_match_set_misc3, misc3_v, icmp_header_data,
+		 icmp_header_data_v & icmp_header_data_m);
 }
 
 /**
Signature · 1 line
2.21.0
#7 lore raw

Hi
Sorry I didn't see that you sent V3 and responded on V2 So just rewriting my comments.

Best,
Ori

Quoted 112 lines

-----Original Message-----
From: dev <[email protected]> On Behalf Of Li Zhang
Subject: [dpdk-dev] [PATCH v3 1/1] net/mlx5: support match ICMP identifier fields

PRM expose fields "Icmp_header_data" in IPv4 ICMP.
Update ICMP mask parameter with ICMP identifier and sequence number fields.
ICMP sequence number spec with mask, Icmp_header_data low 16 bits are set. ICMP identifier spec with mask, Icmp_header_data high 16 bits are set.

---
 doc/guides/nics/mlx5.rst               |  4 ++--
 doc/guides/rel_notes/release_20_11.rst |  2 +-
 drivers/net/mlx5/mlx5_flow.c           | 10 ++++++++--
 drivers/net/mlx5/mlx5_flow_dv.c        | 16 +++++++++++++++-
 4 files changed, 26 insertions(+), 6 deletions(-)
doc/guides/nics/mlx5.rst +1 -1
index 211c0c5a6c..576dbe5efd 100644
@@ -288,7 +288,7 @@ Limitations
   - The input buffer, providing the removal size, is not validated.
   - The buffer size must match the length of the headers to be removed.
 
-- ICMP/ICMP6 code/type matching, IP-in-IP and MPLS flow matching are all
+- ICMP(code/type/identifier/sequence number) / ICMP6(code/type) matching,

IP-in-IP and MPLS flow matching are all
mutually exclusive features which cannot be supported together (see :ref:mlx5_firmware_config).

doc/guides/nics/mlx5.rst +1 -1
@@ -1009,7 +1009,7 @@ Below are some firmware configurations listed.
 
     FLEX_PARSER_PROFILE_ENABLE=1
 
-- enable ICMP/ICMP6 code/type fields matching::
+- enable ICMP(code/type/identifier/sequence number) / ICMP6(code/type)

fields matching::

FLEX_PARSER_PROFILE_ENABLE=2

doc/guides/rel_notes/release_20_11.rst +1 -1
index c6642f5f94..791f133d8f 100644
@@ -73,7 +73,7 @@ New Features
   * Added flag action.
   * Added raw encap/decap actions.
   * Added VXLAN encap/decap actions.
-  * Added ICMP and ICMP6 matching items.
+  * Added ICMP(code/type/identifier/sequence number) and

ICMP6(code/type) matching items.
* Added option to set port mask for insertion/deletion:
``--portmask=N``
where N represents the hexadecimal bitmask of ports used.

drivers/net/mlx5/mlx5_flow.c +6 -0
index 416505f1c8..3cabfd4627 100644
@@ -1303,6 +1303,12 @@ mlx5_flow_validate_item_icmp(const struct
 rte_flow_item *item,
 			     struct rte_flow_error *error)
 {
 	const struct rte_flow_item_icmp *mask = item->mask;
+	const struct rte_flow_item_icmp nic_mask = {
+		.hdr.icmp_type = 0xff,
+		.hdr.icmp_code = 0xff,
+		.hdr.icmp_ident = RTE_BE16(0xffff),
+		.hdr.icmp_seq_nb = RTE_BE16(0xffff),
+	};
 	const int tunnel = !!(item_flags & MLX5_FLOW_LAYER_TUNNEL);
 	const uint64_t l3m = tunnel ? MLX5_FLOW_LAYER_INNER_L3_IPV4 :
drivers/net/mlx5/mlx5_flow.c +2 -2
 				      MLX5_FLOW_LAYER_OUTER_L3_IPV4;
@@ -1325,10 +1331,10 @@ mlx5_flow_validate_item_icmp(const struct
 rte_flow_item *item,
 					  RTE_FLOW_ERROR_TYPE_ITEM,
 item,
 					  "multiple L4 layers not supported");
 	if (!mask)
-		mask = &rte_flow_item_icmp_mask;
+		mask = &nic_mask;
 	ret = mlx5_flow_item_acceptable
 		(item, (const uint8_t *)mask,
-		 (const uint8_t *)&rte_flow_item_icmp_mask,
+		 (const uint8_t *)&nic_mask,
 		 sizeof(struct rte_flow_item_icmp), error);
drivers/net/mlx5/mlx5_flow.c +0 -0
 	if (ret < 0)
 		return ret;
drivers/net/mlx5/mlx5_flow_dv.c +2 -0
index 3819cdb266..b5d6455067 100644
@@ -7378,6 +7378,8 @@ flow_dv_translate_item_icmp(void *matcher, void
 *key,
 {
 	const struct rte_flow_item_icmp *icmp_m = item->mask;
 	const struct rte_flow_item_icmp *icmp_v = item->spec;
+	uint32_t icmp_header_data_m = 0;
+	uint32_t icmp_header_data_v = 0;
 	void *headers_m;
 	void *headers_v;
drivers/net/mlx5/mlx5_flow_dv.c +0 -0
 	void *misc3_m = MLX5_ADDR_OF(fte_match_param, matcher,
@@ -7396,8 +7398,14 @@ flow_dv_translate_item_icmp(void *matcher, void
 *key,
 	MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol,
 IPPROTO_ICMP);
 	if (!icmp_v)
 		return;

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, void · line 7411

Quoted 10 lines
drivers/net/mlx5/mlx5_flow_dv.c +7 -1
-	if (!icmp_m)
+	if (!icmp_m) {
 		icmp_m = &rte_flow_item_icmp_mask;
+		icmp_header_data_m = RTE_BE32(UINT32_MAX);
+	} else {
+		icmp_header_data_m = rte_cpu_to_be_16(icmp_m-
 >hdr.icmp_seq_nb);
+		icmp_header_data_m |=
+			rte_cpu_to_be_16(icmp_m->hdr.icmp_ident) << 16;
+	}

Yes but there is no need to add new fields to the mask, it will break existing applications. So please remove it.

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, void · line 7426

Quoted 11 lines
drivers/net/mlx5/mlx5_flow_dv.c +2 -0
 	/*
 	 * Force flow only to match the non-fragmented IPv4 ICMP packets.
 	 * If only the protocol is specified, no need to match the frag.
@@ -7412,6 +7420,12 @@ flow_dv_translate_item_icmp(void *matcher, void
 *key,
 		 icmp_m->hdr.icmp_code);
 	MLX5_SET(fte_match_set_misc3, misc3_v, icmp_code,
 		 icmp_v->hdr.icmp_code & icmp_m->hdr.icmp_code);
+	icmp_header_data_v = rte_cpu_to_be_16(icmp_v->hdr.icmp_seq_nb);
+	icmp_header_data_v |= rte_cpu_to_be_16(icmp_v->hdr.icmp_ident)
 << 16;

Why is it not BE? From the structure definition:
struct rte_icmp_hdr {

	uint8_t  icmp_type;     /* ICMP packet type. */
	uint8_t  icmp_code;     /* ICMP packet code. */
	rte_be16_t icmp_cksum;  /* ICMP packet checksum. */
	rte_be16_t icmp_ident;  /* ICMP packet identifier. */

rte_be16_t icmp_seq_nb; /* ICMP packet sequence number. */
} __rte_packed;
Also you are setting cpu value with BE.
Maybe you want to rte_be_to_cpu?

Quoted 9 lines
drivers/net/mlx5/mlx5_flow_dv.c +4 -0
+	MLX5_SET(fte_match_set_misc3, misc3_m, icmp_header_data,
+		 icmp_header_data_m);
+	MLX5_SET(fte_match_set_misc3, misc3_v, icmp_header_data,
+		 icmp_header_data_v & icmp_header_data_m);
 }

/**
--
2.21.0

author
#8 lore raw

Hi Ori,

Thanks for your comments.
My answer inline.
I will update them in V4 patch.

Regards,
Li Zhang

Quoted 138 lines

-----Original Message-----
From: Ori Kam <[email protected]>
Sent: Thursday, October 1, 2020 4:14 PM
To: Li Zhang <[email protected]>; Dekel Peled <[email protected]>; Slava Ovsiienko <[email protected]>; Matan Azrad <[email protected]>
Cc: [email protected]; NBU-Contact-Thomas Monjalon <[email protected]>; Raslan Darawsheh <[email protected]>
Subject: RE: [dpdk-dev] [PATCH v3 1/1] net/mlx5: support match ICMP identifier fields

Hi
Sorry I didn't see that you sent V3 and responded on V2 So just rewriting my comments.

Best,
Ori

Quoted 9 lines

-----Original Message-----
From: dev <[email protected]> On Behalf Of Li Zhang
Subject: [dpdk-dev] [PATCH v3 1/1] net/mlx5: support match ICMP identifier fields

PRM expose fields "Icmp_header_data" in IPv4 ICMP.
Update ICMP mask parameter with ICMP identifier and sequence number fields.
ICMP sequence number spec with mask, Icmp_header_data low 16 bits are

set.

Quoted 69 lines

ICMP identifier spec with mask, Icmp_header_data high 16 bits are set.

---
 doc/guides/nics/mlx5.rst               |  4 ++--
 doc/guides/rel_notes/release_20_11.rst |  2 +-
 drivers/net/mlx5/mlx5_flow.c           | 10 ++++++++--
 drivers/net/mlx5/mlx5_flow_dv.c        | 16 +++++++++++++++-
 4 files changed, 26 insertions(+), 6 deletions(-)
doc/guides/nics/mlx5.rst index renamed from doc/guides/nics/mlx5.rst +0 -0

211c0c5a6c..576dbe5efd 100644

doc/guides/nics/mlx5.rst +0 -1
@@ -288,7 +288,7 @@ Limitations
   - The input buffer, providing the removal size, is not validated.
   - The buffer size must match the length of the headers to be removed.
 
-- ICMP/ICMP6 code/type matching, IP-in-IP and MPLS flow matching are

all
+- ICMP(code/type/identifier/sequence number) / ICMP6(code/type) +matching,
IP-in-IP and MPLS flow matching are all
mutually exclusive features which cannot be supported together (see :ref:mlx5_firmware_config).

doc/guides/nics/mlx5.rst +2 -1
@@ -1009,7 +1009,7 @@ Below are some firmware configurations listed.
 
     FLEX_PARSER_PROFILE_ENABLE=1
 
-- enable ICMP/ICMP6 code/type fields matching::
+- enable ICMP(code/type/identifier/sequence number) /
+ICMP6(code/type)

fields matching::

FLEX_PARSER_PROFILE_ENABLE=2

doc/guides/rel_notes/release_20_11.rst +1 -1
index c6642f5f94..791f133d8f 100644
@@ -73,7 +73,7 @@ New Features
   * Added flag action.
   * Added raw encap/decap actions.
   * Added VXLAN encap/decap actions.
-  * Added ICMP and ICMP6 matching items.
+  * Added ICMP(code/type/identifier/sequence number) and

ICMP6(code/type) matching items.
* Added option to set port mask for insertion/deletion:
``--portmask=N``
where N represents the hexadecimal bitmask of ports used.

(quoted diff) +0 -0

b/drivers/net/mlx5/mlx5_flow.c index 416505f1c8..3cabfd4627 100644

drivers/net/mlx5/mlx5_flow.c +6 -0
@@ -1303,6 +1303,12 @@ mlx5_flow_validate_item_icmp(const struct
 rte_flow_item *item,
 			     struct rte_flow_error *error)  {
 	const struct rte_flow_item_icmp *mask = item->mask;
+	const struct rte_flow_item_icmp nic_mask = {
+		.hdr.icmp_type = 0xff,
+		.hdr.icmp_code = 0xff,
+		.hdr.icmp_ident = RTE_BE16(0xffff),
+		.hdr.icmp_seq_nb = RTE_BE16(0xffff),
+	};
 	const int tunnel = !!(item_flags & MLX5_FLOW_LAYER_TUNNEL);
 	const uint64_t l3m = tunnel ? MLX5_FLOW_LAYER_INNER_L3_IPV4 :
 				      MLX5_FLOW_LAYER_OUTER_L3_IPV4;
(quoted diff) +0 -0
@@ -1325,10 +1331,10 @@
 > mlx5_flow_validate_item_icmp(const struct rte_flow_item *item,
 >  					  RTE_FLOW_ERROR_TYPE_ITEM,
 > item,
 >  					  "multiple L4 layers not supported");
 >  	if (!mask)
 > -		mask = &rte_flow_item_icmp_mask;
 > +		mask = &nic_mask;
Quoted 9 lines
drivers/net/mlx5/mlx5_flow.c +1 -1
 	ret = mlx5_flow_item_acceptable
 		(item, (const uint8_t *)mask,
-		 (const uint8_t *)&rte_flow_item_icmp_mask,
+		 (const uint8_t *)&nic_mask,
 		 sizeof(struct rte_flow_item_icmp), error);
 	if (ret < 0)
 		return ret;
(quoted diff) +0 -0

b/drivers/net/mlx5/mlx5_flow_dv.c index 3819cdb266..b5d6455067

100644

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher,

Quoted 3 lines
drivers/net/mlx5/mlx5_flow_dv.c +0 -0
@@ -7378,6 +7378,8 @@ flow_dv_translate_item_icmp(void *matcher,

void

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, void *key,

Quoted 8 lines
drivers/net/mlx5/mlx5_flow_dv.c +2 -0
 *key,  {
 	const struct rte_flow_item_icmp *icmp_m = item->mask;
 	const struct rte_flow_item_icmp *icmp_v = item->spec;
+	uint32_t icmp_header_data_m = 0;
+	uint32_t icmp_header_data_v = 0;
 	void *headers_m;
 	void *headers_v;
 	void *misc3_m = MLX5_ADDR_OF(fte_match_param, matcher, @@ -

7396,8

Quoted 11 lines

+7398,14 @@ flow_dv_translate_item_icmp(void *matcher, void *key,
MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol,
IPPROTO_ICMP);

drivers/net/mlx5/mlx5_flow_dv.c +4 -1
 	if (!icmp_v)
 		return;
-	if (!icmp_m)
+	if (!icmp_m) {
 		icmp_m = &rte_flow_item_icmp_mask;
+		icmp_header_data_m = RTE_BE32(UINT32_MAX);
+	} else {
+		icmp_header_data_m = rte_cpu_to_be_16(icmp_m-
Quoted 9 lines

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, void *key, · line 7408

Quoted 4 lines
Quoted 1 line

hdr.icmp_seq_nb);

drivers/net/mlx5/mlx5_flow_dv.c +3 -0
+		icmp_header_data_m |=
+			rte_cpu_to_be_16(icmp_m->hdr.icmp_ident) << 16;
+	}

Yes but there is no need to add new fields to the mask, it will break existing applications.
So please remove it.

Thanks, I will remove &rte_flow_item_icmp_mask.
For icmp_header_data_m, it is used to merge 16bit icmp_seq_nb and 16bit icmp_ident into 32bit data. So that it can use icmp_header_data_m set 32bit misc3_m directly.

Quoted 16 lines

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher,

Quoted 4 lines
drivers/net/mlx5/mlx5_flow_dv.c +0 -0
 	/*
 	 * Force flow only to match the non-fragmented IPv4 ICMP packets.
 	 * If only the protocol is specified, no need to match the frag.
@@ -7412,6 +7420,12 @@ flow_dv_translate_item_icmp(void *matcher,

void

drivers/net/mlx5/mlx5_flow_dv.c flow_dv_translate_item_icmp(void *matcher, · line 7427

Quoted 8 lines
drivers/net/mlx5/mlx5_flow_dv.c +2 -0
 *key,
 		 icmp_m->hdr.icmp_code);
 	MLX5_SET(fte_match_set_misc3, misc3_v, icmp_code,
 		 icmp_v->hdr.icmp_code & icmp_m->hdr.icmp_code);
+	icmp_header_data_v = rte_cpu_to_be_16(icmp_v-
 hdr.icmp_seq_nb);
+	icmp_header_data_v |= rte_cpu_to_be_16(icmp_v->hdr.icmp_ident)
 << 16;

Why is it not BE? From the structure definition:
struct rte_icmp_hdr {

Quoted 8 lines
	uint8_t  icmp_type;     /* ICMP packet type. */
	uint8_t  icmp_code;     /* ICMP packet code. */
	rte_be16_t icmp_cksum;  /* ICMP packet checksum. */
	rte_be16_t icmp_ident;  /* ICMP packet identifier. */
	rte_be16_t icmp_seq_nb; /* ICMP packet sequence number. */ }

__rte_packed; Also you are setting cpu value with BE. Maybe you want to rte_be_to_cpu?

You are right I should use the rte_be_to_cpu_16 instead of rte_cpu_to_be_16.

Quoted 9 lines
Quoted 9 lines
drivers/net/mlx5/mlx5_flow_dv.c +4 -0
+	MLX5_SET(fte_match_set_misc3, misc3_m, icmp_header_data,
+		 icmp_header_data_m);
+	MLX5_SET(fte_match_set_misc3, misc3_v, icmp_header_data,
+		 icmp_header_data_v & icmp_header_data_m);

}

/**
--
2.21.0