From patchwork Fri Jun 24 05:31:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 113389 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F1758A0032; Fri, 24 Jun 2022 07:34:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EC98040A87; Fri, 24 Jun 2022 07:34:29 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id F06F440A82 for ; Fri, 24 Jun 2022 07:34:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656048868; x=1687584868; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=2ebO77B3OCMVm0nsOqGkrpuPBZgTs4YzxZ/KxinjwTo=; b=hssfvXkwPvaVi+6GAg12mYWd4fzjUUOr/8cyDwJRCk7nMLjDmNhQ/zAE y9YIt+LXewWStyBwi0dBXwlYLmJjI75dCRLmMY1r2YxujSu9CBwtJo+/i eGq2wu3ip5IkJF3bmz2FfsMLw5cEdIdsGwX1UWxacEDWprFJd4U16DIqu IgPVF99oJuTuQZ90a98bKMuLlT+QuhXMOp415Aw/BkV3jMadzbuh4fuGZ 261IObAKgiMAIFfKZQQBUODGhTmAWO1BpnwbzEu4wk4vHRQyEjsvTcpnK gzFepJSv5aX7GmLzNLTWlg92/GnaclulXmwEcwMmIm4v2MFOIzNYZMt+p g==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="279693437" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="279693437" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 22:34:27 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645115678" Received: from unknown (HELO localhost.localdomain) ([10.239.252.222]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 22:34:26 -0700 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V1 4/6] tests/dpdk_gro_lib_cbdma: delete modify dpdk code by dpdk change Date: Fri, 24 Jun 2022 01:31:52 -0400 Message-Id: <20220624053152.2832144-1-weix.ling@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org According to the dpdk commit 1945c64674(app/testpmd: perform SW IP checksum for GRO/GSO packets) and commit 8ba1723783(net/vhost: perform SW checksum in Tx path), no need to modify DPDK code to test. Signed-off-by: Wei Ling --- tests/TestSuite_dpdk_gro_lib_cbdma.py | 58 --------------------------- 1 file changed, 58 deletions(-) diff --git a/tests/TestSuite_dpdk_gro_lib_cbdma.py b/tests/TestSuite_dpdk_gro_lib_cbdma.py index 50eb58c5..22be91bf 100644 --- a/tests/TestSuite_dpdk_gro_lib_cbdma.py +++ b/tests/TestSuite_dpdk_gro_lib_cbdma.py @@ -55,7 +55,6 @@ class TestDPDKGROLibCbdma(TestCase): self.socket_mem = "1024" else: self.socket_mem = "1024,1024" - self.prepare_dpdk() self.base_dir = self.dut.base_dir.replace("~", "/root") self.ports_socket = self.dut.get_numa_id(self.dut_ports[0]) self.vhost_user = self.dut.new_session(suite="vhost-user") @@ -148,62 +147,6 @@ class TestDPDKGROLibCbdma(TestCase): "ip netns exec ns1 ethtool -K %s tso on" % self.nic_in_kernel, "#" ) - def prepare_dpdk(self): - # Changhe the testpmd checksum fwd code for mac change - self.dut.send_expect( - "cp ./app/test-pmd/csumonly.c ./app/test-pmd/csumonly_backup.c", "#" - ) - self.dut.send_expect( - "cp ./drivers/net/vhost/rte_eth_vhost.c ./drivers/net/vhost/rte_eth_vhost-backup.c", - "#", - ) - self.dut.send_expect( - "sed -i '/ether_addr_copy(&peer_eth/i\#if 0' ./app/test-pmd/csumonly.c", "#" - ) - self.dut.send_expect( - "sed -i '/parse_ethernet(eth_hdr, &info/i\#endif' ./app/test-pmd/csumonly.c", - "#", - ) - # change offload of vhost - tx_offload = ( - "RTE_ETH_TX_OFFLOAD_VLAN_INSERT | " - + "RTE_ETH_TX_OFFLOAD_UDP_CKSUM | " - + "RTE_ETH_TX_OFFLOAD_TCP_CKSUM | " - + "RTE_ETH_TX_OFFLOAD_IPV4_CKSUM | " - + "RTE_ETH_TX_OFFLOAD_TCP_TSO;" - ) - rx_offload = ( - "RTE_ETH_RX_OFFLOAD_VLAN_STRIP | " - + "RTE_ETH_RX_OFFLOAD_TCP_CKSUM | " - + "RTE_ETH_RX_OFFLOAD_UDP_CKSUM | " - + "RTE_ETH_RX_OFFLOAD_IPV4_CKSUM | " - + "RTE_ETH_RX_OFFLOAD_TCP_LRO;" - ) - self.dut.send_expect( - "sed -i 's/RTE_ETH_TX_OFFLOAD_VLAN_INSERT;/%s/' drivers/net/vhost/rte_eth_vhost.c" - % tx_offload, - "#", - ) - self.dut.send_expect( - "sed -i 's/RTE_ETH_RX_OFFLOAD_VLAN_STRIP;/%s/' drivers/net/vhost/rte_eth_vhost.c" - % rx_offload, - "#", - ) - self.dut.build_install_dpdk(self.dut.target) - - def unprepare_dpdk(self): - # Recovery the DPDK code to original - self.dut.send_expect( - "cp ./app/test-pmd/csumonly_backup.c ./app/test-pmd/csumonly.c ", "#" - ) - self.dut.send_expect( - "cp ./drivers/net/vhost/rte_eth_vhost-backup.c ./drivers/net/vhost/rte_eth_vhost.c ", - "#", - ) - self.dut.send_expect("rm -rf ./app/test-pmd/csumonly_backup.c", "#") - self.dut.send_expect("rm -rf ./drivers/net/vhost/rte_eth_vhost-backup.c", "#") - self.dut.build_install_dpdk(self.dut.target) - def set_vm_cpu_number(self, vm_config): # config the vcpu numbers = 1 # config the cpupin only have one core @@ -348,7 +291,6 @@ class TestDPDKGROLibCbdma(TestCase): """ Run after each test suite. """ - self.unprepare_dpdk() self.dut.send_expect("ip netns del ns1", "# ", 30) self.dut.send_expect("./usertools/dpdk-devbind.py -u %s" % (self.pci), "# ", 30) self.dut.send_expect(