From patchwork Fri Jun 24 05:31:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 113386 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 83A2BA0032; Fri, 24 Jun 2022 07:33:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7EFD640E2D; Fri, 24 Jun 2022 07:33:58 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id A566040A82 for ; Fri, 24 Jun 2022 07:33:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656048836; x=1687584836; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=JUf25Rlu9bzi0cEt9fiokfhbNRUbKasjwmFZHRLW8FM=; b=Y5YODLUHOhVUke7KzfsI5/8x/rFWgCOzFGNoZxs5B1J9tdEr7H2dANet MMVcIiFIaN16v0O3sumftUQUeUTvnI2nWeGi36lkwqs0TshImUaH+ZNyU MXLjJ4qyDBVtwwLH+BZi+NIxrfR0PScloIONRM2ssjFCTl/kvqGfqrq1p cZvh+NKQQfHS9FOzdVqQbUsYzOeJEYcD5Q8XGXguS+R4g9N5+Q83UA5LG 490wzme+dfI3V7FZ4lpFCd64mejCYo509pCS+vhKXJLP8icke96fdFJpt sE35vXjInPe55e7y9N1shhxJsHa1EQdMRSIGiXnoS23AFYSSTKppTCvde A==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="279693325" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="279693325" 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:33:55 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645115542" 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:33:54 -0700 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V1 1/6] test_plans/dpdk_gro_lib_test_plan: delete modify dpdk code by dpdk change Date: Fri, 24 Jun 2022 01:31:20 -0400 Message-Id: <20220624053120.2831964-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 --- test_plans/dpdk_gro_lib_test_plan.rst | 46 --------------------------- 1 file changed, 46 deletions(-) diff --git a/test_plans/dpdk_gro_lib_test_plan.rst b/test_plans/dpdk_gro_lib_test_plan.rst index e8c2472f..e36550d2 100644 --- a/test_plans/dpdk_gro_lib_test_plan.rst +++ b/test_plans/dpdk_gro_lib_test_plan.rst @@ -41,47 +41,6 @@ also cover lightmode and heavymode test. Prerequisites ============= -Modify the testpmd code as following:: - - --- a/app/test-pmd/csumonly.c - +++ b/app/test-pmd/csumonly.c - @@ -693,10 +693,12 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) -                  * and inner headers */ -   -                 eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); - +#if 0 -                 ether_addr_copy(&peer_eth_addrs[fs->peer_addr], -                                 ð_hdr->d_addr); -                 ether_addr_copy(&ports[fs->tx_port].eth_addr, -                                 ð_hdr->s_addr); - +#endif -                 parse_ethernet(eth_hdr, &info); -                 l3_hdr = (char *)eth_hdr + info.l2_len; - -Modify the dpdk code as following:: - - diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c - index b38a4b6b1..573250dbe 100644 - --- a/drivers/net/vhost/rte_eth_vhost.c - +++ b/drivers/net/vhost/rte_eth_vhost.c - @@ -1071,8 +1071,14 @@ eth_dev_info(struct rte_eth_dev *dev, - dev_info->min_rx_bufsize = 0; - - dev_info->tx_offload_capa = DEV_TX_OFFLOAD_MULTI_SEGS | - - DEV_TX_OFFLOAD_VLAN_INSERT; - - dev_info->rx_offload_capa = DEV_RX_OFFLOAD_VLAN_STRIP; - + 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; - + dev_info->rx_offload_capa = 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; - } - Test flow ========= @@ -321,11 +280,6 @@ Vxlan topology Test Case5: DPDK GRO test with 2 queues using tcp/ipv4 traffic ============================================================== -Test flow -========= - -NIC2(In kernel) -> NIC1(DPDK) -> testpmd(csum fwd) -> Vhost -> Virtio-net - 1. Connect two nic port directly, put nic2 into another namesapce and turn on the tso of this nic port by below cmds:: ip netns del ns1 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( From patchwork Fri Jun 24 05:31:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 113388 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 D026CA0032; Fri, 24 Jun 2022 07:34:19 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C9611427F1; Fri, 24 Jun 2022 07:34:19 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id D6BE040A82 for ; Fri, 24 Jun 2022 07:34:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656048858; x=1687584858; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=3baboUfQ7QBnc4jED/tAj5E2AVFJJfRujHXjDoPfme8=; b=lU2VbODPmWAo8fotayrSTdhobDnS/AaRptL7G0s38rx4iyPLRGEh/nAY 1bqu9WbB5C2EQY/k1ZPdkg3XWnc4nELhs1XG/b3nYgeXzUCFkBJ8k1Shs /av26wUrmThHcsjMYKLiE0c0tPrpKhmhXlSFMDTBFxsjDS4ME1aYd0zIJ V0aYCbjFRm/uZoDPGAKM9NA3OL6AtsCXg3y8os0pINHxPNnMEwLeZoP84 9bhTSYSrDLhVy7Jf4J8RpshJI1lLwGFWKMbCFyZNXf1HO2ViPXQCn8jcK 5ZNVR+xLzWMYOVN8yhIASQS9wzXt7LSX3H40V6AfskfurDfZuLOUOFtok A==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367246490" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367246490" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 22:34:16 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645115631" 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:15 -0700 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V1 3/6] test_plans/dpdk_gro_lib_cbdma_test_plan: delete modify dpdk code by dpdk change Date: Fri, 24 Jun 2022 01:31:42 -0400 Message-Id: <20220624053142.2832084-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 --- test_plans/dpdk_gro_lib_cbdma_test_plan.rst | 50 --------------------- 1 file changed, 50 deletions(-) diff --git a/test_plans/dpdk_gro_lib_cbdma_test_plan.rst b/test_plans/dpdk_gro_lib_cbdma_test_plan.rst index 14aa5d3c..562ecdd0 100644 --- a/test_plans/dpdk_gro_lib_cbdma_test_plan.rst +++ b/test_plans/dpdk_gro_lib_cbdma_test_plan.rst @@ -45,52 +45,6 @@ This test plan includes dpdk gro lib test with TCP/IPv4 traffic with CBDMA. Prerequisites ============= -Modify the testpmd code as following:: - - --- a/app/test-pmd/csumonly.c - +++ b/app/test-pmd/csumonly.c - @@ -693,10 +693,12 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) -                  * and inner headers */ -   -                 eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); - +#if 0 -                 ether_addr_copy(&peer_eth_addrs[fs->peer_addr], -                                 ð_hdr->d_addr); -                 ether_addr_copy(&ports[fs->tx_port].eth_addr, -                                 ð_hdr->s_addr); - +#endif -                 parse_ethernet(eth_hdr, &info); -                 l3_hdr = (char *)eth_hdr + info.l2_len; - -Modify the dpdk code as following:: - - diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c - index b38a4b6b1..573250dbe 100644 - --- a/drivers/net/vhost/rte_eth_vhost.c - +++ b/drivers/net/vhost/rte_eth_vhost.c - @@ -1071,8 +1071,14 @@ eth_dev_info(struct rte_eth_dev *dev, - dev_info->min_rx_bufsize = 0; - - dev_info->tx_offload_capa = DEV_TX_OFFLOAD_MULTI_SEGS | - - DEV_TX_OFFLOAD_VLAN_INSERT; - - dev_info->rx_offload_capa = DEV_RX_OFFLOAD_VLAN_STRIP; - + 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; - + dev_info->rx_offload_capa = 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; - } - -Compile DPDK as following:: - - CC=gcc meson --werror -Denable_kmods=True -Dlibdir=lib --default-library=static x86_64-native-linuxapp-gcc - ninja -C x86_64-native-linuxapp-gcc -j 110 - Test flow ========= @@ -100,10 +54,6 @@ NIC2(In kernel) -> NIC1(DPDK) -> testpmd(csum fwd) -> Vhost -> Virtio-net Test Case1: DPDK GRO test with two queues and two CBDMA channels using tcp/ipv4 traffic ======================================================================================= -Test flow -========= - - 1. Connect two nic port directly, put nic2 into another namesapce and turn on the tso of this nic port by below cmds:: ip netns del ns1 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( From patchwork Fri Jun 24 05:32:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 113390 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 205A5A0032; Fri, 24 Jun 2022 07:34:42 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1C4EC40E2D; Fri, 24 Jun 2022 07:34:42 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id 1EBAD40A82 for ; Fri, 24 Jun 2022 07:34:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656048880; x=1687584880; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=HCE9wKTxUWybKX/AeTYSYQTDHomkYQgVABR0GgZ82Oo=; b=Ez9IQlCu4GyrjGFTnbNoDHHhF+ATVOu5rvl+Gu6ZgWDkJ+1n3nWr+kYe cgsbp189HpLWBZhNSW09y4OKn4IWw8X+JMpl2RFt18ifRa7vhR3i+dumo +cME4T1ooVuR9sjAN3NCrGzzICwsHyjEt7bStRFL1jB5ArTQocjSdJWNj xG7VQHE8vhPDZzE1Fhs/UtX5VE6yb7bD1bJ3fk2qfN/pbw1dBUVPtH+N9 GW8tRTMMdzV4zLsA8hVaFR1Wi3ychSrG6MPODkyHlkOws7mFNM/vyTRRf ORusdwdHRnUCGXrjEcHVVbsL3xLSysUlq173L5Tj2wcQRE2RIadrHLKCs A==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="306392488" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="306392488" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 22:34:39 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645115710" 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:38 -0700 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V1 5/6] test_plans/dpdk_gso_lib_test_plan: modify dpdk code by dpdk change Date: Fri, 24 Jun 2022 01:32:04 -0400 Message-Id: <20220624053204.2832205-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 --- test_plans/dpdk_gso_lib_test_plan.rst | 69 +++++++++------------------ 1 file changed, 22 insertions(+), 47 deletions(-) diff --git a/test_plans/dpdk_gso_lib_test_plan.rst b/test_plans/dpdk_gso_lib_test_plan.rst index ee37cdde..727de1f7 100644 --- a/test_plans/dpdk_gso_lib_test_plan.rst +++ b/test_plans/dpdk_gso_lib_test_plan.rst @@ -32,29 +32,10 @@ This test plan includes dpdk gso lib test with TCP/UDP/VxLAN/GRE traffic. Prerequisites ============= -Modify the testpmd code as following:: - - --- a/app/test-pmd/csumonly.c - +++ b/app/test-pmd/csumonly.c - @@ -693,10 +693,12 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) -                  * and inner headers */ -   -                 eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); - +#if 0 -                 ether_addr_copy(&peer_eth_addrs[fs->peer_addr], -                                 ð_hdr->d_addr); -                 ether_addr_copy(&ports[fs->tx_port].eth_addr, -                                 ð_hdr->s_addr); - +#endif -                 parse_ethernet(eth_hdr, &info); -                 l3_hdr = (char *)eth_hdr + info.l2_len; - Test flow ========= -:: - - NIC2(In kernel) <- NIC1(DPDK) <- testpmd(csum fwd) <- Vhost <- Virtio-net +NIC2(In kernel) <- NIC1(DPDK) <- testpmd(csum fwd) <- Vhost <- Virtio-net Test Case1: DPDK GSO test with tcp traffic ========================================== @@ -84,17 +65,15 @@ Test Case1: DPDK GSO test with tcp traffic 3. Set up vm with virto device and using kernel virtio-net driver: - :: - taskset -c 13 \ qemu-system-x86_64 -name us-vhost-vm1 \ - -cpu host -enable-kvm -m 2048 -object memory-backend-file,id=mem,size=2048M,mem-path=/mnt/huge,share=on \ - -numa node,memdev=mem \ - -mem-prealloc -monitor unix:/tmp/vm2_monitor.sock,server,nowait -net nic,macaddr=00:00:00:08:e8:aa,addr=1f -net user,hostfwd=tcp:127.0.0.1:6001-:22 \ - -smp cores=1,sockets=1 -drive file=/home/osimg/ubuntu16.img \ - -chardev socket,id=char0,path=./vhost-net \ - -netdev type=vhost-user,id=mynet1,chardev=char0,vhostforce \ - -device virtio-net-pci,mac=52:54:00:00:00:01,netdev=mynet1,mrg_rxbuf=on,csum=on,gso=on,host_tso4=on,guest_tso4=on,rx_queue_size=1024,tx_queue_size=1024 -vnc :10 -daemonize + -cpu host -enable-kvm -m 2048 -object memory-backend-file,id=mem,size=2048M,mem-path=/mnt/huge,share=on \ + -numa node,memdev=mem \ + -mem-prealloc -monitor unix:/tmp/vm2_monitor.sock,server,nowait -net nic,macaddr=00:00:00:08:e8:aa,addr=1f -net user,hostfwd=tcp:127.0.0.1:6001-:22 \ + -smp cores=1,sockets=1 -drive file=/home/osimg/ubuntu16.img \ + -chardev socket,id=char0,path=./vhost-net \ + -netdev type=vhost-user,id=mynet1,chardev=char0,vhostforce \ + -device virtio-net-pci,mac=52:54:00:00:00:01,netdev=mynet1,mrg_rxbuf=on,csum=on,gso=on,host_tso4=on,guest_tso4=on,rx_queue_size=1024,tx_queue_size=1024 -vnc :10 -daemonize 4. In vm, config the virtio-net device with ip:: @@ -146,17 +125,15 @@ Test Case3: DPDK GSO test with vxlan traffic 3. Set up vm with virto device and using kernel virtio-net driver: - :: - taskset -c 13 \ qemu-system-x86_64 -name us-vhost-vm1 \ - -cpu host -enable-kvm -m 2048 -object memory-backend-file,id=mem,size=2048M,mem-path=/mnt/huge,share=on \ - -numa node,memdev=mem \ - -mem-prealloc -monitor unix:/tmp/vm2_monitor.sock,server,nowait -net nic,macaddr=00:00:00:08:e8:aa,addr=1f -net user,hostfwd=tcp:127.0.0.1:6001-:22 \ - -smp cores=1,sockets=1 -drive file=/home/osimg/ubuntu16.img \ - -chardev socket,id=char0,path=./vhost-net \ - -netdev type=vhost-user,id=mynet1,chardev=char0,vhostforce \ - -device virtio-net-pci,mac=52:54:00:00:00:01,netdev=mynet1,mrg_rxbuf=on,csum=on,gso=on,host_tso4=on,guest_tso4=on,rx_queue_size=1024,tx_queue_size=1024 -vnc :10 -daemonize + -cpu host -enable-kvm -m 2048 -object memory-backend-file,id=mem,size=2048M,mem-path=/mnt/huge,share=on \ + -numa node,memdev=mem \ + -mem-prealloc -monitor unix:/tmp/vm2_monitor.sock,server,nowait -net nic,macaddr=00:00:00:08:e8:aa,addr=1f -net user,hostfwd=tcp:127.0.0.1:6001-:22 \ + -smp cores=1,sockets=1 -drive file=/home/osimg/ubuntu16.img \ + -chardev socket,id=char0,path=./vhost-net \ + -netdev type=vhost-user,id=mynet1,chardev=char0,vhostforce \ + -device virtio-net-pci,mac=52:54:00:00:00:01,netdev=mynet1,mrg_rxbuf=on,csum=on,gso=on,host_tso4=on,guest_tso4=on,rx_queue_size=1024,tx_queue_size=1024 -vnc :10 -daemonize 4. In vm, config the virtio-net device with ip:: @@ -200,17 +177,15 @@ Test Case4: DPDK GSO test with gre traffic 3. Set up vm with virto device and using kernel virtio-net driver: - :: - taskset -c 13 \ qemu-system-x86_64 -name us-vhost-vm1 \ - -cpu host -enable-kvm -m 2048 -object memory-backend-file,id=mem,size=2048M,mem-path=/mnt/huge,share=on \ - -numa node,memdev=mem \ - -mem-prealloc -monitor unix:/tmp/vm2_monitor.sock,server,nowait -net nic,macaddr=00:00:00:08:e8:aa,addr=1f -net user,hostfwd=tcp:127.0.0.1:6001-:22 \ - -smp cores=1,sockets=1 -drive file=/home/osimg/ubuntu16.img \ - -chardev socket,id=char0,path=./vhost-net \ - -netdev type=vhost-user,id=mynet1,chardev=char0,vhostforce \ - -device virtio-net-pci,mac=52:54:00:00:00:01,netdev=mynet1,mrg_rxbuf=on,csum=on,gso=on,host_tso4=on,guest_tso4=on,rx_queue_size=1024,tx_queue_size=1024 -vnc :10 -daemonize + -cpu host -enable-kvm -m 2048 -object memory-backend-file,id=mem,size=2048M,mem-path=/mnt/huge,share=on \ + -numa node,memdev=mem \ + -mem-prealloc -monitor unix:/tmp/vm2_monitor.sock,server,nowait -net nic,macaddr=00:00:00:08:e8:aa,addr=1f -net user,hostfwd=tcp:127.0.0.1:6001-:22 \ + -smp cores=1,sockets=1 -drive file=/home/osimg/ubuntu16.img \ + -chardev socket,id=char0,path=./vhost-net \ + -netdev type=vhost-user,id=mynet1,chardev=char0,vhostforce \ + -device virtio-net-pci,mac=52:54:00:00:00:01,netdev=mynet1,mrg_rxbuf=on,csum=on,gso=on,host_tso4=on,guest_tso4=on,rx_queue_size=1024,tx_queue_size=1024 -vnc :10 -daemonize 4. In vm, config the virtio-net device with ip:: From patchwork Fri Jun 24 05:32:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 113391 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 4A805A0032; Fri, 24 Jun 2022 07:34:52 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 44EA0427EC; Fri, 24 Jun 2022 07:34:52 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id 3F75F40A82 for ; Fri, 24 Jun 2022 07:34:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656048890; x=1687584890; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=K2kkhjzGbpzjINpm8n3VBORVlvR+kiqab1gxcY9xmTk=; b=DJMonVWY2q3WayuEltVArs4zVvkDlZ4AwRgiyKMof7E2vLrQmE2wypHN 8L/nKD2BFwxpjaS+ptBJUq1rwUrk9cBxhnX7yIkbs9OHy6cCp97jQhaNy 5NsDbXNiMYnaqakoSyUgIO9b0ThFj36eGf+akDj231wuaHODA4g+xURtM GHq9D9i4YBQfTz0mLqOIXJIzXOo6zpwQLSA+Quf7TPN2dpLFmGyep2VqK jGrzrTQcNYdnhwyBmW8iZROrdGl8dzzbo51Lu68pD+3SO0+D2Uj7i+XIm zNkbTb6vulX6fQdxjmWoMWnS7SjD6M8pc4VQluMolTN1LiQoBpiv3/0j/ Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="306392509" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="306392509" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 22:34:49 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645115736" 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:48 -0700 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V1 6/6] tests/dpdk_gso_lib: modify dpdk code by dpdk change Date: Fri, 24 Jun 2022 01:32:14 -0400 Message-Id: <20220624053214.2832265-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 Acked-by: Xingguang He Tested-by: Chenyu Huang --- tests/TestSuite_dpdk_gso_lib.py | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/tests/TestSuite_dpdk_gso_lib.py b/tests/TestSuite_dpdk_gso_lib.py index ee71bcd6..9a43eae8 100644 --- a/tests/TestSuite_dpdk_gso_lib.py +++ b/tests/TestSuite_dpdk_gso_lib.py @@ -79,7 +79,6 @@ class TestDPDKGsoLib(TestCase): else: self.socket_mem = "1024,1024" - self.prepare_dpdk() self.base_dir = self.dut.base_dir.replace("~", "/root") def set_up(self): @@ -187,29 +186,6 @@ class TestDPDKGsoLib(TestCase): ) self.dut.send_expect("ip netns exec ns1 ifconfig gre100 1.1.1.1/24 up", "#") - 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( - "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", - "#", - ) - self.dut.build_install_dpdk(self.dut.target) - - def unprepare_dpdk(self): - # Recovery the DPDK code to original - time.sleep(5) - self.dut.send_expect( - "cp ./app/test-pmd/csumonly_backup.c ./app/test-pmd/csumonly.c ", "#" - ) - self.dut.send_expect("rm -rf ./app/test-pmd/csumonly_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 @@ -517,7 +493,6 @@ class TestDPDKGsoLib(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(