Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/111409/?format=api
{ "id": 111409, "url": "http://patches.dpdk.org/api/patches/111409/?format=api", "web_url": "http://patches.dpdk.org/project/dts/patch/20220519091018.2818476-1-weix.ling@intel.com/", "project": { "id": 3, "url": "http://patches.dpdk.org/api/projects/3/?format=api", "name": "DTS", "link_name": "dts", "list_id": "dts.dpdk.org", "list_email": "dts@dpdk.org", "web_url": "", "scm_url": "git://dpdk.org/tools/dts", "webscm_url": "http://git.dpdk.org/tools/dts/", "list_archive_url": "https://inbox.dpdk.org/dts", "list_archive_url_format": "https://inbox.dpdk.org/dts/{}", "commit_url_format": "" }, "msgid": "<20220519091018.2818476-1-weix.ling@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dts/20220519091018.2818476-1-weix.ling@intel.com", "date": "2022-05-19T09:10:18", "name": "[V3,2/2] tests/vm2vm_virtio_net_perf: delete CBDMA related testcases and code", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "86a9232372fb25dace0b51f0ff303603b0e6a8ba", "submitter": { "id": 1828, "url": "http://patches.dpdk.org/api/people/1828/?format=api", "name": "Ling, WeiX", "email": "weix.ling@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dts/patch/20220519091018.2818476-1-weix.ling@intel.com/mbox/", "series": [ { "id": 23033, "url": "http://patches.dpdk.org/api/series/23033/?format=api", "web_url": "http://patches.dpdk.org/project/dts/list/?series=23033", "date": "2022-05-19T09:09:59", "name": "delete CBDMA related testcases and code", "version": 3, "mbox": "http://patches.dpdk.org/series/23033/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/111409/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/111409/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dts-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id F01A6A0503;\n\tThu, 19 May 2022 11:11:47 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id E41AA40222;\n\tThu, 19 May 2022 11:11:47 +0200 (CEST)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n by mails.dpdk.org (Postfix) with ESMTP id CA4AB40140\n for <dts@dpdk.org>; Thu, 19 May 2022 11:11:45 +0200 (CEST)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 19 May 2022 02:11:41 -0700", "from unknown (HELO localhost.localdomain) ([10.239.251.222])\n by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 19 May 2022 02:11:40 -0700" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1652951506; x=1684487506;\n h=from:to:cc:subject:date:message-id:mime-version:\n content-transfer-encoding;\n bh=zff1C/IeKZeXu5pRa5qTABuEMygOM91lfLazfciDVSs=;\n b=Tqof8I87s72LOVHgb1uZlGl/AUCG43rs1JBgDpwOYA/DLVAfVjalc4n5\n qqj4wvIjoxxBgkmblDzO97oZqA7deZyAbcAWCUUvJkwk3SJOxJuJ0cbOk\n /0o0li91da1ElJIe0U/8+UHQQcD77ww1yHpjk8rWyWz3jQPLlwTMfqCSv\n SRZPu3DwkhUbQE6KiGLXqs1GwQjov1vQlnVfHCFmefAOv6WGOWb13plYi\n Qt2ycgEUR7hplFimWC5+R97LcFL2Yv6DXn8xKRndIHMdBuLrCCVazeIN8\n 65lCwd5PwZ3vzzegoHB06qQNuDjPuFjQ1W1CrxbbAeK+ZF7GHMVLtSlR3 g==;", "X-IronPort-AV": [ "E=McAfee;i=\"6400,9594,10351\"; a=\"271806167\"", "E=Sophos;i=\"5.91,237,1647327600\"; d=\"scan'208\";a=\"271806167\"", "E=Sophos;i=\"5.91,237,1647327600\"; d=\"scan'208\";a=\"714889853\"" ], "From": "Wei Ling <weix.ling@intel.com>", "To": "dts@dpdk.org", "Cc": "Wei Ling <weix.ling@intel.com>", "Subject": "[dts][PATCH V3 2/2] tests/vm2vm_virtio_net_perf: delete CBDMA related\n testcases and code", "Date": "Thu, 19 May 2022 05:10:18 -0400", "Message-Id": "<20220519091018.2818476-1-weix.ling@intel.com>", "X-Mailer": "git-send-email 2.25.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dts@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "test suite reviews and discussions <dts.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dts>,\n <mailto:dts-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dts/>", "List-Post": "<mailto:dts@dpdk.org>", "List-Help": "<mailto:dts-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dts>,\n <mailto:dts-request@dpdk.org?subject=subscribe>", "Errors-To": "dts-bounces@dpdk.org" }, "content": "Delete CBDMA related testcases and code.\n\nSigned-off-by: Wei Ling <weix.ling@intel.com>\n---\n tests/TestSuite_vm2vm_virtio_net_perf.py | 540 +----------------------\n 1 file changed, 13 insertions(+), 527 deletions(-)", "diff": "diff --git a/tests/TestSuite_vm2vm_virtio_net_perf.py b/tests/TestSuite_vm2vm_virtio_net_perf.py\nindex 486f1acf..e10c8bd2 100644\n--- a/tests/TestSuite_vm2vm_virtio_net_perf.py\n+++ b/tests/TestSuite_vm2vm_virtio_net_perf.py\n@@ -71,10 +71,6 @@ class TestVM2VMVirtioNetPerf(TestCase):\n self.vhost = self.dut.new_session(suite=\"vhost\")\n self.pmd_vhost = PmdOutput(self.dut, self.vhost)\n self.app_testpmd_path = self.dut.apps_name[\"test-pmd\"]\n- # get cbdma device\n- self.cbdma_dev_infos = []\n- self.dmas_info = None\n- self.device_str = None\n self.checked_vm = False\n self.dut.restore_interfaces()\n \n@@ -86,67 +82,6 @@ class TestVM2VMVirtioNetPerf(TestCase):\n self.vm_dut = []\n self.vm = []\n \n- def get_cbdma_ports_info_and_bind_to_dpdk(\n- self, cbdma_num=2, allow_diff_socket=False\n- ):\n- \"\"\"\n- get all cbdma ports\n- \"\"\"\n- out = self.dut.send_expect(\n- \"./usertools/dpdk-devbind.py --status-dev dma\", \"# \", 30\n- )\n- device_info = out.split(\"\\n\")\n- for device in device_info:\n- pci_info = re.search(\"\\s*(0000:\\S*:\\d*.\\d*)\", device)\n- if pci_info is not None:\n- dev_info = pci_info.group(1)\n- # the numa id of ioat dev, only add the device which on same socket with nic dev\n- bus = int(dev_info[5:7], base=16)\n- if bus >= 128:\n- cur_socket = 1\n- else:\n- cur_socket = 0\n- if allow_diff_socket:\n- self.cbdma_dev_infos.append(pci_info.group(1))\n- else:\n- if self.ports_socket == cur_socket:\n- self.cbdma_dev_infos.append(pci_info.group(1))\n- self.verify(\n- len(self.cbdma_dev_infos) >= cbdma_num,\n- \"There no enough cbdma device to run this suite\",\n- )\n- used_cbdma = self.cbdma_dev_infos[0:cbdma_num]\n- dmas_info = \"\"\n- for dmas in used_cbdma[0 : int(cbdma_num / 2)]:\n- number = used_cbdma[0 : int(cbdma_num / 2)].index(dmas)\n- dmas = \"txq{}@{},\".format(number, dmas)\n- dmas_info += dmas\n- for dmas in used_cbdma[int(cbdma_num / 2) :]:\n- number = used_cbdma[int(cbdma_num / 2) :].index(dmas)\n- dmas = \"txq{}@{},\".format(number, dmas)\n- dmas_info += dmas\n- self.dmas_info = dmas_info[:-1]\n- self.device_str = \" \".join(used_cbdma)\n- self.dut.send_expect(\n- \"./usertools/dpdk-devbind.py --force --bind=%s %s\"\n- % (self.drivername, self.device_str),\n- \"# \",\n- 60,\n- )\n-\n- def bind_cbdma_device_to_kernel(self):\n- if self.device_str is not None:\n- self.dut.send_expect(\"modprobe ioatdma\", \"# \")\n- self.dut.send_expect(\n- \"./usertools/dpdk-devbind.py -u %s\" % self.device_str, \"# \", 30\n- )\n- self.dut.send_expect(\n- \"./usertools/dpdk-devbind.py --force --bind=ioatdma %s\"\n- % self.device_str,\n- \"# \",\n- 60,\n- )\n-\n @property\n def check_2m_env(self):\n out = self.dut.send_expect(\n@@ -156,65 +91,43 @@ class TestVM2VMVirtioNetPerf(TestCase):\n \n def start_vhost_testpmd(\n self,\n- cbdma=False,\n no_pci=True,\n client_mode=False,\n enable_queues=1,\n nb_cores=2,\n rxq_txq=None,\n exchange_cbdma=False,\n- iova_mode=\"\",\n ):\n \"\"\"\n launch the testpmd with different parameters\n \"\"\"\n- if cbdma is True:\n- dmas_info_list = self.dmas_info.split(\",\")\n- cbdma_arg_0_list = []\n- cbdma_arg_1_list = []\n- for item in dmas_info_list:\n- if dmas_info_list.index(item) < int(len(dmas_info_list) / 2):\n- cbdma_arg_0_list.append(item)\n- else:\n- cbdma_arg_1_list.append(item)\n- cbdma_arg_0 = \",dmas=[{}]\".format(\";\".join(cbdma_arg_0_list))\n- cbdma_arg_1 = \",dmas=[{}]\".format(\";\".join(cbdma_arg_1_list))\n- else:\n- cbdma_arg_0 = \"\"\n- cbdma_arg_1 = \"\"\n testcmd = self.app_testpmd_path + \" \"\n if not client_mode:\n- vdev1 = \"--vdev 'net_vhost0,iface=%s/vhost-net0,queues=%d%s' \" % (\n+ vdev1 = \"--vdev 'net_vhost0,iface=%s/vhost-net0,queues=%d' \" % (\n self.base_dir,\n enable_queues,\n- cbdma_arg_0,\n )\n- vdev2 = \"--vdev 'net_vhost1,iface=%s/vhost-net1,queues=%d%s' \" % (\n+ vdev2 = \"--vdev 'net_vhost1,iface=%s/vhost-net1,queues=%d' \" % (\n self.base_dir,\n enable_queues,\n- cbdma_arg_1,\n )\n else:\n- vdev1 = \"--vdev 'net_vhost0,iface=%s/vhost-net0,client=1,queues=%d%s' \" % (\n+ vdev1 = \"--vdev 'net_vhost0,iface=%s/vhost-net0,client=1,queues=%d' \" % (\n self.base_dir,\n enable_queues,\n- cbdma_arg_0,\n )\n- vdev2 = \"--vdev 'net_vhost1,iface=%s/vhost-net1,client=1,queues=%d%s' \" % (\n+ vdev2 = \"--vdev 'net_vhost1,iface=%s/vhost-net1,client=1,queues=%d' \" % (\n self.base_dir,\n enable_queues,\n- cbdma_arg_1,\n )\n if exchange_cbdma:\n- vdev1 = \"--vdev 'net_vhost0,iface=%s/vhost-net0,client=1,queues=%d%s' \" % (\n+ vdev1 = \"--vdev 'net_vhost0,iface=%s/vhost-net0,client=1,queues=%d' \" % (\n self.base_dir,\n enable_queues,\n- cbdma_arg_1,\n )\n- vdev2 = \"--vdev 'net_vhost1,iface=%s/vhost-net1,client=1,queues=%d%s' \" % (\n+ vdev2 = \"--vdev 'net_vhost1,iface=%s/vhost-net1,client=1,queues=%d' \" % (\n self.base_dir,\n enable_queues,\n- cbdma_arg_0,\n )\n \n eal_params = self.dut.create_eal_parameters(\n@@ -228,13 +141,8 @@ class TestVM2VMVirtioNetPerf(TestCase):\n rxq_txq,\n rxq_txq,\n )\n- if iova_mode:\n- iova_parm = \" --iova=\" + iova_mode\n- else:\n- iova_parm = \"\"\n- self.command_line = testcmd + eal_params + vdev1 + vdev2 + iova_parm + params\n+ self.command_line = testcmd + eal_params + vdev1 + vdev2 + params\n self.pmd_vhost.execute_cmd(self.command_line, timeout=30)\n- self.pmd_vhost.execute_cmd(\"vhost enable tx all\", timeout=30)\n self.pmd_vhost.execute_cmd(\"start\", timeout=30)\n \n def start_vms(self, server_mode=False, opt_queue=None, vm_config=\"vhost_sample\"):\n@@ -309,13 +217,11 @@ class TestVM2VMVirtioNetPerf(TestCase):\n start vhost testpmd and qemu, and config the vm env\n \"\"\"\n self.start_vhost_testpmd(\n- cbdma=cbdma,\n no_pci=no_pci,\n client_mode=client_mode,\n enable_queues=enable_queues,\n nb_cores=nb_cores,\n rxq_txq=rxq_txq,\n- iova_mode=iova_mode,\n )\n self.start_vms(server_mode=server_mode, opt_queue=opt_queue)\n self.config_vm_env(combined=combined, rxq_txq=rxq_txq)\n@@ -461,11 +367,10 @@ class TestVM2VMVirtioNetPerf(TestCase):\n \n def test_vm2vm_split_ring_iperf_with_tso(self):\n \"\"\"\n- TestCase1: VM2VM split ring vhost-user/virtio-net test with tcp traffic\n+ Test Case 1: VM2VM split ring vhost-user/virtio-net test with tcp traffic\n \"\"\"\n self.vm_args = \"disable-modern=false,mrg_rxbuf=off,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on\"\n self.prepare_test_env(\n- cbdma=False,\n no_pci=True,\n client_mode=False,\n enable_queues=1,\n@@ -477,40 +382,12 @@ class TestVM2VMVirtioNetPerf(TestCase):\n )\n self.start_iperf_and_verify_vhost_xstats_info(iperf_mode=\"tso\")\n \n- def test_vm2vm_split_ring_with_tso_and_cbdma_enable(self):\n- \"\"\"\n- TestCase2: VM2VM split ring vhost-user/virtio-net CBDMA enable test with tcp traffic\n- \"\"\"\n- self.vm_args = \"disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on\"\n- self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=2)\n- self.prepare_test_env(\n- cbdma=True,\n- no_pci=False,\n- client_mode=False,\n- enable_queues=1,\n- nb_cores=2,\n- server_mode=False,\n- opt_queue=1,\n- combined=False,\n- rxq_txq=None,\n- )\n- cbdma_value = self.start_iperf_and_verify_vhost_xstats_info(iperf_mode=\"tso\")\n- expect_value = self.get_suite_cfg()[\"expected_throughput\"][\n- \"test_vm2vm_split_ring_iperf_with_tso\"\n- ]\n- self.verify(\n- cbdma_value > expect_value,\n- \"CBDMA enable performance: %s is lower than CBDMA disable: %s.\"\n- % (cbdma_value, expect_value),\n- )\n-\n def test_vm2vm_split_ring_iperf_with_ufo(self):\n \"\"\"\n- TestCase3: VM2VM split ring vhost-user/virtio-net test with udp traffic\n+ Test Case 2: VM2VM split ring vhost-user/virtio-net test with udp traffic\n \"\"\"\n self.vm_args = \"disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on\"\n self.prepare_test_env(\n- cbdma=False,\n no_pci=True,\n client_mode=False,\n enable_queues=1,\n@@ -524,11 +401,10 @@ class TestVM2VMVirtioNetPerf(TestCase):\n \n def test_vm2vm_split_ring_device_capbility(self):\n \"\"\"\n- TestCase4: Check split ring virtio-net device capability\n+ Test Case 3: Check split ring virtio-net device capability\n \"\"\"\n self.vm_args = \"disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on\"\n self.start_vhost_testpmd(\n- cbdma=False,\n no_pci=True,\n client_mode=False,\n enable_queues=1,\n@@ -539,240 +415,12 @@ class TestVM2VMVirtioNetPerf(TestCase):\n self.offload_capbility_check(self.vm_dut[0])\n self.offload_capbility_check(self.vm_dut[1])\n \n- def test_vm2vm_split_ring_with_mergeable_path_check_large_packet_and_cbdma_enable_8queue(\n- self,\n- ):\n- \"\"\"\n- TestCase5: VM2VM virtio-net split ring mergeable CBDMA enable test with large packet payload valid check\n- \"\"\"\n- ipef_result = []\n- self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True)\n-\n- self.logger.info(\"Launch vhost with CBDMA and with 8 queue with VA mode\")\n- self.vm_args = \"disable-modern=false,mrg_rxbuf=on,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on\"\n- self.prepare_test_env(\n- cbdma=True,\n- no_pci=False,\n- client_mode=True,\n- enable_queues=8,\n- nb_cores=4,\n- server_mode=True,\n- opt_queue=8,\n- combined=True,\n- rxq_txq=8,\n- iova_mode=\"va\",\n- )\n- self.check_scp_file_valid_between_vms()\n- iperf_data_cbdma_enable_8_queue = self.start_iperf_and_verify_vhost_xstats_info(\n- iperf_mode=\"tso\"\n- )\n- ipef_result.append(\n- [\n- \"Enable\",\n- \"mergeable path with VA mode\",\n- 8,\n- iperf_data_cbdma_enable_8_queue,\n- ]\n- )\n-\n- self.logger.info(\"Re-launch and exchange CBDMA and with 8 queue with VA mode\")\n- self.vhost.send_expect(\"quit\", \"# \", 30)\n- self.start_vhost_testpmd(\n- cbdma=True,\n- no_pci=False,\n- client_mode=True,\n- enable_queues=8,\n- nb_cores=4,\n- rxq_txq=8,\n- exchange_cbdma=True,\n- iova_mode=\"va\",\n- )\n- self.check_scp_file_valid_between_vms()\n- iperf_data_cbdma_enable_8_queue_exchange = (\n- self.start_iperf_and_verify_vhost_xstats_info(iperf_mode=\"tso\")\n- )\n- ipef_result.append(\n- [\n- \"Disable\",\n- \"mergeable path exchange CBDMA with VA mode\",\n- 8,\n- iperf_data_cbdma_enable_8_queue_exchange,\n- ]\n- )\n-\n- # This test step need to test on 1G guest hugepage ENV.\n- if not self.check_2m_env:\n- self.logger.info(\n- \"Re-launch and exchange CBDMA and with 8 queue with PA mode\"\n- )\n- self.vhost.send_expect(\"quit\", \"# \", 30)\n- self.start_vhost_testpmd(\n- cbdma=True,\n- no_pci=False,\n- client_mode=True,\n- enable_queues=8,\n- nb_cores=4,\n- rxq_txq=8,\n- exchange_cbdma=True,\n- iova_mode=\"pa\",\n- )\n- self.check_scp_file_valid_between_vms()\n- iperf_data_cbdma_enable_8_queue_exchange_pa = (\n- self.start_iperf_and_verify_vhost_xstats_info(iperf_mode=\"tso\")\n- )\n- ipef_result.append(\n- [\n- \"Disable\",\n- \"mergeable path exchange CBDMA with PA mode\",\n- 8,\n- iperf_data_cbdma_enable_8_queue_exchange_pa,\n- ]\n- )\n-\n- self.logger.info(\"Re-launch without CBDMA and with 4 queue\")\n- self.vhost.send_expect(\"quit\", \"# \", 30)\n- self.start_vhost_testpmd(\n- cbdma=False,\n- no_pci=False,\n- client_mode=True,\n- enable_queues=4,\n- nb_cores=4,\n- rxq_txq=4,\n- )\n- self.config_vm_env(combined=True, rxq_txq=4)\n- self.check_scp_file_valid_between_vms()\n- iperf_data_cbdma_disable_4_queue = (\n- self.start_iperf_and_verify_vhost_xstats_info(iperf_mode=\"tso\")\n- )\n- ipef_result.append(\n- [\n- \"Disable\",\n- \"mergeable path without CBDMA with 4 queue\",\n- 4,\n- iperf_data_cbdma_disable_4_queue,\n- ]\n- )\n-\n- self.logger.info(\"Re-launch without CBDMA and with 1 queue\")\n- self.vhost.send_expect(\"quit\", \"# \", 30)\n- self.start_vhost_testpmd(\n- cbdma=False,\n- no_pci=False,\n- client_mode=True,\n- enable_queues=4,\n- nb_cores=4,\n- rxq_txq=1,\n- )\n- self.config_vm_env(combined=True, rxq_txq=1)\n- self.check_scp_file_valid_between_vms()\n- iperf_data_cbdma_disable_1_queue = (\n- self.start_iperf_and_verify_vhost_xstats_info(iperf_mode=\"tso\")\n- )\n- ipef_result.append(\n- [\n- \"Disable\",\n- \"mergeable path without CBDMA with 1 queue\",\n- 1,\n- iperf_data_cbdma_disable_1_queue,\n- ]\n- )\n-\n- self.table_header = [\"CBDMA Enable/Disable\", \"Mode\", \"rxq/txq\", \"Gbits/sec\"]\n- self.result_table_create(self.table_header)\n- for table_row in ipef_result:\n- self.result_table_add(table_row)\n- self.result_table_print()\n- self.verify(\n- iperf_data_cbdma_enable_8_queue > iperf_data_cbdma_disable_4_queue,\n- \"CMDMA enable: %s is lower than CBDMA disable: %s\"\n- % (iperf_data_cbdma_enable_8_queue, iperf_data_cbdma_disable_4_queue),\n- )\n-\n- def test_vm2vm_split_ring_with_no_mergeable_path_check_large_packet_and_cbdma_enable_8queue(\n- self,\n- ):\n- \"\"\"\n- TestCase6: VM2VM virtio-net split ring non-mergeable CBDMA enable test with large packet payload valid check\n- \"\"\"\n- ipef_result = []\n- self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True)\n-\n- self.logger.info(\"Launch vhost-testpmd with CBDMA and used 8 queue\")\n- self.vm_args = \"disable-modern=false,mrg_rxbuf=off,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on\"\n- self.prepare_test_env(\n- cbdma=True,\n- no_pci=False,\n- client_mode=True,\n- enable_queues=8,\n- nb_cores=4,\n- server_mode=True,\n- opt_queue=8,\n- combined=True,\n- rxq_txq=8,\n- )\n- self.check_scp_file_valid_between_vms()\n- iperf_data_cbdma_enable_8_queue = self.start_iperf_and_verify_vhost_xstats_info(\n- iperf_mode=\"tso\"\n- )\n- ipef_result.append(\n- [\"Enable\", \"no-mergeable path\", 8, iperf_data_cbdma_enable_8_queue]\n- )\n-\n- self.logger.info(\"Re-launch without CBDMA and used 8 queue\")\n- self.vhost.send_expect(\"quit\", \"# \", 30)\n- self.start_vhost_testpmd(\n- cbdma=False,\n- no_pci=False,\n- client_mode=True,\n- enable_queues=8,\n- nb_cores=4,\n- rxq_txq=8,\n- )\n- self.check_scp_file_valid_between_vms()\n- iperf_data_cbdma_disable_8_queue = (\n- self.start_iperf_and_verify_vhost_xstats_info(iperf_mode=\"tso\")\n- )\n- ipef_result.append(\n- [\"Disable\", \"no-mergeable path\", 8, iperf_data_cbdma_disable_8_queue]\n- )\n-\n- self.logger.info(\"Re-launch without CBDMA and used 1 queue\")\n- self.vhost.send_expect(\"quit\", \"# \", 30)\n- self.start_vhost_testpmd(\n- cbdma=False,\n- no_pci=False,\n- client_mode=True,\n- enable_queues=8,\n- nb_cores=4,\n- rxq_txq=1,\n- )\n- self.config_vm_env(combined=True, rxq_txq=1)\n- self.check_scp_file_valid_between_vms()\n- iperf_data_cbdma_disable_1_queue = (\n- self.start_iperf_and_verify_vhost_xstats_info(iperf_mode=\"tso\")\n- )\n- ipef_result.append(\n- [\"Disable\", \"no-mergeable path\", 1, iperf_data_cbdma_disable_1_queue]\n- )\n-\n- self.table_header = [\"CBDMA Enable/Disable\", \"Mode\", \"rxq/txq\", \"Gbits/sec\"]\n- self.result_table_create(self.table_header)\n- for table_row in ipef_result:\n- self.result_table_add(table_row)\n- self.result_table_print()\n- self.verify(\n- iperf_data_cbdma_enable_8_queue > iperf_data_cbdma_disable_8_queue,\n- \"CMDMA enable: %s is lower than CBDMA disable: %s\"\n- % (iperf_data_cbdma_enable_8_queue, iperf_data_cbdma_disable_8_queue),\n- )\n-\n def test_vm2vm_packed_ring_iperf_with_tso(self):\n \"\"\"\n- TestCase7: VM2VM packed ring vhost-user/virtio-net test with tcp traffic\n+ Test Case 4: VM2VM packed ring vhost-user/virtio-net test with tcp traffic\n \"\"\"\n self.vm_args = \"disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on\"\n self.prepare_test_env(\n- cbdma=False,\n no_pci=True,\n client_mode=False,\n enable_queues=1,\n@@ -784,32 +432,12 @@ class TestVM2VMVirtioNetPerf(TestCase):\n )\n self.start_iperf_and_verify_vhost_xstats_info(iperf_mode=\"tso\")\n \n- def test_vm2vm_packed_ring_iperf_with_tso_and_cbdma_enable(self):\n- \"\"\"\n- TestCase8: VM2VM packed ring vhost-user/virtio-net CBDMA enable test with tcp traffic\n- \"\"\"\n- self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=2)\n- self.vm_args = \"disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on\"\n- self.prepare_test_env(\n- cbdma=True,\n- no_pci=False,\n- client_mode=False,\n- enable_queues=1,\n- nb_cores=2,\n- server_mode=False,\n- opt_queue=None,\n- combined=False,\n- rxq_txq=None,\n- )\n- self.start_iperf_and_verify_vhost_xstats_info(iperf_mode=\"tso\")\n-\n def test_vm2vm_packed_ring_iperf_with_ufo(self):\n \"\"\"\n- Test Case 9: VM2VM packed ring vhost-user/virtio-net test with udp trafficc\n+ Test Case 5: VM2VM packed ring vhost-user/virtio-net test with udp traffic\n \"\"\"\n self.vm_args = \"disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on\"\n self.prepare_test_env(\n- cbdma=False,\n no_pci=True,\n client_mode=False,\n enable_queues=1,\n@@ -823,11 +451,10 @@ class TestVM2VMVirtioNetPerf(TestCase):\n \n def test_vm2vm_packed_ring_device_capbility(self):\n \"\"\"\n- Test Case 10: Check packed ring virtio-net device capability\n+ Test Case 6: Check packed ring virtio-net device capability\n \"\"\"\n self.vm_args = \"disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on\"\n self.start_vhost_testpmd(\n- cbdma=False,\n no_pci=True,\n client_mode=False,\n enable_queues=1,\n@@ -838,153 +465,12 @@ class TestVM2VMVirtioNetPerf(TestCase):\n self.offload_capbility_check(self.vm_dut[0])\n self.offload_capbility_check(self.vm_dut[1])\n \n- def test_vm2vm_packed_ring_with_mergeable_path_check_large_packet_and_cbdma_enable_8queue(\n- self,\n- ):\n- \"\"\"\n- Test Case 11: VM2VM virtio-net packed ring mergeable 8 queues CBDMA enable test with large packet payload valid check\n- \"\"\"\n- ipef_result = []\n- self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True)\n-\n- self.logger.info(\"Launch vhost-testpmd with CBDMA and used 8 queue\")\n- self.vm_args = \"disable-modern=false,mrg_rxbuf=on,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on,packed=on\"\n- self.prepare_test_env(\n- cbdma=True,\n- no_pci=False,\n- client_mode=False,\n- enable_queues=8,\n- nb_cores=4,\n- server_mode=False,\n- opt_queue=8,\n- combined=True,\n- rxq_txq=8,\n- )\n- for i in range(0, 5):\n- self.check_scp_file_valid_between_vms()\n- iperf_data_cbdma_enable_8_queue = (\n- self.start_iperf_and_verify_vhost_xstats_info(iperf_mode=\"tso\")\n- )\n- ipef_result.append(\n- [\"Enable_%d\" % i, \"mergeable path\", 8, iperf_data_cbdma_enable_8_queue]\n- )\n- self.table_header = [\"CBDMA Enable/Disable\", \"Mode\", \"rxq/txq\", \"Gbits/sec\"]\n- self.result_table_create(self.table_header)\n- for table_row in ipef_result:\n- self.result_table_add(table_row)\n- self.result_table_print()\n-\n- def test_vm2vm_packed_ring_with_no_mergeable_path_check_large_packet_and_cbdma_enable_8queue(\n- self,\n- ):\n- \"\"\"\n- Test Case 12: VM2VM virtio-net packed ring non-mergeable 8 queues CBDMA enable test with large packet payload valid check\n- \"\"\"\n- ipef_result = []\n- self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True)\n-\n- self.logger.info(\"Launch vhost-testpmd with CBDMA and used 8 queue\")\n- self.vm_args = \"disable-modern=false,mrg_rxbuf=off,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on,packed=on\"\n- self.prepare_test_env(\n- cbdma=True,\n- no_pci=False,\n- client_mode=False,\n- enable_queues=8,\n- nb_cores=4,\n- server_mode=False,\n- opt_queue=8,\n- combined=True,\n- rxq_txq=8,\n- )\n- for i in range(0, 5):\n- self.check_scp_file_valid_between_vms()\n- iperf_data_cbdma_enable_8_queue = (\n- self.start_iperf_and_verify_vhost_xstats_info(iperf_mode=\"tso\")\n- )\n- ipef_result.append(\n- [\"Enable\", \"mergeable path\", 8, iperf_data_cbdma_enable_8_queue]\n- )\n- self.table_header = [\"CBDMA Enable/Disable\", \"Mode\", \"rxq/txq\", \"Gbits/sec\"]\n- self.result_table_create(self.table_header)\n- for table_row in ipef_result:\n- self.result_table_add(table_row)\n- self.result_table_print()\n-\n- def test_vm2vm_packed_ring_with_tso_and_cbdma_enable_iova_pa(self):\n- \"\"\"\n- Test Case 13: VM2VM packed ring vhost-user/virtio-net CBDMA enable test with tcp traffic when set iova=pa\n- \"\"\"\n- # This test case need to test on 1G guest hugepage ENV.\n- self.vm_args = \"disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on\"\n- self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=2)\n- self.prepare_test_env(\n- cbdma=True,\n- no_pci=False,\n- client_mode=False,\n- enable_queues=1,\n- nb_cores=2,\n- server_mode=False,\n- opt_queue=1,\n- combined=False,\n- rxq_txq=None,\n- iova_mode=\"pa\",\n- )\n- self.check_scp_file_valid_between_vms()\n- cbdma_value = self.start_iperf_and_verify_vhost_xstats_info(iperf_mode=\"tso\")\n- expect_value = self.get_suite_cfg()[\"expected_throughput\"][\n- \"test_vm2vm_split_ring_iperf_with_tso\"\n- ]\n- self.verify(\n- cbdma_value > expect_value,\n- \"CBDMA enable performance: %s is lower than CBDMA disable: %s.\"\n- % (cbdma_value, expect_value),\n- )\n-\n- def test_vm2vm_packed_ring_with_mergeable_path_check_large_packet_and_cbdma_enable_8queue_iova_pa(\n- self,\n- ):\n- \"\"\"\n- Test Case 14: VM2VM virtio-net packed ring mergeable 8 queues CBDMA enable and PA mode test with large packet payload valid check\n- \"\"\"\n- # This test case need to test on 1G guest hugepage ENV.\n- ipef_result = []\n- self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True)\n-\n- self.logger.info(\"Launch vhost-testpmd with CBDMA and used 8 queue\")\n- self.vm_args = \"disable-modern=false,mrg_rxbuf=on,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on,packed=on\"\n- self.prepare_test_env(\n- cbdma=True,\n- no_pci=False,\n- client_mode=False,\n- enable_queues=8,\n- nb_cores=4,\n- server_mode=False,\n- opt_queue=8,\n- combined=True,\n- rxq_txq=8,\n- iova_mode=\"pa\",\n- )\n- for i in range(0, 5):\n- self.check_scp_file_valid_between_vms()\n- iperf_data_cbdma_enable_8_queue = (\n- self.start_iperf_and_verify_vhost_xstats_info(iperf_mode=\"tso\")\n- )\n- ipef_result.append(\n- [\"Enable_%d\" % i, \"mergeable path\", 8, iperf_data_cbdma_enable_8_queue]\n- )\n- self.table_header = [\"CBDMA Enable/Disable\", \"Mode\", \"rxq/txq\", \"Gbits/sec\"]\n- self.result_table_create(self.table_header)\n- for table_row in ipef_result:\n- self.result_table_add(table_row)\n- self.result_table_print()\n-\n def tear_down(self):\n \"\"\"\n run after each test case.\n \"\"\"\n self.stop_all_apps()\n self.dut.kill_all()\n- self.bind_cbdma_device_to_kernel()\n \n def tear_down_all(self):\n \"\"\"\n", "prefixes": [ "V3", "2/2" ] }