Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/85232/?format=api
{ "id": 85232, "url": "https://patches.dpdk.org/api/patches/85232/?format=api", "web_url": "https://patches.dpdk.org/project/dts/patch/20201216173412.100405-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": "<20201216173412.100405-1-weix.ling@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dts/20201216173412.100405-1-weix.ling@intel.com", "date": "2020-12-16T17:34:12", "name": "[V1] tests/vm2vm_virtio_net_perf:sync dts code with test plan update", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "607f8cb34a0ea7fc3eb4a552ace9f901293f60e8", "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/20201216173412.100405-1-weix.ling@intel.com/mbox/", "series": [ { "id": 14328, "url": "https://patches.dpdk.org/api/series/14328/?format=api", "web_url": "https://patches.dpdk.org/project/dts/list/?series=14328", "date": "2020-12-16T17:34:12", "name": "[V1] tests/vm2vm_virtio_net_perf:sync dts code with test plan update", "version": 1, "mbox": "https://patches.dpdk.org/series/14328/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/85232/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/85232/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 69769A09EF;\n\tWed, 16 Dec 2020 10:38:49 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 123F0C9A4;\n\tWed, 16 Dec 2020 10:38:48 +0100 (CET)", "from mga07.intel.com (mga07.intel.com [134.134.136.100])\n by dpdk.org (Postfix) with ESMTP id 6FDCDC9A0\n for <dts@dpdk.org>; Wed, 16 Dec 2020 10:38:45 +0100 (CET)", "from orsmga002.jf.intel.com ([10.7.209.21])\n by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 16 Dec 2020 01:38:44 -0800", "from unknown (HELO localhost.localdomain) ([10.240.183.222])\n by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 16 Dec 2020 01:38:42 -0800" ], "IronPort-SDR": [ "\n tzHQUdtraSTgvlexrUoUjqx2irVjM8kUqQTdUpFTekHEAC/SNmo6JmVMViZVmALq/GN3MNBmHf\n 2bDvoWi8Jnhg==", "\n 1QBJATLvImXqvkgLtjJBG9jftnA0ZJfr1Z0YIfEOCZMzsJdGn/3vXy2tI5+1derCLtE20iQRTx\n 3L9h5tp7Cf/A==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9836\"; a=\"239131421\"", "E=Sophos;i=\"5.78,424,1599548400\"; d=\"scan'208\";a=\"239131421\"", "E=Sophos;i=\"5.78,424,1599548400\"; d=\"scan'208\";a=\"352488035\"" ], "From": "lingwei <weix.ling@intel.com>", "To": "dts@dpdk.org", "Cc": "lingwei <weix.ling@intel.com>", "Date": "Thu, 17 Dec 2020 01:34:12 +0800", "Message-Id": "<20201216173412.100405-1-weix.ling@intel.com>", "X-Mailer": "git-send-email 2.17.1", "Subject": "[dts] [PATCH V1] tests/vm2vm_virtio_net_perf:sync dts code with\n\ttest plan update", "X-BeenThere": "dts@dpdk.org", "X-Mailman-Version": "2.1.15", "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": "sync dts code with test plan update\n\nSigned-off-by: lingwei <weix.ling@intel.com>\n---\n tests/TestSuite_vm2vm_virtio_net_perf.py | 256 ++++++++++++++---------\n 1 file changed, 155 insertions(+), 101 deletions(-)", "diff": "diff --git a/tests/TestSuite_vm2vm_virtio_net_perf.py b/tests/TestSuite_vm2vm_virtio_net_perf.py\nindex f1afb4fd..4260302f 100644\n--- a/tests/TestSuite_vm2vm_virtio_net_perf.py\n+++ b/tests/TestSuite_vm2vm_virtio_net_perf.py\n@@ -49,8 +49,8 @@ from pmd_output import PmdOutput\n \n class TestVM2VMVirtioNetPerf(TestCase):\n def set_up_all(self):\n- core_config = \"1S/4C/1T\"\n- self.cores_list = self.dut.get_core_list(core_config)\n+ core_config = \"1S/5C/1T\"\n+ self.cores_list = self.dut.get_core_list(core_config, socket=0)\n self.verify(len(self.cores_list) >= 4,\n \"There has not enough cores to test this suite %s\" %\n self.suite_name)\n@@ -66,6 +66,13 @@ 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+ self.dut_ports = self.dut.get_ports()\n+ self.ports_socket = self.dut.get_numa_id(self.dut_ports[0])\n+ # get cbdma device\n+ self.cbdma_dev_infos = []\n+ self.dmas_info = None\n+ self.device_str = None\n+ self.dut.restore_interfaces()\n \n def set_up(self):\n \"\"\"\n@@ -77,91 +84,165 @@ class TestVM2VMVirtioNetPerf(TestCase):\n self.vm_dut = []\n self.vm = []\n \n- def start_vhost_testpmd(self, zerocopy=False):\n+ def get_cbdma_ports_info_and_bind_to_dpdk(self, cbdma_num=2, allow_diff_socket=False):\n+ \"\"\"\n+ get all cbdma ports\n+ \"\"\"\n+ str_info = 'Misc (rawdev) devices using kernel driver'\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+ 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(len(self.cbdma_dev_infos) >= cbdma_num, 'There no enough cbdma device to run this suite')\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.replace('0000:', ''))\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.replace('0000:', ''))\n+ dmas_info += dmas\n+ self.dmas_info = dmas_info[:-1]\n+ self.device_str = ' '.join(used_cbdma)\n+ self.dut.setup_modules(self.target, \"igb_uio\",\"None\")\n+ self.dut.send_expect('./usertools/dpdk-devbind.py --force --bind=%s %s' % (\"igb_uio\", self.device_str), '# ', 60)\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('./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 start_vhost_testpmd(self, cbdma=False, no_pci=True, client=False, queues=1, nb_cores=2):\n \"\"\"\n launch the testpmd with different parameters\n \"\"\"\n- if zerocopy is True:\n- zerocopy_arg = \",dequeue-zero-copy=1\"\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=[{}],dmathr=512\".format(\";\".join(cbdma_arg_0_list))\n+ cbdma_arg_1 = \",dmas=[{}],dmathr=512\".format(\";\".join(cbdma_arg_1_list))\n else:\n- zerocopy_arg = \"\"\n+ cbdma_arg_0 = \"\"\n+ cbdma_arg_1 = \"\"\n testcmd = self.app_testpmd_path + \" \"\n- vdev1 = \"--vdev 'net_vhost0,iface=%s/vhost-net0,queues=1%s' \" % (self.base_dir, zerocopy_arg)\n- vdev2 = \"--vdev 'net_vhost1,iface=%s/vhost-net1,queues=1%s' \" % (self.base_dir, zerocopy_arg)\n- eal_params = self.dut.create_eal_parameters(cores=self.cores_list, prefix='vhost', no_pci=True)\n- para = \" -- -i --nb-cores=2 --txd=1024 --rxd=1024\"\n+ if not client:\n+ vdev1 = \"--vdev 'net_vhost0,iface=%s/vhost-net0,queues=%d%s' \" % (self.base_dir, queues, cbdma_arg_0)\n+ vdev2 = \"--vdev 'net_vhost1,iface=%s/vhost-net1,queues=%d%s' \" % (self.base_dir, queues, cbdma_arg_1)\n+ else:\n+ vdev1 = \"--vdev 'net_vhost0,iface=%s/vhost-net0,client=1,queues=%d%s' \" % (self.base_dir, queues, cbdma_arg_0)\n+ vdev2 = \"--vdev 'net_vhost1,iface=%s/vhost-net1,client=1,queues=%d%s' \" % (self.base_dir, queues, cbdma_arg_1)\n+ eal_params = self.dut.create_eal_parameters(cores=self.cores_list, prefix='vhost', no_pci=no_pci)\n+ if nb_cores == 4:\n+ para = \" -- -i --nb-cores=%d --txd=1024 --rxd=1024 --rxq=8 --txq=8\" % nb_cores\n+ else:\n+ para = \" -- -i --nb-cores=%d --txd=1024 --rxd=1024\" % nb_cores\n self.command_line = testcmd + eal_params + vdev1 + vdev2 + para\n self.pmd_vhost.execute_cmd(self.command_line, timeout=30)\n self.pmd_vhost.execute_cmd('start', timeout=30)\n \n- def start_vms(self, mode=\"mergeable\", packed=False):\n+ def start_vms(self, path_mode, server_mode=False, opt_queue=1):\n \"\"\"\n start two VM, each VM has one virtio device\n \"\"\"\n- setting_args = \"disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on\"\n- if mode == \"ufo\":\n- setting_args += \",guest_ufo=on,host_ufo=on\"\n- elif mode == \"mergeable\":\n- setting_args = \"mrg_rxbuf=on\"\n- elif mode == \"normal\":\n- setting_args = \"mrg_rxbuf=off\"\n- if packed is True:\n- setting_args = \"%s,packed=on\" % setting_args\n+ if path_mode == 1:\n+ setting_args = \"disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on\"\n+ elif path_mode == 2:\n+ setting_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+ elif path_mode == 4:\n+ setting_args = \"disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on\"\n+ elif path_mode == 5:\n+ setting_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+ elif path_mode == 6:\n+ setting_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+ elif path_mode == 10:\n+ setting_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+ elif path_mode == 11:\n+ setting_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 \n for i in range(self.vm_num):\n vm_dut = None\n vm_info = VM(self.dut, 'vm%d' % i, 'vhost_sample')\n vm_params = {}\n vm_params['driver'] = 'vhost-user'\n- vm_params['opt_path'] = self.base_dir + '/vhost-net%d' % i\n+ if not server_mode:\n+ vm_params['opt_path'] = self.base_dir + '/vhost-net%d' % i\n+ else:\n+ vm_params['opt_path'] = self.base_dir + '/vhost-net%d' % i + ',server'\n+ vm_params['opt_queue'] = opt_queue\n vm_params['opt_mac'] = \"52:54:00:00:00:0%d\" % (i+1)\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=False)\n+ vm_dut = vm_info.start(set_target=False, migration_vm=True)\n if vm_dut is None:\n raise Exception(\"Set up VM ENV failed\")\n except Exception as e:\n self.logger.error(\"Failure for %s\" % str(e))\n raise e\n- vm_dut.restore_interfaces()\n+ # vm_dut.restore_interfaces()\n \n self.vm_dut.append(vm_dut)\n self.vm.append(vm_info)\n \n- def config_vm_env(self):\n+ def config_vm_env(self, combined=False):\n \"\"\"\n set virtio device IP and run arp protocal\n \"\"\"\n vm1_intf = self.vm_dut[0].ports_info[0]['intf']\n vm2_intf = self.vm_dut[1].ports_info[0]['intf']\n+ if combined:\n+ self.vm_dut[0].send_expect(\"ethtool -L %s combined 8\" % vm1_intf, \"#\", 10)\n self.vm_dut[0].send_expect(\"ifconfig %s %s\" % (vm1_intf, self.virtio_ip1), \"#\", 10)\n+ if combined:\n+ self.vm_dut[1].send_expect(\"ethtool -L %s combined 8\" % vm2_intf, \"#\", 10)\n self.vm_dut[1].send_expect(\"ifconfig %s %s\" % (vm2_intf, self.virtio_ip2), \"#\", 10)\n self.vm_dut[0].send_expect(\"arp -s %s %s\" % (self.virtio_ip2, self.virtio_mac2), \"#\", 10)\n self.vm_dut[1].send_expect(\"arp -s %s %s\" % (self.virtio_ip1, self.virtio_mac1), \"#\", 10)\n \n- def prepare_test_env(self, zerocopy, path_mode, packed_mode=False):\n+ def prepare_test_env(self, path_mode, cbdma=False, no_pci=True, client=False, queues=1, nb_cores=2, server_mode=False, opt_queue=1, combined=False):\n \"\"\"\n start vhost testpmd and qemu, and config the vm env\n \"\"\"\n- self.start_vhost_testpmd(zerocopy)\n- self.start_vms(mode=path_mode, packed=packed_mode)\n- self.config_vm_env()\n+ self.start_vhost_testpmd(cbdma=cbdma, no_pci=no_pci, client=client, queues=queues, nb_cores=nb_cores)\n+ self.start_vms(path_mode=path_mode, server_mode=server_mode, opt_queue=opt_queue)\n+ self.config_vm_env(combined=combined)\n \n- def start_iperf(self, mode):\n+ def start_iperf(self, iperf_mode='tso'):\n \"\"\"\n run perf command between to vms\n \"\"\"\n # clear the port xstats before iperf\n self.vhost.send_expect(\"clear port xstats all\", \"testpmd> \", 10)\n \n- if mode == \"ufo\":\n- iperf_server = \"iperf -s -u -i 1\"\n- iperf_client = \"iperf -c 1.1.1.2 -i 1 -t 30 -P 4 -u -b 1G -l 9000\"\n- else:\n+ if iperf_mode == \"tso\":\n iperf_server = \"iperf -s -i 1\"\n iperf_client = \"iperf -c 1.1.1.2 -i 1 -t 30\"\n+ else:\n+ iperf_server = \"iperf -s -u -i 1\"\n+ iperf_client = \"iperf -c 1.1.1.2 -i 1 -t 30 -P 4 -u -b 1G -l 9000\"\n self.vm_dut[0].send_expect(\"%s > iperf_server.log &\" % iperf_server, \"\", 10)\n self.vm_dut[1].send_expect(\"%s > iperf_client.log &\" % iperf_client, \"\", 60)\n time.sleep(90)\n@@ -207,12 +288,12 @@ class TestVM2VMVirtioNetPerf(TestCase):\n self.verify(int(tx_info.group(1)) > 0,\n \"Port 0 not forward packet greater than 1522\")\n \n- def start_iperf_and_verify_vhost_xstats_info(self, mode):\n+ def start_iperf_and_verify_vhost_xstats_info(self, iperf_mode='tso'):\n \"\"\"\n start to send packets and verify vm can received data of iperf\n and verify the vhost can received big pkts in testpmd\n \"\"\"\n- self.start_iperf(mode)\n+ self.start_iperf(iperf_mode)\n self.get_perf_result()\n self.verify_xstats_info_on_vhost()\n self.result_table_print()\n@@ -267,121 +348,94 @@ class TestVM2VMVirtioNetPerf(TestCase):\n \n def test_vm2vm_split_ring_iperf_with_tso(self):\n \"\"\"\n- VM2VM split ring vhost-user/virtio-net test with tcp traffic\n+ TestCase1: VM2VM split ring vhost-user/virtio-net test with tcp traffic\n \"\"\"\n- zerocopy = False\n- path_mode = \"tso\"\n- self.prepare_test_env(zerocopy, path_mode)\n- self.start_iperf_and_verify_vhost_xstats_info(mode=\"tso\")\n+ self.prepare_test_env(path_mode=1, cbdma=False, no_pci=True)\n+ self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='tso')\n \n- def test_vm2vm_split_ring_dequeue_zero_copy_with_tso(self):\n+ def test_vm2vm_split_ring_with_tso_and_cbdma_enable(self):\n \"\"\"\n- VM2VM split ring vhost-user/virtio-net zero copy test with tcp traffic\n+ TestCase2: VM2VM split ring vhost-user/virtio-net CBDMA enable test with tcp traffic\n \"\"\"\n- zerocopy = True\n- path_mode = \"tso\"\n- self.prepare_test_env(zerocopy, path_mode)\n- self.start_iperf_and_verify_vhost_xstats_info(mode=\"tso\")\n+ self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=2)\n+ self.prepare_test_env(path_mode=1, cbdma=True, no_pci=False)\n+ self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='tso')\n \n def test_vm2vm_packed_ring_iperf_with_tso(self):\n \"\"\"\n- VM2VM packed ring vhost-user/virtio-net test with tcp traffic\n- \"\"\"\n- zerocopy = False\n- path_mode = \"tso\"\n- packed_mode = True\n- self.prepare_test_env(zerocopy, path_mode, packed_mode)\n- self.start_iperf_and_verify_vhost_xstats_info(mode=\"tso\")\n-\n- def test_vm2vm_packed_ring_dequeue_zero_copy_with_tso(self):\n- \"\"\"\n- VM2VM packed ring vhost-user/virtio-net zero copy test with tcp traffic\n+ TestCase7: VM2VM packed ring vhost-user/virtio-net test with tcp traffic\n \"\"\"\n- zerocopy = True\n- path_mode = \"tso\"\n- packed_mode = True\n- self.prepare_test_env(zerocopy, path_mode, packed_mode)\n- self.start_iperf_and_verify_vhost_xstats_info(mode=\"tso\")\n+ self.prepare_test_env(path_mode=4, cbdma=False, no_pci=True)\n+ self.start_iperf_and_verify_vhost_xstats_info()\n \n def test_vm2vm_split_ring_iperf_with_ufo(self):\n \"\"\"\n- VM2VM split ring vhost-user/virtio-net test with udp traffic\n+ TestCase3: VM2VM split ring vhost-user/virtio-net test with udp traffic\n \"\"\"\n- zerocopy = False\n- path_mode = \"ufo\"\n- self.prepare_test_env(zerocopy, path_mode)\n- self.start_iperf_and_verify_vhost_xstats_info(mode=\"ufo\")\n+ self.prepare_test_env(path_mode=2, cbdma=False, no_pci=True)\n+ self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='ufo')\n \n def test_vm2vm_packed_ring_iperf_with_ufo(self):\n \"\"\"\n- VM2VM packed ring vhost-user/virtio-net test with udp traffic\n+ TestCase8: VM2VM packed ring vhost-user/virtio-net test with udp traffic\n \"\"\"\n- zerocopy = False\n- path_mode = \"ufo\"\n- packed_mode = True\n- self.prepare_test_env(zerocopy, path_mode, packed_mode)\n- self.start_iperf_and_verify_vhost_xstats_info(mode=\"ufo\")\n+ self.prepare_test_env(path_mode=4, cbdma=False, no_pci=True)\n+ self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='other')\n \n def test_vm2vm_split_ring_device_capbility(self):\n \"\"\"\n- Check split ring virtio-net device capability\n+ TestCase4: Check split ring virtio-net device capability\n \"\"\"\n- self.start_vhost_testpmd(zerocopy=False)\n- self.start_vms(mode=\"ufo\")\n+ self.start_vhost_testpmd(cbdma=False, no_pci=True)\n+ self.start_vms(path_mode=2)\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_device_capbility(self):\n \"\"\"\n- Check split ring virtio-net device capability\n+ TestCase9: Check packed ring virtio-net device capability\n \"\"\"\n- self.start_vhost_testpmd(zerocopy=False)\n- self.start_vms(mode=\"ufo\", packed=True)\n+ self.start_vhost_testpmd(cbdma=False, no_pci=True)\n+ self.start_vms(path_mode=4)\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_zero_copy_with_mergeable_path_check_large_packet(self):\n+ def test_vm2vm_split_ring_with_mergeable_path_check_large_packet_and_cbdma_enable_8queue(self):\n \"\"\"\n- VM2VM virtio-net split ring mergeable zero copy test with large packet payload valid check\n+ TestCase5: VM2VM virtio-net split ring mergeable CBDMA enable test with large packet payload valid check\n \"\"\"\n- zerocopy = True\n- path_mode = 'mergeable'\n- self.prepare_test_env(zerocopy, path_mode)\n+ self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True)\n+ self.prepare_test_env(path_mode=5, cbdma=True, no_pci=False, client=True, queues=8, nb_cores=4, server_mode=True, opt_queue=8, combined=True)\n self.check_scp_file_valid_between_vms()\n \n- def test_vm2vm_split_ring_zero_copy_with_no_mergeable_path_check_large_packet(self):\n+ def test_vm2vm_split_ring_with_no_mergeable_path_check_large_packet_and_cbdma_enable_8queue(self):\n \"\"\"\n- VM2VM virtio-net split ring non-mergeable zero copy test with large packet payload valid check\n+ TestCase6: VM2VM virtio-net split ring non-mergeable CBDMA enable test with large packet payload valid check\n \"\"\"\n- zerocopy = True\n- path_mode = 'normal'\n- self.prepare_test_env(zerocopy, path_mode)\n+ self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True)\n+ self.prepare_test_env(path_mode=6, cbdma=True, no_pci=False, client=True, queues=8, nb_cores=4, server_mode=True, opt_queue=8, combined=True)\n self.check_scp_file_valid_between_vms()\n \n- def test_vm2vm_packed_ring_zero_copy_with_mergeable_path_check_large_packet(self):\n+ def test_vm2vm_packed_ring_mergeable_path_check_large_packet(self):\n \"\"\"\n- VM2VM packed ring virtio-net mergeable dequeue zero copy test with large packet payload valid check\n+ TestCase10: VM2VM packed ring virtio-net mergeable with large packet payload valid check\n \"\"\"\n- zerocopy = True\n- path_mode = 'mergeable'\n- packed_mode = True\n- self.prepare_test_env(zerocopy, path_mode, packed_mode)\n+ self.prepare_test_env(path_mode=10, cbdma=False, no_pci=True)\n self.check_scp_file_valid_between_vms()\n \n- def test_vm2vm_packed_ring_zero_copy_with_no_mergeable_path_check_large_packet(self):\n+ def test_vm2vm_packed_ring_no_mergeable_path_check_large_packet(self):\n \"\"\"\n- VM2VM packed ring virtio-net non-mergeable dequeue zero copy test with large packet payload valid check\n+ TestCase11: VM2VM packed ring virtio-net non-mergeable with large packet payload valid check\n \"\"\"\n- zerocopy = True\n- path_mode = 'normal'\n- packed_mode = True\n- self.prepare_test_env(zerocopy, path_mode, packed_mode)\n+ self.prepare_test_env(path_mode=11, cbdma=False, no_pci=True)\n self.check_scp_file_valid_between_vms()\n \n def tear_down(self):\n \"\"\"\n run after each test case.\n \"\"\"\n+ if \"cbdma_enable\" in self.running_case:\n+ self.bind_cbdma_device_to_kernel()\n self.stop_all_apps()\n self.dut.kill_all()\n time.sleep(2)\n", "prefixes": [ "V1" ] }