[v2,2/2] app/testpmd: support VXLAN last 8-bits field matching

Message ID 20210705095020.1120216-3-rongweil@nvidia.com (mailing list archive)
State Superseded, archived
Delegated to: Raslan Darawsheh
Headers
Series support VXLAN header last 8-bits reserved field matching |

Checks

Context Check Description
ci/checkpatch warning coding style issues
ci/github-robot success github build: passed
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-testing fail Testing issues
ci/iol-mellanox-Functional fail Functional Testing issues
ci/iol-intel-Performance success Performance Testing PASS
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/iol-abi-testing success Testing PASS

Commit Message

Rongwei Liu July 5, 2021, 9:50 a.m. UTC
  Add a new testpmd pattern field 'last_rsvd' that supports the
last 8-bits matching of VXLAN header.

The examples for the "last_rsvd" pattern field are as below:

1. ...pattern eth / ipv4 / udp / vxlan last_rsvd is 0x80 / end ...

This flow will exactly match the last 8-bits to be 0x80.

2. ...pattern eth / ipv4 / udp / vxlan last_rsvd spec 0x80
vxlan mask 0x80 / end ...

This flow will only match the MSB of the last 8-bits to be 1.

Signed-off-by: rongwei liu <rongweil@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 app/test-pmd/cmdline_flow.c                 | 9 +++++++++
 app/test-pmd/util.c                         | 5 +++--
 doc/guides/rel_notes/release_21_08.rst      | 7 +++++++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 1 +
 4 files changed, 20 insertions(+), 2 deletions(-)
  

Comments

Thomas Monjalon July 6, 2021, 12:28 p.m. UTC | #1
+Cc more people

05/07/2021 11:50, rongwei liu:
> Add a new testpmd pattern field 'last_rsvd' that supports the
> last 8-bits matching of VXLAN header.
> 
> The examples for the "last_rsvd" pattern field are as below:
> 
> 1. ...pattern eth / ipv4 / udp / vxlan last_rsvd is 0x80 / end ...
> 
> This flow will exactly match the last 8-bits to be 0x80.
> 
> 2. ...pattern eth / ipv4 / udp / vxlan last_rsvd spec 0x80
> vxlan mask 0x80 / end ...
> 
> This flow will only match the MSB of the last 8-bits to be 1.
> 
> Signed-off-by: rongwei liu <rongweil@nvidia.com>
> Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
> ---
>  app/test-pmd/cmdline_flow.c                 | 9 +++++++++
>  app/test-pmd/util.c                         | 5 +++--
>  doc/guides/rel_notes/release_21_08.rst      | 7 +++++++
>  doc/guides/testpmd_app_ug/testpmd_funcs.rst | 1 +
>  4 files changed, 20 insertions(+), 2 deletions(-)
> 
> diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
> index 1c587bb7b8..6e76a625ca 100644
> --- a/app/test-pmd/cmdline_flow.c
> +++ b/app/test-pmd/cmdline_flow.c
> @@ -207,6 +207,7 @@ enum index {
>  	ITEM_SCTP_CKSUM,
>  	ITEM_VXLAN,
>  	ITEM_VXLAN_VNI,
> +	ITEM_VXLAN_LAST_RSVD,
>  	ITEM_E_TAG,
>  	ITEM_E_TAG_GRP_ECID_B,
>  	ITEM_NVGRE,
> @@ -1129,6 +1130,7 @@ static const enum index item_sctp[] = {
>  
>  static const enum index item_vxlan[] = {
>  	ITEM_VXLAN_VNI,
> +	ITEM_VXLAN_LAST_RSVD,
>  	ITEM_NEXT,
>  	ZERO,
>  };
> @@ -2806,6 +2808,13 @@ static const struct token token_list[] = {
>  		.next = NEXT(item_vxlan, NEXT_ENTRY(UNSIGNED), item_param),
>  		.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vxlan, vni)),
>  	},
> +	[ITEM_VXLAN_LAST_RSVD] = {
> +		.name = "last_rsvd",
> +		.help = "VXLAN last reserved bits",
> +		.next = NEXT(item_vxlan, NEXT_ENTRY(UNSIGNED), item_param),
> +		.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vxlan,
> +					     rsvd1)),
> +	},
>  	[ITEM_E_TAG] = {
>  		.name = "e_tag",
>  		.help = "match E-Tag header",
> diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c
> index a9e431a8b2..59626518d5 100644
> --- a/app/test-pmd/util.c
> +++ b/app/test-pmd/util.c
> @@ -266,8 +266,9 @@ dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[],
>  				vx_vni = rte_be_to_cpu_32(vxlan_hdr->vx_vni);
>  				MKDUMPSTR(print_buf, buf_size, cur_len,
>  					  " - VXLAN packet: packet type =%d, "
> -					  "Destination UDP port =%d, VNI = %d",
> -					  packet_type, udp_port, vx_vni >> 8);
> +					  "Destination UDP port =%d, VNI = %d, "
> +					  "last_rsvd = %d", packet_type,
> +					  udp_port, vx_vni >> 8, vx_vni & 0xff);
>  			}
>  		}
>  		MKDUMPSTR(print_buf, buf_size, cur_len,
> diff --git a/doc/guides/rel_notes/release_21_08.rst b/doc/guides/rel_notes/release_21_08.rst
> index a6ecfdf3ce..ad89af8466 100644
> --- a/doc/guides/rel_notes/release_21_08.rst
> +++ b/doc/guides/rel_notes/release_21_08.rst
> @@ -55,6 +55,12 @@ New Features
>       Also, make sure to start the actual text at the margin.
>       =======================================================
>  
> +* **Updated Mellanox mlx5 driver.**
> +
> +  Updated the Mellanox mlx5 driver with new features and improvements, including:
> +
> +  * Added support for matching on vxlan header last 8-bits reserved field.
> +
>  
>  Removed Items
>  -------------
> @@ -136,3 +142,4 @@ Tested Platforms
>     This section is a comment. Do not overwrite or remove it.
>     Also, make sure to start the actual text at the margin.
>     =======================================================
> +
> diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> index 33857acf54..4ca3103067 100644
> --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> @@ -3694,6 +3694,7 @@ This section lists supported pattern items and their attributes, if any.
>  - ``vxlan``: match VXLAN header.
>  
>    - ``vni {unsigned}``: VXLAN identifier.
> +  - ``last_rsvd {unsigned}``: VXLAN last reserved 8-bits.
>  
>  - ``e_tag``: match IEEE 802.1BR E-Tag header.
>  
>
  

Patch

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 1c587bb7b8..6e76a625ca 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -207,6 +207,7 @@  enum index {
 	ITEM_SCTP_CKSUM,
 	ITEM_VXLAN,
 	ITEM_VXLAN_VNI,
+	ITEM_VXLAN_LAST_RSVD,
 	ITEM_E_TAG,
 	ITEM_E_TAG_GRP_ECID_B,
 	ITEM_NVGRE,
@@ -1129,6 +1130,7 @@  static const enum index item_sctp[] = {
 
 static const enum index item_vxlan[] = {
 	ITEM_VXLAN_VNI,
+	ITEM_VXLAN_LAST_RSVD,
 	ITEM_NEXT,
 	ZERO,
 };
@@ -2806,6 +2808,13 @@  static const struct token token_list[] = {
 		.next = NEXT(item_vxlan, NEXT_ENTRY(UNSIGNED), item_param),
 		.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vxlan, vni)),
 	},
+	[ITEM_VXLAN_LAST_RSVD] = {
+		.name = "last_rsvd",
+		.help = "VXLAN last reserved bits",
+		.next = NEXT(item_vxlan, NEXT_ENTRY(UNSIGNED), item_param),
+		.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vxlan,
+					     rsvd1)),
+	},
 	[ITEM_E_TAG] = {
 		.name = "e_tag",
 		.help = "match E-Tag header",
diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c
index a9e431a8b2..59626518d5 100644
--- a/app/test-pmd/util.c
+++ b/app/test-pmd/util.c
@@ -266,8 +266,9 @@  dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[],
 				vx_vni = rte_be_to_cpu_32(vxlan_hdr->vx_vni);
 				MKDUMPSTR(print_buf, buf_size, cur_len,
 					  " - VXLAN packet: packet type =%d, "
-					  "Destination UDP port =%d, VNI = %d",
-					  packet_type, udp_port, vx_vni >> 8);
+					  "Destination UDP port =%d, VNI = %d, "
+					  "last_rsvd = %d", packet_type,
+					  udp_port, vx_vni >> 8, vx_vni & 0xff);
 			}
 		}
 		MKDUMPSTR(print_buf, buf_size, cur_len,
diff --git a/doc/guides/rel_notes/release_21_08.rst b/doc/guides/rel_notes/release_21_08.rst
index a6ecfdf3ce..ad89af8466 100644
--- a/doc/guides/rel_notes/release_21_08.rst
+++ b/doc/guides/rel_notes/release_21_08.rst
@@ -55,6 +55,12 @@  New Features
      Also, make sure to start the actual text at the margin.
      =======================================================
 
+* **Updated Mellanox mlx5 driver.**
+
+  Updated the Mellanox mlx5 driver with new features and improvements, including:
+
+  * Added support for matching on vxlan header last 8-bits reserved field.
+
 
 Removed Items
 -------------
@@ -136,3 +142,4 @@  Tested Platforms
    This section is a comment. Do not overwrite or remove it.
    Also, make sure to start the actual text at the margin.
    =======================================================
+
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 33857acf54..4ca3103067 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -3694,6 +3694,7 @@  This section lists supported pattern items and their attributes, if any.
 - ``vxlan``: match VXLAN header.
 
   - ``vni {unsigned}``: VXLAN identifier.
+  - ``last_rsvd {unsigned}``: VXLAN last reserved 8-bits.
 
 - ``e_tag``: match IEEE 802.1BR E-Tag header.