Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/98571/?format=api
{ "id": 98571, "url": "https://patches.dpdk.org/api/patches/98571/?format=api", "web_url": "https://patches.dpdk.org/project/dts/patch/20210910084830.564152-1-weix.ling@intel.com/", "project": { "id": 3, "url": "https://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": "<20210910084830.564152-1-weix.ling@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dts/20210910084830.564152-1-weix.ling@intel.com", "date": "2021-09-10T08:48:30", "name": "[V1,2/2] tests/vswitch_sample_cbdma: modify testsuite code sync with testplan update", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "5ac354c4064c59026880afeeffe9a3d22c88844b", "submitter": { "id": 1828, "url": "https://patches.dpdk.org/api/people/1828/?format=api", "name": "Ling, WeiX", "email": "weix.ling@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dts/patch/20210910084830.564152-1-weix.ling@intel.com/mbox/", "series": [ { "id": 18827, "url": "https://patches.dpdk.org/api/series/18827/?format=api", "web_url": "https://patches.dpdk.org/project/dts/list/?series=18827", "date": "2021-09-10T08:47:55", "name": "modify vswitch_sample_cdbma testplan and", "version": 1, "mbox": "https://patches.dpdk.org/series/18827/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/98571/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/98571/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 900E5A0547;\n\tFri, 10 Sep 2021 10:54:28 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 8983B406B4;\n\tFri, 10 Sep 2021 10:54:28 +0200 (CEST)", "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n by mails.dpdk.org (Postfix) with ESMTP id 492524067E\n for <dts@dpdk.org>; Fri, 10 Sep 2021 10:54:25 +0200 (CEST)", "from orsmga007.jf.intel.com ([10.7.209.58])\n by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 10 Sep 2021 01:54:15 -0700", "from unknown (HELO localhost.localdomain) ([10.240.183.222])\n by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 10 Sep 2021 01:54:09 -0700" ], "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,10102\"; a=\"200556599\"", "E=Sophos;i=\"5.85,282,1624345200\"; d=\"scan'208\";a=\"200556599\"", "E=Sophos;i=\"5.85,282,1624345200\"; d=\"scan'208\";a=\"470464018\"" ], "From": "Wei Ling <weix.ling@intel.com>", "To": "dts@dpdk.org", "Cc": "Wei Ling <weix.ling@intel.com>", "Date": "Fri, 10 Sep 2021 16:48:30 +0800", "Message-Id": "<20210910084830.564152-1-weix.ling@intel.com>", "X-Mailer": "git-send-email 2.25.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dts] [PATCH V1 2/2] tests/vswitch_sample_cbdma: modify testsuite\n code sync with testplan update", "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", "Sender": "\"dts\" <dts-bounces@dpdk.org>" }, "content": "1.Modify testsuite code sync with testplan update.\n2.Optimize testsuite code.\n\nSigned-off-by: Wei Ling <weix.ling@intel.com>\n---\n tests/TestSuite_vswitch_sample_cbdma.py | 166 ++++++++++++++----------\n 1 file changed, 98 insertions(+), 68 deletions(-)", "diff": "diff --git a/tests/TestSuite_vswitch_sample_cbdma.py b/tests/TestSuite_vswitch_sample_cbdma.py\nindex 08422ea3..aa80197a 100644\n--- a/tests/TestSuite_vswitch_sample_cbdma.py\n+++ b/tests/TestSuite_vswitch_sample_cbdma.py\n@@ -81,8 +81,6 @@ class TestVswitchSampleCBDMA(TestCase):\n self.vm_dst_mac0 = '52:54:00:00:00:01'\n self.vm_dst_mac1 = '52:54:00:00:00:02'\n self.vm_num = 2\n- self.vm_dut = []\n- self.vm = []\n self.app_testpmd_path = self.dut.apps_name['test-pmd']\n # create an instance to set stream field setting\n self.pktgen_helper = PacketGeneratorHelper()\n@@ -106,7 +104,11 @@ class TestVswitchSampleCBDMA(TestCase):\n Run before each test case.\n \"\"\"\n self.dut.send_expect(\"rm -rf %s/vhost-net*\" % self.base_dir, \"#\")\n+ self.dut.send_expect(\"killall -I dpdk-vhost\", '#', 20)\n+ self.dut.send_expect(\"killall -I dpdk-testpmd\", '#', 20)\n self.dut.send_expect(\"killall -I qemu-system-x86_64\", '#', 20)\n+ self.vm_dut = []\n+ self.vm = []\n \n def set_max_queues(self, max_queues=512):\n self.logger.info(\"Configure MAX_QUEUES to {}\".format(max_queues))\n@@ -154,40 +156,38 @@ class TestVswitchSampleCBDMA(TestCase):\n time.sleep(3)\n \n def start_virtio_testpmd(self, pmd_session, dev_mac, dev_id, cores, prefix, enable_queues=1, nb_cores=1,\n- used_queues=1):\n+ used_queues=1, force_max_simd_bitwidth=False, power2=False):\n \"\"\"\n launch the testpmd as virtio with vhost_net0\n \"\"\"\n+ txd_rxd = 1024\n eal_params = \" --vdev=net_virtio_user0,mac={},path=./vhost-net{},queues={},mrg_rxbuf={},in_order={}\" \\\n .format(dev_mac, dev_id, enable_queues, self.mrg_rxbuf, self.in_order)\n if self.vectorized == 1:\n- eal_params = eal_params + \",vectorized=1\"\n+ eal_params += \",vectorized=1\"\n if self.packed_vq == 1:\n- eal_params = eal_params + ',packed_vq=1'\n+ eal_params +=',packed_vq=1'\n if self.server:\n- eal_params = eal_params + \",server=1\"\n+ eal_params += \",server=1\"\n+ if power2:\n+ txd_rxd += 1\n+ eal_params += \",queue_size={}\".format(txd_rxd)\n if self.check_2M_env:\n eal_params += \" --single-file-segments\"\n- params = \"--rxq={} --txq={} --txd=1024 --rxd=1024 --nb-cores={}\".format(used_queues, used_queues, nb_cores)\n+ if force_max_simd_bitwidth:\n+ eal_params += \" --force-max-simd-bitwidth=512\"\n+ params = \"--rxq={} --txq={} --txd={} --rxd={} --nb-cores={}\".format(used_queues, used_queues,txd_rxd,txd_rxd, nb_cores)\n pmd_session.start_testpmd(cores=cores, param=params, eal_param=eal_params, no_pci=True, ports=[], prefix=prefix,\n fixed_prefix=True)\n \n- def start_vms(self, mode=0, mergeable=True, server_mode=False, set_target=True):\n+ def start_vms(self, mergeable=True, packed=False, server_mode=False, set_target=True, bind_dev=True, vm_diff_param=False):\n \"\"\"\n start two VM, each VM has one virtio device\n \"\"\"\n- if mode == 0:\n- setting_args = \"disable-modern=true\"\n- elif mode == 1:\n- setting_args = \"disable-modern=false\"\n- elif mode == 2:\n- setting_args = \"disable-modern=true,packed=on\"\n- if mergeable is True:\n- setting_args += \",\" + \"mrg_rxbuf=on\"\n- else:\n- setting_args += \",\" + \"mrg_rxbuf=off\"\n- setting_args += \",csum=on,gso=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on\"\n-\n+ mergeable = 'on' if mergeable else 'off'\n+ setting_args = \"disable-modern=true,mrg_rxbuf={0},csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on\".format(mergeable)\n+ if packed:\n+ setting_args = setting_args + ',packed=on'\n for i in range(self.vm_num):\n vm_dut = None\n vm_info = VM(self.dut, 'vm%d' % i, 'vhost_sample')\n@@ -198,11 +198,14 @@ class TestVswitchSampleCBDMA(TestCase):\n else:\n vm_params['opt_path'] = self.base_dir + '/vhost-net%d' % i\n vm_params['opt_mac'] = \"52:54:00:00:00:0%d\" % (i + 1)\n- vm_params['opt_settings'] = setting_args\n+ if vm_diff_param and i > 0:\n+ vm_params['opt_settings'] = setting_args + ',packed=on'\n+ else:\n+ vm_params['opt_settings'] = setting_args\n vm_info.set_vm_device(**vm_params)\n time.sleep(3)\n try:\n- vm_dut = vm_info.start(set_target=set_target)\n+ vm_dut = vm_info.start(set_target=set_target, bind_dev=bind_dev)\n if vm_dut is None:\n raise Exception(\"Set up VM ENV failed\")\n except Exception as e:\n@@ -238,7 +241,7 @@ class TestVswitchSampleCBDMA(TestCase):\n out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)\n device_info = out.split('\\n')\n for device in device_info:\n- pci_info = re.search('\\s*(0000:\\d*:\\d*.\\d*)', device)\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@@ -254,7 +257,7 @@ class TestVswitchSampleCBDMA(TestCase):\n dmas_info = ''\n for dmas in used_cbdma:\n number = used_cbdma.index(dmas)\n- dmas = 'txd{}@{},'.format(number, dmas.replace('0000:', ''))\n+ dmas = 'txd{}@{},'.format(number, dmas)\n dmas_info += dmas\n self.dmas_info = dmas_info[:-1]\n self.device_str = ' '.join(used_cbdma)\n@@ -281,7 +284,7 @@ class TestVswitchSampleCBDMA(TestCase):\n self.dut.send_expect('./usertools/dpdk-devbind.py -u %s' % self.device_str, '# ', 30)\n self.dut.send_expect('./usertools/dpdk-devbind.py --force --bind=ioatdma %s' % self.device_str, '# ', 60)\n \n- def config_stream(self, frame_size, port_num, dst_mac_list):\n+ def config_stream(self, frame_size, dst_mac_list):\n tgen_input = []\n rx_port = self.tester.get_local_port(self.dut_ports[0])\n tx_port = self.tester.get_local_port(self.dut_ports[0])\n@@ -303,7 +306,7 @@ class TestVswitchSampleCBDMA(TestCase):\n test_result = {}\n for frame_size in frame_sizes:\n self.logger.info(\"Test running at parameters: \" + \"framesize: {}\".format(frame_size))\n- tgenInput = self.config_stream(frame_size, self.tester_tx_port_num, dst_mac_list)\n+ tgenInput = self.config_stream(frame_size, dst_mac_list)\n # clear streams before add new streams\n self.tester.pktgen.clear_streams()\n # run packet generator\n@@ -311,9 +314,7 @@ class TestVswitchSampleCBDMA(TestCase):\n # set traffic option\n traffic_opt = {'duration': 5}\n _, pps = self.tester.pktgen.measure_throughput(stream_ids=streams, options=traffic_opt)\n- self.virtio_user0_pmd.execute_cmd('show port stats all')\n throughput = pps / 1000000.0\n- self.verify(throughput > 0, \"No traffic detected\")\n test_result[frame_size] = throughput\n self.result_table_add([frame_size, throughput])\n self.result_table_print()\n@@ -338,42 +339,62 @@ class TestVswitchSampleCBDMA(TestCase):\n self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=1)\n \n self.start_vhost_app(with_cbdma=True, cbdma_num=1, socket_num=1, client_mode=True)\n- # launch packed ring in_order vectorized with cbdma\n+ # packed ring\n self.mrg_rxbuf = 0\n self.in_order = 1\n self.vectorized = 1\n self.packed_vq = 1\n self.server = 1\n self.start_virtio_testpmd(pmd_session=self.virtio_user0_pmd, dev_mac=self.virtio_dst_mac0, dev_id=0,\n- cores=self.vuser0_core_list, prefix='testpmd0', nb_cores=1, used_queues=1)\n+ cores=self.vuser0_core_list, prefix='testpmd0', nb_cores=1, used_queues=1,\n+ force_max_simd_bitwidth=True, power2=False)\n packed_ring_result = self.pvp_test_with_cbdma()\n \n- # relaunch split ring in_order vectorized with cbdma\n- self.mrg_rxbuf = 1\n+ # packed ring of power2\n+ self.virtio_user0_pmd.execute_cmd(\"quit\", \"# \")\n+ self.mrg_rxbuf = 0\n+ self.in_order = 1\n+ self.vectorized = 1\n+ self.packed_vq = 1\n+ self.server = 1\n+\n+ self.start_virtio_testpmd(pmd_session=self.virtio_user0_pmd, dev_mac=self.virtio_dst_mac0, dev_id=0,\n+ cores=self.vuser0_core_list, prefix='testpmd0', nb_cores=1, used_queues=1,\n+ force_max_simd_bitwidth=True, power2=True)\n+ packed_ring_power2_result = self.pvp_test_with_cbdma()\n+\n+ # split ring\n+ self.virtio_user0_pmd.execute_cmd(\"quit\", \"# \")\n+ self.mrg_rxbuf = 0\n self.in_order = 1\n self.vectorized = 1\n self.packed_vq = 0\n self.server = 1\n- self.virtio_user0_pmd.execute_cmd(\"quit\", \"#\")\n+\n self.start_virtio_testpmd(pmd_session=self.virtio_user0_pmd, dev_mac=self.virtio_dst_mac0, dev_id=0,\n- cores=self.vuser0_core_list, prefix='testpmd0', nb_cores=1, used_queues=1)\n+ cores=self.vuser0_core_list, prefix='testpmd0', nb_cores=1, used_queues=1,\n+ force_max_simd_bitwidth=False, power2=False)\n split_ring_reult = self.pvp_test_with_cbdma()\n- self.virtio_user0_pmd.execute_cmd(\"quit\", \"#\")\n- self.vhost_user.send_expect(\"^C\", \"# \", 20)\n \n self.table_header = ['Frame Size(Byte)', 'Mode', 'Throughput(Mpps)']\n self.result_table_create(self.table_header)\n for key in packed_ring_result.keys():\n perf_result.append([key, 'packed_ring', packed_ring_result[key]])\n+ for key in packed_ring_power2_result.keys():\n+ perf_result.append([key, 'packed_ring_power2', packed_ring_power2_result[key]])\n for key in split_ring_reult.keys():\n perf_result.append([key, 'split_ring', split_ring_reult[key]])\n for table_row in perf_result:\n self.result_table_add(table_row)\n self.result_table_print()\n- self.virtio_user0_pmd.execute_cmd(\"quit\", \"#\")\n- self.vhost_user.send_expect(\"^C\", \"# \", 20)\n+ for key in packed_ring_result.keys():\n+ self.verify(packed_ring_result[key] > 1, \"The perf test result is lower than 1 Mpps\")\n+ for key in packed_ring_power2_result.keys():\n+ self.verify(packed_ring_power2_result[key] > 1, \"The perf test result is lower than 1 Mpps\")\n+ for key in split_ring_reult.keys():\n+ self.verify(split_ring_reult[key] > 1, \"The perf test result is lower than 1 Mpps\")\n \n- def config_stream_imix(self, frame_sizes, port_num, dst_mac_list):\n+ def config_stream_imix(self, frame_sizes, dst_mac_list):\n tgen_input = []\n rx_port = self.tester.get_local_port(self.dut_ports[0])\n tx_port = self.tester.get_local_port(self.dut_ports[0])\n@@ -395,7 +416,7 @@ class TestVswitchSampleCBDMA(TestCase):\n self.result_table_create(table_header)\n # Begin test perf\n test_result = {}\n- tgenInput = self.config_stream_imix(frame_sizes, self.tester_tx_port_num, dst_mac_list)\n+ tgenInput = self.config_stream_imix(frame_sizes, dst_mac_list)\n fields_config = {'ip': {'src': {'action': 'random'}, }, }\n # clear streams before add new streams\n self.tester.pktgen.clear_streams()\n@@ -404,10 +425,7 @@ class TestVswitchSampleCBDMA(TestCase):\n # set traffic option\n traffic_opt = {'delay': 5, 'duration': 5}\n _, pps = self.tester.pktgen.measure_throughput(stream_ids=streams, options=traffic_opt)\n- self.virtio_user0_pmd.execute_cmd(\"show port stats all\")\n- self.virtio_user1_pmd.execute_cmd(\"show port stats all\")\n throughput = pps / 1000000.0\n- self.verify(throughput > 0, \"traffic is too low: throughput=%s\" % throughput)\n test_result['imix'] = throughput\n self.result_table_add(['imix', throughput])\n self.result_table_print()\n@@ -443,10 +461,10 @@ class TestVswitchSampleCBDMA(TestCase):\n \n self.logger.info(\"Launch vhost app perf test\")\n self.start_vhost_app(with_cbdma=True, cbdma_num=2, socket_num=2, client_mode=True)\n- self.mrg_rxbuf = 0\n- self.in_order = 1\n- self.vectorized = 1\n- self.packed_vq = 0\n+ self.mrg_rxbuf = 1\n+ self.in_order = 0\n+ self.vectorized = 0\n+ self.packed_vq = 1\n self.server = 1\n self.start_virtio_testpmd(pmd_session=self.virtio_user0_pmd, dev_mac=self.virtio_dst_mac0, dev_id=0,\n cores=self.vuser0_core_list, prefix='testpmd0', nb_cores=1, used_queues=1)\n@@ -473,9 +491,10 @@ class TestVswitchSampleCBDMA(TestCase):\n for table_row in perf_result:\n self.result_table_add(table_row)\n self.result_table_print()\n- self.virtio_user0_pmd.execute_cmd(\"quit\", \"#\")\n- self.virtio_user1_pmd.execute_cmd(\"quit\", \"#\")\n- self.vhost_user.send_expect(\"^C\", \"# \", 20)\n+ for key in before_relunch.keys():\n+ self.verify(before_relunch[key] > 1, \"The perf test result is lower than 1 Mpps\")\n+ for key in after_relunch.keys():\n+ self.verify(after_relunch[key] > 1, \"The perf test result is lower than 1 Mpps\")\n \n def get_receive_throughput(self, pmd_session, count=10):\n i = 0\n@@ -513,9 +532,11 @@ class TestVswitchSampleCBDMA(TestCase):\n frame_sizes = [64, 2000, 8000, 'imix']\n if relaunch:\n self.virtio_user0_pmd.execute_cmd('stop')\n- self.virtio_user0_pmd.execute_cmd('clear port stats all')\n self.virtio_user1_pmd.execute_cmd('stop')\n+ self.virtio_user0_pmd.execute_cmd('clear port stats all')\n self.virtio_user1_pmd.execute_cmd('clear port stats all')\n+ self.virtio_user0_pmd.execute_cmd('show port stats all')\n+ self.virtio_user1_pmd.execute_cmd('show port stats all')\n self.set_testpmd0_param(self.virtio_user0_pmd, self.virtio_dst_mac1)\n self.set_testpmd1_param(self.virtio_user1_pmd, self.virtio_dst_mac0)\n \n@@ -541,9 +562,9 @@ class TestVswitchSampleCBDMA(TestCase):\n self.logger.info(\"Launch vhost app perf test\")\n self.start_vhost_app(with_cbdma=True, cbdma_num=2, socket_num=2, client_mode=True)\n self.mrg_rxbuf = 1\n- self.in_order = 1\n- self.vectorized = 1\n- self.packed_vq = 0\n+ self.in_order = 0\n+ self.vectorized = 0\n+ self.packed_vq = 1\n self.server = 1\n self.start_virtio_testpmd(pmd_session=self.virtio_user0_pmd, dev_mac=self.virtio_dst_mac0, dev_id=0,\n cores=self.vuser0_core_list, prefix='testpmd0', nb_cores=1, used_queues=1)\n@@ -555,6 +576,7 @@ class TestVswitchSampleCBDMA(TestCase):\n self.start_virtio_testpmd(pmd_session=self.virtio_user1_pmd, dev_mac=self.virtio_dst_mac1, dev_id=1,\n cores=self.vuser1_core_list, prefix='testpmd1', nb_cores=1, used_queues=1)\n before_relunch_result = self.vm2vm_check_with_two_cbdma()\n+\n self.logger.info(\"Relaunch vhost app perf test\")\n self.vhost_user.send_expect(\"^C\", \"# \", 20)\n self.start_vhost_app(with_cbdma=True, cbdma_num=2, socket_num=2, client_mode=True)\n@@ -569,9 +591,16 @@ class TestVswitchSampleCBDMA(TestCase):\n for table_row in perf_result:\n self.result_table_add(table_row)\n self.result_table_print()\n- self.virtio_user0_pmd.execute_cmd(\"quit\", \"# \")\n- self.virtio_user1_pmd.execute_cmd(\"quit\", \"# \")\n- self.vhost_user.send_expect(\"^C\", \"# \", 20)\n+ for key in before_relunch_result.keys():\n+ if key == 64:\n+ self.verify(before_relunch_result[key] > 1, \"The perf test result is lower than 1 Mpps\")\n+ else:\n+ self.verify(before_relunch_result[key] > 0.1, \"The perf test result is lower than 0.1 Mpps\")\n+ for key in after_relunch_result.keys():\n+ if key == 64:\n+ self.verify(after_relunch_result[key] > 1, \"The perf test result is lower than 1 Mpps\")\n+ else:\n+ self.verify(after_relunch_result[key] > 0.1, \"The perf test result is lower than 0.1 Mpps\")\n \n def vm2vm_check_with_two_vhost_device(self):\n rx_throughput = {}\n@@ -589,7 +618,7 @@ class TestVswitchSampleCBDMA(TestCase):\n \n def start_vms_testpmd_and_test(self, need_start_vm=True):\n if need_start_vm:\n- self.start_vms(mode=2, mergeable=True, server_mode=True)\n+ self.start_vms(mergeable=True, packed=False, server_mode=True, set_target=True, bind_dev=True, vm_diff_param=True)\n self.vm0_pmd = PmdOutput(self.vm_dut[0])\n self.vm1_pmd = PmdOutput(self.vm_dut[1])\n self.start_vm_testpmd(self.vm0_pmd)\n@@ -608,11 +637,11 @@ class TestVswitchSampleCBDMA(TestCase):\n perf_result = []\n self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=2)\n \n- self.logger.info(\"Before rebind perf VM Driver test\")\n+ self.logger.info(\"Before rebind VM Driver perf test\")\n self.start_vhost_app(with_cbdma=True, cbdma_num=2, socket_num=2, client_mode=True)\n before_rebind = self.start_vms_testpmd_and_test(need_start_vm=True)\n \n- self.logger.info(\"After rebind perf VM Driver test\")\n+ self.logger.info(\"After rebind VM Driver perf test\")\n # repeat bind 50 time from virtio-pci to vfio-pci\n self.repeat_bind_driver(dut=self.vm_dut[0], repeat_times=50)\n self.repeat_bind_driver(dut=self.vm_dut[1], repeat_times=50)\n@@ -622,9 +651,6 @@ class TestVswitchSampleCBDMA(TestCase):\n # repeat bind 50 time from virtio-pci to vfio-pci\n self.repeat_bind_driver(dut=self.vm_dut[0], repeat_times=50)\n self.repeat_bind_driver(dut=self.vm_dut[1], repeat_times=50)\n- for i in range(len(self.vm)):\n- self.vm[i].stop()\n- self.vhost_user.send_expect(\"^C\", \"# \", 20)\n \n self.table_header = ['Frame Size(Byte)', 'Before/After Bind VM Driver', 'Throughput(Mpps)']\n self.result_table_create(self.table_header)\n@@ -710,9 +736,9 @@ class TestVswitchSampleCBDMA(TestCase):\n md5_revd = md5_revd[: md5_revd.find(' ')]\n self.verify(md5_send == md5_revd, 'the received file is different with send file')\n \n- def start_iperf_and_scp_test_in_vms(self, need_start_vm=True, mode=0, mergeable=False, server_mode=False):\n+ def start_iperf_and_scp_test_in_vms(self, need_start_vm=True, mergeable=False, packed=False, server_mode=False):\n if need_start_vm:\n- self.start_vms(mode=mode, mergeable=mergeable, server_mode=server_mode, set_target=False)\n+ self.start_vms(mergeable=mergeable, packed=packed, server_mode=server_mode, set_target=True, bind_dev=False)\n self.vm0_pmd = PmdOutput(self.vm_dut[0])\n self.vm1_pmd = PmdOutput(self.vm_dut[1])\n self.config_vm_env()\n@@ -730,7 +756,7 @@ class TestVswitchSampleCBDMA(TestCase):\n \n self.logger.info(\"launch vhost\")\n self.start_vhost_app(with_cbdma=True, cbdma_num=2, socket_num=2, client_mode=True)\n- before_rerun = self.start_iperf_and_scp_test_in_vms(need_start_vm=True, mode=0, mergeable=False, server_mode=True)\n+ before_rerun = self.start_iperf_and_scp_test_in_vms(need_start_vm=True, mergeable=False, packed=False, server_mode=True)\n \n self.logger.info(\"relaunch vhost\")\n self.vhost_user.send_expect(\"^C\", \"# \", 20)\n@@ -762,7 +788,7 @@ class TestVswitchSampleCBDMA(TestCase):\n self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=2)\n \n self.start_vhost_app(with_cbdma=True, cbdma_num=2, socket_num=2, client_mode=False)\n- before_rerun = self.start_iperf_and_scp_test_in_vms(need_start_vm=True, mode=2, mergeable=False, server_mode=False)\n+ before_rerun = self.start_iperf_and_scp_test_in_vms(need_start_vm=True, mergeable=False, packed=True, server_mode=False)\n \n self.logger.info(\"rerun scp and iperf test\")\n rerun_test_1 = self.start_iperf_and_scp_test_in_vms(need_start_vm=False)\n@@ -770,6 +796,7 @@ class TestVswitchSampleCBDMA(TestCase):\n rerun_test_3 = self.start_iperf_and_scp_test_in_vms(need_start_vm=False)\n rerun_test_4 = self.start_iperf_and_scp_test_in_vms(need_start_vm=False)\n rerun_test_5 = self.start_iperf_and_scp_test_in_vms(need_start_vm=False)\n+\n self.table_header = ['Path', 'Before/After rerun scp/iperf', 'Throughput(Mpps)']\n self.result_table_create(self.table_header)\n perf_result.append(['packed ring', 'Before rerun test', before_rerun])\n@@ -794,6 +821,10 @@ class TestVswitchSampleCBDMA(TestCase):\n \"\"\"\n Run after each test case.\n \"\"\"\n+ self.dut.kill_all()\n+ for i in range(len(self.vm)):\n+ self.vm[i].stop()\n+ self.vhost_user.send_expect(\"^C\", \"# \", 20)\n self.bind_cbdma_device_to_kernel()\n \n def tear_down_all(self):\n@@ -801,5 +832,4 @@ class TestVswitchSampleCBDMA(TestCase):\n Run after each test suite.\n \"\"\"\n self.set_max_queues(128)\n- self.dut.build_install_dpdk(self.target)\n self.close_all_session()\n", "prefixes": [ "V1", "2/2" ] }