From 8b2ca2f17acca6f93d15dc10015ad3543f3550df Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 31 May 2024 04:13:43 +0000 Subject: [PATCH] Revert "feat(hoststack): Enable L4 checksum RX offload" This reverts commit 4e897a7a91e8b4782da05a4c906392e62c8f8ab5. Reason for revert: Container/Qemu is not conditioned. Change-Id: I497caa2db24803f40811b3c60c359b4772cacda7 Signed-off-by: Peter Mikus --- resources/libraries/python/ContainerUtils.py | 1 - resources/libraries/python/KubernetesUtils.py | 3 +-- resources/libraries/python/QemuUtils.py | 3 +-- resources/libraries/python/VppConfigGenerator.py | 5 ----- resources/libraries/robot/shared/interfaces.robot | 5 ----- .../hoststack/10ge2p1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot | 1 - .../10ge2p1x710-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot | 1 - .../10ge2p1x710-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot | 1 - ...10ge2p1x710-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot | 1 - .../hoststack/10ge2p1x710-eth-ip4udpbase-ldpreload-iperf3-bps.robot | 1 - .../perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot | 1 - .../10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot | 1 - .../10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot | 1 - .../10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot | 1 - .../10ge2p1x710-eth-ip4udpscale1cl10s-ldpreload-iperf3-bps.robot | 1 - ...l-10ge2p1x710-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-cps.robot | 1 - ...l-10ge2p1x710-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-rps.robot | 1 - .../2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps.robot | 1 - .../2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps.robot | 1 - 19 files changed, 2 insertions(+), 29 deletions(-) diff --git a/resources/libraries/python/ContainerUtils.py b/resources/libraries/python/ContainerUtils.py index c0a282f775..fc32248f6b 100644 --- a/resources/libraries/python/ContainerUtils.py +++ b/resources/libraries/python/ContainerUtils.py @@ -763,7 +763,6 @@ class ContainerEngine: vpp_config = self.create_base_vpp_startup_config(cpuset_cpus) vpp_config.add_dpdk_dev(*devices) vpp_config.add_dpdk_log_level(u"debug") - vpp_config.add_dpdk_enable_tcp_udp_checksum() vpp_config.add_dpdk_no_tx_checksum_offload() vpp_config.add_dpdk_dev_default_rxq(rxq) vpp_config.add_plugin(u"enable", u"dpdk_plugin.so") diff --git a/resources/libraries/python/KubernetesUtils.py b/resources/libraries/python/KubernetesUtils.py index 6da5ba017d..9ded0e8b9e 100644 --- a/resources/libraries/python/KubernetesUtils.py +++ b/resources/libraries/python/KubernetesUtils.py @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Cisco and/or its affiliates. +# Copyright (c) 2021 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -492,7 +492,6 @@ class KubernetesUtils: vpp_config.add_ip6_hash_buckets(u"2000000") if not kwargs[u"jumbo"]: vpp_config.add_dpdk_no_multi_seg() - vpp_config.add_dpdk_enable_tcp_udp_checksum() vpp_config.add_dpdk_no_tx_checksum_offload() vpp_config.add_dpdk_dev_default_rxq(kwargs[u"rxq_count_int"]) vpp_config.add_dpdk_dev(kwargs[u"if1"], kwargs[u"if2"]) diff --git a/resources/libraries/python/QemuUtils.py b/resources/libraries/python/QemuUtils.py index c9bbed4e81..2df89ee87c 100644 --- a/resources/libraries/python/QemuUtils.py +++ b/resources/libraries/python/QemuUtils.py @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Cisco and/or its affiliates. +# Copyright (c) 2022-2023 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -344,7 +344,6 @@ class QemuUtils: vpp_config.add_dpdk_log_level(u"debug") if not kwargs[u"jumbo_frames"]: vpp_config.add_dpdk_no_multi_seg() - vpp_config.add_dpdk_no_enable_tcp_udp_checksum() vpp_config.add_dpdk_no_tx_checksum_offload() if "ipsec" in self._opt.get(u'vnf'): vpp_config.add_plugin(u"enable", u"crypto_native_plugin.so") diff --git a/resources/libraries/python/VppConfigGenerator.py b/resources/libraries/python/VppConfigGenerator.py index fb3df2fc16..73eff44066 100644 --- a/resources/libraries/python/VppConfigGenerator.py +++ b/resources/libraries/python/VppConfigGenerator.py @@ -551,11 +551,6 @@ class VppConfigGenerator: path = ["dpdk", "no-multi-seg"] self.add_config_item(self._nodeconfig, "", path) - def add_dpdk_enable_tcp_udp_checksum(self): - """Add DPDK enable-tcp-udp-checksum configuration.""" - path = ["dpdk", "enable-tcp-udp-checksum"] - self.add_config_item(self._nodeconfig, "", path) - def add_dpdk_no_tx_checksum_offload(self): """Add DPDK no-tx-checksum-offload configuration.""" path = ["dpdk", "no-tx-checksum-offload"] diff --git a/resources/libraries/robot/shared/interfaces.robot b/resources/libraries/robot/shared/interfaces.robot index b4d6959d01..091a09eeaf 100644 --- a/resources/libraries/robot/shared/interfaces.robot +++ b/resources/libraries/robot/shared/interfaces.robot @@ -16,7 +16,6 @@ | Library | resources.libraries.python.VhostUser *** Variables *** -| ${dpdk_enable_tcp_udp_checksum}= | ${False} | ${dpdk_no_tx_checksum_offload}= | ${True} *** Keywords *** @@ -137,8 +136,6 @@ | | | Unbind PCI Devices From Other Driver | ${nodes['${dut}']} | vfio-pci | | | | ... | @{${dut}_pf_pci} | | | Run keyword | ${dut}.Add DPDK Dev | @{${dut}_pf_pci} -| | | Run Keyword If | ${dpdk_enable_tcp_udp_checksum} -| | | ... | ${dut}.Add DPDK Enable TCP UDP Checksum | | | Run Keyword If | ${dpdk_no_tx_checksum_offload} | | | ... | ${dut}.Add DPDK No Tx Checksum Offload | | | Run Keyword | ${dut}.Add DPDK Log Level | debug @@ -204,8 +201,6 @@ | | Run Keyword If | ${index} >= 0 | Return From Keyword | | FOR | ${dut} | IN | @{duts} | | | Run keyword | ${dut}.Add DPDK Dev | @{${dut}_pf_pci} -| | | Run Keyword If | ${dpdk_enable_tcp_udp_checksum} -| | | ... | ${dut}.Add DPDK Enable TCP UDP Checksum | | | Run Keyword If | ${dpdk_no_tx_checksum_offload} | | | ... | ${dut}.Add DPDK No Tx Checksum Offload | | | Run Keyword | ${dut}.Add DPDK Log Level | debug diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot index 654562f38d..2f8232e4c2 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot @@ -50,7 +50,6 @@ | ${nic_vfs}= | 0 | ${smt_used}= | ${False} | ${overhead}= | ${0} -| ${dpdk_enable_tcp_udp_checksum}= | ${True} | ${dpdk_no_tx_checksum_offload}= | ${False} | ${frame_size}= | ${1518} | ${crypto_type}= | ${None} diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot index c7ed27e2d1..39dd77f684 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot @@ -50,7 +50,6 @@ | ${nic_vfs}= | 0 | ${smt_used}= | ${False} | ${overhead}= | ${0} -| ${dpdk_enable_tcp_udp_checksum}= | ${True} | ${dpdk_no_tx_checksum_offload}= | ${False} | ${frame_size}= | ${1518} | ${crypto_type}= | ${None} diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot index 20a4049c50..17ac73b8e0 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot @@ -49,7 +49,6 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${dpdk_enable_tcp_udp_checksum}= | ${True} | ${dpdk_no_tx_checksum_offload}= | ${False} | ${frame_size}= | ${1518} | ${crypto_type}= | ${None} diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot index 5c13ca0e9b..30ac61def0 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot @@ -49,7 +49,6 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${dpdk_enable_tcp_udp_checksum}= | ${True} | ${dpdk_no_tx_checksum_offload}= | ${False} | ${frame_size}= | ${1518} | ${crypto_type}= | ${None} diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpbase-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpbase-ldpreload-iperf3-bps.robot index 87f3c09896..491e20b170 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpbase-ldpreload-iperf3-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpbase-ldpreload-iperf3-bps.robot @@ -50,7 +50,6 @@ | ${nic_vfs}= | 0 | ${smt_used}= | ${False} | ${overhead}= | ${0} -| ${dpdk_enable_tcp_udp_checksum}= | ${True} | ${dpdk_no_tx_checksum_offload}= | ${False} | ${frame_size}= | ${1518} | ${crypto_type}= | ${None} diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot index 911af4c170..5f2eafb2f5 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot @@ -49,7 +49,6 @@ | ${nic_vfs}= | 0 | ${smt_used}= | ${False} | ${overhead}= | ${0} -| ${dpdk_enable_tcp_udp_checksum}= | ${True} | ${dpdk_no_tx_checksum_offload}= | ${False} | ${frame_size}= | ${1518} | ${crypto_type}= | ${None} diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot index e068186700..5806905b4f 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot @@ -49,7 +49,6 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${dpdk_enable_tcp_udp_checksum}= | ${True} | ${dpdk_no_tx_checksum_offload}= | ${False} | ${frame_size}= | ${1518} | ${crypto_type}= | ${None} diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot index 1203173398..a31273681e 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot @@ -49,7 +49,6 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${dpdk_enable_tcp_udp_checksum}= | ${True} | ${dpdk_no_tx_checksum_offload}= | ${False} | ${frame_size}= | ${1518} | ${crypto_type}= | ${None} diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot index 6c28e2f3e7..59951aa5db 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot @@ -49,7 +49,6 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${dpdk_enable_tcp_udp_checksum}= | ${True} | ${dpdk_no_tx_checksum_offload}= | ${False} | ${frame_size}= | ${1518} | ${crypto_type}= | ${None} diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpscale1cl10s-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpscale1cl10s-ldpreload-iperf3-bps.robot index c942f2bea6..0368f9d15b 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpscale1cl10s-ldpreload-iperf3-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpscale1cl10s-ldpreload-iperf3-bps.robot @@ -49,7 +49,6 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${dpdk_enable_tcp_udp_checksum}= | ${True} | ${dpdk_no_tx_checksum_offload}= | ${False} | ${frame_size}= | ${1518} | ${crypto_type}= | ${None} diff --git a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-cps.robot b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-cps.robot index 667b83382f..cd6cb673c5 100644 --- a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-cps.robot +++ b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-cps.robot @@ -51,7 +51,6 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${dpdk_enable_tcp_udp_checksum}= | ${True} | ${dpdk_no_tx_checksum_offload}= | ${False} #| ${page_size}= | 1G | ${ciphers}= | 0 diff --git a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-rps.robot b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-rps.robot index 3cf4cf378c..e1680b4779 100644 --- a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-rps.robot +++ b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-rps.robot @@ -51,7 +51,6 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${dpdk_enable_tcp_udp_checksum}= | ${True} | ${dpdk_no_tx_checksum_offload}= | ${False} #| ${page_size}= | 1G | ${ciphers}= | 0 diff --git a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps.robot b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps.robot index 75c9a4f003..7f1e4ba189 100644 --- a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps.robot +++ b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps.robot @@ -49,7 +49,6 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${dpdk_enable_tcp_udp_checksum}= | ${True} | ${dpdk_no_tx_checksum_offload}= | ${False} | ${ciphers}= | 0 | ${rps_cps}= | cps diff --git a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps.robot b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps.robot index 9020c6cd6f..0db8a72a16 100644 --- a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps.robot +++ b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps.robot @@ -49,7 +49,6 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${dpdk_enable_tcp_udp_checksum}= | ${True} | ${dpdk_no_tx_checksum_offload}= | ${False} | ${ciphers}= | 0 | ${rps_cps}= | rps -- 2.16.6