Skip to contentSkip to conversation

net/i40e: add support for VXLAN-GPE

PATCH Superseded Qiming Yang 5 participants 27 messages Jan 2, 2019 – Apr 3, 2019 Network drivers

lore
Share & tools
lore
#1 lore raw

PATCH 2/2 net/i40e: support VXLAN-GPE classification

In reply to Qiming Yang

Added VXLAN-GPE tunnel filter, supported filter to queue.

---
 app/test-pmd/cmdline.c         | 4 +++-
 drivers/net/i40e/i40e_ethdev.c | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)
app/test-pmd/cmdline.c +3 -1
index 51c7fac..7b7cb12 100644
@@ -8704,6 +8704,8 @@ cmd_tunnel_filter_parsed(void *parsed_result,
 
 	if (!strcmp(res->tunnel_type, "vxlan"))
 		tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_VXLAN;
+	else if (!strcmp(res->tunnel_type, "vxlan-gpe"))
+		tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_VXLAN_GPE;
 	else if (!strcmp(res->tunnel_type, "nvgre"))
 		tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_NVGRE;
 	else if (!strcmp(res->tunnel_type, "ipingre"))
@@ -8753,7 +8755,7 @@ cmdline_parse_token_ipaddr_t cmd_tunnel_filter_ip_value =
 	ip_value);
 cmdline_parse_token_string_t cmd_tunnel_filter_tunnel_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
-	tunnel_type, "vxlan#nvgre#ipingre");
+	tunnel_type, "vxlan#nvgre#ipingre#vxlan-gpe");
 
 cmdline_parse_token_string_t cmd_tunnel_filter_filter_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
drivers/net/i40e/i40e_ethdev.c +3 -0
index 1dd04e6..8eb2a02 100644
@@ -7690,6 +7690,9 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
 	case RTE_TUNNEL_TYPE_IP_IN_GRE:
 		tun_type = I40E_AQC_ADD_CLOUD_TNL_TYPE_IP;
 		break;
+	case RTE_TUNNEL_TYPE_VXLAN_GPE:
+		tun_type = I40E_AQC_ADD_CLOUD_TNL_TYPE_VXLAN_GPE;
+		break;
 	default:
 		/* Other tunnel types is not supported. */
 		PMD_DRV_LOG(ERR, "tunnel type is not supported.");
Signature · 1 line
2.9.5
#0 lore raw

PATCH 1/2 net/i40e: add support for VXLAN-GPE

Can recognize new packet type VXLAN-GPE in i40e driver. Added inner IP/TCP/UDP checksum and RSS support for VXLAN-GPE packet.

---
 app/test-pmd/cmdline.c           |  6 ++++--
 drivers/net/i40e/i40e_ethdev.c   | 13 +++++++++----
 lib/librte_ethdev/rte_eth_ctrl.h |  1 +
 3 files changed, 14 insertions(+), 6 deletions(-)
app/test-pmd/cmdline.c +4 -2
index 3ddc3e0..51c7fac 100644
@@ -8877,6 +8877,8 @@ cmd_cfg_tunnel_udp_port_parsed(void *parsed_result,
 		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN;
 	} else if (!strcmp(res->tunnel_type, "geneve")) {
 		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_GENEVE;
+	} else if (!strcmp(res->tunnel_type, "vxlan-gpe")) {
+		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN_GPE;
 	} else {
 		printf("Invalid tunnel type\n");
 		return;
@@ -8911,7 +8913,7 @@ cmdline_parse_token_string_t cmd_config_tunnel_udp_port_action =
 				 "add#rm");
 cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_tunnel_udp_port, tunnel_type,
-				 "vxlan#geneve");
+				 "vxlan#geneve#vxlan-gpe");
 cmdline_parse_token_num_t cmd_config_tunnel_udp_port_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port, udp_port,
 			      UINT16);
@@ -8919,7 +8921,7 @@ cmdline_parse_token_num_t cmd_config_tunnel_udp_port_value =
 cmdline_parse_inst_t cmd_cfg_tunnel_udp_port = {
 	.f = cmd_cfg_tunnel_udp_port_parsed,
 	.data = NULL,
-	.help_str = "port config <port_id> udp_tunnel_port add|rm vxlan|geneve <udp_port>",
+	.help_str = "port config <port_id> udp_tunnel_port add|rm vxlan|geneve|vxlan-gpe <udp_port>",
 	.tokens = {
 		(void *)&cmd_config_tunnel_udp_port_port,
 		(void *)&cmd_config_tunnel_udp_port_config,
drivers/net/i40e/i40e_ethdev.c +9 -4
index 8dc1a4a..1dd04e6 100644
@@ -8338,7 +8338,7 @@ i40e_get_vxlan_port_idx(struct i40e_pf *pf, uint16_t port)
 }
 
 static int
-i40e_add_vxlan_port(struct i40e_pf *pf, uint16_t port)
+i40e_add_vxlan_port(struct i40e_pf *pf, uint16_t port, int udp_type)
 {
 	int  idx, ret;
 	uint8_t filter_idx;
@@ -8361,7 +8361,7 @@ i40e_add_vxlan_port(struct i40e_pf *pf, uint16_t port)
 		return -ENOSPC;
 	}
 
-	ret =  i40e_aq_add_udp_tunnel(hw, port, I40E_AQC_TUNNEL_TYPE_VXLAN,
+	ret =  i40e_aq_add_udp_tunnel(hw, port, udp_type,
 					&filter_idx, NULL);
 	if (ret < 0) {
 		PMD_DRV_LOG(ERR, "Failed to add VXLAN UDP port %d", port);
@@ -8429,9 +8429,13 @@ i40e_dev_udp_tunnel_port_add(struct rte_eth_dev *dev,
 
 	switch (udp_tunnel->prot_type) {
 	case RTE_TUNNEL_TYPE_VXLAN:
-		ret = i40e_add_vxlan_port(pf, udp_tunnel->udp_port);
+		ret = i40e_add_vxlan_port(pf, udp_tunnel->udp_port,
+					  I40E_AQC_TUNNEL_TYPE_VXLAN);
 		break;
-
+	case RTE_TUNNEL_TYPE_VXLAN_GPE:
+                ret = i40e_add_vxlan_port(pf, udp_tunnel->udp_port,
+					  I40E_AQC_TUNNEL_TYPE_VXLAN_GPE);
+                break;
 	case RTE_TUNNEL_TYPE_GENEVE:
 	case RTE_TUNNEL_TYPE_TEREDO:
 		PMD_DRV_LOG(ERR, "Tunnel type is not supported now.");
@@ -8460,6 +8464,7 @@ i40e_dev_udp_tunnel_port_del(struct rte_eth_dev *dev,
 
 	switch (udp_tunnel->prot_type) {
 	case RTE_TUNNEL_TYPE_VXLAN:
+	case RTE_TUNNEL_TYPE_VXLAN_GPE:
 		ret = i40e_del_vxlan_port(pf, udp_tunnel->udp_port);
 		break;
 	case RTE_TUNNEL_TYPE_GENEVE:
lib/librte_ethdev/rte_eth_ctrl.h +1 -0
index 5ea8ae2..b341634 100644
@@ -229,6 +229,7 @@ enum rte_eth_tunnel_type {
 	RTE_TUNNEL_TYPE_NVGRE,
 	RTE_TUNNEL_TYPE_IP_IN_GRE,
 	RTE_L2_TUNNEL_TYPE_E_TAG,
+	RTE_TUNNEL_TYPE_VXLAN_GPE,
 	RTE_TUNNEL_TYPE_MAX,
 };
 
Signature · 1 line
2.9.5
#2 lore raw

v2 cover Supported VXLAN-GPE in i40e

This patch set supported new packet type VXLAN-GPE and add support for inner checksum, RSS and classification for VXLAN-GPE.

---
V2:
1. move testpmd related changes to a new patch
2. added release note update.

Qiming Yang (4):
net/i40e: add support for VXLAN-GPE
net/i40e: support VXLAN-GPE classification
app/testpmd: Add VXLAN-GPE to tunnel type
doc: add release note for VXLAN-GPE support

 app/test-pmd/cmdline.c                 | 10 +++++++---
 doc/guides/rel_notes/release_19_05.rst |  6 ++++++
 drivers/net/i40e/i40e_ethdev.c         | 16 ++++++++++++----
 lib/librte_ethdev/rte_eth_ctrl.h       |  1 +
 4 files changed, 26 insertions(+), 7 deletions(-)
Signature · 1 line
2.9.5
#3 lore raw

PATCH v2 1/4 net/i40e: add support for VXLAN-GPE

Can recognize new packet type VXLAN-GPE in i40e driver. Added inner IP/TCP/UDP checksum and RSS support for VXLAN-GPE packet.

---
 drivers/net/i40e/i40e_ethdev.c   | 13 +++++++++----
 lib/librte_ethdev/rte_eth_ctrl.h |  1 +
 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/net/i40e/i40e_ethdev.c +9 -4
index dca61f0..8093eae 100644
@@ -8368,7 +8368,7 @@ i40e_get_vxlan_port_idx(struct i40e_pf *pf, uint16_t port)
 }
 
 static int
-i40e_add_vxlan_port(struct i40e_pf *pf, uint16_t port)
+i40e_add_vxlan_port(struct i40e_pf *pf, uint16_t port, int udp_type)
 {
 	int  idx, ret;
 	uint8_t filter_idx;
@@ -8391,7 +8391,7 @@ i40e_add_vxlan_port(struct i40e_pf *pf, uint16_t port)
 		return -ENOSPC;
 	}
 
-	ret =  i40e_aq_add_udp_tunnel(hw, port, I40E_AQC_TUNNEL_TYPE_VXLAN,
+	ret =  i40e_aq_add_udp_tunnel(hw, port, udp_type,
 					&filter_idx, NULL);
 	if (ret < 0) {
 		PMD_DRV_LOG(ERR, "Failed to add VXLAN UDP port %d", port);
@@ -8459,9 +8459,13 @@ i40e_dev_udp_tunnel_port_add(struct rte_eth_dev *dev,
 
 	switch (udp_tunnel->prot_type) {
 	case RTE_TUNNEL_TYPE_VXLAN:
-		ret = i40e_add_vxlan_port(pf, udp_tunnel->udp_port);
+		ret = i40e_add_vxlan_port(pf, udp_tunnel->udp_port,
+					  I40E_AQC_TUNNEL_TYPE_VXLAN);
 		break;
-
+	case RTE_TUNNEL_TYPE_VXLAN_GPE:
+                ret = i40e_add_vxlan_port(pf, udp_tunnel->udp_port,
+					  I40E_AQC_TUNNEL_TYPE_VXLAN_GPE);
+                break;
 	case RTE_TUNNEL_TYPE_GENEVE:
 	case RTE_TUNNEL_TYPE_TEREDO:
 		PMD_DRV_LOG(ERR, "Tunnel type is not supported now.");
@@ -8490,6 +8494,7 @@ i40e_dev_udp_tunnel_port_del(struct rte_eth_dev *dev,
 
 	switch (udp_tunnel->prot_type) {
 	case RTE_TUNNEL_TYPE_VXLAN:
+	case RTE_TUNNEL_TYPE_VXLAN_GPE:
 		ret = i40e_del_vxlan_port(pf, udp_tunnel->udp_port);
 		break;
 	case RTE_TUNNEL_TYPE_GENEVE:
lib/librte_ethdev/rte_eth_ctrl.h +1 -0
index 5ea8ae2..b341634 100644
@@ -229,6 +229,7 @@ enum rte_eth_tunnel_type {
 	RTE_TUNNEL_TYPE_NVGRE,
 	RTE_TUNNEL_TYPE_IP_IN_GRE,
 	RTE_L2_TUNNEL_TYPE_E_TAG,
+	RTE_TUNNEL_TYPE_VXLAN_GPE,
 	RTE_TUNNEL_TYPE_MAX,
 };
 
Signature · 1 line
2.9.5
#4 lore raw

PATCH v2 2/4 net/i40e: support VXLAN-GPE classification

In reply to Qiming Yang

Added VXLAN-GPE tunnel filter, supported filter to queue.

---
 drivers/net/i40e/i40e_ethdev.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/net/i40e/i40e_ethdev.c +3 -0
index 8093eae..8d28ada 100644
@@ -7720,6 +7720,9 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
 	case RTE_TUNNEL_TYPE_IP_IN_GRE:
 		tun_type = I40E_AQC_ADD_CLOUD_TNL_TYPE_IP;
 		break;
+	case RTE_TUNNEL_TYPE_VXLAN_GPE:
+		tun_type = I40E_AQC_ADD_CLOUD_TNL_TYPE_VXLAN_GPE;
+		break;
 	default:
 		/* Other tunnel types is not supported. */
 		PMD_DRV_LOG(ERR, "tunnel type is not supported.");
Signature · 1 line
2.9.5
#5 lore raw

PATCH v2 3/4 app/testpmd: add VXLAN-GPE to tunnel type

In reply to Qiming Yang

This patch added new item "vxlan-gpe" to tunnel_type to support new VXLAN-GPE packet type, and its clasification.

---
 app/test-pmd/cmdline.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
app/test-pmd/cmdline.c +7 -3
index db53cc0..08a554c 100644
@@ -8710,6 +8710,8 @@ cmd_tunnel_filter_parsed(void *parsed_result,
 
 	if (!strcmp(res->tunnel_type, "vxlan"))
 		tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_VXLAN;
+	else if (!strcmp(res->tunnel_type, "vxlan-gpe"))
+		tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_VXLAN_GPE;
 	else if (!strcmp(res->tunnel_type, "nvgre"))
 		tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_NVGRE;
 	else if (!strcmp(res->tunnel_type, "ipingre"))
@@ -8759,7 +8761,7 @@ cmdline_parse_token_ipaddr_t cmd_tunnel_filter_ip_value =
 	ip_value);
 cmdline_parse_token_string_t cmd_tunnel_filter_tunnel_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
-	tunnel_type, "vxlan#nvgre#ipingre");
+	tunnel_type, "vxlan#nvgre#ipingre#vxlan-gpe");
 
 cmdline_parse_token_string_t cmd_tunnel_filter_filter_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
@@ -8883,6 +8885,8 @@ cmd_cfg_tunnel_udp_port_parsed(void *parsed_result,
 		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN;
 	} else if (!strcmp(res->tunnel_type, "geneve")) {
 		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_GENEVE;
+	} else if (!strcmp(res->tunnel_type, "vxlan-gpe")) {
+		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN_GPE;
 	} else {
 		printf("Invalid tunnel type\n");
 		return;
@@ -8917,7 +8921,7 @@ cmdline_parse_token_string_t cmd_config_tunnel_udp_port_action =
 				 "add#rm");
 cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_tunnel_udp_port, tunnel_type,
-				 "vxlan#geneve");
+				 "vxlan#geneve#vxlan-gpe");
 cmdline_parse_token_num_t cmd_config_tunnel_udp_port_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port, udp_port,
 			      UINT16);
@@ -8925,7 +8929,7 @@ cmdline_parse_token_num_t cmd_config_tunnel_udp_port_value =
 cmdline_parse_inst_t cmd_cfg_tunnel_udp_port = {
 	.f = cmd_cfg_tunnel_udp_port_parsed,
 	.data = NULL,
-	.help_str = "port config <port_id> udp_tunnel_port add|rm vxlan|geneve <udp_port>",
+	.help_str = "port config <port_id> udp_tunnel_port add|rm vxlan|geneve|vxlan-gpe <udp_port>",
 	.tokens = {
 		(void *)&cmd_config_tunnel_udp_port_port,
 		(void *)&cmd_config_tunnel_udp_port_config,
Signature · 1 line
2.9.5
#6 lore raw

PATCH v2 4/4 doc: add release note for VXLAN-GPE support

In reply to Qiming Yang
---
 doc/guides/rel_notes/release_19_05.rst | 6 ++++++
 1 file changed, 6 insertions(+)
doc/guides/rel_notes/release_19_05.rst +6 -0
index 61a2c73..2aef044 100644
@@ -91,6 +91,12 @@ New Features
 
   * Added promiscuous mode support.
 
+* **Updated the i40e driver.**
+
+  New features for PF:
+
+  * Support for VXLAN-GPE packet on Intel® 40GbE Controllers.
+  * Added support for VXLAN-GPE classification.
 
 Removed Items
 -------------
Signature · 1 line
2.9.5
#7 lore raw

v3 cover Supported VXLAN-GPE in i40e

In reply to Qiming Yang

This patch set supported new packet type VXLAN-GPE and add support for inner checksum, RSS and classification for VXLAN-GPE.

---
V3:
1. fixed issue in release note.
2. fixed check patch issue.
3. spilted eal related change to a new patch.

V2:
1. move testpmd related changes to a new patch.
2. added release note update.

Qiming Yang (5):
eal: add VXLAN-GPE macro
net/i40e: add support for VXLAN-GPE
net/i40e: support VXLAN-GPE classification
app/testpmd: add VXLAN-GPE to tunnel type
doc: add release note for VXLAN-GPE support

 app/test-pmd/cmdline.c                 | 10 +++++++---
 doc/guides/rel_notes/release_19_05.rst |  6 ++++++
 drivers/net/i40e/i40e_ethdev.c         | 16 ++++++++++++----
 lib/librte_ethdev/rte_eth_ctrl.h       |  1 +
 4 files changed, 26 insertions(+), 7 deletions(-)
Signature · 1 line
2.9.5
#8 lore raw

PATCH v3 1/5 eal: add VXLAN-GPE macro

This patch added VXLAN-GPE macro in rte_eth_tunnel_type.

---
 lib/librte_ethdev/rte_eth_ctrl.h | 1 +
 1 file changed, 1 insertion(+)
lib/librte_ethdev/rte_eth_ctrl.h +1 -0
index 5ea8ae2..b341634 100644
@@ -229,6 +229,7 @@ enum rte_eth_tunnel_type {
 	RTE_TUNNEL_TYPE_NVGRE,
 	RTE_TUNNEL_TYPE_IP_IN_GRE,
 	RTE_L2_TUNNEL_TYPE_E_TAG,
+	RTE_TUNNEL_TYPE_VXLAN_GPE,
 	RTE_TUNNEL_TYPE_MAX,
 };
 
Signature · 1 line
2.9.5
#9 lore raw

PATCH v3 2/5 net/i40e: add support for VXLAN-GPE

In reply to Qiming Yang

Can recognize new packet type VXLAN-GPE in i40e driver. Added inner IP/TCP/UDP checksum and RSS support for VXLAN-GPE packet.

---
 drivers/net/i40e/i40e_ethdev.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/net/i40e/i40e_ethdev.c +9 -4
index dca61f0..b2ec5cc 100644
@@ -8368,7 +8368,7 @@ i40e_get_vxlan_port_idx(struct i40e_pf *pf, uint16_t port)
 }
 
 static int
-i40e_add_vxlan_port(struct i40e_pf *pf, uint16_t port)
+i40e_add_vxlan_port(struct i40e_pf *pf, uint16_t port, int udp_type)
 {
 	int  idx, ret;
 	uint8_t filter_idx;
@@ -8391,7 +8391,7 @@ i40e_add_vxlan_port(struct i40e_pf *pf, uint16_t port)
 		return -ENOSPC;
 	}
 
-	ret =  i40e_aq_add_udp_tunnel(hw, port, I40E_AQC_TUNNEL_TYPE_VXLAN,
+	ret =  i40e_aq_add_udp_tunnel(hw, port, udp_type,
 					&filter_idx, NULL);
 	if (ret < 0) {
 		PMD_DRV_LOG(ERR, "Failed to add VXLAN UDP port %d", port);
@@ -8459,9 +8459,13 @@ i40e_dev_udp_tunnel_port_add(struct rte_eth_dev *dev,
 
 	switch (udp_tunnel->prot_type) {
 	case RTE_TUNNEL_TYPE_VXLAN:
-		ret = i40e_add_vxlan_port(pf, udp_tunnel->udp_port);
+		ret = i40e_add_vxlan_port(pf, udp_tunnel->udp_port,
+					  I40E_AQC_TUNNEL_TYPE_VXLAN);
+		break;
+	case RTE_TUNNEL_TYPE_VXLAN_GPE:
+		ret = i40e_add_vxlan_port(pf, udp_tunnel->udp_port,
+					  I40E_AQC_TUNNEL_TYPE_VXLAN_GPE);
 		break;
-
 	case RTE_TUNNEL_TYPE_GENEVE:
 	case RTE_TUNNEL_TYPE_TEREDO:
 		PMD_DRV_LOG(ERR, "Tunnel type is not supported now.");
@@ -8490,6 +8494,7 @@ i40e_dev_udp_tunnel_port_del(struct rte_eth_dev *dev,
 
 	switch (udp_tunnel->prot_type) {
 	case RTE_TUNNEL_TYPE_VXLAN:
+	case RTE_TUNNEL_TYPE_VXLAN_GPE:
 		ret = i40e_del_vxlan_port(pf, udp_tunnel->udp_port);
 		break;
 	case RTE_TUNNEL_TYPE_GENEVE:
Signature · 1 line
2.9.5
#11 lore raw

PATCH v3 3/5 net/i40e: support VXLAN-GPE classification

In reply to Qiming Yang

Added VXLAN-GPE tunnel filter, supported filter to queue.

---
 drivers/net/i40e/i40e_ethdev.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/net/i40e/i40e_ethdev.c +3 -0
index b2ec5cc..18faf65 100644
@@ -7720,6 +7720,9 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
 	case RTE_TUNNEL_TYPE_IP_IN_GRE:
 		tun_type = I40E_AQC_ADD_CLOUD_TNL_TYPE_IP;
 		break;
+	case RTE_TUNNEL_TYPE_VXLAN_GPE:
+		tun_type = I40E_AQC_ADD_CLOUD_TNL_TYPE_VXLAN_GPE;
+		break;
 	default:
 		/* Other tunnel types is not supported. */
 		PMD_DRV_LOG(ERR, "tunnel type is not supported.");
Signature · 1 line
2.9.5
#12 lore raw

PATCH v3 4/5 app/testpmd: add VXLAN-GPE to tunnel type

In reply to Qiming Yang

This patch added new item "vxlan-gpe" to tunnel_type to support new VXLAN-GPE packet type, and its clasification.

---
 app/test-pmd/cmdline.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
app/test-pmd/cmdline.c +7 -3
index db53cc0..08a554c 100644
@@ -8710,6 +8710,8 @@ cmd_tunnel_filter_parsed(void *parsed_result,
 
 	if (!strcmp(res->tunnel_type, "vxlan"))
 		tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_VXLAN;
+	else if (!strcmp(res->tunnel_type, "vxlan-gpe"))
+		tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_VXLAN_GPE;
 	else if (!strcmp(res->tunnel_type, "nvgre"))
 		tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_NVGRE;
 	else if (!strcmp(res->tunnel_type, "ipingre"))
@@ -8759,7 +8761,7 @@ cmdline_parse_token_ipaddr_t cmd_tunnel_filter_ip_value =
 	ip_value);
 cmdline_parse_token_string_t cmd_tunnel_filter_tunnel_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
-	tunnel_type, "vxlan#nvgre#ipingre");
+	tunnel_type, "vxlan#nvgre#ipingre#vxlan-gpe");
 
 cmdline_parse_token_string_t cmd_tunnel_filter_filter_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
@@ -8883,6 +8885,8 @@ cmd_cfg_tunnel_udp_port_parsed(void *parsed_result,
 		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN;
 	} else if (!strcmp(res->tunnel_type, "geneve")) {
 		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_GENEVE;
+	} else if (!strcmp(res->tunnel_type, "vxlan-gpe")) {
+		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN_GPE;
 	} else {
 		printf("Invalid tunnel type\n");
 		return;
@@ -8917,7 +8921,7 @@ cmdline_parse_token_string_t cmd_config_tunnel_udp_port_action =
 				 "add#rm");
 cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_tunnel_udp_port, tunnel_type,
-				 "vxlan#geneve");
+				 "vxlan#geneve#vxlan-gpe");
 cmdline_parse_token_num_t cmd_config_tunnel_udp_port_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port, udp_port,
 			      UINT16);
@@ -8925,7 +8929,7 @@ cmdline_parse_token_num_t cmd_config_tunnel_udp_port_value =
 cmdline_parse_inst_t cmd_cfg_tunnel_udp_port = {
 	.f = cmd_cfg_tunnel_udp_port_parsed,
 	.data = NULL,
-	.help_str = "port config <port_id> udp_tunnel_port add|rm vxlan|geneve <udp_port>",
+	.help_str = "port config <port_id> udp_tunnel_port add|rm vxlan|geneve|vxlan-gpe <udp_port>",
 	.tokens = {
 		(void *)&cmd_config_tunnel_udp_port_port,
 		(void *)&cmd_config_tunnel_udp_port_config,
Signature · 1 line
2.9.5
#13 lore raw

PATCH v3 5/5 doc: add release note for VXLAN-GPE support

In reply to Qiming Yang

Updated release note.

---
 doc/guides/rel_notes/release_19_05.rst | 6 ++++++
 1 file changed, 6 insertions(+)
doc/guides/rel_notes/release_19_05.rst +6 -0
index 61a2c73..c936f97 100644
@@ -91,6 +91,12 @@ New Features
 
   * Added promiscuous mode support.
 
+* **Updated the i40e driver.**
+
+  New features for PF:
+
+  * Support for VXLAN-GPE packet.
+  * Added support for VXLAN-GPE classification.
 
 Removed Items
 -------------
Signature · 1 line
2.9.5
#10 lore raw
In reply to Qiming Yang
Quoted 11 lines

-----Original Message-----
From: Yang, Qiming
Sent: Monday, March 18, 2019 11:42 PM
To: [email protected]
Cc: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>
Subject: [PATCH v3 2/5] net/i40e: add support for VXLAN-GPE

Can recognize new packet type VXLAN-GPE in i40e driver. Added inner IP/TCP/UDP checksum and RSS support for VXLAN-GPE packet.

The commit log is a missing leading.
.
there is no inner IP/TCP/UDP checksum and RSS related change

May reword to

Add new protocol type VXLAN-GPE support for UDP tunnel.
inner IP/TCP/UDP checksum and RSS configuration shared the same implementation of VXLAN.

Quoted 55 lines
---
 drivers/net/i40e/i40e_ethdev.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/net/i40e/i40e_ethdev.c +2 -2
index dca61f0..b2ec5cc 100644
@@ -8368,7 +8368,7 @@ i40e_get_vxlan_port_idx(struct i40e_pf *pf, uint16_t
 port)  }
 
 static int
-i40e_add_vxlan_port(struct i40e_pf *pf, uint16_t port)
+i40e_add_vxlan_port(struct i40e_pf *pf, uint16_t port, int udp_type)
 {
 	int  idx, ret;
 	uint8_t filter_idx;
@@ -8391,7 +8391,7 @@ i40e_add_vxlan_port(struct i40e_pf *pf, uint16_t port)
 		return -ENOSPC;
 	}
 
-	ret =  i40e_aq_add_udp_tunnel(hw, port,
 I40E_AQC_TUNNEL_TYPE_VXLAN,
+	ret =  i40e_aq_add_udp_tunnel(hw, port, udp_type,
 					&filter_idx, NULL);
 	if (ret < 0) {
drivers/net/i40e/i40e_ethdev.c +7 -5
 		PMD_DRV_LOG(ERR, "Failed to add VXLAN UDP port %d", port); @@
-8459,9 +8459,13 @@ i40e_dev_udp_tunnel_port_add(struct rte_eth_dev *dev,
 
 	switch (udp_tunnel->prot_type) {
 	case RTE_TUNNEL_TYPE_VXLAN:
-		ret = i40e_add_vxlan_port(pf, udp_tunnel->udp_port);
+		ret = i40e_add_vxlan_port(pf, udp_tunnel->udp_port,
+					  I40E_AQC_TUNNEL_TYPE_VXLAN);
+		break;
+	case RTE_TUNNEL_TYPE_VXLAN_GPE:
+		ret = i40e_add_vxlan_port(pf, udp_tunnel->udp_port,
+					  I40E_AQC_TUNNEL_TYPE_VXLAN_GPE);
 		break;
-
 	case RTE_TUNNEL_TYPE_GENEVE:
 	case RTE_TUNNEL_TYPE_TEREDO:
 		PMD_DRV_LOG(ERR, "Tunnel type is not supported now."); @@
-8490,6 +8494,7 @@ i40e_dev_udp_tunnel_port_del(struct rte_eth_dev *dev,
 
 	switch (udp_tunnel->prot_type) {
 	case RTE_TUNNEL_TYPE_VXLAN:
+	case RTE_TUNNEL_TYPE_VXLAN_GPE:
 		ret = i40e_del_vxlan_port(pf, udp_tunnel->udp_port);
 		break;
 	case RTE_TUNNEL_TYPE_GENEVE:
--

2.9.5

Acked-by on the v3 series
#14 lore raw

Re: [PATCH v3 0/5] Supported VXLAN-GPE in i40e

In reply to Qiming Yang
Quoted 29 lines

-----Original Message-----
From: Yang, Qiming
Sent: Monday, March 18, 2019 11:42 PM
To: [email protected]
Cc: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>
Subject: [PATCH v3 0/5] Supported VXLAN-GPE in i40e

This patch set supported new packet type VXLAN-GPE and add support for inner checksum, RSS and classification for VXLAN-GPE.

---
V3:
1. fixed issue in release note.
2. fixed check patch issue.
3. spilted eal related change to a new patch.

V2:
1. move testpmd related changes to a new patch.
2. added release note update.

Qiming Yang (5):
eal: add VXLAN-GPE macro
net/i40e: add support for VXLAN-GPE
net/i40e: support VXLAN-GPE classification
app/testpmd: add VXLAN-GPE to tunnel type
doc: add release note for VXLAN-GPE support

Quoted 8 lines
 app/test-pmd/cmdline.c                 | 10 +++++++---
 doc/guides/rel_notes/release_19_05.rst |  6 ++++++
 drivers/net/i40e/i40e_ethdev.c         | 16 ++++++++++++----
 lib/librte_ethdev/rte_eth_ctrl.h       |  1 +
 4 files changed, 26 insertions(+), 7 deletions(-)

--
2.9.5

some reword needed on patch 2/5 commit log and please do a rebase.

otherwise

#15 lore raw

v4 cover Supported VXLAN-GPE in i40e

In reply to Qiming Yang

This patch set supported new packet type VXLAN-GPE and add support for VXLAN-GPE packet classification.

---
V4:
1. rebased to the latest code.
2. deleted misleading statement.

V3:
1. fixed issue in release note.
2. fixed check patch issue.
3. spilted eal related change to a new patch.

V2:
1. move testpmd related changes to a new patch.
2. added release note update.

Qiming Yang (5):
eal: add VXLAN-GPE macro
net/i40e: add support for VXLAN-GPE
net/i40e: support VXLAN-GPE classification
app/testpmd: add VXLAN-GPE to tunnel type
doc: add release note for VXLAN-GPE support

 app/test-pmd/cmdline.c                 | 10 +++++++---
 doc/guides/rel_notes/release_19_05.rst |  6 ++++++
 drivers/net/i40e/i40e_ethdev.c         | 16 ++++++++++++----
 lib/librte_ethdev/rte_eth_ctrl.h       |  1 +
 4 files changed, 26 insertions(+), 7 deletions(-)
Signature · 1 line
2.9.5
#16 lore raw

PATCH v4 1/5 eal: add VXLAN-GPE macro

This patch added VXLAN-GPE macro in rte_eth_tunnel_type.

---
 lib/librte_ethdev/rte_eth_ctrl.h | 1 +
 1 file changed, 1 insertion(+)
lib/librte_ethdev/rte_eth_ctrl.h +1 -0
index 5ea8ae2..b341634 100644
@@ -229,6 +229,7 @@ enum rte_eth_tunnel_type {
 	RTE_TUNNEL_TYPE_NVGRE,
 	RTE_TUNNEL_TYPE_IP_IN_GRE,
 	RTE_L2_TUNNEL_TYPE_E_TAG,
+	RTE_TUNNEL_TYPE_VXLAN_GPE,
 	RTE_TUNNEL_TYPE_MAX,
 };
 
Signature · 1 line
2.9.5
#19 lore raw

PATCH v4 2/5 net/i40e: add support for VXLAN-GPE

In reply to Qiming Yang

Add new protocol type VXLAN-GPE support for UDP tunnel. inner IP/TCP/UDP checksum and RSS configuration shared the same implementation of VXLAN.

---
 drivers/net/i40e/i40e_ethdev.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/net/i40e/i40e_ethdev.c +9 -4
index 8191a6a..0debee5 100644
@@ -8368,7 +8368,7 @@ i40e_get_vxlan_port_idx(struct i40e_pf *pf, uint16_t port)
 }
 
 static int
-i40e_add_vxlan_port(struct i40e_pf *pf, uint16_t port)
+i40e_add_vxlan_port(struct i40e_pf *pf, uint16_t port, int udp_type)
 {
 	int  idx, ret;
 	uint8_t filter_idx;
@@ -8391,7 +8391,7 @@ i40e_add_vxlan_port(struct i40e_pf *pf, uint16_t port)
 		return -ENOSPC;
 	}
 
-	ret =  i40e_aq_add_udp_tunnel(hw, port, I40E_AQC_TUNNEL_TYPE_VXLAN,
+	ret =  i40e_aq_add_udp_tunnel(hw, port, udp_type,
 					&filter_idx, NULL);
 	if (ret < 0) {
 		PMD_DRV_LOG(ERR, "Failed to add VXLAN UDP port %d", port);
@@ -8459,9 +8459,13 @@ i40e_dev_udp_tunnel_port_add(struct rte_eth_dev *dev,
 
 	switch (udp_tunnel->prot_type) {
 	case RTE_TUNNEL_TYPE_VXLAN:
-		ret = i40e_add_vxlan_port(pf, udp_tunnel->udp_port);
+		ret = i40e_add_vxlan_port(pf, udp_tunnel->udp_port,
+					  I40E_AQC_TUNNEL_TYPE_VXLAN);
+		break;
+	case RTE_TUNNEL_TYPE_VXLAN_GPE:
+		ret = i40e_add_vxlan_port(pf, udp_tunnel->udp_port,
+					  I40E_AQC_TUNNEL_TYPE_VXLAN_GPE);
 		break;
-
 	case RTE_TUNNEL_TYPE_GENEVE:
 	case RTE_TUNNEL_TYPE_TEREDO:
 		PMD_DRV_LOG(ERR, "Tunnel type is not supported now.");
@@ -8490,6 +8494,7 @@ i40e_dev_udp_tunnel_port_del(struct rte_eth_dev *dev,
 
 	switch (udp_tunnel->prot_type) {
 	case RTE_TUNNEL_TYPE_VXLAN:
+	case RTE_TUNNEL_TYPE_VXLAN_GPE:
 		ret = i40e_del_vxlan_port(pf, udp_tunnel->udp_port);
 		break;
 	case RTE_TUNNEL_TYPE_GENEVE:
Signature · 1 line
2.9.5
#20 lore raw

PATCH v4 3/5 net/i40e: support VXLAN-GPE classification

In reply to Qiming Yang

Added VXLAN-GPE tunnel filter, supported filter to queue.

---
 drivers/net/i40e/i40e_ethdev.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/net/i40e/i40e_ethdev.c +3 -0
index 0debee5..dbcacb0 100644
@@ -7720,6 +7720,9 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
 	case RTE_TUNNEL_TYPE_IP_IN_GRE:
 		tun_type = I40E_AQC_ADD_CLOUD_TNL_TYPE_IP;
 		break;
+	case RTE_TUNNEL_TYPE_VXLAN_GPE:
+		tun_type = I40E_AQC_ADD_CLOUD_TNL_TYPE_VXLAN_GPE;
+		break;
 	default:
 		/* Other tunnel types is not supported. */
 		PMD_DRV_LOG(ERR, "tunnel type is not supported.");
Signature · 1 line
2.9.5
#21 lore raw

PATCH v4 4/5 app/testpmd: add VXLAN-GPE to tunnel type

In reply to Qiming Yang

This patch added new item "vxlan-gpe" to tunnel_type to support new VXLAN-GPE packet type, and its clasification.

---
 app/test-pmd/cmdline.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
app/test-pmd/cmdline.c +7 -3
index db53cc0..08a554c 100644
@@ -8710,6 +8710,8 @@ cmd_tunnel_filter_parsed(void *parsed_result,
 
 	if (!strcmp(res->tunnel_type, "vxlan"))
 		tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_VXLAN;
+	else if (!strcmp(res->tunnel_type, "vxlan-gpe"))
+		tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_VXLAN_GPE;
 	else if (!strcmp(res->tunnel_type, "nvgre"))
 		tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_NVGRE;
 	else if (!strcmp(res->tunnel_type, "ipingre"))
@@ -8759,7 +8761,7 @@ cmdline_parse_token_ipaddr_t cmd_tunnel_filter_ip_value =
 	ip_value);
 cmdline_parse_token_string_t cmd_tunnel_filter_tunnel_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
-	tunnel_type, "vxlan#nvgre#ipingre");
+	tunnel_type, "vxlan#nvgre#ipingre#vxlan-gpe");
 
 cmdline_parse_token_string_t cmd_tunnel_filter_filter_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
@@ -8883,6 +8885,8 @@ cmd_cfg_tunnel_udp_port_parsed(void *parsed_result,
 		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN;
 	} else if (!strcmp(res->tunnel_type, "geneve")) {
 		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_GENEVE;
+	} else if (!strcmp(res->tunnel_type, "vxlan-gpe")) {
+		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN_GPE;
 	} else {
 		printf("Invalid tunnel type\n");
 		return;
@@ -8917,7 +8921,7 @@ cmdline_parse_token_string_t cmd_config_tunnel_udp_port_action =
 				 "add#rm");
 cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_tunnel_udp_port, tunnel_type,
-				 "vxlan#geneve");
+				 "vxlan#geneve#vxlan-gpe");
 cmdline_parse_token_num_t cmd_config_tunnel_udp_port_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port, udp_port,
 			      UINT16);
@@ -8925,7 +8929,7 @@ cmdline_parse_token_num_t cmd_config_tunnel_udp_port_value =
 cmdline_parse_inst_t cmd_cfg_tunnel_udp_port = {
 	.f = cmd_cfg_tunnel_udp_port_parsed,
 	.data = NULL,
-	.help_str = "port config <port_id> udp_tunnel_port add|rm vxlan|geneve <udp_port>",
+	.help_str = "port config <port_id> udp_tunnel_port add|rm vxlan|geneve|vxlan-gpe <udp_port>",
 	.tokens = {
 		(void *)&cmd_config_tunnel_udp_port_port,
 		(void *)&cmd_config_tunnel_udp_port_config,
Signature · 1 line
2.9.5
#25 lore raw

PATCH v4 5/5 doc: add release note for VXLAN-GPE support

In reply to Qiming Yang

Updated release note.

---
 doc/guides/rel_notes/release_19_05.rst | 6 ++++++
 1 file changed, 6 insertions(+)
doc/guides/rel_notes/release_19_05.rst +6 -0
index 610c4cd..ab184df 100644
@@ -95,6 +95,12 @@ New Features
 
    Added support of SSE and AVX2 instructions in ICE RX and TX path.
 
+* **Updated the i40e driver.**
+
+  New features for PF:
+  
+  * Added support for VXLAN-GPE packet.
+  * Added support for VXLAN-GPE classification.
 
 Removed Items
 -------------
Signature · 1 line
2.9.5
Applied
#26 lore raw

Re: [PATCH v4 0/5] Supported VXLAN-GPE in i40e

In reply to Qiming Yang
Quoted 35 lines

-----Original Message-----
From: Yang, Qiming
Sent: Wednesday, March 20, 2019 12:37 AM
To: [email protected]
Cc: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>
Subject: [PATCH v4 0/5] Supported VXLAN-GPE in i40e

This patch set supported new packet type VXLAN-GPE and add support for VXLAN-GPE packet classification.

---
V4:
1. rebased to the latest code.
2. deleted misleading statement.

V3:
1. fixed issue in release note.
2. fixed check patch issue.
3. spilted eal related change to a new patch.

V2:
1. move testpmd related changes to a new patch.
2. added release note update.

Qiming Yang (5):
eal: add VXLAN-GPE macro
net/i40e: add support for VXLAN-GPE
net/i40e: support VXLAN-GPE classification
app/testpmd: add VXLAN-GPE to tunnel type
doc: add release note for VXLAN-GPE support

Quoted 8 lines
 app/test-pmd/cmdline.c                 | 10 +++++++---
 doc/guides/rel_notes/release_19_05.rst |  6 ++++++
 drivers/net/i40e/i40e_ethdev.c         | 16 ++++++++++++----
 lib/librte_ethdev/rte_eth_ctrl.h       |  1 +
 4 files changed, 26 insertions(+), 7 deletions(-)

--
2.9.5

Applied to dpdk-next-net-intel.

Thanks
Qi

#17 lore raw

Re: [PATCH v4 1/5] eal: add VXLAN-GPE macro

In reply to Qiming Yang

eal: in the title ? we are in ethdev.

Quoted 13 lines · Qiming Yang

This patch added VXLAN-GPE macro in rte_eth_tunnel_type.

---
 lib/librte_ethdev/rte_eth_ctrl.h | 1 +
 1 file changed, 1 insertion(+)
lib/librte_ethdev/rte_eth_ctrl.h +0 -0
index 5ea8ae2..b341634 100644

lib/librte_ethdev/rte_eth_ctrl.h enum rte_eth_tunnel_type { · line 235

Quoted 7 lines
lib/librte_ethdev/rte_eth_ctrl.h +1 -0
@@ -229,6 +229,7 @@ enum rte_eth_tunnel_type {
        RTE_TUNNEL_TYPE_NVGRE,
        RTE_TUNNEL_TYPE_IP_IN_GRE,
        RTE_L2_TUNNEL_TYPE_E_TAG,
+       RTE_TUNNEL_TYPE_VXLAN_GPE,
        RTE_TUNNEL_TYPE_MAX,
 };
 

Comments on this patch:
- is this the normal process to get an ethdev api update go through dpdk-next-net-intel without an ethdev maintainer acking?
- does this patch introduce an api/abi breakage? (validate-abi.sh did not complain, to my surprise)

Signature · 1 line
David Marchand
#18 lore raw

Re: [PATCH v4 1/5] eal: add VXLAN-GPE macro

Quoted 21 lines · David Marchand

eal: in the title ? we are in ethdev.

Quoted 17 lines · Qiming Yang

This patch added VXLAN-GPE macro in rte_eth_tunnel_type.

---
 lib/librte_ethdev/rte_eth_ctrl.h | 1 +
 1 file changed, 1 insertion(+)
lib/librte_ethdev/rte_eth_ctrl.h +1 -0
index 5ea8ae2..b341634 100644
@@ -229,6 +229,7 @@ enum rte_eth_tunnel_type {
        RTE_TUNNEL_TYPE_NVGRE,
        RTE_TUNNEL_TYPE_IP_IN_GRE,
        RTE_L2_TUNNEL_TYPE_E_TAG,
+       RTE_TUNNEL_TYPE_VXLAN_GPE,
Quoted 8 lines

lib/librte_ethdev/rte_eth_ctrl.h enum rte_eth_tunnel_type { · line 235

Quoted 3 lines
lib/librte_ethdev/rte_eth_ctrl.h +0 -0
        RTE_TUNNEL_TYPE_MAX,
 };
 

Comments on this patch:
- is this the normal process to get an ethdev api update go through dpdk-next-net-intel without an ethdev maintainer acking?

No.
Vendor sub-trees are for the driver only changes.

Quoted 3 lines

- does this patch introduce an api/abi breakage? (validate-abi.sh did not complain, to my surprise)

#22 lore raw

Re: [PATCH v4 4/5] app/testpmd: add VXLAN-GPE to tunnel type

In reply to Qiming Yang

Hi Qiminq,

Quoted 77 lines

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Qiming Yang
Sent: Tuesday, March 19, 2019 4:37 PM
To: [email protected]
Cc: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>
Subject: [dpdk-dev] [PATCH v4 4/5] app/testpmd: add VXLAN-GPE to tunnel type

This patch added new item "vxlan-gpe" to tunnel_type to support new VXLAN-GPE packet type, and its clasification.

---
 app/test-pmd/cmdline.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
app/test-pmd/cmdline.c index renamed from app/test-pmd/cmdline.c +0 -0

db53cc0..08a554c 100644

app/test-pmd/cmdline.c +2 -0
@@ -8710,6 +8710,8 @@ cmd_tunnel_filter_parsed(void *parsed_result,
 
 	if (!strcmp(res->tunnel_type, "vxlan"))
 		tunnel_filter_conf.tunnel_type =
 RTE_TUNNEL_TYPE_VXLAN;
+	else if (!strcmp(res->tunnel_type, "vxlan-gpe"))
+		tunnel_filter_conf.tunnel_type =
 RTE_TUNNEL_TYPE_VXLAN_GPE;
 	else if (!strcmp(res->tunnel_type, "nvgre"))

tunnel_filter_conf.tunnel_type =
RTE_TUNNEL_TYPE_NVGRE;
else if (!strcmp(res->tunnel_type, "ipingre")) @@ -8759,7 +8761,7
@@ cmdline_parse_token_ipaddr_t cmd_tunnel_filter_ip_value =

app/test-pmd/cmdline.c +1 -1
 	ip_value);
 cmdline_parse_token_string_t cmd_tunnel_filter_tunnel_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
-	tunnel_type, "vxlan#nvgre#ipingre");
+	tunnel_type, "vxlan#nvgre#ipingre#vxlan-gpe");
 
 cmdline_parse_token_string_t cmd_tunnel_filter_filter_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result, @@ -

8883,6 +8885,8 @@ cmd_cfg_tunnel_udp_port_parsed(void *parsed_result,

app/test-pmd/cmdline.c +2 -0
 		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN;
 	} else if (!strcmp(res->tunnel_type, "geneve")) {
 		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_GENEVE;
+	} else if (!strcmp(res->tunnel_type, "vxlan-gpe")) {
+		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN_GPE;
 	} else {
 		printf("Invalid tunnel type\n");
 		return;
@@ -8917,7 +8921,7 @@ cmdline_parse_token_string_t

cmd_config_tunnel_udp_port_action =
"add#rm");
cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_type
=
TOKEN_STRING_INITIALIZER(struct cmd_config_tunnel_udp_port,
tunnel_type,

app/test-pmd/cmdline.c +1 -1
-				 "vxlan#geneve");
+				 "vxlan#geneve#vxlan-gpe");
 cmdline_parse_token_num_t cmd_config_tunnel_udp_port_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port,

udp_port,

app/test-pmd/cmdline.c +0 -0
 			      UINT16);
@@ -8925,7 +8929,7 @@ cmdline_parse_token_num_t

cmd_config_tunnel_udp_port_value = cmdline_parse_inst_t cmd_cfg_tunnel_udp_port = {

app/test-pmd/cmdline.c +0 -1
 	.f = cmd_cfg_tunnel_udp_port_parsed,
 	.data = NULL,
-	.help_str = "port config <port_id> udp_tunnel_port add|rm

vxlan|geneve <udp_port>",

app/test-pmd/cmdline.c +2 -1
+	.help_str = "port config <port_id> udp_tunnel_port add|rm
+vxlan|geneve|vxlan-gpe <udp_port>",
 	.tokens = {
 		(void *)&cmd_config_tunnel_udp_port_port,
 		(void *)&cmd_config_tunnel_udp_port_config,
--
Quoted 1 line

2.9.5

Should the help strings at lines 374, 378 , 861 in cmdline.c be updated for vxlan-gpe? Should the help string at lines 2188, 8779 in cmdline.c be updated for vxlan-gpe?

The function flowtype_to_str() at line 11922 should be updated for for vxlan-gpe.

There should also be an update in doc/guides/tesptpmd_app_ug/*.rst for vxlan-gpe.

Regards,

Bernard.

#23 lore raw

Re: [PATCH v4 4/5] app/testpmd: add VXLAN-GPE to tunnel type

Hi Qiming,

<snip>

Quoted 84 lines
Quoted 24 lines

Subject: [dpdk-dev] [PATCH v4 4/5] app/testpmd: add VXLAN-GPE to tunnel type

This patch added new item "vxlan-gpe" to tunnel_type to support new VXLAN-GPE packet type, and its clasification.

---
 app/test-pmd/cmdline.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
app/test-pmd/cmdline.c index renamed from app/test-pmd/cmdline.c +0 -0

db53cc0..08a554c 100644

app/test-pmd/cmdline.c +2 -0
@@ -8710,6 +8710,8 @@ cmd_tunnel_filter_parsed(void *parsed_result,
 
 	if (!strcmp(res->tunnel_type, "vxlan"))
 		tunnel_filter_conf.tunnel_type =
 RTE_TUNNEL_TYPE_VXLAN;
+	else if (!strcmp(res->tunnel_type, "vxlan-gpe"))
+		tunnel_filter_conf.tunnel_type =
 RTE_TUNNEL_TYPE_VXLAN_GPE;
 	else if (!strcmp(res->tunnel_type, "nvgre"))
Quoted 3 lines

tunnel_filter_conf.tunnel_type =
RTE_TUNNEL_TYPE_NVGRE;
else if (!strcmp(res->tunnel_type, "ipingre")) @@ -8759,7 +8761,7

@@

Quoted 10 lines

cmdline_parse_token_ipaddr_t cmd_tunnel_filter_ip_value =

app/test-pmd/cmdline.c +1 -1
 	ip_value);
 cmdline_parse_token_string_t cmd_tunnel_filter_tunnel_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
-	tunnel_type, "vxlan#nvgre#ipingre");
+	tunnel_type, "vxlan#nvgre#ipingre#vxlan-gpe");
 
 cmdline_parse_token_string_t cmd_tunnel_filter_filter_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result, @@ -

8883,6 +8885,8 @@ cmd_cfg_tunnel_udp_port_parsed(void

*parsed_result,

Quoted 9 lines
app/test-pmd/cmdline.c +2 -0
 		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN;
 	} else if (!strcmp(res->tunnel_type, "geneve")) {
 		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_GENEVE;
+	} else if (!strcmp(res->tunnel_type, "vxlan-gpe")) {
+		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN_GPE;
 	} else {
 		printf("Invalid tunnel type\n");
 		return;
@@ -8917,7 +8921,7 @@ cmdline_parse_token_string_t
Quoted 3 lines

cmd_config_tunnel_udp_port_action =
"add#rm");
cmdline_parse_token_string_t

cmd_config_tunnel_udp_port_tunnel_type

app/test-pmd/cmdline.c cmdline_parse_token_string_t cmd_config_tunnel_udp_port_action =

Quoted 7 lines

=
TOKEN_STRING_INITIALIZER(struct cmd_config_tunnel_udp_port,
tunnel_type,

app/test-pmd/cmdline.c +1 -1
-				 "vxlan#geneve");
+				 "vxlan#geneve#vxlan-gpe");
 cmdline_parse_token_num_t cmd_config_tunnel_udp_port_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port,

udp_port,

Quoted 14 lines
app/test-pmd/cmdline.c +0 -0
 			      UINT16);
@@ -8925,7 +8929,7 @@ cmdline_parse_token_num_t

cmd_config_tunnel_udp_port_value = cmdline_parse_inst_t cmd_cfg_tunnel_udp_port = {

app/test-pmd/cmdline.c +0 -1
 	.f = cmd_cfg_tunnel_udp_port_parsed,
 	.data = NULL,
-	.help_str = "port config <port_id> udp_tunnel_port add|rm

vxlan|geneve <udp_port>",

app/test-pmd/cmdline.c +2 -1
+	.help_str = "port config <port_id> udp_tunnel_port add|rm
+vxlan|geneve|vxlan-gpe <udp_port>",
 	.tokens = {
 		(void *)&cmd_config_tunnel_udp_port_port,
 		(void *)&cmd_config_tunnel_udp_port_config,
--
Quoted 1 line

2.9.5

Should the help strings at lines 374, 378 , 861 in cmdline.c be updated for vxlan-gpe?
Should the help string at lines 2188, 8779 in cmdline.c be updated for vxlan- gpe?

The function flowtype_to_str() at line 11922 should be updated for for vxlan-gpe.

Quoted 7 lines

There should also be an update in doc/guides/tesptpmd_app_ug/*.rst for vxlan-gpe.

Regards,

Bernard.

Could you also check that the usage() function is updated in dpdk/app/test-pmd/parameters.c

Regards,

Bernard.

#24 lore raw

Re: [PATCH v4 4/5] app/testpmd: add VXLAN-GPE to tunnel type

In reply to Iremonger, Bernard

Thanks for your reminder, I'll add doc update later.

Qiming

Quoted 107 lines

-----Original Message-----
From: Iremonger, Bernard
Sent: Wednesday, March 27, 2019 7:04 PM
To: Yang, Qiming <[email protected]>; [email protected]
Cc: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>
Subject: RE: [dpdk-dev] [PATCH v4 4/5] app/testpmd: add VXLAN-GPE to tunnel type

Hi Qiminq,

Quoted 30 lines

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Qiming Yang
Sent: Tuesday, March 19, 2019 4:37 PM
To: [email protected]
Cc: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>
Subject: [dpdk-dev] [PATCH v4 4/5] app/testpmd: add VXLAN-GPE to tunnel type

This patch added new item "vxlan-gpe" to tunnel_type to support new VXLAN-GPE packet type, and its clasification.

---
 app/test-pmd/cmdline.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
app/test-pmd/cmdline.c index renamed from app/test-pmd/cmdline.c +0 -0

db53cc0..08a554c 100644

app/test-pmd/cmdline.c +2 -0
@@ -8710,6 +8710,8 @@ cmd_tunnel_filter_parsed(void *parsed_result,
 
 	if (!strcmp(res->tunnel_type, "vxlan"))
 		tunnel_filter_conf.tunnel_type =
 RTE_TUNNEL_TYPE_VXLAN;
+	else if (!strcmp(res->tunnel_type, "vxlan-gpe"))
+		tunnel_filter_conf.tunnel_type =
 RTE_TUNNEL_TYPE_VXLAN_GPE;
 	else if (!strcmp(res->tunnel_type, "nvgre"))
Quoted 3 lines

tunnel_filter_conf.tunnel_type =
RTE_TUNNEL_TYPE_NVGRE;
else if (!strcmp(res->tunnel_type, "ipingre")) @@ -8759,7 +8761,7

@@

Quoted 10 lines

cmdline_parse_token_ipaddr_t cmd_tunnel_filter_ip_value =

app/test-pmd/cmdline.c +1 -1
 	ip_value);
 cmdline_parse_token_string_t cmd_tunnel_filter_tunnel_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
-	tunnel_type, "vxlan#nvgre#ipingre");
+	tunnel_type, "vxlan#nvgre#ipingre#vxlan-gpe");
 
 cmdline_parse_token_string_t cmd_tunnel_filter_filter_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result, @@ -

8883,6 +8885,8 @@ cmd_cfg_tunnel_udp_port_parsed(void

*parsed_result,

Quoted 15 lines
app/test-pmd/cmdline.c +2 -0
 		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN;
 	} else if (!strcmp(res->tunnel_type, "geneve")) {
 		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_GENEVE;
+	} else if (!strcmp(res->tunnel_type, "vxlan-gpe")) {
+		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN_GPE;
 	} else {
 		printf("Invalid tunnel type\n");
 		return;
@@ -8917,7 +8921,7 @@ cmdline_parse_token_string_t

cmd_config_tunnel_udp_port_action =
"add#rm");
cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_type
=
TOKEN_STRING_INITIALIZER(struct cmd_config_tunnel_udp_port,
tunnel_type,

app/test-pmd/cmdline.c cmdline_parse_token_string_t cmd_config_tunnel_udp_port_action =

Quoted 4 lines
app/test-pmd/cmdline.c +1 -1
-				 "vxlan#geneve");
+				 "vxlan#geneve#vxlan-gpe");
 cmdline_parse_token_num_t cmd_config_tunnel_udp_port_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port,

udp_port,

Quoted 14 lines
app/test-pmd/cmdline.c +0 -0
 			      UINT16);
@@ -8925,7 +8929,7 @@ cmdline_parse_token_num_t

cmd_config_tunnel_udp_port_value = cmdline_parse_inst_t cmd_cfg_tunnel_udp_port = {

app/test-pmd/cmdline.c +0 -1
 	.f = cmd_cfg_tunnel_udp_port_parsed,
 	.data = NULL,
-	.help_str = "port config <port_id> udp_tunnel_port add|rm

vxlan|geneve <udp_port>",

app/test-pmd/cmdline.c +2 -1
+	.help_str = "port config <port_id> udp_tunnel_port add|rm
+vxlan|geneve|vxlan-gpe <udp_port>",
 	.tokens = {
 		(void *)&cmd_config_tunnel_udp_port_port,
 		(void *)&cmd_config_tunnel_udp_port_config,
--
Quoted 1 line

2.9.5

Should the help strings at lines 374, 378 , 861 in cmdline.c be updated for vxlan-gpe?
Should the help string at lines 2188, 8779 in cmdline.c be updated for vxlan- gpe?

The function flowtype_to_str() at line 11922 should be updated for for vxlan-gpe.

There should also be an update in doc/guides/tesptpmd_app_ug/*.rst for vxlan-gpe.

Regards,

Bernard.