|WARNING| pw115697 [PATCH] net/i40e: fix incorrect VLAN stripping for QinQ

|WARNING| pw115697 [PATCH] net/i40e: fix incorrect VLAN stripping for QinQ

[dpdklab]

[-- Attachment #1: Type: text/plain, Size: 3672 bytes --]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/115697

_apply patch failure_

Submitter: Kevin Liu <kevinx.liu@intel.com>
Date: Thursday, September 01 2022 10:05:49 
Applied on: CommitID:4aee6110bb10b0225fa9562f2e48af233a9058a1
Apply patch set 115697 failed:

Checking patch doc/guides/nics/i40e.rst...
error: while searching for:
If FW version >= 8.4, there'll be some Vlan related issues:

#. TCI input set for QinQ  is invalid.
#. Fail to configure TPID for QinQ.
#. Fail to strip outer Vlan.

Example of getting best performance with l3fwd example
------------------------------------------------------

error: patch failed: doc/guides/nics/i40e.rst:982
Checking patch drivers/net/i40e/i40e_ethdev.c...
error: while searching for:
		if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_EXTEND) {
			if (pf->fw8_3gt) {
				i40e_vsi_config_qinq(vsi, TRUE);
			} else {
				i40e_vsi_config_double_vlan(vsi, TRUE);
				/* Set global registers with default ethertype. */

error: patch failed: drivers/net/i40e/i40e_ethdev.c:4068
error: while searching for:
							RTE_ETHER_TYPE_VLAN);
			}
		} else {
			if (pf->fw8_3gt)
				i40e_vsi_config_qinq(vsi, FALSE);
			else
				i40e_vsi_config_double_vlan(vsi, FALSE);
		}
		/*restore mac/vlan filters of all ports*/
		for (j = 0; j < port_num; j++) {

error: patch failed: drivers/net/i40e/i40e_ethdev.c:4077
Hunk #5 succeeded at 4073 (offset -39 lines).
Hunk #6 succeeded at 5215 (offset -39 lines).
Hunk #7 succeeded at 5226 (offset -39 lines).
Hunk #8 succeeded at 5868 (offset -39 lines).
Hunk #9 succeeded at 6171 (offset -39 lines).
Checking patch drivers/net/i40e/i40e_ethdev.h...
Applying patch doc/guides/nics/i40e.rst with 1 reject...
Rejected hunk #1.
Applying patch drivers/net/i40e/i40e_ethdev.c with 2 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Rejected hunk #4.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Hunk #8 applied cleanly.
Hunk #9 applied cleanly.
Applied patch drivers/net/i40e/i40e_ethdev.h cleanly.
diff a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst	(rejected hunks)
@@ -982,8 +982,6 @@ Vlan related Features miss when FW >= 8.4
 If FW version >= 8.4, there'll be some Vlan related issues:
 
 #. TCI input set for QinQ  is invalid.
-#. Fail to configure TPID for QinQ.
-#. Fail to strip outer Vlan.
 
 Example of getting best performance with l3fwd example
 ------------------------------------------------------
diff a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c	(rejected hunks)
@@ -4068,6 +4075,10 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)
 		if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_EXTEND) {
 			if (pf->fw8_3gt) {
 				i40e_vsi_config_qinq(vsi, TRUE);
+				if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) {
+					i40e_vsi_config_vlan_stripping(vsi, FALSE);
+					i40e_vsi_config_vlan_stripping_v1(vsi, TRUE);
+				}
 			} else {
 				i40e_vsi_config_double_vlan(vsi, TRUE);
 				/* Set global registers with default ethertype. */
@@ -4077,10 +4088,15 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)
 							RTE_ETHER_TYPE_VLAN);
 			}
 		} else {
-			if (pf->fw8_3gt)
+			if (pf->fw8_3gt) {
 				i40e_vsi_config_qinq(vsi, FALSE);
-			else
+				if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) {
+					i40e_vsi_config_vlan_stripping_v1(vsi, FALSE);
+					i40e_vsi_config_vlan_stripping(vsi, TRUE);
+				}
+			} else {
 				i40e_vsi_config_double_vlan(vsi, FALSE);
+			}
 		}
 		/*restore mac/vlan filters of all ports*/
 		for (j = 0; j < port_num; j++) {

https://lab.dpdk.org/results/dashboard/patchsets/23364/

UNH-IOL DPDK Community Lab