From patchwork Thu May 19 06:35:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 111357 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 899D8A0503; Thu, 19 May 2022 08:36:54 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7E6C740156; Thu, 19 May 2022 08:36:54 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id 6511940140 for ; Thu, 19 May 2022 08:36:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652942213; x=1684478213; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=RE95lTimYf6bw1kx1VKSDv1fCmtNjrDiBmRTyeQ4gTo=; b=bY8n4cVHE+QCcvQDbKEe/sQ6it2Kx0LkSettfeGDxh2nuWDPI7FAvPXe 8gnhRRB7/ObtcGCWp5Z32vLltvitzJhG126UbSaQKvad8iaMTnGZYEj3D YQM8ciMR4ntEeJQMBbwSngNbcg0sl/8D4xcMAKkc0FsfzjXSC5QOzABnK l94/gOBPoqsfQAVq/9WGba1/g7Qt1PbbxXvtNNhC249Jasa0zkutvVtYM 8ZdWu7XK19uoZFnFUPVmrFHR8afQ++rXsHCVrrp094u/P853L9c6eB9z/ 2DUYBmVcZ1hk1LC5M5jcVFka0oc57cvlenrAw0rbN0pkRTKqnzieQBimU Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10351"; a="269635987" X-IronPort-AV: E=Sophos;i="5.91,236,1647327600"; d="scan'208";a="269635987" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 May 2022 23:36:41 -0700 X-IronPort-AV: E=Sophos;i="5.91,236,1647327600"; d="scan'208";a="701000766" Received: from unknown (HELO localhost.localdomain) ([10.239.251.222]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 May 2022 23:36:40 -0700 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V1 2/2] tests/dpdk_gro_lib: delete CBDMA related testcase and code Date: Thu, 19 May 2022 02:35:19 -0400 Message-Id: <20220519063519.2813371-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 Delete CBDMA related testcase and code. Signed-off-by: Wei Ling --- tests/TestSuite_dpdk_gro_lib.py | 151 ++++---------------------------- 1 file changed, 15 insertions(+), 136 deletions(-) diff --git a/tests/TestSuite_dpdk_gro_lib.py b/tests/TestSuite_dpdk_gro_lib.py index e19b3695..ea69f635 100644 --- a/tests/TestSuite_dpdk_gro_lib.py +++ b/tests/TestSuite_dpdk_gro_lib.py @@ -105,10 +105,6 @@ class TestDPDKGROLib(TestCase): self.prepare_dpdk() self.base_dir = self.dut.base_dir.replace("~", "/root") self.ports_socket = self.dut.get_numa_id(self.dut_ports[0]) - # get cbdma device - self.cbdma_dev_infos = [] - self.dmas_info = None - self.device_str = None def set_up(self): # @@ -119,59 +115,6 @@ class TestDPDKGROLib(TestCase): self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#") self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") - def get_cbdma_ports_info_and_bind_to_dpdk(self, cbdma_num): - """ - get all cbdma ports - """ - out = self.dut.send_expect( - "./usertools/dpdk-devbind.py --status-dev dma", "# ", 30 - ) - device_info = out.split("\n") - for device in device_info: - pci_info = re.search("\s*(0000:\S*:\d*.\d*)", device) - if pci_info is not None: - dev_info = pci_info.group(1) - # the numa id of ioat dev, only add the device which - # on same socket with nic dev - bus = int(dev_info[5:7], base=16) - if bus >= 128: - cur_socket = 1 - else: - cur_socket = 0 - if self.ports_socket == cur_socket: - self.cbdma_dev_infos.append(pci_info.group(1)) - self.verify( - len(self.cbdma_dev_infos) >= cbdma_num, - "There no enough cbdma device to run this suite", - ) - used_cbdma = self.cbdma_dev_infos[0:cbdma_num] - dmas_info = "" - for dmas in used_cbdma: - number = used_cbdma.index(dmas) - dmas = "txq{}@{};".format(number, dmas) - dmas_info += dmas - self.dmas_info = dmas_info[:-1] - self.device_str = " ".join(self.cbdma_dev_infos) - self.dut.send_expect( - "./usertools/dpdk-devbind.py --force --bind=%s %s" - % (self.drivername, self.device_str), - "# ", - 60, - ) - - def bind_cbdma_device_to_kernel(self): - if self.device_str is not None: - self.dut.send_expect("modprobe ioatdma", "# ") - self.dut.send_expect( - "./usertools/dpdk-devbind.py -u %s" % self.device_str, "# ", 30 - ) - self.dut.send_expect( - "./usertools/dpdk-devbind.py --force --bind=ioatdma %s" - % self.device_str, - "# ", - 60, - ) - def launch_testpmd_gro_on(self, mode=1, queue=1): # # Launch the vhost sample with different parameters @@ -179,37 +122,21 @@ class TestDPDKGROLib(TestCase): # mode 2 : tcp traffic heavy mode # mode 3 : vxlan traffic light mode # mode 4 : tcp traffic flush 4 - # mode 5 : tcp traffice light mode with cdbma enable - if mode == 5: - self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=2) - eal_param = self.dut.create_eal_parameters( - cores=self.vhost_list, - vdevs=[ - "'net_vhost0,iface=%s/vhost-net,queues=%s,dmas=[%s]'" - % (self.base_dir, queue, self.dmas_info) - ], - ) - self.testcmd_start = ( - self.path + eal_param + " -- -i --txd=1024 --rxd=1024 --txq=2 --rxq=2" - ) - self.vhost_user = self.dut.new_session(suite="user") - self.vhost_user.send_expect(self.testcmd_start, "testpmd> ", 120) - else: - eal_param = self.dut.create_eal_parameters( - cores=self.vhost_list, - vdevs=[ - "net_vhost0,iface=%s/vhost-net,queues=%s" % (self.base_dir, queue) - ], - ports=[self.pci], - ) - self.testcmd_start = ( - self.path - + eal_param - + " -- -i --enable-hw-vlan-strip --tx-offloads=0x00 --txd=1024 --rxd=1024" - ) - self.vhost_user = self.dut.new_session(suite="user") - self.vhost_user.send_expect(self.testcmd_start, "testpmd> ", 120) - self.set_testpmd_params() + eal_param = self.dut.create_eal_parameters( + cores=self.vhost_list, + vdevs=[ + "net_vhost0,iface=%s/vhost-net,queues=%s" % (self.base_dir, queue) + ], + ports=[self.pci], + ) + self.testcmd_start = ( + self.path + + eal_param + + " -- -i --enable-hw-vlan-strip --tx-offloads=0x00 --txd=1024 --rxd=1024" + ) + self.vhost_user = self.dut.new_session(suite="user") + self.vhost_user.send_expect(self.testcmd_start, "testpmd> ", 120) + self.set_testpmd_params() def set_testpmd_params(self, mode=1): # set testpmd params @@ -513,53 +440,6 @@ class TestDPDKGROLib(TestCase): self.quit_testpmd() self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") - def test_vhost_gro_tcp_ipv4_with_cbdma_enable(self): - self.config_kernel_nic_host(0) - self.heavymode = 5 - self.launch_testpmd_gro_on(self.heavymode, queue=2) - self.start_vm(mode=5, queue=2) - time.sleep(5) - self.dut.get_session_output(timeout=2) - # Get the virtio-net device name - for port in self.vm1_dut.ports_info: - self.vm1_intf = port["intf"] - # Start the Iperf test - self.vm1_dut.send_expect("ifconfig -a", "#", 30) - self.vm1_dut.send_expect( - "ifconfig %s %s up" % (self.vm1_intf, self.virtio_ip1), "#", 10 - ) - self.vm1_dut.send_expect("ethtool -L %s combined 2" % self.vm1_intf, "#", 10) - self.vm1_dut.send_expect("ethtool -K %s gro off" % (self.vm1_intf), "#", 10) - self.set_testpmd_params() - self.vm1_dut.send_expect("iperf -s", "", 10) - self.dut.send_expect("rm /root/iperf_client.log", "#", 10) - out = self.dut.send_expect( - "ip netns exec ns1 iperf -c %s -i 1 -t 60 -m -P 2 > /root/iperf_client.log &" - % (self.virtio_ip1), - "", - 180, - ) - time.sleep(30) - print(out) - perfdata = self.iperf_result_verify("GRO lib") - print(("the GRO lib %s " % (self.output_result))) - # self.dut.send_expect('rm /root/iperf_client.log', '#', 10) - self.quit_testpmd() - self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") - exp_perfdata = self.dut.send_expect( - "cat /root/dpdk_gro_lib_on_iperf_tc5.log", "#" - ) - self.verify( - "No such file or directory" not in exp_perfdata, - "Cannot find dpdk_gro_lib_on_iperf_tc5.log, please run test_vhost_gro_with_2queues_tcp_lightmode firstly", - ) - if exp_perfdata: - self.verify( - float(perfdata) > float(exp_perfdata), - "TestFailed: W/cbdma iperf data is %s Kbits/sec, W/O cbdma iperf data is %s Kbits/sec" - % (perfdata, exp_perfdata), - ) - def test_vhost_gro_with_2queues_tcp_lightmode(self): """ Test Case5: DPDK GRO test with 2 queues using tcp/ipv4 traffic @@ -626,7 +506,6 @@ class TestDPDKGROLib(TestCase): "# ", 30, ) - self.bind_cbdma_device_to_kernel() def tear_down_all(self): """