Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/103844/?format=api
{ "id": 103844, "url": "http://patchwork.dpdk.org/api/patches/103844/?format=api", "web_url": "http://patchwork.dpdk.org/project/dts/patch/20211105150710.91345-3-linglix.chen@intel.com/", "project": { "id": 3, "url": "http://patchwork.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": "<20211105150710.91345-3-linglix.chen@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dts/20211105150710.91345-3-linglix.chen@intel.com", "date": "2021-11-05T15:07:10", "name": "[V1,2/2] tests/loopback_virtio_user_server_mode: add two new cases", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "eb4f9412ce3f539c8c92ad69619d8fe849452386", "submitter": { "id": 1843, "url": "http://patchwork.dpdk.org/api/people/1843/?format=api", "name": "Lingli Chen", "email": "linglix.chen@intel.com" }, "delegate": null, "mbox": "http://patchwork.dpdk.org/project/dts/patch/20211105150710.91345-3-linglix.chen@intel.com/mbox/", "series": [ { "id": 20331, "url": "http://patchwork.dpdk.org/api/series/20331/?format=api", "web_url": "http://patchwork.dpdk.org/project/dts/list/?series=20331", "date": "2021-11-05T15:07:08", "name": "loopback_virtio_user_server_mode: add two new cases", "version": 1, "mbox": "http://patchwork.dpdk.org/series/20331/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/103844/comments/", "check": "fail", "checks": "http://patchwork.dpdk.org/api/patches/103844/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 B420BA0C60;\n\tFri, 5 Nov 2021 08:05:47 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id ADA9440689;\n\tFri, 5 Nov 2021 08:05:47 +0100 (CET)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n by mails.dpdk.org (Postfix) with ESMTP id A50F34113C\n for <dts@dpdk.org>; Fri, 5 Nov 2021 08:05:45 +0100 (CET)", "from orsmga008.jf.intel.com ([10.7.209.65])\n by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 05 Nov 2021 00:05:45 -0700", "from unknown (HELO dpdk.lan) ([10.240.183.77])\n by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 05 Nov 2021 00:05:43 -0700" ], "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,10158\"; a=\"318058167\"", "E=Sophos;i=\"5.87,210,1631602800\"; d=\"scan'208\";a=\"318058167\"", "E=Sophos;i=\"5.87,210,1631602800\"; d=\"scan'208\";a=\"501845308\"" ], "From": "Lingli Chen <linglix.chen@intel.com>", "To": "dts@dpdk.org", "Cc": "yinan.wang@intel.com,\n\tLingli Chen <linglix.chen@intel.com>", "Date": "Fri, 5 Nov 2021 15:07:10 +0000", "Message-Id": "<20211105150710.91345-3-linglix.chen@intel.com>", "X-Mailer": "git-send-email 2.33.1", "In-Reply-To": "<20211105150710.91345-1-linglix.chen@intel.com>", "References": "<20211105150710.91345-1-linglix.chen@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dts] [PATCH V1 2/2] tests/loopback_virtio_user_server_mode: add\n two new cases", "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. Add 2 new cases: case 13, 14.\n2. Modify case 3, 4, 8, 10 sync with testplan.\n\nSigned-off-by: Lingli Chen <linglix.chen@intel.com>\n---\n ...tSuite_loopback_virtio_user_server_mode.py | 353 +++++++++++++++---\n 1 file changed, 295 insertions(+), 58 deletions(-)", "diff": "diff --git a/tests/TestSuite_loopback_virtio_user_server_mode.py b/tests/TestSuite_loopback_virtio_user_server_mode.py\nindex 7fbfe804..119b178f 100644\n--- a/tests/TestSuite_loopback_virtio_user_server_mode.py\n+++ b/tests/TestSuite_loopback_virtio_user_server_mode.py\n@@ -37,11 +37,10 @@ Test loopback virtio-user server mode\n \"\"\"\n import re\n import time\n-\n import framework.utils as utils\n from framework.pmd_output import PmdOutput\n from framework.test_case import TestCase\n-\n+from framework.packet import Packet\n \n class TestLoopbackVirtioUserServerMode(TestCase):\n \n@@ -61,6 +60,12 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n self.core_list_host = self.core_list[3:6]\n self.path=self.dut.apps_name['test-pmd']\n self.testpmd_name = self.path.split(\"/\")[-1]\n+ self.app_pdump = self.dut.apps_name['pdump']\n+ self.dump_pcap = \"/root/pdump-rx.pcap\"\n+ self.device_str = ''\n+ self.dut_ports = self.dut.get_ports()\n+ self.ports_socket = self.dut.get_numa_id(self.dut_ports[0])\n+ self.cbdma_dev_infos = []\n \n def set_up(self):\n \"\"\"\n@@ -108,13 +113,17 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n if set_fwd_mac:\n self.virtio_user_pmd.execute_cmd(\"set fwd mac\", \"testpmd> \", 120)\n \n- def lanuch_vhost_testpmd_with_multi_queue(self, extern_params=\"\"):\n+ def lanuch_vhost_testpmd_with_multi_queue(self, extern_params=\"\", set_fwd_mac=True):\n \"\"\"\n start testpmd with multi qeueue\n \"\"\"\n- self.lanuch_vhost_testpmd(self.queue_number, self.nb_cores, extern_params=extern_params)\n+ eal_params = \"--vdev 'eth_vhost0,iface=vhost-net,client=1,queues={}'\".format(self.queue_number)\n+ param = \"--rxq={} --txq={} --nb-cores={} {}\".format(self.queue_number, self.queue_number, self.nb_cores, extern_params)\n+ self.vhost_pmd.start_testpmd(self.core_list_host, param=param, no_pci=True, ports=[], eal_param=eal_params, prefix='vhost', fixed_prefix=True)\n+ if set_fwd_mac:\n+ self.vhost_pmd.execute_cmd(\"set fwd mac\", \"testpmd> \", 120)\n \n- def lanuch_virtio_user_testpmd_with_multi_queue(self, mode, extern_params=\"\"):\n+ def lanuch_virtio_user_testpmd_with_multi_queue(self, mode, extern_params=\"\", set_fwd_mac=True):\n \"\"\"\n start testpmd of vhost user\n \"\"\"\n@@ -126,7 +135,8 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n param = \"{} --nb-cores={} --rxq={} --txq={}\".format(extern_params, self.nb_cores, self.queue_number, self.queue_number)\n self.virtio_user_pmd.start_testpmd(cores=self.core_list_user, param=param, eal_param=eal_param, \\\n no_pci=True, ports=[], prefix=\"virtio\", fixed_prefix=True)\n- self.virtio_user_pmd.execute_cmd(\"set fwd mac\", \"testpmd> \", 120)\n+ if set_fwd_mac:\n+ self.virtio_user_pmd.execute_cmd(\"set fwd mac\", \"testpmd> \", 120)\n \n def start_to_send_packets(self, session_rx, session_tx):\n \"\"\"\n@@ -136,6 +146,35 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n session_rx.send_command(\"start\", 3)\n session_tx.send_expect(\"start tx_first 32\", \"testpmd> \", 30)\n \n+ def start_to_send_8k_packets(self, session_rx, session_tx):\n+ \"\"\"\n+ start the testpmd of vhost-user and virtio-user\n+ start to send 8k packets\n+ \"\"\"\n+ session_rx.send_command(\"start\", 3)\n+ session_tx.send_expect(\"set txpkts 2000,2000,2000,2000\", \"testpmd> \", 30)\n+ session_tx.send_expect(\"start tx_first 32\", \"testpmd> \", 30)\n+\n+ def start_to_send_8k_packets_csum(self, session_tx):\n+ \"\"\"\n+ start the testpmd of vhost-user, start to send 8k packets\n+ \"\"\"\n+ session_tx.send_expect(\"set fwd csum\", \"testpmd> \", 30)\n+ session_tx.send_expect(\"set txpkts 2000,2000,2000,2000\", \"testpmd> \", 30)\n+ session_tx.send_expect(\"set burst 1\", \"testpmd> \", 30)\n+ session_tx.send_expect(\"start tx_first 1\", \"testpmd> \", 10)\n+ session_tx.send_expect(\"stop\", \"testpmd> \", 30)\n+\n+ def start_to_send_8k_packets_csum_cbdma(self, session_tx):\n+ \"\"\"\n+ start the testpmd of vhost-user, start to send 8k packets\n+ \"\"\"\n+ session_tx.send_expect(\"vhost enable tx all\", \"testpmd> \", 30)\n+ session_tx.send_expect(\"set fwd csum\", \"testpmd> \", 30)\n+ session_tx.send_expect(\"set txpkts 64,64,64,2000,2000,2000\", \"testpmd> \", 30)\n+ session_tx.send_expect(\"start tx_first 32\", \"testpmd> \", 5)\n+ session_tx.send_expect(\"stop\", \"testpmd> \", 30)\n+\n def check_port_throughput_after_port_stop(self):\n \"\"\"\n check the throughput after port stop\n@@ -182,6 +221,74 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n self.check_port_link_status_after_port_restart()\n self.vhost_pmd.execute_cmd(\"start tx_first 32\", \"testpmd> \", 120)\n \n+ def port_restart_send_8k_packets(self):\n+ self.vhost_pmd.execute_cmd(\"stop\", \"testpmd> \", 120)\n+ self.vhost_pmd.execute_cmd(\"port stop 0\", \"testpmd> \", 120)\n+ self.check_port_throughput_after_port_stop()\n+ self.vhost_pmd.execute_cmd(\"clear port stats all\", \"testpmd> \", 120)\n+ self.vhost_pmd.execute_cmd(\"port start 0\", \"testpmd> \", 120)\n+ self.check_port_link_status_after_port_restart()\n+ self.vhost_pmd.execute_cmd(\"set txpkts 2000,2000,2000,2000\", \"testpmd> \", 120)\n+ self.vhost_pmd.execute_cmd(\"start tx_first 32\", \"testpmd> \", 120)\n+\n+ def launch_pdump_to_capture_pkt(self, dump_port):\n+ \"\"\"\n+ bootup pdump in dut\n+ \"\"\"\n+ self.pdump_session = self.dut.new_session(suite=\"pdump\")\n+ cmd = self.app_pdump + \" \" + \\\n+ \"-v --file-prefix=virtio -- \" + \\\n+ \"--pdump 'device_id=%s,queue=*,rx-dev=%s,mbuf-size=8000'\"\n+ self.pdump_session.send_expect(cmd % (dump_port, self.dump_pcap), 'Port')\n+\n+ def check_packet_payload_valid(self, pkt_len):\n+ \"\"\"\n+ check the payload is valid\n+ \"\"\"\n+ self.pdump_session.send_expect('^c', '# ', 60)\n+ time.sleep(3)\n+ self.dut.session.copy_file_from(src=\"%s\" % self.dump_pcap, dst=\"%s\" % self.dump_pcap)\n+ pkt = Packet()\n+ pkts = pkt.read_pcapfile(self.dump_pcap)\n+ data = str(pkts[0]['Raw'])\n+\n+ for i in range(len(pkts)):\n+ self.verify(len(pkts[i]) == pkt_len, \"virtio-user0 receive packet's length not equal %s Byte\" %pkt_len)\n+ value = str(pkts[i]['Raw'])\n+ self.verify(data == value, \"the payload in receive packets has been changed from %s\" %i)\n+ self.dut.send_expect(\"rm -rf %s\" % self.dump_pcap, \"#\")\n+\n+ def relanuch_vhost_testpmd_send_8k_packets(self, extern_params, cbdma=False):\n+\n+ self.vhost_pmd.execute_cmd(\"quit\", \"#\", 60)\n+ self.logger.info('now reconnet from vhost')\n+ if cbdma:\n+ self.lanuch_vhost_testpmd_with_cbdma(extern_params=extern_params)\n+ else:\n+ self.lanuch_vhost_testpmd_with_multi_queue(extern_params=extern_params, set_fwd_mac=False)\n+ self.launch_pdump_to_capture_pkt(self.vuser0_port)\n+ if cbdma:\n+ self.start_to_send_8k_packets_csum_cbdma(self.vhost)\n+ else:\n+ self.start_to_send_8k_packets_csum(self.vhost)\n+ self.check_packet_payload_valid(self.pkt_len)\n+\n+ def relanuch_virtio_testpmd_with_multi_path(self, mode, case_info, extern_params, cbdma=False):\n+\n+ self.virtio_user_pmd.execute_cmd(\"quit\", \"#\", 60)\n+ self.logger.info(case_info)\n+ self.lanuch_virtio_user_testpmd_with_multi_queue(mode=mode, extern_params=extern_params, set_fwd_mac=False)\n+ self.virtio_user_pmd.execute_cmd(\"set fwd csum\")\n+ self.virtio_user_pmd.execute_cmd(\"start\")\n+ self.launch_pdump_to_capture_pkt(self.vuser0_port)\n+ if cbdma:\n+ self.start_to_send_8k_packets_csum_cbdma(self.vhost)\n+ else:\n+ self.start_to_send_8k_packets_csum(self.vhost)\n+ self.check_packet_payload_valid(self.pkt_len)\n+\n+ self.relanuch_vhost_testpmd_send_8k_packets(extern_params, cbdma)\n+\n def relanuch_vhost_testpmd_with_multi_queue(self):\n self.vhost_pmd.execute_cmd(\"quit\", \"#\", 60)\n self.check_link_status(self.virtio_user, \"down\")\n@@ -192,7 +299,7 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n self.check_link_status(self.vhost, \"down\")\n self.lanuch_virtio_user_testpmd_with_multi_queue(mode, extern_params)\n \n- def calculate_avg_throughput(self, case_info, cycle):\n+ def calculate_avg_throughput(self, case_info, cycle, Pkt_size=True):\n \"\"\"\n calculate the average throughput\n \"\"\"\n@@ -206,14 +313,19 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n result = lines.group(1)\n results += float(result)\n Mpps = results / (1000000 * 10)\n- self.verify(Mpps > 5, \"port can not receive packets\")\n-\n results_row.append(case_info)\n- results_row.append('64')\n+ if Pkt_size:\n+ self.verify(Mpps > 5, \"port can not receive packets\")\n+ results_row.append('64')\n+ else:\n+ self.verify(Mpps > 1, \"port can not receive packets\")\n+ results_row.append('8k')\n+\n results_row.append(Mpps)\n results_row.append(self.queue_number)\n results_row.append(cycle)\n self.result_table_add(results_row)\n+ self.logger.info(results_row)\n \n def check_packets_of_each_queue(self):\n \"\"\"\n@@ -247,7 +359,7 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n \n def test_server_mode_launch_virtio_first(self):\n \"\"\"\n- basic test for virtio-user server mode, launch virtio-user first\n+ Test Case 2: basic test for split ring server mode, launch virtio-user first\n \"\"\"\n self.queue_number = 1\n self.nb_cores = 1\n@@ -263,7 +375,7 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n \n def test_server_mode_launch_virtio11_first(self):\n \"\"\"\n- basic test for virtio-user server mode, launch virtio-user first\n+ Test Case 1: basic test for packed ring server mode, launch virtio-user first\n \"\"\"\n self.queue_number = 1\n self.nb_cores = 1\n@@ -279,7 +391,7 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n \n def test_server_mode_reconnect_with_virtio11_mergeable_path(self):\n \"\"\"\n- reconnect test with virtio 1.1 mergeable path and server mode\n+ Test Case 8: reconnect test with virtio 1.1 mergeable path and server mode\n \"\"\"\n self.queue_number = 2\n self.nb_cores = 2\n@@ -288,25 +400,25 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n extern_params = '--tx-offloads=0x0 --enable-hw-vlan-strip --rss-ip'\n self.lanuch_vhost_testpmd_with_multi_queue()\n self.lanuch_virtio_user_testpmd_with_multi_queue(mode=mode, extern_params=extern_params)\n- self.start_to_send_packets(self.vhost, self.virtio_user)\n- self.calculate_avg_throughput(case_info, \"before reconnet\")\n+ self.start_to_send_8k_packets(self.vhost, self.virtio_user)\n+ self.calculate_avg_throughput(case_info, \"before reconnet\", Pkt_size=False)\n \n # reconnect from vhost\n self.logger.info('now reconnet from vhost')\n self.relanuch_vhost_testpmd_with_multi_queue()\n- self.start_to_send_packets(self.virtio_user, self.vhost)\n- self.calculate_avg_throughput(case_info, \"reconnet from vhost\")\n+ self.start_to_send_8k_packets(self.virtio_user, self.vhost)\n+ self.calculate_avg_throughput(case_info, \"reconnet from vhost\", Pkt_size=False)\n \n # reconnet from virtio\n self.logger.info('now reconnet from virtio_user')\n self.relanuch_virtio_testpmd_with_multi_queue(mode=mode, extern_params=extern_params)\n- self.start_to_send_packets(self.vhost, self.virtio_user)\n- self.calculate_avg_throughput(case_info, \"reconnet from virtio user\")\n+ self.start_to_send_8k_packets(self.vhost, self.virtio_user)\n+ self.calculate_avg_throughput(case_info, \"reconnet from virtio user\", Pkt_size=False)\n \n # port restart\n self.logger.info('now vhost port restart')\n- self.port_restart()\n- self.calculate_avg_throughput(case_info, \"after port restart\")\n+ self.port_restart_send_8k_packets()\n+ self.calculate_avg_throughput(case_info, \"after port restart\", Pkt_size=False)\n \n self.result_table_print()\n self.check_packets_of_each_queue()\n@@ -314,7 +426,7 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n \n def test_server_mode_reconnect_with_virtio11_non_mergeable_path(self):\n \"\"\"\n- reconnect test with virtio 1.1 non_mergeable path and server mode\n+ Test Case 9: reconnect test with virtio 1.1 non_mergeable path and server mode\n \"\"\"\n self.queue_number = 2\n self.nb_cores = 2\n@@ -349,34 +461,34 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n \n def test_server_mode_reconnect_with_virtio11_inorder_mergeable_path(self):\n \"\"\"\n- reconnect test with virtio 1.1 inorder mergeable path and server mode\n+ Test Case 10: reconnect test with virtio 1.1 inorder mergeable path and server mode\n \"\"\"\n- self.queue_number = 2\n+ self.queue_number = 8\n self.nb_cores = 2\n case_info = 'virtio1.1 inorder mergeable path'\n mode = \"packed_vq=1,in_order=1,mrg_rxbuf=1\"\n extern_params = '--tx-offloads=0x0 --enable-hw-vlan-strip --rss-ip'\n self.lanuch_vhost_testpmd_with_multi_queue()\n self.lanuch_virtio_user_testpmd_with_multi_queue(mode=mode, extern_params=extern_params)\n- self.start_to_send_packets(self.vhost, self.virtio_user)\n- self.calculate_avg_throughput(case_info, \"before reconnet\")\n+ self.start_to_send_8k_packets(self.vhost, self.virtio_user)\n+ self.calculate_avg_throughput(case_info, \"before reconnet\", Pkt_size=False)\n \n # reconnect from vhost\n self.logger.info('now reconnet from vhost')\n self.relanuch_vhost_testpmd_with_multi_queue()\n- self.start_to_send_packets(self.virtio_user, self.vhost)\n- self.calculate_avg_throughput(case_info, \"reconnet from vhost\")\n+ self.start_to_send_8k_packets(self.virtio_user, self.vhost)\n+ self.calculate_avg_throughput(case_info, \"reconnet from vhost\", Pkt_size=False)\n \n # reconnet from virtio\n self.logger.info('now reconnet from virtio_user')\n self.relanuch_virtio_testpmd_with_multi_queue(mode=mode, extern_params=extern_params)\n- self.start_to_send_packets(self.vhost, self.virtio_user)\n- self.calculate_avg_throughput(case_info, \"reconnet from virtio user\")\n+ self.start_to_send_8k_packets(self.vhost, self.virtio_user)\n+ self.calculate_avg_throughput(case_info, \"reconnet from virtio user\", Pkt_size=False)\n \n # port restart\n self.logger.info('now vhost port restart')\n- self.port_restart()\n- self.calculate_avg_throughput(case_info, \"after port restart\")\n+ self.port_restart_send_8k_packets()\n+ self.calculate_avg_throughput(case_info, \"after port restart\", Pkt_size=False)\n \n self.result_table_print()\n self.check_packets_of_each_queue()\n@@ -384,11 +496,11 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n \n def test_server_mode_reconnect_with_virtio11_inorder_non_mergeable_path(self):\n \"\"\"\n- reconnect test with virtio 1.1 inorder non_mergeable path and server mode\n+ Test Case 11: reconnect test with virtio 1.1 inorder non_mergeable path and server mode\n \"\"\"\n self.queue_number = 2\n self.nb_cores = 2\n- case_info = 'virtio1.1 non_mergeable path'\n+ case_info = 'virtio1.1 inorder non_mergeable path'\n mode = \"packed_vq=1,in_order=1,mrg_rxbuf=0,vectorized=1\"\n extern_params = '--rx-offloads=0x10 --enable-hw-vlan-strip --rss-ip'\n self.lanuch_vhost_testpmd_with_multi_queue()\n@@ -419,11 +531,11 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n \n def test_server_mode_reconnect_with_virtio11_inorder_vectorized_path(self):\n \"\"\"\n- reconnect test with virtio 1.1 inorder non_mergeable path and server mode\n+ Test Case 12: reconnect test with virtio 1.1 inorder vectorized path and server mode\n \"\"\"\n self.queue_number = 2\n self.nb_cores = 2\n- case_info = 'virtio1.1 non_mergeable path'\n+ case_info = 'virtio1.1 inorder vectorized path'\n mode = \"packed_vq=1,in_order=1,mrg_rxbuf=0,vectorized=1\"\n extern_params = '--tx-offloads=0x0 --enable-hw-vlan-strip --rss-ip'\n self.lanuch_vhost_testpmd_with_multi_queue()\n@@ -454,7 +566,7 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n \n def test_server_mode_reconnect_with_virtio10_inorder_mergeable_path(self):\n \"\"\"\n- reconnect test with virtio 1.0 inorder mergeable path and server mode\n+ Test Case 4: reconnect test with virtio 1.0 inorder mergeable path and server mode\n \"\"\"\n self.queue_number = 2\n self.nb_cores = 2\n@@ -463,25 +575,25 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n extern_params = '--tx-offloads=0x0 --enable-hw-vlan-strip --rss-ip'\n self.lanuch_vhost_testpmd_with_multi_queue()\n self.lanuch_virtio_user_testpmd_with_multi_queue(mode=mode, extern_params=extern_params)\n- self.start_to_send_packets(self.vhost, self.virtio_user)\n- self.calculate_avg_throughput(case_info, \"before reconnet\")\n+ self.start_to_send_8k_packets(self.vhost, self.virtio_user)\n+ self.calculate_avg_throughput(case_info, \"before reconnet\", Pkt_size=False)\n \n # reconnet from vhost\n self.logger.info('now reconnet from vhost')\n self.relanuch_vhost_testpmd_with_multi_queue()\n- self.start_to_send_packets(self.virtio_user, self.vhost)\n- self.calculate_avg_throughput(case_info, \"reconnet from vhost\")\n+ self.start_to_send_8k_packets(self.virtio_user, self.vhost)\n+ self.calculate_avg_throughput(case_info, \"reconnet from vhost\", Pkt_size=False)\n \n # reconnet from virtio\n self.logger.info('now reconnet from virtio_user')\n self.relanuch_virtio_testpmd_with_multi_queue(mode=mode, extern_params=extern_params)\n- self.start_to_send_packets(self.vhost, self.virtio_user)\n- self.calculate_avg_throughput(case_info, \"reconnet from virtio_user\")\n+ self.start_to_send_8k_packets(self.vhost, self.virtio_user)\n+ self.calculate_avg_throughput(case_info, \"reconnet from virtio_user\", Pkt_size=False)\n \n # port restart\n self.logger.info('now vhost port restart')\n- self.port_restart()\n- self.calculate_avg_throughput(case_info, \"after port restart\")\n+ self.port_restart_send_8k_packets()\n+ self.calculate_avg_throughput(case_info, \"after port restart\", Pkt_size=False)\n \n self.result_table_print()\n self.check_packets_of_each_queue()\n@@ -489,7 +601,7 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n \n def test_server_mode_reconnect_with_virtio10_inorder_non_mergeable_path(self):\n \"\"\"\n- reconnect test with virtio 1.0 inorder non_mergeable path and server mode\n+ Test Case 5: reconnect test with virtio 1.0 inorder non_mergeable path and server mode\n \"\"\"\n self.queue_number = 2\n self.nb_cores = 2\n@@ -524,34 +636,34 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n \n def test_server_mode_reconnect_with_virtio10_mergeable_path(self):\n \"\"\"\n- reconnect test with virtio 1.0 mergeable path and server mode\n+ Test Case 3: reconnect test with virtio 1.0 mergeable path and server mode\n \"\"\"\n- self.queue_number = 2\n+ self.queue_number = 8\n self.nb_cores = 2\n case_info = 'virtio1.0 mergeable path'\n mode = \"in_order=0,mrg_rxbuf=1\"\n extern_params = '--tx-offloads=0x0 --enable-hw-vlan-strip --rss-ip'\n self.lanuch_vhost_testpmd_with_multi_queue()\n self.lanuch_virtio_user_testpmd_with_multi_queue(mode=mode, extern_params=extern_params)\n- self.start_to_send_packets(self.vhost, self.virtio_user)\n- self.calculate_avg_throughput(case_info, \"before reconnet\")\n+ self.start_to_send_8k_packets(self.vhost, self.virtio_user)\n+ self.calculate_avg_throughput(case_info, \"before reconnet\", Pkt_size=False)\n \n # reconnet from vhost\n self.logger.info('now reconnet from vhost')\n self.relanuch_vhost_testpmd_with_multi_queue()\n- self.start_to_send_packets(self.virtio_user, self.vhost)\n- self.calculate_avg_throughput(case_info, \"reconnet from vhost\")\n+ self.start_to_send_8k_packets(self.virtio_user, self.vhost)\n+ self.calculate_avg_throughput(case_info, \"reconnet from vhost\", Pkt_size=False)\n \n # reconnet from virtio\n self.logger.info('now reconnet from virtio_user')\n self.relanuch_virtio_testpmd_with_multi_queue(mode=mode, extern_params=extern_params)\n- self.start_to_send_packets(self.vhost, self.virtio_user)\n- self.calculate_avg_throughput(case_info, \"reconnet from virtio_user\")\n+ self.start_to_send_8k_packets(self.vhost, self.virtio_user)\n+ self.calculate_avg_throughput(case_info, \"reconnet from virtio_user\", Pkt_size=False)\n \n # port restart\n self.logger.info('now vhost port restart')\n- self.port_restart()\n- self.calculate_avg_throughput(case_info, \"after port restart\")\n+ self.port_restart_send_8k_packets()\n+ self.calculate_avg_throughput(case_info, \"after port restart\", Pkt_size=False)\n \n self.result_table_print()\n self.check_packets_of_each_queue()\n@@ -559,7 +671,7 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n \n def test_server_mode_reconnect_with_virtio10_non_mergeable_path(self):\n \"\"\"\n- reconnect test with virtio 1.0 non_mergeable path and server mode\n+ Test Case 6: reconnect test with virtio 1.0 non_mergeable path and server mode\n \"\"\"\n self.queue_number = 2\n self.nb_cores = 2\n@@ -594,7 +706,7 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n \n def test_server_mode_reconnect_with_virtio10_vector_rx_path(self):\n \"\"\"\n- reconnect test with virtio 1.0 vector_rx path and server mode\n+ Test Case 7: reconnect test with virtio 1.0 vector_rx path and server mode\n \"\"\"\n self.queue_number = 2\n self.nb_cores = 2\n@@ -626,12 +738,137 @@ class TestLoopbackVirtioUserServerMode(TestCase):\n self.check_packets_of_each_queue()\n self.close_all_testpmd()\n \n+ def test_server_mode_reconnect_with_packed_and_split_mergeable_path_payload_check(self):\n+ \"\"\"\n+ Test Case 13: loopback packed ring and split ring mergeable path payload check test using server mode and multi-queues\n+ \"\"\"\n+ self.queue_number = 8\n+ self.nb_cores = 1\n+ extern_params = '--txd=1024 --rxd=1024'\n+ case_info = 'packed ring mergeable inorder path'\n+ mode = \"mrg_rxbuf=1,in_order=1,packed_vq=1\"\n+\n+ self.lanuch_vhost_testpmd_with_multi_queue(extern_params=extern_params, set_fwd_mac=False)\n+ self.logger.info(case_info)\n+ self.lanuch_virtio_user_testpmd_with_multi_queue(mode=mode, extern_params=extern_params, set_fwd_mac=False)\n+ self.virtio_user_pmd.execute_cmd(\"set fwd csum\")\n+ self.virtio_user_pmd.execute_cmd(\"start\")\n+ #3. Attach pdump secondary process to primary process by same file-prefix\n+ self.vuser0_port = 'net_virtio_user0'\n+ self.launch_pdump_to_capture_pkt(self.vuser0_port)\n+ self.start_to_send_8k_packets_csum(self.vhost)\n+\n+ #5. Check all the packets length is 8000 Byte in the pcap file\n+ self.pkt_len = 8000\n+ self.check_packet_payload_valid(self.pkt_len)\n+\n+ # reconnet from vhost\n+ self.relanuch_vhost_testpmd_send_8k_packets(extern_params)\n+\n+ # reconnet from virtio\n+ self.logger.info('now reconnet from virtio_user with other path')\n+ case_info = 'packed ring mergeable path'\n+ mode = \"mrg_rxbuf=1,in_order=0,packed_vq=1\"\n+ self.relanuch_virtio_testpmd_with_multi_path(mode, case_info, extern_params)\n+\n+ case_info = 'split ring mergeable inorder path'\n+ mode = \"mrg_rxbuf=1,in_order=1\"\n+ self.relanuch_virtio_testpmd_with_multi_path(mode, case_info, extern_params)\n+\n+ case_info = 'split ring mergeable path'\n+ mode = \"mrg_rxbuf=1,in_order=0\"\n+ self.relanuch_virtio_testpmd_with_multi_path(mode, case_info, extern_params)\n+\n+ self.close_all_testpmd()\n+\n+ def test_server_mode_reconnect_with_packed_and_split_mergeable_path_cbdma_payload_check(self):\n+ \"\"\"\n+ Test Case 14: loopback packed ring and split ring mergeable path cbdma test payload check with server mode and multi-queues\n+ \"\"\"\n+ self.cbdma_nic_dev_num = 8\n+ self.get_cbdma_ports_info_and_bind_to_dpdk()\n+ self.queue_number = 8\n+ self.vdev = f\"--vdev 'eth_vhost0,iface=vhost-net,queues={self.queue_number},client=1,dmas=[txq0@{self.cbdma_dev_infos[0]};txq1@{self.cbdma_dev_infos[1]};txq2@{self.cbdma_dev_infos[2]};txq3@{self.cbdma_dev_infos[3]};txq4@{self.cbdma_dev_infos[4]};txq5@{self.cbdma_dev_infos[5]};txq6@{self.cbdma_dev_infos[6]};txq7@{self.cbdma_dev_infos[7]}]' \"\n+\n+ self.nb_cores = 1\n+ extern_params = '--txd=1024 --rxd=1024'\n+ case_info = 'packed ring mergeable inorder path'\n+ mode = \"mrg_rxbuf=1,in_order=1,packed_vq=1\"\n+\n+ self.lanuch_vhost_testpmd_with_cbdma(extern_params=extern_params)\n+ self.logger.info(case_info)\n+ self.lanuch_virtio_user_testpmd_with_multi_queue(mode=mode, extern_params=extern_params, set_fwd_mac=False)\n+ self.virtio_user_pmd.execute_cmd(\"set fwd csum\")\n+ self.virtio_user_pmd.execute_cmd(\"start\")\n+ # 3. Attach pdump secondary process to primary process by same file-prefix\n+ self.vuser0_port = 'net_virtio_user0'\n+ self.launch_pdump_to_capture_pkt(self.vuser0_port)\n+ self.start_to_send_8k_packets_csum_cbdma(self.vhost)\n+\n+ # 5. Check all the packets length is 6192 Byte in the pcap file\n+ self.pkt_len = 6192\n+ self.check_packet_payload_valid(self.pkt_len)\n+ #reconnet from vhost\n+ self.relanuch_vhost_testpmd_send_8k_packets(extern_params, cbdma=True)\n+\n+ # reconnet from virtio\n+ self.logger.info('now reconnet from virtio_user with other path')\n+ case_info = 'packed ring mergeable path'\n+ mode = \"mrg_rxbuf=1,in_order=0,packed_vq=1\"\n+ self.relanuch_virtio_testpmd_with_multi_path(mode, case_info, extern_params, cbdma=True)\n+\n+ case_info = 'split ring mergeable inorder path'\n+ mode = \"mrg_rxbuf=1,in_order=1\"\n+ self.relanuch_virtio_testpmd_with_multi_path(mode, case_info, extern_params, cbdma=True)\n+\n+ case_info = 'split ring mergeable path'\n+ mode = \"mrg_rxbuf=1,in_order=0\"\n+ self.relanuch_virtio_testpmd_with_multi_path(mode, case_info, extern_params, cbdma=True)\n+\n+ self.close_all_testpmd()\n+\n+ def lanuch_vhost_testpmd_with_cbdma(self, extern_params=\"\"):\n+ \"\"\"\n+ start testpmd with cbdma\n+ \"\"\"\n+ param = \"--rxq={} --txq={} --nb-cores={} {}\".format(self.queue_number, self.queue_number, self.nb_cores, extern_params)\n+ self.vhost_pmd.start_testpmd(self.core_list_host, param=param, no_pci=False, ports=[], eal_param=self.vdev, prefix='vhost', fixed_prefix=True)\n+\n+ def get_cbdma_ports_info_and_bind_to_dpdk(self):\n+ \"\"\"\n+ get all cbdma ports\n+ \"\"\"\n+ out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev dma', '# ', 30)\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 self.ports_socket == cur_socket:\n+ self.cbdma_dev_infos.append(pci_info.group(1))\n+ self.verify(len(self.cbdma_dev_infos) >= 8, 'There no enough cbdma device to run this suite')\n+ self.device_str = ' '.join(self.cbdma_dev_infos[0:self.cbdma_nic_dev_num])\n+ self.dut.send_expect('./usertools/dpdk-devbind.py --force --bind=%s %s' % (self.drivername, 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 tear_down(self):\n \"\"\"\n Run after each test case.\n \"\"\"\n self.dut.send_expect(\"killall -s INT %s\" % self.testpmd_name, \"#\")\n self.close_all_session()\n+ self.bind_cbdma_device_to_kernel()\n time.sleep(2)\n \n def tear_down_all(self):\n", "prefixes": [ "V1", "2/2" ] }