Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/99405/?format=api
{ "id": 99405, "url": "http://patches.dpdk.org/api/patches/99405/?format=api", "web_url": "http://patches.dpdk.org/project/dts/patch/20210922164147.111013-1-linglix.chen@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": "<20210922164147.111013-1-linglix.chen@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dts/20210922164147.111013-1-linglix.chen@intel.com", "date": "2021-09-22T16:41:47", "name": "[V1] tests/vm2vm_virtio_pmd: fix script issues", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "6663f8d247b89023dbcb36b95fc505a342373275", "submitter": { "id": 1843, "url": "http://patches.dpdk.org/api/people/1843/?format=api", "name": "Lingli Chen", "email": "linglix.chen@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dts/patch/20210922164147.111013-1-linglix.chen@intel.com/mbox/", "series": [ { "id": 19072, "url": "http://patches.dpdk.org/api/series/19072/?format=api", "web_url": "http://patches.dpdk.org/project/dts/list/?series=19072", "date": "2021-09-22T16:41:47", "name": "[V1] tests/vm2vm_virtio_pmd: fix script issues", "version": 1, "mbox": "http://patches.dpdk.org/series/19072/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/99405/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/99405/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 74147A0C45;\n\tWed, 22 Sep 2021 10:40:38 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 486E241196;\n\tWed, 22 Sep 2021 10:40:38 +0200 (CEST)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n by mails.dpdk.org (Postfix) with ESMTP id 3D3494069E\n for <dts@dpdk.org>; Wed, 22 Sep 2021 10:40:35 +0200 (CEST)", "from orsmga007.jf.intel.com ([10.7.209.58])\n by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 22 Sep 2021 01:40:17 -0700", "from unknown (HELO localhost.localdomain) ([10.240.183.77])\n by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 22 Sep 2021 01:40:16 -0700" ], "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,10114\"; a=\"203703555\"", "E=Sophos;i=\"5.85,313,1624345200\"; d=\"scan'208\";a=\"203703555\"", "E=Sophos;i=\"5.85,313,1624345200\"; d=\"scan'208\";a=\"474434959\"" ], "From": "Lingli Chen <linglix.chen@intel.com>", "To": "dts@dpdk.org", "Cc": "Lingli Chen <linglix.chen@intel.com>", "Date": "Wed, 22 Sep 2021 16:41:47 +0000", "Message-Id": "<20210922164147.111013-1-linglix.chen@intel.com>", "X-Mailer": "git-send-email 2.32.0", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dts] [PATCH V1] tests/vm2vm_virtio_pmd: fix script issues", "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.Launch virtio-pmd on VM with_mergeable_path add --rx-offloads=0x00002000, due to dpdk code change from 21.08-rc2.\n2.start_vms() use setting_args instead mode and mergeable parameters.\n3.fix case 10 sync with testplan.\n\nSigned-off-by: Lingli Chen <linglix.chen@intel.com>\n---\n tests/TestSuite_vm2vm_virtio_pmd.py | 141 ++++++++++++++--------------\n 1 file changed, 73 insertions(+), 68 deletions(-)", "diff": "diff --git a/tests/TestSuite_vm2vm_virtio_pmd.py b/tests/TestSuite_vm2vm_virtio_pmd.py\nindex 44f17a36..e0dab2c7 100644\n--- a/tests/TestSuite_vm2vm_virtio_pmd.py\n+++ b/tests/TestSuite_vm2vm_virtio_pmd.py\n@@ -66,6 +66,7 @@ class TestVM2VMVirtioPMD(TestCase):\n self.pmd_vhost = PmdOutput(self.dut, self.vhost_user)\n self.cbdma_dev_infos = []\n self.vm_config = 'vhost_sample'\n+ self.device_str = ' '\n \n def set_up(self):\n \"\"\"\n@@ -145,30 +146,29 @@ class TestVM2VMVirtioPMD(TestCase):\n self.virtio_user0.send_expect('set burst 1', 'testpmd> ', 30)\n self.virtio_user0.send_expect('start tx_first 10', 'testpmd> ', 30)\n \n- def start_vm_testpmd(self, vm_client, path_mode, extern_param=\"\", virtio_net_pci=\"\", queues=\"\"):\n+ def start_vm_testpmd(self, vm_client, path_mode, extern_param=\"\", virtio_net_pci=\"\"):\n \"\"\"\n launch the testpmd in vm\n \"\"\"\n # deal with ports\n w_pci_list = []\n- w_pci_list.append('-w %s,%s' % (virtio_net_pci, 'vectorized=1'))\n+ w_pci_list.append('-a %s,%s' % (virtio_net_pci, 'vectorized=1'))\n w_pci_str = ' '.join(w_pci_list)\n if path_mode == \"mergeable\":\n command = self.app_testpmd_path + \" -c 0x3 -n 4 \" + \\\n- \"--file-prefix=virtio -- -i --tx-offloads=0x00 \" + \\\n- \"--enable-hw-vlan-strip \" + \"--txq={0} --rxq={0} \".format(queues) if queues else \"\"\n-\n+ \"--file-prefix=virtio -- -i --tx-offloads=0x00 --rx-offloads=0x00002000 \" + \\\n+ \"--enable-hw-vlan-strip \"\n command = command + \"--txd=1024 --rxd=1024 %s\"\n vm_client.send_expect(command % extern_param, \"testpmd> \", 20)\n elif path_mode == \"normal\":\n command = self.app_testpmd_path + \" -c 0x3 -n 4 \" + \\\n \"--file-prefix=virtio -- -i --tx-offloads=0x00 \" + \\\n- \"--enable-hw-vlan-strip \" + \"--txq={0} --rxq={0} \".format(queues) if queues else \"\"\n+ \"--enable-hw-vlan-strip \"\n command = command + \"--txd=1024 --rxd=1024 %s\"\n vm_client.send_expect(command % extern_param, \"testpmd> \", 20)\n elif path_mode == \"vector_rx\":\n command = self.app_testpmd_path + \" -c 0x3 -n 4 \" + \\\n- \"--file-prefix=virtio %s -- -i\" + \"--txq={0} --rxq={0} \".format(queues) if queues else \"\"\n+ \"--file-prefix=virtio %s -- -i \"\n command = command + \"--txd=1024 --rxd=1024 %s\"\n vm_client.send_expect(command % (w_pci_str, extern_param), \"testpmd> \", 20)\n \n@@ -188,29 +188,16 @@ class TestVM2VMVirtioPMD(TestCase):\n \"--pdump '%s,queue=*,rx-dev=%s,mbuf-size=8000'\"\n self.pdump_session.send_expect(command_line % (self.dut.prefix_subfix, dump_port, self.dump_pcap), 'Port')\n \n- def start_vms(self, mode=0, mergeable=True, server_mode=False, opt_queue=None, vm_config=''):\n+ def start_vms(self, setting_args='', server_mode=False, opt_queue=None, vm_config='vhost_sample'):\n \"\"\"\n start two VM, each VM has one virtio device\n \"\"\"\n # for virtio 0.95, start vm with \"disable-modern=true\"\n # for virito 1.0, start vm with \"disable-modern=false\"\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=false,packed=on\"\n- if mergeable is True:\n- setting_args += \",\" + \"mrg_rxbuf=on\"\n- else:\n- setting_args += \",\" + \"mrg_rxbuf=off\"\n vm_params = {}\n- if opt_queue > 1:\n- setting_args += \",csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on\"\n+\n+ if opt_queue is not None:\n vm_params['opt_queue'] = opt_queue\n- setting_args = setting_args + \",mq=on,vectors=40\"\n- else:\n- setting_args += \",csum=on,gso=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on\"\n \n for i in range(self.vm_num):\n vm_dut = None\n@@ -304,62 +291,67 @@ class TestVM2VMVirtioPMD(TestCase):\n \n def test_vhost_vm2vm_virtio_pmd_with_normal_path(self):\n \"\"\"\n- vhost-user + virtio-pmd with normal path\n+ Test Case 2: vhost-user + virtio-pmd with normal path\n \"\"\"\n+ setting_args = \"disable-modern=true,mrg_rxbuf=off,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on\"\n path_mode = \"normal\"\n self.get_core_list(2)\n self.start_vhost_testpmd()\n- self.start_vms(mode=0, mergeable=False)\n+ self.start_vms(setting_args=setting_args)\n self.start_vm_testpmd(self.vm_dut[0], path_mode)\n self.start_vm_testpmd(self.vm_dut[1], path_mode)\n self.send_and_verify(mode=\"virtio 0.95 normal path\", path=path_mode)\n \n def test_vhost_vm2vm_virito_10_pmd_with_normal_path(self):\n \"\"\"\n- vhost-user + virtio1.0-pmd with normal path\n+ Test Case 4: vhost-user + virtio1.0-pmd with normal path\n \"\"\"\n path_mode = \"normal\"\n+ setting_args = \"disable-modern=false,mrg_rxbuf=off,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on\"\n self.get_core_list(2)\n self.start_vhost_testpmd()\n- self.start_vms(mode=1, mergeable=False)\n+ self.start_vms(setting_args=setting_args)\n self.start_vm_testpmd(self.vm_dut[0], path_mode)\n self.start_vm_testpmd(self.vm_dut[1], path_mode)\n self.send_and_verify(mode=\"virtio 1.0 normal path\", path=path_mode)\n \n def test_vhost_vm2vm_virtio_pmd_with_vector_rx_path(self):\n \"\"\"\n- vhost-user + virtio-pmd with vector_rx path\n+ Test Case 1: vhost-user + virtio-pmd with vector_rx path\n \"\"\"\n path_mode = \"vector_rx\"\n+ setting_args = \"disable-modern=true,mrg_rxbuf=off,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on\"\n self.get_core_list(2)\n self.start_vhost_testpmd()\n- self.start_vms(mode=0, mergeable=False)\n+ self.start_vms(setting_args=setting_args)\n self.start_vm_testpmd(self.vm_dut[0], path_mode, virtio_net_pci = self.vm_dut[0].ports_info[0]['pci'])\n self.start_vm_testpmd(self.vm_dut[1], path_mode, virtio_net_pci = self.vm_dut[1].ports_info[0]['pci'])\n self.send_and_verify(mode=\"virtio 0.95 vector_rx\", path=path_mode)\n \n def test_vhost_vm2vm_virtio_10_pmd_with_vector_rx_path(self):\n \"\"\"\n- vhost-user + virtio1.0-pmd with vector_rx path\n+ Test Case 3: vhost-user + virtio1.0-pmd with vector_rx path\n \"\"\"\n path_mode = \"vector_rx\"\n+ setting_args = \"disable-modern=false,mrg_rxbuf=off,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on\"\n self.get_core_list(2)\n self.start_vhost_testpmd()\n- self.start_vms(mode=1, mergeable=False)\n+ self.start_vms(setting_args=setting_args)\n self.start_vm_testpmd(self.vm_dut[0], path_mode, virtio_net_pci = self.vm_dut[0].ports_info[0]['pci'])\n self.start_vm_testpmd(self.vm_dut[1], path_mode, virtio_net_pci = self.vm_dut[1].ports_info[0]['pci'])\n self.send_and_verify(mode=\"virtio 1.0 vector_rx\", path=path_mode)\n \n def test_vhost_vm2vm_virito_pmd_with_mergeable_path(self):\n \"\"\"\n- vhost-user + virtio-pmd with mergeable path test with payload check\n+ Test Case 5: vhost-user + virtio-pmd with mergeable path test with payload check\n \"\"\"\n path_mode = \"mergeable\"\n+ setting_args = \"disable-modern=true,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on\"\n extern_param = '--max-pkt-len=9600'\n dump_port = 'port=0'\n self.get_core_list(2)\n self.start_vhost_testpmd()\n- self.start_vms(mode=0, mergeable=True)\n+ self.start_vms(setting_args=setting_args)\n # git the vm enough huge to run pdump\n self.vm_dut[0].set_huge_pages(2048)\n # start testpmd and pdump in VM0\n@@ -377,14 +369,15 @@ class TestVM2VMVirtioPMD(TestCase):\n \n def test_vhost_vm2vm_virito_10_pmd_with_mergeable_path(self):\n \"\"\"\n- vhost-user + virtio1.0-pmd with mergeable path test with payload check\n+ Test Case 6: vhost-user + virtio1.0-pmd with mergeable path test with payload check\n \"\"\"\n path_mode = \"mergeable\"\n+ setting_args = \"disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on\"\n extern_param = '--max-pkt-len=9600'\n dump_port = 'port=0'\n self.get_core_list(2)\n self.start_vhost_testpmd()\n- self.start_vms(mode=1, mergeable=True)\n+ self.start_vms(setting_args=setting_args)\n # git the vm enough huge to run pdump\n self.vm_dut[0].set_huge_pages(2048)\n # start testpmd and pdump in VM0\n@@ -402,26 +395,28 @@ class TestVM2VMVirtioPMD(TestCase):\n \n def test_vhost_vm2vm_virito_11_pmd_with_normal_path(self):\n \"\"\"\n- vhost-user + virtio1.0-pmd with normal path\n+ Test Case 8: vhost-user + virtio1.0-pmd with normal path\n \"\"\"\n path_mode = \"normal\"\n+ setting_args = \"disable-modern=false,mrg_rxbuf=off,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on\"\n self.get_core_list(2)\n self.start_vhost_testpmd()\n- self.start_vms(mode=2, mergeable=False)\n+ self.start_vms(setting_args=setting_args)\n self.start_vm_testpmd(self.vm_dut[0], path_mode)\n self.start_vm_testpmd(self.vm_dut[1], path_mode)\n self.send_and_verify(mode=\"virtio 1.0 normal path\", path=path_mode)\n \n def test_vhost_vm2vm_virito_11_pmd_with_mergeable_path(self):\n \"\"\"\n- vhost-user + virtio1.0-pmd with mergeable path test with payload check\n+ Test Case 7: vhost-user + virtio1.0-pmd with mergeable path test with payload check\n \"\"\"\n path_mode = \"mergeable\"\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 extern_param = '--max-pkt-len=9600'\n dump_port = 'port=0'\n self.get_core_list(2)\n self.start_vhost_testpmd()\n- self.start_vms(mode=2, mergeable=True)\n+ self.start_vms(setting_args=setting_args)\n # git the vm enough huge to run pdump\n self.vm_dut[0].set_huge_pages(2048)\n # start testpmd and pdump in VM0\n@@ -437,22 +432,25 @@ class TestVM2VMVirtioPMD(TestCase):\n # check the packet in vm0\n self.check_packet_payload_valid(self.vm_dut[0])\n \n- def test_vhost_vm2vm_virtio_split_ring_with_mergeable_path_cbdma_enabled(self):\n+ def test_vhost_vm2vm_virtio_split_ring_with_mergeable_path_cbdma_enable(self):\n \"\"\"\n Test Case 9: VM2VM virtio-pmd split ring mergeable path 8 queues CBDMA enable with server mode stable test\n \"\"\"\n self.nb_cores = 4\n+ path_mode = \"mergeable\"\n+ extern_param = '--max-pkt-len=9600 --txq=8 --rxq=8'\n self.get_core_list(self.nb_cores + 1)\n self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, queue_num=8, allow_diff_socket=True)\n self.logger.info(\"Launch vhost-testpmd with CBDMA and used 8 queue\")\n- self.prepare_test_env(cbdma=True, no_pci=False, client_mode=True, enable_queues=8, nb_cores=4,\n- server_mode=True, opt_queue=8, combined=True, rxq_txq=8)\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+ self.prepare_test_env(cbdma=True, no_pci=False, client_mode=True, enable_queues=8, nb_cores=4, setting_args=setting_args,\n+ server_mode=True, opt_queue=8, rxq_txq=8)\n self.logger.info(\"Launch testpmd in VM1\")\n- self.start_vm_testpmd(self.vm_dut[0], \"mergeable\", extern_param=\"--max-pkt-len=9600\", queues=\"8\")\n+ self.start_vm_testpmd(self.vm_dut[0], path_mode, extern_param)\n self.vm_dut[0].send_expect('set fwd mac', 'testpmd> ', 30)\n self.vm_dut[0].send_expect('start', 'testpmd> ', 30)\n self.logger.info(\"Launch testpmd in VM2, sent imix pkts from VM2\")\n- self.start_vm_testpmd(self.vm_dut[1], \"mergeable\", extern_param=\"--max-pkt-len=9600\", queues=\"8\")\n+ self.start_vm_testpmd(self.vm_dut[1], path_mode, extern_param)\n self.vm_dut[1].send_expect('set fwd mac', 'testpmd> ', 30)\n self.vm_dut[1].send_expect('set txpkts 64,256,512,1024,2000,64,256,512,1024,2000', 'testpmd> ', 30)\n self.vm_dut[1].send_expect('start tx_first 1', 'testpmd> ', 30)\n@@ -469,50 +467,57 @@ class TestVM2VMVirtioPMD(TestCase):\n self.check_port_stats_result(self.vm_dut[0], queue_num=8)\n self.check_port_stats_result(self.vm_dut[1], queue_num=8)\n \n- def test_vhost_vm2vm_split_ring_with_mergeable_path_and_server_mode_cbdma_enabled(self):\n+ def test_vhost_vm2vm_split_ring_with_mergeable_path_and_server_mode_cbdma_enable(self):\n \"\"\"\n Test Case 10: VM2VM virtio-pmd split ring mergeable path dynamic queue size CBDMA enable with server mode test\n \"\"\"\n self.nb_cores = 4\n+ path_mode = \"mergeable\"\n+ extern_param = '--max-pkt-len=9600 --txq=8 --rxq=8'\n self.get_core_list(self.nb_cores + 1)\n self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, queue_num=8, allow_diff_socket=True)\n- self.logger.info(\"Launch vhost-testpmd with CBDMA and used 8 queue\")\n- self.prepare_test_env(cbdma=True, no_pci=False, client_mode=True, enable_queues=8, nb_cores=4,\n- server_mode=True, opt_queue=8, combined=True, rxq_txq=8)\n+ self.logger.info(\"Launch vhost-testpmd with CBDMA and used 4 queue\")\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+ self.prepare_test_env(cbdma=True, no_pci=False, client_mode=True, enable_queues=8, nb_cores=4, setting_args=setting_args,\n+ server_mode=True, opt_queue=8, rxq_txq=4)\n self.logger.info(\"Launch testpmd in VM1\")\n- self.start_vm_testpmd(self.vm_dut[0], \"mergeable\", extern_param=\"--max-pkt-len=9600\", queues=\"8\")\n+ self.start_vm_testpmd(self.vm_dut[0], path_mode, extern_param)\n self.vm_dut[0].send_expect('set fwd mac', 'testpmd> ', 30)\n self.vm_dut[0].send_expect('start', 'testpmd> ', 30)\n self.logger.info(\"Launch testpmd in VM2 and send imix pkts\")\n- self.start_vm_testpmd(self.vm_dut[1], \"mergeable\", extern_param=\"--max-pkt-len=9600\", queues=\"8\")\n+ self.start_vm_testpmd(self.vm_dut[1], path_mode, extern_param)\n self.vm_dut[1].send_expect('set fwd mac', 'testpmd> ', 30)\n self.vm_dut[1].send_expect('set txpkts 64,256,512,1024,2000,64,256,512,1024,2000', 'testpmd> ', 30)\n self.vm_dut[1].send_expect('start tx_first 32', 'testpmd> ', 30)\n self.logger.info(\"Check imix packets\")\n- self.check_port_stats_result(self.vm_dut[0], queue_num=8)\n- self.check_port_stats_result(self.vm_dut[1], queue_num=8)\n+ self.check_port_stats_result(self.vm_dut[0], queue_num=4)\n+ self.check_port_stats_result(self.vm_dut[1], queue_num=4)\n self.logger.info(\"Relaunch vhost side testpmd and Check imix packets 10 times\")\n- self.pmd_vhost.execute_cmd('quit', '#')\n- self.start_vhost_testpmd_cbdma(cbdma=True, no_pci=False, client_mode=True, enable_queues=8, nb_cores=4,\n- rxq_txq=8)\n- self.vm_dut[1].send_expect('stop', 'testpmd> ', 30)\n- self.vm_dut[1].send_expect('start tx_first 32', 'testpmd> ', 30)\n- self.check_port_stats_result(self.vm_dut[0], queue_num=8)\n- self.check_port_stats_result(self.vm_dut[1], queue_num=8)\n+ for _ in range(10):\n+ self.pmd_vhost.execute_cmd('quit', '#')\n+ self.start_vhost_testpmd_cbdma(cbdma=True, no_pci=False, client_mode=True, enable_queues=8, nb_cores=4,\n+ rxq_txq=8)\n+ self.vm_dut[1].send_expect('stop', 'testpmd> ', 30)\n+ self.vm_dut[1].send_expect('start tx_first 32', 'testpmd> ', 30)\n+ self.check_port_stats_result(self.vm_dut[0], queue_num=8)\n+ self.check_port_stats_result(self.vm_dut[1], queue_num=8)\n \n- def test_vhost_vm2vm_packed_ring_with_mergeable_path_and_8queues_cbdma_enabled(self):\n+ def test_vhost_vm2vm_packed_ring_with_mergeable_path_and_8queues_cbdma_enable(self):\n \"\"\"\n Test Case 11: VM2VM virtio-pmd packed ring mergeable path 8 queues CBDMA enable test\n \"\"\"\n self.nb_cores = 4\n+ path_mode = \"mergeable\"\n+ extern_param = '--max-pkt-len=9600 --txq=8 --rxq=8'\n self.get_core_list(self.nb_cores + 1)\n self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, queue_num=8, allow_diff_socket=True)\n- self.prepare_test_env(cbdma=True, no_pci=False, client_mode=False, enable_queues=8, nb_cores=4,\n- server_mode=False, opt_queue=8, combined=True, rxq_txq=8, mode=2)\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+ self.prepare_test_env(cbdma=True, no_pci=False, client_mode=False, enable_queues=8, nb_cores=4, setting_args=setting_args,\n+ server_mode=False, opt_queue=8, rxq_txq=8)\n self.logger.info(\"Launch testpmd in VM1\")\n- self.start_vm_testpmd(self.vm_dut[0], \"mergeable\", extern_param=\"--max-pkt-len=9600\", queues=\"8\")\n+ self.start_vm_testpmd(self.vm_dut[0], path_mode, extern_param)\n self.logger.info(\"Launch testpmd in VM2 and send imix pkts\")\n- self.start_vm_testpmd(self.vm_dut[1], \"mergeable\", extern_param=\"--max-pkt-len=9600\", queues=\"8\")\n+ self.start_vm_testpmd(self.vm_dut[1], path_mode, extern_param)\n self.vm_dut[0].send_expect('set fwd mac', 'testpmd> ', 30)\n self.vm_dut[0].send_expect('start', 'testpmd> ', 30)\n self.vm_dut[1].send_expect('set fwd mac', 'testpmd> ', 30)\n@@ -531,7 +536,7 @@ class TestVM2VMVirtioPMD(TestCase):\n self.logger.info(e)\n time.sleep(10)\n self.start_one_vms(mode=1, server_mode=False, opt_queue=8, vm_config=self.vm_config)\n- self.start_vm_testpmd(self.vm_dut[1], \"mergeable\", extern_param=\"--max-pkt-len=9600\", queues=\"8\")\n+ self.start_vm_testpmd(self.vm_dut[1], path_mode, extern_param)\n self.vm_dut[0].send_expect('start', 'testpmd> ', 30)\n self.vm_dut[1].send_expect('set fwd mac', 'testpmd> ', 30)\n self.vm_dut[1].send_expect('set txpkts 64,256,512,1024,20000,64,256,512,1024,20000', 'testpmd> ', 30)\n@@ -616,14 +621,14 @@ class TestVM2VMVirtioPMD(TestCase):\n vm_dut.send_expect(\"clear port stats all\", \"testpmd> \", 30)\n vm_dut.send_expect(\"start\", \"testpmd> \", 30)\n \n- def prepare_test_env(self, cbdma=False, no_pci=True, client_mode=False, enable_queues=1, nb_cores=2,\n- server_mode=False, opt_queue=None, combined=False, rxq_txq=None, iova_mode=False, vm_config='vhost_sample', mode=1):\n+ def prepare_test_env(self, cbdma=False, no_pci=True, client_mode=False, enable_queues=1, nb_cores=2, setting_args='',\n+ server_mode=False, opt_queue=None, rxq_txq=None, iova_mode=False, vm_config='vhost_sample'):\n \"\"\"\n start vhost testpmd and qemu, and config the vm env\n \"\"\"\n self.start_vhost_testpmd_cbdma(cbdma=cbdma, no_pci=no_pci, client_mode=client_mode, enable_queues=enable_queues,\n nb_cores=nb_cores, rxq_txq=rxq_txq, iova_mode=iova_mode)\n- self.start_vms(server_mode=server_mode, opt_queue=opt_queue, mode=mode, vm_config=vm_config)\n+ self.start_vms(setting_args=setting_args, server_mode=server_mode, opt_queue=opt_queue, vm_config=vm_config)\n \n def start_vhost_testpmd_cbdma(self, cbdma=False, no_pci=True, client_mode=False, enable_queues=1, nb_cores=2, rxq_txq=None, iova_mode=False):\n \"\"\"\n", "prefixes": [ "V1" ] }