From patchwork Fri Jun 24 05:31:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 113387 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 9D109A0032; Fri, 24 Jun 2022 07:34:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9972A427EC; Fri, 24 Jun 2022 07:34:07 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id F189940A82 for ; Fri, 24 Jun 2022 07:34:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656048846; x=1687584846; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=dNBlsAROj3OcFKAiDWP1GD0t8CluuwScBlGcLa4grOA=; b=oJ8MOuOW1llwVwd+vwvUw0aXqRqtxKk0vGkG3yNxqOQlIrvSepk3JnXU 7gVdorsPqsSP14ti8YOgTCn0UchrLWIOGxBnlpwZa+dmcD2Ou+9ynOYhu q0bnRoDjiIWlJLH25/ppQid9OV5ccobypgMTkvzQdbQTnU/plh7vmemzb mPTdQVrFvstp0FcG8yCsa84/fgAikP2MDqWawg0d0zjP6S5js0c1soSya ohUQP9lrNzQrblbMxaw5mmWh3CmINX8o0YqTnm5e31lukE8dIvlJ09fq2 T6vL6VTJch/EyG1vTEvaNLSdgw7yQsg+3d65QlFa/Cs8aKZf0MyD+arAf g==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="263964848" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="263964848" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 22:34:04 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645115587" 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:03 -0700 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V1 2/6] tests/dpdk_gro_lib: delete modify dpdk code by dpdk change Date: Fri, 24 Jun 2022 01:31:30 -0400 Message-Id: <20220624053130.2832024-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.py | 59 --------------------------------- 1 file changed, 59 deletions(-) diff --git a/tests/TestSuite_dpdk_gro_lib.py b/tests/TestSuite_dpdk_gro_lib.py index f00dc054..87da392b 100644 --- a/tests/TestSuite_dpdk_gro_lib.py +++ b/tests/TestSuite_dpdk_gro_lib.py @@ -75,7 +75,6 @@ class TestDPDKGROLib(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]) @@ -183,63 +182,6 @@ class TestDPDKGROLib(TestCase): ) self.dut.send_expect("ip netns exec ns1 ip link set up dev vxlan1", "#") - 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 = ( - "DEV_TX_OFFLOAD_VLAN_INSERT | " - + "DEV_TX_OFFLOAD_UDP_CKSUM | " - + "DEV_TX_OFFLOAD_TCP_CKSUM | " - + "DEV_TX_OFFLOAD_IPV4_CKSUM | " - + "DEV_TX_OFFLOAD_TCP_TSO;" - ) - rx_offload = ( - "DEV_RX_OFFLOAD_VLAN_STRIP | " - + "DEV_RX_OFFLOAD_TCP_CKSUM | " - + "DEV_RX_OFFLOAD_UDP_CKSUM | " - + "DEV_RX_OFFLOAD_IPV4_CKSUM | " - + "DEV_RX_OFFLOAD_TCP_LRO;" - ) - self.dut.send_expect( - "sed -i 's/DEV_TX_OFFLOAD_VLAN_INSERT;/%s/' drivers/net/vhost/rte_eth_vhost.c" - % tx_offload, - "#", - ) - self.dut.send_expect( - "sed -i 's/DEV_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 @@ -485,7 +427,6 @@ class TestDPDKGROLib(TestCase): for i in self.dut_ports: port = self.dut.ports_info[i]["port"] port.bind_driver(self.def_driver) - 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(