[dts][PATCH V1 01/12] test_plans/vf_offload: dts adaptation DPDk checksum function changes

[dts][PATCH V1 01/12] test_plans/vf_offload: dts adaptation DPDk checksum function changes

[Weiyuan Li]

DPDK22.11 236bc417e2da(app/testpmd: fix MAC header in checksum forward
engine) changes the checksum functions adds switches to control whether
to exchange MAC address.

Modify DTS code to adapt to this change.

Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>
---
 test_plans/vf_offload_test_plan.rst | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/test_plans/vf_offload_test_plan.rst b/test_plans/vf_offload_test_plan.rst
index c5e720f2..c3b189c0 100644
--- a/test_plans/vf_offload_test_plan.rst
+++ b/test_plans/vf_offload_test_plan.rst
@@ -92,7 +92,13 @@ Enable the IPv4/UDP/TCP/SCTP HW checksum offload on port 0::
   testpmd> csum set udp hw 0
   testpmd> csum set sctp hw 0
   testpmd> port start all
-  testpmd> set promisc 0 on
+  testpmd> set promisc 0 
+  
+  Due to DPDK 236bc417e2da(app/testpmd: fix MAC header in checksum forward engine) changes the checksum 
+  functions adds switches to control whether to exchange MAC address.
+  Currently, our test scripts are based on not exchanging MAC addresses, mac-swap needs to be disabled:
+  testpmd> csum mac-swap off 0
+
   testpmd> start
     csum packet forwarding - CRC stripping disabled - packets/burst=32
     nb forwarding cores=1 - nb forwarding ports=10
@@ -133,6 +139,12 @@ Enable the IPv4/UDP/TCP/SCTP SW checksum offload on port 0::
   testpmd> csum set sctp sw 0
   testpmd> port start all
   testpmd> set promisc 0 on
+
+  Due to DPDK 236bc417e2da(app/testpmd: fix MAC header in checksum forward engine) changes the checksum 
+  functions adds switches to control whether to exchange MAC address.
+  Currently, our test scripts are based on not exchanging MAC addresses, mac-swap needs to be disabled:
+  testpmd> csum mac-swap off 0
+
   testpmd> start
     csum packet forwarding - CRC stripping disabled - packets/burst=32
     nb forwarding cores=1 - nb forwarding ports=10
@@ -217,6 +229,12 @@ Launch the userland ``testpmd`` application on DUT as follows::
   # Set fwd engine and start
 
   testpmd> set fwd csum
+
+  Due to DPDK 236bc417e2da(app/testpmd: fix MAC header in checksum forward engine) changes the checksum 
+  functions adds switches to control whether to exchange MAC address.
+  Currently, our test scripts are based on not exchanging MAC addresses, mac-swap needs to be disabled:
+  testpmd> csum mac-swap off 0
+
   testpmd> start
 
 Test IPv4() in scapy::
-- 
2.27.0

[dts][PATCH V1 02/12] tests/vf_offload: dts adaptation DPDk checksum function changes

[Weiyuan Li]

DPDK22.11 236bc417e2da(app/testpmd: fix MAC header in checksum forward
engine) changes the checksum functions adds switches to control whether
to exchange MAC address.

Modify DTS code to adapt to this change.

Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>
---
 tests/TestSuite_vf_offload.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/TestSuite_vf_offload.py b/tests/TestSuite_vf_offload.py
index 75c75f05..26fad2b8 100644
--- a/tests/TestSuite_vf_offload.py
+++ b/tests/TestSuite_vf_offload.py
@@ -314,6 +314,8 @@ class TestVfOffload(TestCase):
             param="--portmask=%s " % (self.portMask) + "--enable-rx-cksum " + "",
         )
         self.vm0_testpmd.execute_cmd("set fwd csum")
+        self.vm0_testpmd.execute_cmd("csum mac-swap off 0", "testpmd>")
+        self.vm0_testpmd.execute_cmd("csum mac-swap off 1", "testpmd>")
         self.vm0_testpmd.execute_cmd("set promisc 1 on")
         self.vm0_testpmd.execute_cmd("set promisc 0 on")
 
@@ -376,6 +378,8 @@ class TestVfOffload(TestCase):
             param="--portmask=%s " % (self.portMask) + "--enable-rx-cksum " + "",
         )
         self.vm0_testpmd.execute_cmd("set fwd csum")
+        self.vm0_testpmd.execute_cmd("csum mac-swap off 0", "testpmd>")
+        self.vm0_testpmd.execute_cmd("csum mac-swap off 1", "testpmd>")
         self.vm0_testpmd.execute_cmd("set promisc 1 on")
         self.vm0_testpmd.execute_cmd("set promisc 0 on")
 
-- 
2.27.0

[dts][PATCH V1 03/12] test_plans/checksum_offload: dts adaptation DPDk checksum function changes

[Weiyuan Li]

DPDK22.11 236bc417e2da(app/testpmd: fix MAC header in checksum forward
engine) changes the checksum functions adds switches to control whether
to exchange MAC address.

Modify DTS code to adapt to this change.

Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>
---
 test_plans/checksum_offload_test_plan.rst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test_plans/checksum_offload_test_plan.rst b/test_plans/checksum_offload_test_plan.rst
index 00db1a74..b7e1694c 100644
--- a/test_plans/checksum_offload_test_plan.rst
+++ b/test_plans/checksum_offload_test_plan.rst
@@ -59,6 +59,11 @@ Set the verbose level to 1 to display information for each received packet::
 
   testpmd> set verbose 1
 
+Due to DPDK 236bc417e2da(app/testpmd: fix MAC header in checksum forward engine) changes the checksum 
+functions adds switches to control whether to exchange MAC address.
+Currently, our test scripts are based on not exchanging MAC addresses, mac-swap needs to be disabled:
+
+  testpmd> csum mac-swap off 0
 
 Test Case: Insert IPv4/IPv6 UDP/TCP/SCTP checksum on the transmit packet
 ========================================================================
@@ -1000,4 +1005,4 @@ combination: IPv4/UDP, IPv4/TCP, IPv6/UDP, IPv6/TCP::
 
 Then verify that the same number of packet are correctly received on the tester. 
 
-Inspect the pcap file from the packet capture and verify the checksums.
\ No newline at end of file
+Inspect the pcap file from the packet capture and verify the checksums.
-- 
2.27.0

[dts][PATCH V1 04/12] tests/checksum_offload: dts adaptation DPDk checksum function changes

[Weiyuan Li]

DPDK22.11 236bc417e2da(app/testpmd: fix MAC header in checksum forward
engine) changes the checksum functions adds switches to control whether
to exchange MAC address.

Modify DTS code to adapt to this change.

Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>
---
 tests/TestSuite_checksum_offload.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/TestSuite_checksum_offload.py b/tests/TestSuite_checksum_offload.py
index 6eed3f05..0214231c 100644
--- a/tests/TestSuite_checksum_offload.py
+++ b/tests/TestSuite_checksum_offload.py
@@ -90,6 +90,7 @@ class TestChecksumOffload(TestCase):
         )
         self.dut.send_expect("set verbose 1", "testpmd>")
         self.dut.send_expect("set fwd csum", "testpmd>")
+        self.dut.send_expect("csum mac-swap off 0", "testpmd>")
 
     def checksum_enablehw(self, port):
         self.dut.send_expect("port stop all", "testpmd>")
-- 
2.27.0

[dts][PATCH V1 05/12] test_plans/ice_advanced_iavf_rss: dts adaptation DPDk checksum function changes

[Weiyuan Li]

DPDK22.11 236bc417e2da(app/testpmd: fix MAC header in checksum forward
engine) changes the checksum functions adds switches to control whether
to exchange MAC address.

Modify DTS code to adapt to this change.

Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>
---
 test_plans/ice_advanced_iavf_rss_test_plan.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test_plans/ice_advanced_iavf_rss_test_plan.rst b/test_plans/ice_advanced_iavf_rss_test_plan.rst
index e5abe8be..2818c228 100644
--- a/test_plans/ice_advanced_iavf_rss_test_plan.rst
+++ b/test_plans/ice_advanced_iavf_rss_test_plan.rst
@@ -3367,6 +3367,11 @@ Test case: Set HW csum, flow rule does not impact RX checksum and TX checksum
     port start all
     set promisc 0 on
     set verbose 1
+
+    Due to DPDK 236bc417e2da(app/testpmd: fix MAC header in checksum forward engine) changes the checksum 
+    functions adds switches to control whether to exchange MAC address.
+    Currently, our test scripts are based on not exchanging MAC addresses, mac-swap needs to be disabled:
+    testpmd> csum mac-swap off 0
     start
 
 3. Capture the tx packet at tester port and check checksum values same as expect pkts::
-- 
2.27.0

[dts][PATCH V1 06/12] tests/ice_advanced_iavf_rss: dts adaptation DPDk checksum function changes

[Weiyuan Li]

DPDK22.11 236bc417e2da(app/testpmd: fix MAC header in checksum forward
engine) changes the checksum functions adds switches to control whether
to exchange MAC address.

Modify DTS code to adapt to this change.

Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>
---
 tests/TestSuite_ice_advanced_iavf_rss.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/TestSuite_ice_advanced_iavf_rss.py b/tests/TestSuite_ice_advanced_iavf_rss.py
index 8e8d7319..ddbc8cd6 100644
--- a/tests/TestSuite_ice_advanced_iavf_rss.py
+++ b/tests/TestSuite_ice_advanced_iavf_rss.py
@@ -7052,6 +7052,7 @@ class AdvancedIavfRSSTest(TestCase):
         self.pmd_output.execute_cmd("csum set sctp hw 0")
         self.pmd_output.execute_cmd("port start all")
         self.pmd_output.execute_cmd("set promisc 0 on")
+        self.pmd_output.execute_cmd("csum mac-swap off 0", "testpmd>")
         self.pmd_output.execute_cmd("start")
         dst_mac = "00:11:22:33:44:56"
         pkt_list = {
-- 
2.27.0

[dts][PATCH V1 07/12] test_plans/ice_advanced_rss: dts adaptation DPDk checksum function changes

[Weiyuan Li]

DPDK22.11 236bc417e2da(app/testpmd: fix MAC header in checksum forward
engine) changes the checksum functions adds switches to control whether
to exchange MAC address.

Modify DTS code to adapt to this change.

Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>
---
 test_plans/ice_advanced_rss_test_plan.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test_plans/ice_advanced_rss_test_plan.rst b/test_plans/ice_advanced_rss_test_plan.rst
index d2e8a07a..755a1a37 100644
--- a/test_plans/ice_advanced_rss_test_plan.rst
+++ b/test_plans/ice_advanced_rss_test_plan.rst
@@ -2562,6 +2562,12 @@ Test case: Set HW csum, flow rule does not impact RX checksum and TX checksum
     csum set sctp hw 0
     port start all
     set verbose 1
+
+    Due to DPDK 236bc417e2da(app/testpmd: fix MAC header in checksum forward engine) changes the checksum 
+    functions adds switches to control whether to exchange MAC address.
+    Currently, our test scripts are based on not exchanging MAC addresses, mac-swap needs to be disabled:
+    testpmd> csum mac-swap off 0
+
     start
 
 3. Capture the tx packet at tester port and check checksum values same as expect pkts::
-- 
2.27.0

[dts][PATCH V1 08/12] tests/ice_advanced_rss: dts adaptation DPDk checksum function changes

[Weiyuan Li]

DPDK22.11 236bc417e2da(app/testpmd: fix MAC header in checksum forward
engine) changes the checksum functions adds switches to control whether
to exchange MAC address.

Modify DTS code to adapt to this change.

Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>
---
 tests/TestSuite_ice_advanced_rss.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/TestSuite_ice_advanced_rss.py b/tests/TestSuite_ice_advanced_rss.py
index e18e42f6..f01a11fb 100644
--- a/tests/TestSuite_ice_advanced_rss.py
+++ b/tests/TestSuite_ice_advanced_rss.py
@@ -6367,6 +6367,7 @@ class AdvancedRSSTest(TestCase):
         self.pmd_output.execute_cmd("csum set udp hw 0")
         self.pmd_output.execute_cmd("csum set tcp hw 0")
         self.pmd_output.execute_cmd("csum set sctp hw 0")
+        self.pmd_output.execute_cmd("csum mac-swap off 0", "testpmd>")
         self.pmd_output.execute_cmd("port start all")
         self.pmd_output.execute_cmd("start")
         dst_mac = "00:11:22:33:44:56"
-- 
2.27.0

[dts][PATCH V1 09/12] test_plans/ice_iavf_fdir: dts adaptation DPDk checksum function changes

[Weiyuan Li]

DPDK22.11 236bc417e2da(app/testpmd: fix MAC header in checksum forward
engine) changes the checksum functions adds switches to control whether
to exchange MAC address.

Modify DTS code to adapt to this change.

Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>
---
 test_plans/ice_iavf_fdir_test_plan.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/test_plans/ice_iavf_fdir_test_plan.rst b/test_plans/ice_iavf_fdir_test_plan.rst
index 54779ad2..2b73037f 100644
--- a/test_plans/ice_iavf_fdir_test_plan.rst
+++ b/test_plans/ice_iavf_fdir_test_plan.rst
@@ -5103,6 +5103,12 @@ Subcase 1: PFCP FDIR vlan strip on HW checksum offload check
     testpmd> port start all
     testpmd> set promisc 0 on
     testpmd> set verbose 1
+
+    Due to DPDK 236bc417e2da(app/testpmd: fix MAC header in checksum forward engine) changes the checksum 
+    functions adds switches to control whether to exchange MAC address.
+    Currently, our test scripts are based on not exchanging MAC addresses, mac-swap needs to be disabled:
+    testpmd> csum mac-swap off 0
+
     testpmd> start
 
 4. DUT create fdir rules for MAC_IPV4_PFCP_NODE/MAC_IPV4_PFCP_SESSION/MAC_IPV6_PFCP_NODE/MAC_IPV6_PFCP_SESSION with queue index and mark::
@@ -5174,6 +5180,12 @@ subcase 2: PFCP FDIR vlan strip off SW checksum offload check
     testpmd> port start all
     testpmd> set verbose 1
     testpmd> set promisc 0 on
+
+    Due to DPDK 236bc417e2da(app/testpmd: fix MAC header in checksum forward engine) changes the checksum 
+    functions adds switches to control whether to exchange MAC address.
+    Currently, our test scripts are based on not exchanging MAC addresses, mac-swap needs to be disabled:
+    testpmd> csum mac-swap off 0
+
     testpmd> start
 
 4. DUT create fdir rules for MAC_IPV4_PFCP_NODE/MAC_IPV4_PFCP_SESSION/MAC_IPV6_PFCP_NODE/MAC_IPV6_PFCP_SESSION with queue index and mark::
-- 
2.27.0

[dts][PATCH V1 10/12] tests/ice_iavf_fdir: dts adaptation DPDk checksum function changes

[Weiyuan Li]

DPDK22.11 236bc417e2da(app/testpmd: fix MAC header in checksum forward
engine) changes the checksum functions adds switches to control whether
to exchange MAC address.

Modify DTS code to adapt to this change.

Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>
---
 tests/TestSuite_ice_iavf_fdir.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/TestSuite_ice_iavf_fdir.py b/tests/TestSuite_ice_iavf_fdir.py
index d6ca832a..6410920c 100644
--- a/tests/TestSuite_ice_iavf_fdir.py
+++ b/tests/TestSuite_ice_iavf_fdir.py
@@ -11082,6 +11082,7 @@ class TestICEIAVFFdir(TestCase):
         self.dut.send_expect("csum set udp %s %d" % (hw, port), "testpmd>")
         self.dut.send_expect("port start all", "testpmd>")
         self.dut.send_expect("set promisc 0 on", "testpmd>")
+        self.dut.send_expect("csum mac-swap off 0", "testpmd>")
         self.dut.send_expect("start", "testpmd>")
 
     def get_chksum_values(self, packets_expected):
-- 
2.27.0

[dts][PATCH V1 11/12] test_plans/tx_preparation: dts adaptation DPDk checksum function changes

[Weiyuan Li]

DPDK22.11 236bc417e2da(app/testpmd: fix MAC header in checksum forward
engine) changes the checksum functions adds switches to control whether
to exchange MAC address.

Modify DTS code to adapt to this change.

Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>
---
 test_plans/tx_preparation_test_plan.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test_plans/tx_preparation_test_plan.rst b/test_plans/tx_preparation_test_plan.rst
index 9d68782b..a739c13d 100644
--- a/test_plans/tx_preparation_test_plan.rst
+++ b/test_plans/tx_preparation_test_plan.rst
@@ -64,6 +64,11 @@ Enable hardware checksum for IP/TCP/UDP packets::
    testpmd> csum set tcp hw 0
    testpmd> csum set udp hw 0
 
+Due to DPDK 236bc417e2da(app/testpmd: fix MAC header in checksum forward engine) changes the checksum 
+functions adds switches to control whether to exchange MAC address.
+Currently, our test scripts are based on not exchanging MAC addresses, mac-swap needs to be disabled:
+
+   testpmd> csum mac-swap off 0
 
 Test Case: TX preparation forwarding of non-TSO packets
 =======================================================
-- 
2.27.0

[dts][PATCH V1 12/12] tests/tx_preparation: dts adaptation DPDk checksum function changes

[Weiyuan Li]

DPDK22.11 236bc417e2da(app/testpmd: fix MAC header in checksum forward
engine) changes the checksum functions adds switches to control whether
to exchange MAC address.

Modify DTS code to adapt to this change.

Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>
---
 tests/TestSuite_tx_preparation.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/TestSuite_tx_preparation.py b/tests/TestSuite_tx_preparation.py
index 42fff1cf..51d02d10 100644
--- a/tests/TestSuite_tx_preparation.py
+++ b/tests/TestSuite_tx_preparation.py
@@ -183,6 +183,7 @@ class TestTX_preparation(TestCase):
         """
         self.dut_testpmd.execute_cmd("tso set 0 0")
         self.dut_testpmd.execute_cmd("port start all")
+        self.dut_testpmd.execute_cmd("csum mac-swap off 0", "testpmd>")
         self.dut_testpmd.execute_cmd("start")
 
         self.send_packet_verify()
@@ -192,6 +193,7 @@ class TestTX_preparation(TestCase):
         ftag functional test
         """
         self.dut_testpmd.execute_cmd("tso set %s 0" % TSO_value)
+        self.dut_testpmd.execute_cmd("csum mac-swap off 0", "testpmd>")
         self.dut_testpmd.execute_cmd("port start all")
         self.dut_testpmd.execute_cmd("start")
 
-- 
2.27.0

RE: [dts][PATCH V1 12/12] tests/tx_preparation: dts adaptation DPDk checksum function changes

[Peng, Yuan]

> -----Original Message-----
> From: Li, WeiyuanX <weiyuanx.li@intel.com>
> Sent: Friday, November 25, 2022 5:17 PM
> To: dts@dpdk.org; Peng, Yuan <yuan.peng@intel.com>
> Cc: Li, WeiyuanX <weiyuanx.li@intel.com>
> Subject: [dts][PATCH V1 12/12] tests/tx_preparation: dts adaptation DPDk
> checksum function changes
> 
> DPDK22.11 236bc417e2da(app/testpmd: fix MAC header in checksum
> forward
> engine) changes the checksum functions adds switches to control whether to
> exchange MAC address.
> 
> Modify DTS code to adapt to this change.
> 
> Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>
> ---

Acked-by: Yuan Peng <yuan.peng@intel.com>

RE: [dts][PATCH V1 12/12] tests/tx_preparation: dts adaptation DPDk checksum function changes

[Jiale, SongX]

> -----Original Message-----
> From: Weiyuan Li <weiyuanx.li@intel.com>
> Sent: Friday, November 25, 2022 5:17 PM
> To: dts@dpdk.org; Peng, Yuan <yuan.peng@intel.com>
> Cc: Li, WeiyuanX <weiyuanx.li@intel.com>
> Subject: [dts][PATCH V1 12/12] tests/tx_preparation: dts adaptation DPDk
> checksum function changes
> 
> DPDK22.11 236bc417e2da(app/testpmd: fix MAC header in checksum
> forward
> engine) changes the checksum functions adds switches to control whether to
> exchange MAC address.
> 
> Modify DTS code to adapt to this change.
> 
> Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>
> ---
Tested-by: Song Jiale <songx.jiale@intel.com>