Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/120070/?format=api
https://patches.dpdk.org/api/patches/120070/?format=api", "web_url": "https://patches.dpdk.org/project/dts/patch/20221122083727.2897177-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": "<20221122083727.2897177-1-weix.ling@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dts/20221122083727.2897177-1-weix.ling@intel.com", "date": "2022-11-22T08:37:27", "name": "[V2,2/2] tests/vm2vm_virtio_net_perf_cbdma: modify dmas parameter by DPDK changed", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "ba2ce73825ca727da10c8c68bb86affe0f731ea1", "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/20221122083727.2897177-1-weix.ling@intel.com/mbox/", "series": [ { "id": 25856, "url": "https://patches.dpdk.org/api/series/25856/?format=api", "web_url": "https://patches.dpdk.org/project/dts/list/?series=25856", "date": "2022-11-22T08:37:17", "name": "[V2,1/2] test_plans/vm2vm_virtio_net_perf_cbdma_test_plan: modify dmas parameter by DPDK changed", "version": 2, "mbox": "https://patches.dpdk.org/series/25856/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/120070/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/120070/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 5D343A057F;\n\tTue, 22 Nov 2022 09:43:29 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 57FE042D53;\n\tTue, 22 Nov 2022 09:43:29 +0100 (CET)", "from mga06.intel.com (mga06b.intel.com [134.134.136.31])\n by mails.dpdk.org (Postfix) with ESMTP id D288D427EB\n for <dts@dpdk.org>; Tue, 22 Nov 2022 09:43:26 +0100 (CET)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 22 Nov 2022 00:43:18 -0800", "from unknown (HELO localhost.localdomain) ([10.239.252.222])\n by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 22 Nov 2022 00:43:15 -0800" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1669106607; x=1700642607;\n h=from:to:cc:subject:date:message-id:mime-version:\n content-transfer-encoding;\n bh=upjseM6oAhkxdZ+zLjN5ASZqLqaLkRi0dT4MWhHqRrk=;\n b=AeIlsBRpJ6VES5EeICQUU3kdTqlBsLn/ox9dCnzLgkKLu3KqXSB2q6ST\n jubDMd4TWFQxvhkG+Y/4DlFn0CIiSaEdwJhFJ3WGUqyadJotN47Y0giLP\n BHiJdGPo/ObCNIGG5m2nYeMc76in0STTVhjFAFFzatnZ2+CfPyKA1snM1\n o2+sn2qSaIaO+7/38PkxrQzoZqehBC1pWUexzZlUlVHZGsul1HGJ3a/FU\n biJMi1A4avzUE1Nwl0w62mCO8Pjtj44cISNrpZRcm1lGwHUxJG0nQDCEm\n xxCAgVbrhtXrrmZn9fgCkV1lfjoqlDckLYeqrMcZCID0ZrZ/NOzlh3pyn w==;", "X-IronPort-AV": [ "E=McAfee;i=\"6500,9779,10538\"; a=\"375910794\"", "E=Sophos;i=\"5.96,183,1665471600\";\n d=\"scan'208,223\";a=\"375910794\"", "E=McAfee;i=\"6500,9779,10538\"; a=\"783770747\"", "E=Sophos;i=\"5.96,183,1665471600\";\n d=\"scan'208,223\";a=\"783770747\"" ], "From": "Wei Ling <weix.ling@intel.com>", "To": "dts@dpdk.org", "Cc": "Wei Ling <weix.ling@intel.com>", "Subject": "[dts][PATCH V2 2/2] tests/vm2vm_virtio_net_perf_cbdma: modify dmas\n parameter by DPDK changed", "Date": "Tue, 22 Nov 2022 16:37:27 +0800", "Message-Id": "<20221122083727.2897177-1-weix.ling@intel.com>", "X-Mailer": "git-send-email 2.25.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dts@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "test suite reviews and discussions <dts.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dts>,\n <mailto:dts-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dts/>", "List-Post": "<mailto:dts@dpdk.org>", "List-Help": "<mailto:dts-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dts>,\n <mailto:dts-request@dpdk.org?subject=subscribe>", "Errors-To": "dts-bounces@dpdk.org" }, "content": "From DPDK-22.11, the dmas parameter have been changed by the local patch,\nso modify the dmas parameter in the testsuite.\n\nSigned-off-by: Wei Ling <weix.ling@intel.com>\n---\n .../TestSuite_vm2vm_virtio_net_perf_cbdma.py | 1283 ++++++++++-------\n 1 file changed, 741 insertions(+), 542 deletions(-)", "diff": "diff --git a/tests/TestSuite_vm2vm_virtio_net_perf_cbdma.py b/tests/TestSuite_vm2vm_virtio_net_perf_cbdma.py\nindex e8e1bd57..163bcab7 100644\n--- a/tests/TestSuite_vm2vm_virtio_net_perf_cbdma.py\n+++ b/tests/TestSuite_vm2vm_virtio_net_perf_cbdma.py\n@@ -267,25 +267,21 @@ class TestVM2VMVirtioNetPerfCbdma(TestCase):\n md5_send == md5_revd, \"the received file is different with send file\"\n )\n \n- def test_vm2vm_virtiio_net_split_ring_cbdma_enable_test_with_tcp_traffic(self):\n+ def test_vm2vm_virtio_net_split_ring_cbdma_enable_test_with_tcp_traffic(self):\n \"\"\"\n Test Case 1: VM2VM virtio-net split ring CBDMA enable test with tcp traffic\n \"\"\"\n self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=2)\n- lcore_dma = \"lcore%s@%s,\" \"lcore%s@%s\" % (\n- self.vhost_core_list[1],\n- self.cbdma_list[0],\n- self.vhost_core_list[2],\n- self.cbdma_list[1],\n- )\n+\n+ dmas1 = \"txq0@%s;\" \"rxq0@%s\" % (self.cbdma_list[0], self.cbdma_list[0])\n+ dmas2 = \"txq0@%s;\" \"rxq0@%s\" % (self.cbdma_list[1], self.cbdma_list[1])\n eal_param = (\n- \"--vdev 'net_vhost0,iface=vhost-net0,queues=1,tso=1,dmas=[txq0;rxq0]'\"\n- + \" --vdev 'net_vhost1,iface=vhost-net1,queues=1,tso=1,dmas=[txq0;rxq0]'\"\n- )\n- param = (\n- \" --nb-cores=2 --txd=1024 --rxd=1024 --txq=1 --rxq=1\"\n- + \" --lcore-dma=[%s]\" % lcore_dma\n+ \"--vdev 'net_vhost0,iface=vhost-net0,queues=1,tso=1,dmas=[%s]' \"\n+ \"--vdev 'net_vhost1,iface=vhost-net1,queues=1,tso=1,dmas=[%s]'\"\n+ % (dmas1, dmas2)\n )\n+ param = \" --nb-cores=2 --txd=1024 --rxd=1024 --rxq=1 --txq=1\"\n+\n self.start_vhost_testpmd(\n cores=self.vhost_core_list,\n ports=self.cbdma_list,\n@@ -308,69 +304,87 @@ class TestVM2VMVirtioNetPerfCbdma(TestCase):\n Test Case 2: VM2VM virtio-net split ring mergeable 8 queues CBDMA enable test with large packet payload valid check\n \"\"\"\n self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True)\n- lcore_dma = (\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s\"\n+ dmas1 = (\n+ \"txq0@%s;\"\n+ \"txq1@%s;\"\n+ \"txq2@%s;\"\n+ \"txq3@%s;\"\n+ \"txq4@%s;\"\n+ \"txq5@%s;\"\n+ \"txq6@%s;\"\n+ \"txq7@%s;\"\n+ \"rxq0@%s;\"\n+ \"rxq1@%s;\"\n+ \"rxq2@%s;\"\n+ \"rxq3@%s;\"\n+ \"rxq4@%s;\"\n+ \"rxq5@%s;\"\n+ \"rxq6@%s;\"\n+ \"rxq7@%s\"\n % (\n- self.vhost_core_list[1],\n self.cbdma_list[0],\n- self.vhost_core_list[1],\n+ self.cbdma_list[0],\n+ self.cbdma_list[1],\n self.cbdma_list[1],\n- self.vhost_core_list[1],\n self.cbdma_list[2],\n- self.vhost_core_list[1],\n+ self.cbdma_list[2],\n self.cbdma_list[3],\n- self.vhost_core_list[1],\n+ self.cbdma_list[3],\n+ self.cbdma_list[4],\n self.cbdma_list[4],\n- self.vhost_core_list[1],\n self.cbdma_list[5],\n- self.vhost_core_list[2],\n+ self.cbdma_list[5],\n+ self.cbdma_list[6],\n self.cbdma_list[6],\n- self.vhost_core_list[2],\n self.cbdma_list[7],\n- self.vhost_core_list[3],\n- self.cbdma_list[8],\n- self.vhost_core_list[3],\n- self.cbdma_list[9],\n- self.vhost_core_list[3],\n- self.cbdma_list[10],\n- self.vhost_core_list[3],\n- self.cbdma_list[11],\n- self.vhost_core_list[3],\n- self.cbdma_list[12],\n- self.vhost_core_list[3],\n- self.cbdma_list[13],\n- self.vhost_core_list[3],\n- self.cbdma_list[14],\n- self.vhost_core_list[4],\n- self.cbdma_list[15],\n+ self.cbdma_list[7],\n )\n )\n- eal_param = (\n- \"--vdev 'net_vhost0,iface=vhost-net0,client=1,queues=8,tso=1,dmas=[txq0;txq1;txq2;txq3;txq4;txq5;txq6;txq7;rxq0;rxq1;rxq2;rxq3;rxq4;rxq5;rxq6;rxq7]'\"\n- + \" --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8,tso=1,dmas=[txq0;txq1;txq2;txq3;txq4;txq5;txq6;txq7;rxq0;rxq1;rxq2;rxq3;rxq4;rxq5;rxq6;rxq7]'\"\n+ dmas2 = (\n+ \"txq0@%s;\"\n+ \"txq1@%s;\"\n+ \"txq2@%s;\"\n+ \"txq3@%s;\"\n+ \"txq4@%s;\"\n+ \"txq5@%s;\"\n+ \"txq6@%s;\"\n+ \"txq7@%s;\"\n+ \"rxq0@%s;\"\n+ \"rxq1@%s;\"\n+ \"rxq2@%s;\"\n+ \"rxq3@%s;\"\n+ \"rxq4@%s;\"\n+ \"rxq5@%s;\"\n+ \"rxq6@%s;\"\n+ \"rxq7@%s\"\n+ % (\n+ self.cbdma_list[0],\n+ self.cbdma_list[0],\n+ self.cbdma_list[1],\n+ self.cbdma_list[1],\n+ self.cbdma_list[2],\n+ self.cbdma_list[2],\n+ self.cbdma_list[3],\n+ self.cbdma_list[3],\n+ self.cbdma_list[4],\n+ self.cbdma_list[4],\n+ self.cbdma_list[5],\n+ self.cbdma_list[5],\n+ self.cbdma_list[6],\n+ self.cbdma_list[6],\n+ self.cbdma_list[7],\n+ self.cbdma_list[7],\n+ )\n )\n- param = (\n- \" --nb-cores=4 --txd=1024 --rxd=1024 --txq=8 --rxq=8\"\n- + \" --lcore-dma=[%s]\" % lcore_dma\n+ eal_param = (\n+ \"--vdev 'net_vhost0,iface=vhost-net0,client=1,tso=1,queues=8,dmas=[%s]' \"\n+ \"--vdev 'net_vhost1,iface=vhost-net1,client=1,tso=1,queues=8,dmas=[%s]'\"\n+ % (dmas1, dmas2)\n )\n+ param = \" --nb-cores=4 --txd=1024 --rxd=1024 --rxq=8 --txq=8\"\n self.start_vhost_testpmd(\n cores=self.vhost_core_list,\n- ports=self.cbdma_list,\n+ ports=self.cbdma_list[0:8],\n eal_param=eal_param,\n param=param,\n iova_mode=\"va\",\n@@ -385,81 +399,51 @@ class TestVM2VMVirtioNetPerfCbdma(TestCase):\n self.get_perf_result()\n \n self.pmdout_vhost_user.execute_cmd(\"quit\", \"#\")\n- lcore_dma = (\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s\"\n+ dmas1 = (\n+ \"txq0@%s;\"\n+ \"txq1@%s;\"\n+ \"txq2@%s;\"\n+ \"txq3@%s;\"\n+ \"txq4@%s;\"\n+ \"txq5@%s;\"\n+ \"txq6@%s\"\n % (\n- self.vhost_core_list[1],\n self.cbdma_list[0],\n- self.vhost_core_list[1],\n- self.cbdma_list[1],\n- self.vhost_core_list[1],\n- self.cbdma_list[2],\n- self.vhost_core_list[1],\n- self.cbdma_list[3],\n- self.vhost_core_list[2],\n self.cbdma_list[0],\n- self.vhost_core_list[2],\n- self.cbdma_list[2],\n- self.vhost_core_list[2],\n- self.cbdma_list[4],\n- self.vhost_core_list[2],\n- self.cbdma_list[5],\n- self.vhost_core_list[2],\n- self.cbdma_list[6],\n- self.vhost_core_list[2],\n- self.cbdma_list[7],\n- self.vhost_core_list[3],\n+ self.cbdma_list[0],\n+ self.cbdma_list[0],\n+ self.cbdma_list[0],\n+ self.cbdma_list[0],\n+ self.cbdma_list[0],\n+ )\n+ )\n+ dmas2 = (\n+ \"txq1@%s;\"\n+ \"txq2@%s;\"\n+ \"txq3@%s;\"\n+ \"txq4@%s;\"\n+ \"txq5@%s;\"\n+ \"txq6@%s;\"\n+ \"txq7@%s\"\n+ % (\n+ self.cbdma_list[1],\n+ self.cbdma_list[1],\n+ self.cbdma_list[1],\n+ self.cbdma_list[1],\n+ self.cbdma_list[1],\n+ self.cbdma_list[1],\n self.cbdma_list[1],\n- self.vhost_core_list[3],\n- self.cbdma_list[3],\n- self.vhost_core_list[3],\n- self.cbdma_list[8],\n- self.vhost_core_list[3],\n- self.cbdma_list[9],\n- self.vhost_core_list[3],\n- self.cbdma_list[10],\n- self.vhost_core_list[3],\n- self.cbdma_list[11],\n- self.vhost_core_list[3],\n- self.cbdma_list[12],\n- self.vhost_core_list[3],\n- self.cbdma_list[13],\n- self.vhost_core_list[3],\n- self.cbdma_list[14],\n- self.vhost_core_list[4],\n- self.cbdma_list[15],\n )\n )\n eal_param = (\n- \"--vdev 'net_vhost0,iface=vhost-net0,client=1,queues=8,tso=1,dmas=[txq0;txq1;txq2;txq3;txq4;txq5;txq6]'\"\n- + \" --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8,tso=1,dmas=[txq1;txq2;txq3;txq4;txq5;txq6;txq7]'\"\n- )\n- param = (\n- \" --nb-cores=4 --txd=1024 --rxd=1024 --txq=8 --rxq=8\"\n- + \" --lcore-dma=[%s]\" % lcore_dma\n+ \"--vdev 'net_vhost0,iface=vhost-net0,queues=8,tso=1,client=1,legacy-ol-flags=1,dmas=[%s]' \"\n+ \"--vdev 'net_vhost1,iface=vhost-net1,queues=8,tso=1,client=1,legacy-ol-flags=1,dmas=[%s]'\"\n+ % (dmas1, dmas2)\n )\n+ param = \" --nb-cores=4 --txd=1024 --rxd=1024 --rxq=8 --txq=8\"\n self.start_vhost_testpmd(\n cores=self.vhost_core_list,\n- ports=self.cbdma_list,\n+ ports=self.cbdma_list[0:2],\n eal_param=eal_param,\n param=param,\n iova_mode=\"va\",\n@@ -470,18 +454,52 @@ class TestVM2VMVirtioNetPerfCbdma(TestCase):\n self.get_perf_result()\n \n if not self.check_2M_env:\n- eal_param = (\n- \"--vdev 'net_vhost0,iface=vhost-net0,client=1,queues=8,tso=1,dmas=[txq0;txq1;txq2;txq3;txq4;txq5;txq6]'\"\n- + \" --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8,tso=1,dmas=[txq0;txq1;txq2;txq3;txq4;txq5;txq6]'\"\n+ dmas1 = (\n+ \"txq0@%s;\"\n+ \"txq1@%s;\"\n+ \"txq2@%s;\"\n+ \"txq3@%s;\"\n+ \"txq4@%s;\"\n+ \"txq5@%s;\"\n+ \"txq6@%s\"\n+ % (\n+ self.cbdma_list[0],\n+ self.cbdma_list[1],\n+ self.cbdma_list[0],\n+ self.cbdma_list[1],\n+ self.cbdma_list[0],\n+ self.cbdma_list[1],\n+ self.cbdma_list[2],\n+ )\n+ )\n+ dmas2 = (\n+ \"rxq0@%s;\"\n+ \"rxq1@%s;\"\n+ \"rxq2@%s;\"\n+ \"rxq3@%s;\"\n+ \"rxq4@%s;\"\n+ \"rxq5@%s;\"\n+ \"rxq6@%s\"\n+ % (\n+ self.cbdma_list[2],\n+ self.cbdma_list[3],\n+ self.cbdma_list[2],\n+ self.cbdma_list[3],\n+ self.cbdma_list[2],\n+ self.cbdma_list[3],\n+ self.cbdma_list[4],\n+ )\n )\n- param = (\n- \" --nb-cores=4 --txd=1024 --rxd=1024 --txq=8 --rxq=8\"\n- + \" --lcore-dma=[%s]\" % lcore_dma\n+ eal_param = (\n+ \"--vdev 'net_vhost0,iface=vhost-net0,queues=8,tso=1,client=1,dmas=[%s]' \"\n+ \"--vdev 'net_vhost1,iface=vhost-net1,queues=8,tso=1,client=1,dmas=[%s]'\"\n+ % (dmas1, dmas2)\n )\n+ param = \" --nb-cores=4 --txd=1024 --rxd=1024 --rxq=8 --txq=8\"\n self.pmdout_vhost_user.execute_cmd(\"quit\", \"#\")\n self.start_vhost_testpmd(\n cores=self.vhost_core_list,\n- ports=self.cbdma_list,\n+ ports=self.cbdma_list[0:8],\n eal_param=eal_param,\n param=param,\n iova_mode=\"pa\",\n@@ -493,8 +511,8 @@ class TestVM2VMVirtioNetPerfCbdma(TestCase):\n \n self.pmdout_vhost_user.execute_cmd(\"quit\", \"#\")\n eal_param = (\n- \"--vdev 'net_vhost0,iface=vhost-net0,client=1,queues=4,tso=1'\"\n- + \" --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=4,tso=1'\"\n+ \"--vdev 'net_vhost0,iface=vhost-net0,client=1,queues=4,tso=1' \"\n+ + \"--vdev 'net_vhost1,iface=vhost-net1,client=1,queues=4,tso=1'\"\n )\n param = \" --nb-cores=4 --txd=1024 --rxd=1024 --txq=4 --rxq=4\"\n self.start_vhost_testpmd(\n@@ -510,9 +528,10 @@ class TestVM2VMVirtioNetPerfCbdma(TestCase):\n self.get_perf_result()\n \n self.pmdout_vhost_user.execute_cmd(\"quit\", \"#\")\n+\n eal_param = (\n- \"--vdev 'net_vhost0,iface=vhost-net0,client=1,queues=4,tso=1'\"\n- + \" --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=4,tso=1'\"\n+ \"--vdev 'net_vhost0,iface=vhost-net0,client=1,queues=4,tso=1' \"\n+ + \"--vdev 'net_vhost1,iface=vhost-net1,client=1,queues=4,tso=1'\"\n )\n param = \" --nb-cores=4 --txd=1024 --rxd=1024 --rxq=1 --txq=1\"\n self.start_vhost_testpmd(\n@@ -533,67 +552,84 @@ class TestVM2VMVirtioNetPerfCbdma(TestCase):\n Test Case 3: VM2VM virtio-net split ring non-mergeable 8 queues CBDMA enable test with large packet payload valid check\n \"\"\"\n self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True)\n- lcore_dma = (\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s\"\n+ dmas1 = (\n+ \"txq0@%s;\"\n+ \"txq1@%s;\"\n+ \"txq2@%s;\"\n+ \"txq3@%s;\"\n+ \"txq4@%s;\"\n+ \"txq5@%s;\"\n+ \"txq6@%s;\"\n+ \"txq7@%s;\"\n+ \"rxq0@%s;\"\n+ \"rxq1@%s;\"\n+ \"rxq2@%s;\"\n+ \"rxq3@%s;\"\n+ \"rxq4@%s;\"\n+ \"rxq5@%s;\"\n+ \"rxq6@%s;\"\n+ \"rxq7@%s\"\n % (\n- self.vhost_core_list[1],\n self.cbdma_list[0],\n- self.vhost_core_list[1],\n self.cbdma_list[1],\n- self.vhost_core_list[1],\n self.cbdma_list[2],\n- self.vhost_core_list[1],\n self.cbdma_list[3],\n- self.vhost_core_list[1],\n self.cbdma_list[4],\n- self.vhost_core_list[1],\n self.cbdma_list[5],\n- self.vhost_core_list[2],\n self.cbdma_list[6],\n- self.vhost_core_list[2],\n self.cbdma_list[7],\n- self.vhost_core_list[3],\n+ self.cbdma_list[0],\n+ self.cbdma_list[1],\n+ self.cbdma_list[2],\n+ self.cbdma_list[3],\n+ self.cbdma_list[4],\n+ self.cbdma_list[5],\n+ self.cbdma_list[6],\n+ self.cbdma_list[7],\n+ )\n+ )\n+ dmas2 = (\n+ \"txq0@%s;\"\n+ \"txq1@%s;\"\n+ \"txq2@%s;\"\n+ \"txq3@%s;\"\n+ \"txq4@%s;\"\n+ \"txq5@%s;\"\n+ \"txq6@%s;\"\n+ \"txq7@%s;\"\n+ \"rxq0@%s;\"\n+ \"rxq1@%s;\"\n+ \"rxq2@%s;\"\n+ \"rxq3@%s;\"\n+ \"rxq4@%s;\"\n+ \"rxq5@%s;\"\n+ \"rxq6@%s;\"\n+ \"rxq7@%s\"\n+ % (\n+ self.cbdma_list[8],\n+ self.cbdma_list[9],\n+ self.cbdma_list[10],\n+ self.cbdma_list[11],\n+ self.cbdma_list[12],\n+ self.cbdma_list[13],\n+ self.cbdma_list[14],\n+ self.cbdma_list[15],\n self.cbdma_list[8],\n- self.vhost_core_list[3],\n self.cbdma_list[9],\n- self.vhost_core_list[3],\n self.cbdma_list[10],\n- self.vhost_core_list[3],\n self.cbdma_list[11],\n- self.vhost_core_list[3],\n self.cbdma_list[12],\n- self.vhost_core_list[3],\n self.cbdma_list[13],\n- self.vhost_core_list[3],\n self.cbdma_list[14],\n- self.vhost_core_list[4],\n self.cbdma_list[15],\n )\n )\n-\n eal_param = (\n- \"--vdev 'net_vhost0,iface=vhost-net0,client=1,queues=8,tso=1,dmas=[txq0;txq1;txq2;txq3;txq4;txq5;txq6;txq7;rxq0;rxq1;rxq2;rxq3;rxq4;rxq5;rxq6;rxq7]'\"\n- + \" --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8,tso=1,dmas=[txq0;txq1;txq2;txq3;txq4;txq5;txq6;txq7;rxq0;rxq1;rxq2;rxq3;rxq4;rxq5;rxq6;rxq7]'\"\n- )\n- param = (\n- \" --nb-cores=4 --txd=1024 --rxd=1024 --txq=8 --rxq=8\"\n- + \" --lcore-dma=[%s]\" % lcore_dma\n+ \"--vdev 'net_vhost0,iface=vhost-net0,client=1,tso=1,queues=8,dmas=[%s],dma-ring-size=1024' \"\n+ \"--vdev 'net_vhost1,iface=vhost-net1,client=1,tso=1,queues=8,dmas=[%s],dma-ring-size=1024'\"\n+ % (dmas1, dmas2)\n )\n+ param = \" --nb-cores=4 --txd=1024 --rxd=1024 --rxq=8 --txq=8\"\n self.start_vhost_testpmd(\n cores=self.vhost_core_list,\n ports=self.cbdma_list,\n@@ -606,83 +642,52 @@ class TestVM2VMVirtioNetPerfCbdma(TestCase):\n self.config_vm_ip()\n self.config_vm_combined(combined=8)\n self.check_ping_between_vms()\n+\n self.check_scp_file_valid_between_vms()\n self.start_iperf()\n self.get_perf_result()\n \n self.pmdout_vhost_user.execute_cmd(\"quit\", \"#\")\n- lcore_dma = (\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s\"\n+\n+ dmas1 = (\n+ \"txq0@%s;\"\n+ \"txq1@%s;\"\n+ \"txq2@%s;\"\n+ \"txq3@%s;\"\n+ \"txq4@%s;\"\n+ \"txq5@%s\"\n % (\n- self.vhost_core_list[1],\n self.cbdma_list[0],\n- self.vhost_core_list[1],\n self.cbdma_list[1],\n- self.vhost_core_list[1],\n self.cbdma_list[2],\n- self.vhost_core_list[1],\n self.cbdma_list[3],\n- self.vhost_core_list[2],\n- self.cbdma_list[0],\n- self.vhost_core_list[2],\n- self.cbdma_list[2],\n- self.vhost_core_list[2],\n self.cbdma_list[4],\n- self.vhost_core_list[2],\n self.cbdma_list[5],\n- self.vhost_core_list[2],\n- self.cbdma_list[6],\n- self.vhost_core_list[2],\n- self.cbdma_list[7],\n- self.vhost_core_list[3],\n+ )\n+ )\n+\n+ dmas2 = (\n+ \"rxq2@%s;\"\n+ \"rxq3@%s;\"\n+ \"rxq4@%s;\"\n+ \"rxq5@%s;\"\n+ \"rxq6@%s;\"\n+ \"rxq7@%s\"\n+ % (\n+ self.cbdma_list[0],\n self.cbdma_list[1],\n- self.vhost_core_list[3],\n+ self.cbdma_list[2],\n self.cbdma_list[3],\n- self.vhost_core_list[3],\n- self.cbdma_list[8],\n- self.vhost_core_list[3],\n- self.cbdma_list[9],\n- self.vhost_core_list[3],\n- self.cbdma_list[10],\n- self.vhost_core_list[3],\n- self.cbdma_list[11],\n- self.vhost_core_list[3],\n- self.cbdma_list[12],\n- self.vhost_core_list[3],\n- self.cbdma_list[13],\n- self.vhost_core_list[3],\n- self.cbdma_list[14],\n- self.vhost_core_list[4],\n- self.cbdma_list[15],\n+ self.cbdma_list[4],\n+ self.cbdma_list[5],\n )\n )\n eal_param = (\n- \"--vdev 'net_vhost0,iface=vhost-net0,client=1,queues=8,tso=1,dmas=[txq0;txq1;txq2;txq3;txq4;txq5;txq6]'\"\n- + \" --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8,tso=1,dmas=[txq1;txq2;txq3;txq4;txq5;txq6]'\"\n- )\n- param = (\n- \" --nb-cores=4 --txd=1024 --rxd=1024 --txq=8 --rxq=8\"\n- + \" --lcore-dma=[%s]\" % lcore_dma\n+ \"--vdev 'net_vhost0,iface=vhost-net0,client=1,tso=1,queues=8,dmas=[%s],dma-ring-size=128' \"\n+ \"--vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8,tso=1,dmas=[%s],dma-ring-size=128'\"\n+ % (dmas1, dmas2)\n )\n+ param = \" --nb-cores=4 --txd=1024 --rxd=1024 --txq=8 --rxq=8\"\n self.start_vhost_testpmd(\n cores=self.vhost_core_list,\n ports=self.cbdma_list,\n@@ -690,15 +695,16 @@ class TestVM2VMVirtioNetPerfCbdma(TestCase):\n param=param,\n iova_mode=\"va\",\n )\n- self.check_scp_file_valid_between_vms()\n- self.check_ping_between_vms()\n- self.start_iperf()\n- self.get_perf_result()\n+ for _ in range(3):\n+ self.check_scp_file_valid_between_vms()\n+ self.check_ping_between_vms()\n+ self.start_iperf()\n+ self.get_perf_result()\n \n self.pmdout_vhost_user.execute_cmd(\"quit\", \"#\")\n eal_param = (\n- \"--vdev 'net_vhost0,iface=vhost-net0,client=1,queues=8,tso=1'\"\n- + \" --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8,tso=1'\"\n+ \"--vdev 'net_vhost0,iface=vhost-net0,client=1,queues=8,tso=1' \"\n+ + \"--vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8,tso=1'\"\n )\n param = \" --nb-cores=4 --txd=1024 --rxd=1024 --txq=8 --rxq=8\"\n self.start_vhost_testpmd(\n@@ -708,7 +714,7 @@ class TestVM2VMVirtioNetPerfCbdma(TestCase):\n param=param,\n iova_mode=\"va\",\n )\n- self.config_vm_combined(combined=4)\n+ self.config_vm_combined(combined=8)\n self.check_ping_between_vms()\n self.check_scp_file_valid_between_vms()\n self.start_iperf()\n@@ -716,8 +722,8 @@ class TestVM2VMVirtioNetPerfCbdma(TestCase):\n \n self.pmdout_vhost_user.execute_cmd(\"quit\", \"#\")\n eal_param = (\n- \"--vdev 'net_vhost0,iface=vhost-net0,client=1,queues=8,tso=1'\"\n- + \" --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8,tso=1'\"\n+ \"--vdev 'net_vhost0,iface=vhost-net0,client=1,queues=8,tso=1' \"\n+ + \"--vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8,tso=1'\"\n )\n param = \" --nb-cores=4 --txd=1024 --rxd=1024 --txq=1 --rxq=1\"\n self.start_vhost_testpmd(\n@@ -732,74 +738,156 @@ class TestVM2VMVirtioNetPerfCbdma(TestCase):\n self.start_iperf()\n self.get_perf_result()\n \n- def test_vm2vm_virtio_net_split_ring_mergeable_16_queues_cbdma_enable_test_with_large_packet_payload_valid_check(\n+ def test_vm2vm_virtio_net_split_ring_mergeable_16_queues_cbdma_enable_test_with_Rx_Tx_csum_in_SW(\n self,\n ):\n \"\"\"\n- Test Case 4: VM2VM virtio-net split ring mergeable 16 queues CBDMA enable test with large packet payload valid check\n+ Test Case 4: VM2VM virtio-net split ring mergeable 16 queues CBDMA enable test with Rx/Tx csum in SW\n \"\"\"\n self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True)\n- lcore_dma = (\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s\"\n+ dmas1 = (\n+ \"txq0@%s;\"\n+ \"txq1@%s;\"\n+ \"txq2@%s;\"\n+ \"txq3@%s;\"\n+ \"txq4@%s;\"\n+ \"txq5@%s;\"\n+ \"txq6@%s;\"\n+ \"txq7@%s;\"\n+ \"txq8@%s;\"\n+ \"txq9@%s;\"\n+ \"txq10@%s;\"\n+ \"txq11@%s;\"\n+ \"txq12@%s;\"\n+ \"txq13@%s;\"\n+ \"txq14@%s;\"\n+ \"txq15@%s;\"\n+ \"rxq0@%s;\"\n+ \"rxq1@%s;\"\n+ \"rxq2@%s;\"\n+ \"rxq3@%s;\"\n+ \"rxq4@%s;\"\n+ \"rxq5@%s;\"\n+ \"rxq6@%s;\"\n+ \"rxq7@%s;\"\n+ \"rxq8@%s;\"\n+ \"rxq9@%s;\"\n+ \"rxq10@%s;\"\n+ \"rxq11@%s;\"\n+ \"rxq12@%s;\"\n+ \"rxq13@%s;\"\n+ \"rxq14@%s;\"\n+ \"rxq15@%s\"\n % (\n- self.vhost_core_list[1],\n self.cbdma_list[0],\n- self.vhost_core_list[1],\n+ self.cbdma_list[0],\n+ self.cbdma_list[1],\n+ self.cbdma_list[1],\n+ self.cbdma_list[2],\n+ self.cbdma_list[2],\n+ self.cbdma_list[3],\n+ self.cbdma_list[3],\n+ self.cbdma_list[4],\n+ self.cbdma_list[4],\n+ self.cbdma_list[5],\n+ self.cbdma_list[5],\n+ self.cbdma_list[6],\n+ self.cbdma_list[6],\n+ self.cbdma_list[7],\n+ self.cbdma_list[7],\n+ self.cbdma_list[0],\n+ self.cbdma_list[0],\n+ self.cbdma_list[1],\n+ self.cbdma_list[1],\n+ self.cbdma_list[2],\n+ self.cbdma_list[2],\n+ self.cbdma_list[3],\n+ self.cbdma_list[3],\n+ self.cbdma_list[4],\n+ self.cbdma_list[4],\n+ self.cbdma_list[5],\n+ self.cbdma_list[5],\n+ self.cbdma_list[6],\n+ self.cbdma_list[6],\n+ self.cbdma_list[7],\n+ self.cbdma_list[7],\n+ )\n+ )\n+\n+ dmas2 = (\n+ \"txq0@%s;\"\n+ \"txq1@%s;\"\n+ \"txq2@%s;\"\n+ \"txq3@%s;\"\n+ \"txq4@%s;\"\n+ \"txq5@%s;\"\n+ \"txq6@%s;\"\n+ \"txq7@%s;\"\n+ \"txq8@%s;\"\n+ \"txq9@%s;\"\n+ \"txq10@%s;\"\n+ \"txq11@%s;\"\n+ \"txq12@%s;\"\n+ \"txq13@%s;\"\n+ \"txq14@%s;\"\n+ \"txq15@%s;\"\n+ \"rxq0@%s;\"\n+ \"rxq1@%s;\"\n+ \"rxq2@%s;\"\n+ \"rxq3@%s;\"\n+ \"rxq4@%s;\"\n+ \"rxq5@%s;\"\n+ \"rxq6@%s;\"\n+ \"rxq7@%s;\"\n+ \"rxq8@%s;\"\n+ \"rxq9@%s;\"\n+ \"rxq10@%s;\"\n+ \"rxq11@%s;\"\n+ \"rxq12@%s;\"\n+ \"rxq13@%s;\"\n+ \"rxq14@%s;\"\n+ \"rxq15@%s\"\n+ % (\n+ self.cbdma_list[0],\n+ self.cbdma_list[1],\n+ self.cbdma_list[2],\n+ self.cbdma_list[3],\n+ self.cbdma_list[4],\n+ self.cbdma_list[5],\n+ self.cbdma_list[6],\n+ self.cbdma_list[7],\n+ self.cbdma_list[8],\n+ self.cbdma_list[9],\n+ self.cbdma_list[10],\n+ self.cbdma_list[11],\n+ self.cbdma_list[12],\n+ self.cbdma_list[13],\n+ self.cbdma_list[14],\n+ self.cbdma_list[15],\n+ self.cbdma_list[0],\n self.cbdma_list[1],\n- self.vhost_core_list[2],\n self.cbdma_list[2],\n- self.vhost_core_list[2],\n self.cbdma_list[3],\n- self.vhost_core_list[3],\n self.cbdma_list[4],\n- self.vhost_core_list[4],\n self.cbdma_list[5],\n- self.vhost_core_list[4],\n self.cbdma_list[6],\n- self.vhost_core_list[4],\n self.cbdma_list[7],\n- self.vhost_core_list[5],\n self.cbdma_list[8],\n- self.vhost_core_list[5],\n self.cbdma_list[9],\n- self.vhost_core_list[6],\n self.cbdma_list[10],\n- self.vhost_core_list[6],\n self.cbdma_list[11],\n- self.vhost_core_list[7],\n self.cbdma_list[12],\n- self.vhost_core_list[7],\n self.cbdma_list[13],\n- self.vhost_core_list[8],\n self.cbdma_list[14],\n- self.vhost_core_list[8],\n self.cbdma_list[15],\n )\n )\n eal_param = (\n- \"--vdev 'net_vhost0,iface=vhost-net0,client=1,queues=16,tso=1,dmas=[txq0;txq1;txq2;txq3;txq4;txq5;txq6;txq7;txq8;txq9;txq10;txq11;txq12;txq13;txq14;txq15;rxq0;rxq1;rxq2;rxq3;rxq4;rxq5;rxq6;rxq7;rxq8;rxq9;rxq10;rxq11;rxq12;rxq13;rxq14;rxq15]'\"\n- + \" --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=16,tso=1,dmas=[txq0;txq1;txq2;txq3;txq4;txq5;txq6;txq7;txq8;txq9;txq10;txq11;txq12;txq13;txq14;txq15;rxq0;rxq1;rxq2;rxq3;rxq4;rxq5;rxq6;rxq7;rxq8;rxq9;rxq10;rxq11;rxq12;rxq13;rxq14;rxq15]'\"\n- )\n+ \"--vdev 'net_vhost0,iface=vhost-net0,client=1,queues=16,tso=1,dmas=[%s]' \"\n+ \"--vdev 'net_vhost1,iface=vhost-net1,client=1,queues=16,tso=1,dmas=[%s]'\"\n+ ) % (dmas1, dmas2)\n \n- param = (\n- \" --nb-cores=8 --txd=1024 --rxd=1024 --txq=16 --rxq=16\"\n- + \" --lcore-dma=[%s]\" % lcore_dma\n- )\n+ param = \" --nb-cores=8 --txd=1024 --rxd=1024 --txq=16 --rxq=16\"\n self.start_vhost_testpmd(\n cores=self.vhost_core_list,\n ports=self.cbdma_list,\n@@ -807,7 +895,17 @@ class TestVM2VMVirtioNetPerfCbdma(TestCase):\n param=param,\n iova_mode=\"va\",\n )\n- self.vm_args = \"disable-modern=false,mrg_rxbuf=on,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on\"\n+ self.pmdout_vhost_user.execute_cmd(\"set fwd csum\")\n+ self.pmdout_vhost_user.execute_cmd(\"csum mac-swap off 0\")\n+ self.pmdout_vhost_user.execute_cmd(\"csum mac-swap off 1\")\n+ self.pmdout_vhost_user.execute_cmd(\"stop\")\n+ self.pmdout_vhost_user.execute_cmd(\"port stop all\")\n+ self.pmdout_vhost_user.execute_cmd(\"port config 0 tx_offload tcp_cksum on\")\n+ self.pmdout_vhost_user.execute_cmd(\"port config 1 tx_offload tcp_cksum on\")\n+ self.pmdout_vhost_user.execute_cmd(\"port start all\")\n+ self.pmdout_vhost_user.execute_cmd(\"start\")\n+\n+ self.vm_args = \"disable-modern=false,mrg_rxbuf=on,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=off,guest_ecn=on,guest_ufo=on,host_ufo=on\"\n self.start_vms(server_mode=True, vm_queue=16)\n self.config_vm_ip()\n self.config_vm_combined(combined=16)\n@@ -821,20 +919,13 @@ class TestVM2VMVirtioNetPerfCbdma(TestCase):\n Test Case 5: VM2VM virtio-net packed ring CBDMA enable test with tcp traffic\n \"\"\"\n self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=2)\n- lcore_dma = \"lcore%s@%s,\" \"lcore%s@%s\" % (\n- self.vhost_core_list[1],\n- self.cbdma_list[0],\n- self.vhost_core_list[2],\n- self.cbdma_list[1],\n- )\n+ dmas1 = \"txq0@%s;\" \"rxq0@%s\" % (self.cbdma_list[0], self.cbdma_list[0])\n+ dmas2 = \"txq0@%s;\" \"rxq0@%s\" % (self.cbdma_list[1], self.cbdma_list[1])\n eal_param = (\n- \"--vdev 'net_vhost0,iface=vhost-net0,queues=1,tso=1,dmas=[txq0;rxq0]'\"\n- + \" --vdev 'net_vhost1,iface=vhost-net1,queues=1,tso=1,dmas=[txq0;rxq0]'\"\n- )\n- param = (\n- \" --nb-cores=2 --txd=1024 --rxd=1024 --txq=1 --rxq=1\"\n- + \" --lcore-dma=[%s]\" % lcore_dma\n- )\n+ \"--vdev 'net_vhost0,iface=vhost-net0,queues=1,tso=1,dmas=[%s]' \"\n+ \"--vdev 'net_vhost1,iface=vhost-net1,queues=1,tso=1,dmas=[%s]'\"\n+ ) % (dmas1, dmas2)\n+ param = \" --nb-cores=2 --txd=1024 --rxd=1024 --txq=1 --rxq=1\"\n self.start_vhost_testpmd(\n cores=self.vhost_core_list,\n ports=self.cbdma_list,\n@@ -857,66 +948,84 @@ class TestVM2VMVirtioNetPerfCbdma(TestCase):\n Test Case 6: VM2VM virtio-net packed ring mergeable 8 queues CBDMA enable test with large packet payload valid check\n \"\"\"\n self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True)\n- lcore_dma = (\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s\"\n+ dmas1 = (\n+ \"txq0@%s;\"\n+ \"txq1@%s;\"\n+ \"txq2@%s;\"\n+ \"txq3@%s;\"\n+ \"txq4@%s;\"\n+ \"txq5@%s;\"\n+ \"txq6@%s;\"\n+ \"txq7@%s;\"\n+ \"rxq0@%s;\"\n+ \"rxq1@%s;\"\n+ \"rxq2@%s;\"\n+ \"rxq3@%s;\"\n+ \"rxq4@%s;\"\n+ \"rxq5@%s;\"\n+ \"rxq6@%s;\"\n+ \"rxq7@%s\"\n % (\n- self.vhost_core_list[1],\n self.cbdma_list[0],\n- self.vhost_core_list[1],\n+ self.cbdma_list[0],\n self.cbdma_list[1],\n- self.vhost_core_list[1],\n+ self.cbdma_list[1],\n+ self.cbdma_list[2],\n self.cbdma_list[2],\n- self.vhost_core_list[1],\n self.cbdma_list[3],\n- self.vhost_core_list[1],\n+ self.cbdma_list[3],\n+ self.cbdma_list[4],\n self.cbdma_list[4],\n- self.vhost_core_list[1],\n self.cbdma_list[5],\n- self.vhost_core_list[2],\n+ self.cbdma_list[5],\n+ self.cbdma_list[6],\n self.cbdma_list[6],\n- self.vhost_core_list[2],\n self.cbdma_list[7],\n- self.vhost_core_list[3],\n- self.cbdma_list[8],\n- self.vhost_core_list[3],\n- self.cbdma_list[9],\n- self.vhost_core_list[3],\n- self.cbdma_list[10],\n- self.vhost_core_list[3],\n- self.cbdma_list[11],\n- self.vhost_core_list[3],\n- self.cbdma_list[12],\n- self.vhost_core_list[3],\n- self.cbdma_list[13],\n- self.vhost_core_list[3],\n- self.cbdma_list[14],\n- self.vhost_core_list[4],\n- self.cbdma_list[15],\n+ self.cbdma_list[7],\n )\n )\n- eal_param = (\n- \"--vdev 'net_vhost0,iface=vhost-net0,queues=8,tso=1,dmas=[txq0;txq1;txq2;txq3;txq4;txq5;txq6;txq7;rxq0;rxq1;rxq2;rxq3;rxq4;rxq5;rxq6;rxq7]'\"\n- + \" --vdev 'net_vhost1,iface=vhost-net1,queues=8,tso=1,dmas=[txq0;txq1;txq2;txq3;txq4;txq5;txq6;txq7;rxq0;rxq1;rxq2;rxq3;rxq4;rxq5;rxq6;rxq7]'\"\n+ dmas2 = (\n+ \"txq0@%s;\"\n+ \"txq1@%s;\"\n+ \"txq2@%s;\"\n+ \"txq3@%s;\"\n+ \"txq4@%s;\"\n+ \"txq5@%s;\"\n+ \"txq6@%s;\"\n+ \"txq7@%s;\"\n+ \"rxq0@%s;\"\n+ \"rxq1@%s;\"\n+ \"rxq2@%s;\"\n+ \"rxq3@%s;\"\n+ \"rxq4@%s;\"\n+ \"rxq5@%s;\"\n+ \"rxq6@%s;\"\n+ \"rxq7@%s\"\n+ % (\n+ self.cbdma_list[0],\n+ self.cbdma_list[0],\n+ self.cbdma_list[1],\n+ self.cbdma_list[1],\n+ self.cbdma_list[2],\n+ self.cbdma_list[2],\n+ self.cbdma_list[3],\n+ self.cbdma_list[3],\n+ self.cbdma_list[4],\n+ self.cbdma_list[4],\n+ self.cbdma_list[5],\n+ self.cbdma_list[5],\n+ self.cbdma_list[6],\n+ self.cbdma_list[6],\n+ self.cbdma_list[7],\n+ self.cbdma_list[7],\n+ )\n )\n- param = (\n- \" --nb-cores=4 --txd=1024 --rxd=1024 --txq=8 --rxq=8\"\n- + \" --lcore-dma=[%s]\" % lcore_dma\n+ eal_param = (\n+ \"--vdev 'net_vhost0,iface=vhost-net0,queues=8,tso=1,dmas=[%s]' \"\n+ \"--vdev 'net_vhost1,iface=vhost-net1,queues=8,tso=1,dmas=[%s]'\"\n+ % (dmas1, dmas2)\n )\n+ param = \" --nb-cores=4 --txd=1024 --rxd=1024 --txq=8 --rxq=8\"\n self.start_vhost_testpmd(\n cores=self.vhost_core_list,\n ports=self.cbdma_list,\n@@ -941,66 +1050,68 @@ class TestVM2VMVirtioNetPerfCbdma(TestCase):\n Test Case 7: VM2VM virtio-net packed ring non-mergeable 8 queues CBDMA enable test with large packet payload valid check\n \"\"\"\n self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True)\n- lcore_dma = (\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s\"\n+ dmas1 = (\n+ \"txq0@%s;\"\n+ \"txq1@%s;\"\n+ \"txq2@%s;\"\n+ \"txq3@%s;\"\n+ \"txq4@%s;\"\n+ \"txq5@%s;\"\n+ \"rxq2@%s;\"\n+ \"rxq3@%s;\"\n+ \"rxq4@%s;\"\n+ \"rxq5@%s;\"\n+ \"rxq6@%s;\"\n+ \"rxq7@%s\"\n % (\n- self.vhost_core_list[1],\n self.cbdma_list[0],\n- self.vhost_core_list[1],\n+ self.cbdma_list[0],\n+ self.cbdma_list[1],\n self.cbdma_list[1],\n- self.vhost_core_list[1],\n self.cbdma_list[2],\n- self.vhost_core_list[1],\n+ self.cbdma_list[2],\n+ self.cbdma_list[3],\n self.cbdma_list[3],\n- self.vhost_core_list[1],\n self.cbdma_list[4],\n- self.vhost_core_list[1],\n+ self.cbdma_list[4],\n self.cbdma_list[5],\n- self.vhost_core_list[2],\n- self.cbdma_list[6],\n- self.vhost_core_list[2],\n- self.cbdma_list[7],\n- self.vhost_core_list[3],\n+ self.cbdma_list[5],\n+ )\n+ )\n+ dmas2 = (\n+ \"txq2@%s;\"\n+ \"txq3@%s;\"\n+ \"txq4@%s;\"\n+ \"txq5@%s;\"\n+ \"txq6@%s;\"\n+ \"txq7@%s;\"\n+ \"rxq0@%s;\"\n+ \"rxq1@%s;\"\n+ \"rxq2@%s;\"\n+ \"rxq3@%s;\"\n+ \"rxq4@%s;\"\n+ \"rxq5@%s\"\n+ % (\n+ self.cbdma_list[8],\n self.cbdma_list[8],\n- self.vhost_core_list[3],\n self.cbdma_list[9],\n- self.vhost_core_list[3],\n+ self.cbdma_list[9],\n+ self.cbdma_list[10],\n self.cbdma_list[10],\n- self.vhost_core_list[3],\n self.cbdma_list[11],\n- self.vhost_core_list[3],\n+ self.cbdma_list[11],\n+ self.cbdma_list[12],\n self.cbdma_list[12],\n- self.vhost_core_list[3],\n self.cbdma_list[13],\n- self.vhost_core_list[3],\n- self.cbdma_list[14],\n- self.vhost_core_list[4],\n- self.cbdma_list[15],\n+ self.cbdma_list[13],\n )\n )\n eal_param = (\n- \"--vdev 'net_vhost0,iface=vhost-net0,queues=8,tso=1,dmas=[txq0;txq1;txq2;txq3;txq4;txq5;rxq2;rxq3;rxq4;rxq5;rxq6;rxq7]'\"\n- + \" --vdev 'net_vhost1,iface=vhost-net1,queues=8,tso=1,dmas=[txq2;txq3;txq4;txq5;txq6;txq7;rxq0;rxq1;rxq2;rxq3;rxq4;rxq5]'\"\n- )\n- param = (\n- \" --nb-cores=4 --txd=1024 --rxd=1024 --txq=8 --rxq=8\"\n- + \" --lcore-dma=[%s]\" % lcore_dma\n+ \"--vdev 'net_vhost0,iface=vhost-net0,queues=8,tso=1,dmas=[%s],dma-ring-size=1024' \"\n+ \"--vdev 'net_vhost1,iface=vhost-net1,queues=8,tso=1,dmas=[%s],dma-ring-size=1024'\"\n+ % (dmas1, dmas2)\n )\n+ param = \" --nb-cores=4 --txd=1024 --rxd=1024 --txq=8 --rxq=8\"\n self.start_vhost_testpmd(\n cores=self.vhost_core_list,\n ports=self.cbdma_list,\n@@ -1013,78 +1124,162 @@ class TestVM2VMVirtioNetPerfCbdma(TestCase):\n self.config_vm_ip()\n self.config_vm_combined(combined=8)\n self.check_ping_between_vms()\n- for _ in range(6):\n+ self.check_scp_file_valid_between_vms()\n+ for _ in range(5):\n self.check_scp_file_valid_between_vms()\n self.start_iperf()\n self.get_perf_result()\n \n- def test_vm2vm_virtio_net_packed_ring_mergeable_16_queues_cbdma_enable_test_with_large_packet_payload_check(\n+ def test_vm2vm_virtio_net_packed_ring_mergeable_16_queues_cbdma_enable_test_with_Rx_Tx_csum_in_SW(\n self,\n ):\n \"\"\"\n- Test Case 8: VM2VM virtio-net packed ring mergeable 16 queues CBDMA enabled test with large packet payload valid check\n+ Test Case 8: VM2VM virtio-net packed ring mergeable 16 queues CBDMA enabled test with Rx/Tx csum in SW\n \"\"\"\n self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True)\n- lcore_dma = (\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s\"\n+ dmas1 = (\n+ \"txq0@%s;\"\n+ \"txq1@%s;\"\n+ \"txq2@%s;\"\n+ \"txq3@%s;\"\n+ \"txq4@%s;\"\n+ \"txq5@%s;\"\n+ \"txq6@%s;\"\n+ \"txq7@%s;\"\n+ \"txq8@%s;\"\n+ \"txq9@%s;\"\n+ \"txq10@%s;\"\n+ \"txq11@%s;\"\n+ \"txq12@%s;\"\n+ \"txq13@%s;\"\n+ \"txq14@%s;\"\n+ \"txq15@%s;\"\n+ \"rxq0@%s;\"\n+ \"rxq1@%s;\"\n+ \"rxq2@%s;\"\n+ \"rxq3@%s;\"\n+ \"rxq4@%s;\"\n+ \"rxq5@%s;\"\n+ \"rxq6@%s;\"\n+ \"rxq7@%s;\"\n+ \"rxq8@%s;\"\n+ \"rxq9@%s;\"\n+ \"rxq10@%s;\"\n+ \"rxq11@%s;\"\n+ \"rxq12@%s;\"\n+ \"rxq13@%s;\"\n+ \"rxq14@%s;\"\n+ \"rxq15@%s\"\n % (\n- self.vhost_core_list[1],\n self.cbdma_list[0],\n- self.vhost_core_list[1],\n+ self.cbdma_list[0],\n+ self.cbdma_list[1],\n self.cbdma_list[1],\n- self.vhost_core_list[2],\n self.cbdma_list[2],\n- self.vhost_core_list[2],\n+ self.cbdma_list[2],\n+ self.cbdma_list[3],\n self.cbdma_list[3],\n- self.vhost_core_list[3],\n self.cbdma_list[4],\n- self.vhost_core_list[4],\n+ self.cbdma_list[4],\n self.cbdma_list[5],\n- self.vhost_core_list[4],\n+ self.cbdma_list[5],\n+ self.cbdma_list[6],\n self.cbdma_list[6],\n- self.vhost_core_list[4],\n self.cbdma_list[7],\n- self.vhost_core_list[5],\n+ self.cbdma_list[7],\n+ self.cbdma_list[8],\n self.cbdma_list[8],\n- self.vhost_core_list[5],\n self.cbdma_list[9],\n- self.vhost_core_list[6],\n+ self.cbdma_list[9],\n+ self.cbdma_list[10],\n self.cbdma_list[10],\n- self.vhost_core_list[6],\n self.cbdma_list[11],\n- self.vhost_core_list[7],\n+ self.cbdma_list[11],\n self.cbdma_list[12],\n- self.vhost_core_list[7],\n+ self.cbdma_list[12],\n+ self.cbdma_list[13],\n self.cbdma_list[13],\n- self.vhost_core_list[8],\n self.cbdma_list[14],\n- self.vhost_core_list[8],\n+ self.cbdma_list[14],\n+ self.cbdma_list[15],\n self.cbdma_list[15],\n )\n )\n- eal_param = (\n- \"--vdev 'net_vhost0,iface=vhost-net0,queues=16,tso=1,dmas=[txq0;txq1;txq2;txq3;txq4;txq5;txq6;txq7;txq8;txq9;txq10;txq11,txq12,txq13;txq14;txq15;rxq0;rxq1;rxq2;rxq3;rxq4;rxq5;rxq6;rxq7;rxq8;rxq9;rxq10;rxq11;rxq12;rxq13;rxq14;rxq15]'\"\n- + \" --vdev 'net_vhost1,iface=vhost-net1,queues=16,tso=1,dmas=[txq0;txq1;txq2;txq3;txq4;txq5;txq6;txq7;txq8;txq9;txq10;txq11,txq12,txq13;txq14;txq15;rxq0;rxq1;rxq2;rxq3;rxq4;rxq5;rxq6;rxq7;rxq8;rxq9;rxq10;rxq11;rxq12;rxq13;rxq14;rxq15]'\"\n+\n+ dmas2 = (\n+ \"txq0@%s;\"\n+ \"txq1@%s;\"\n+ \"txq2@%s;\"\n+ \"txq3@%s;\"\n+ \"txq4@%s;\"\n+ \"txq5@%s;\"\n+ \"txq6@%s;\"\n+ \"txq7@%s;\"\n+ \"txq8@%s;\"\n+ \"txq9@%s;\"\n+ \"txq10@%s;\"\n+ \"txq11@%s;\"\n+ \"txq12@%s;\"\n+ \"txq13@%s;\"\n+ \"txq14@%s;\"\n+ \"txq15@%s;\"\n+ \"rxq0@%s;\"\n+ \"rxq1@%s;\"\n+ \"rxq2@%s;\"\n+ \"rxq3@%s;\"\n+ \"rxq4@%s;\"\n+ \"rxq5@%s;\"\n+ \"rxq6@%s;\"\n+ \"rxq7@%s;\"\n+ \"rxq8@%s;\"\n+ \"rxq9@%s;\"\n+ \"rxq10@%s;\"\n+ \"rxq11@%s;\"\n+ \"rxq12@%s;\"\n+ \"rxq13@%s;\"\n+ \"rxq14@%s;\"\n+ \"rxq15@%s\"\n+ % (\n+ self.cbdma_list[0],\n+ self.cbdma_list[1],\n+ self.cbdma_list[2],\n+ self.cbdma_list[3],\n+ self.cbdma_list[4],\n+ self.cbdma_list[5],\n+ self.cbdma_list[6],\n+ self.cbdma_list[7],\n+ self.cbdma_list[8],\n+ self.cbdma_list[9],\n+ self.cbdma_list[10],\n+ self.cbdma_list[11],\n+ self.cbdma_list[12],\n+ self.cbdma_list[13],\n+ self.cbdma_list[14],\n+ self.cbdma_list[15],\n+ self.cbdma_list[0],\n+ self.cbdma_list[1],\n+ self.cbdma_list[2],\n+ self.cbdma_list[3],\n+ self.cbdma_list[4],\n+ self.cbdma_list[5],\n+ self.cbdma_list[6],\n+ self.cbdma_list[7],\n+ self.cbdma_list[8],\n+ self.cbdma_list[9],\n+ self.cbdma_list[10],\n+ self.cbdma_list[11],\n+ self.cbdma_list[12],\n+ self.cbdma_list[13],\n+ self.cbdma_list[14],\n+ self.cbdma_list[15],\n+ )\n )\n- param = (\n- \" --nb-cores=8 --txd=1024 --rxd=1024 --txq=16 --rxq=16\"\n- + \" --lcore-dma=[%s]\" % lcore_dma\n+ eal_param = (\n+ \"--vdev 'net_vhost0,iface=vhost-net0,queues=16,tso=1,dmas=[%s]' \"\n+ \"--vdev 'net_vhost1,iface=vhost-net1,queues=16,tso=1,dmas=[%s]'\"\n+ % (dmas1, dmas2)\n )\n+ param = \" --nb-cores=8 --txd=1024 --rxd=1024 --txq=16 --rxq=16\"\n self.start_vhost_testpmd(\n cores=self.vhost_core_list,\n ports=self.cbdma_list,\n@@ -1092,7 +1287,18 @@ class TestVM2VMVirtioNetPerfCbdma(TestCase):\n param=param,\n iova_mode=\"va\",\n )\n- self.vm_args = \"disable-modern=false,mrg_rxbuf=on,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on,packed=on\"\n+\n+ self.pmdout_vhost_user.execute_cmd(\"set fwd csum\")\n+ self.pmdout_vhost_user.execute_cmd(\"csum mac-swap off 0\")\n+ self.pmdout_vhost_user.execute_cmd(\"csum mac-swap off 1\")\n+ self.pmdout_vhost_user.execute_cmd(\"stop\")\n+ self.pmdout_vhost_user.execute_cmd(\"port stop all\")\n+ self.pmdout_vhost_user.execute_cmd(\"port config 0 tx_offload tcp_cksum on\")\n+ self.pmdout_vhost_user.execute_cmd(\"port config 1 tx_offload tcp_cksum on\")\n+ self.pmdout_vhost_user.execute_cmd(\"port start all\")\n+ self.pmdout_vhost_user.execute_cmd(\"start\")\n+\n+ self.vm_args = \"disable-modern=false,mrg_rxbuf=on,mq=on,vectors=40,csum=on,guest_csum=off,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on,packed=on\"\n self.start_vms(server_mode=False, vm_queue=16)\n self.config_vm_ip()\n self.config_vm_combined(combined=16)\n@@ -1102,129 +1308,122 @@ class TestVM2VMVirtioNetPerfCbdma(TestCase):\n self.start_iperf()\n self.get_perf_result()\n \n- def test_vm2vm_virtio_net_packed_ring_cbdma_enable_test_with_tcp_traffic_when_set_iova_pa(\n+ def test_vm2vm_virtio_net_packed_ring_cbdma_enable_test_dma_ring_size_with_tcp_traffic(\n self,\n ):\n \"\"\"\n- Test Case 9: VM2VM virtio-net packed ring CBDMA enable test with tcp traffic when set iova=pa\n+ Test Case 9: VM2VM virtio-net packed ring CBDMA enable test dma-ring-size with tcp traffic\n \"\"\"\n- if not self.check_2M_env:\n- self.get_cbdma_ports_info_and_bind_to_dpdk(2)\n- lcore_dma = \"lcore%s@%s,\" \"lcore%s@%s\" % (\n- self.vhost_core_list[1],\n- self.cbdma_list[0],\n- self.vhost_core_list[2],\n- self.cbdma_list[1],\n- )\n- eal_param = (\n- \"--vdev 'net_vhost0,iface=vhost-net0,queues=1,tso=1,dmas=[txq0;rxq0]'\"\n- + \" --vdev 'net_vhost1,iface=vhost-net1,queues=1,tso=1,dmas=[txq0;rxq0]'\"\n- )\n- param = (\n- \" --nb-cores=2 --txd=1024 --rxd=1024 --txq=1 --rxq=1\"\n- + \" --lcore-dma=[%s]\" % lcore_dma\n- )\n- self.start_vhost_testpmd(\n- cores=self.vhost_core_list,\n- ports=self.cbdma_list,\n- eal_param=eal_param,\n- param=param,\n- iova_mode=\"pa\",\n- )\n- self.vm_args = \"disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on\"\n- self.start_vms(server_mode=False, vm_queue=1)\n- self.config_vm_ip()\n- self.check_ping_between_vms()\n+ self.get_cbdma_ports_info_and_bind_to_dpdk(2)\n+ dmas1 = \"txq0@%s;\" \"rxq0@%s\" % (self.cbdma_list[0], self.cbdma_list[0])\n+ dmas2 = \"txq0@%s;\" \"rxq0@%s\" % (self.cbdma_list[1], self.cbdma_list[1])\n+ eal_param = (\n+ \"--vdev 'net_vhost0,iface=vhost-net0,queues=1,tso=1,dmas=[%s],dma-ring-size=256' \"\n+ \"--vdev 'net_vhost1,iface=vhost-net1,queues=1,tso=1,dmas=[%s],dma-ring-size=256'\"\n+ % (dmas1, dmas2)\n+ )\n+ param = \" --nb-cores=2 --txd=1024 --rxd=1024 --txq=1 --rxq=1\"\n+ self.start_vhost_testpmd(\n+ cores=self.vhost_core_list,\n+ ports=self.cbdma_list,\n+ eal_param=eal_param,\n+ param=param,\n+ iova_mode=\"va\",\n+ )\n+ self.vm_args = \"disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on\"\n+ self.start_vms(server_mode=False, vm_queue=1)\n+ self.config_vm_ip()\n+ self.check_ping_between_vms()\n+ for _ in range(3):\n self.check_scp_file_valid_between_vms()\n self.start_iperf()\n self.get_perf_result()\n self.verify_xstats_info_on_vhost()\n \n- def test_vm2vm_virtio_net_packed_ring_mergeable_8_queues_cbdma_enable_and_pa_mode_test_with_large_packet_payload_valid_check(\n+ def test_vm2vm_virtio_net_packed_ring_8_queues_cbdma_enable_test_with_legacy_mode(\n self,\n ):\n \"\"\"\n- Test Case 10: VM2VM virtio-net packed ring mergeable 8 queues CBDMA enable and PA mode test with large packet payload valid check\n+ Test Case 10: VM2VM virtio-net packed ring 8 queues CBDMA enable test with legacy mode\n \"\"\"\n- if not self.check_2M_env:\n- self.get_cbdma_ports_info_and_bind_to_dpdk(\n- cbdma_num=16, allow_diff_socket=True\n- )\n- lcore_dma = (\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s,\"\n- \"lcore%s@%s\"\n- % (\n- self.vhost_core_list[1],\n- self.cbdma_list[0],\n- self.vhost_core_list[1],\n- self.cbdma_list[1],\n- self.vhost_core_list[1],\n- self.cbdma_list[2],\n- self.vhost_core_list[1],\n- self.cbdma_list[3],\n- self.vhost_core_list[1],\n- self.cbdma_list[4],\n- self.vhost_core_list[1],\n- self.cbdma_list[5],\n- self.vhost_core_list[2],\n- self.cbdma_list[6],\n- self.vhost_core_list[2],\n- self.cbdma_list[7],\n- self.vhost_core_list[3],\n- self.cbdma_list[8],\n- self.vhost_core_list[3],\n- self.cbdma_list[9],\n- self.vhost_core_list[3],\n- self.cbdma_list[10],\n- self.vhost_core_list[3],\n- self.cbdma_list[11],\n- self.vhost_core_list[3],\n- self.cbdma_list[12],\n- self.vhost_core_list[3],\n- self.cbdma_list[13],\n- self.vhost_core_list[3],\n- self.cbdma_list[14],\n- self.vhost_core_list[4],\n- self.cbdma_list[15],\n- )\n- )\n- eal_param = (\n- \"--vdev 'net_vhost0,iface=vhost-net0,queues=8,tso=1,dmas=[txq0;txq1;txq2;txq3;txq4;txq5;rxq2;rxq3;rxq4;rxq5;rxq6;rxq7]'\"\n- + \" --vdev 'net_vhost1,iface=vhost-net1,queues=8,tso=1,dmas=[txq2;txq3;txq4;txq5;txq6;txq7;rxq0;rxq1;rxq2;rxq3;rxq4;rxq5]'\"\n- )\n- param = (\n- \" --nb-cores=4 --txd=1024 --rxd=1024 --txq=8 --rxq=8\"\n- + \" --lcore-dma=[%s]\" % lcore_dma\n+ self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True)\n+ dmas1 = (\n+ \"txq0@%s;\"\n+ \"txq1@%s;\"\n+ \"txq2@%s;\"\n+ \"txq3@%s;\"\n+ \"txq4@%s;\"\n+ \"txq5@%s;\"\n+ \"rxq2@%s;\"\n+ \"rxq3@%s;\"\n+ \"rxq4@%s;\"\n+ \"rxq5@%s;\"\n+ \"rxq6@%s;\"\n+ \"rxq7@%s\"\n+ % (\n+ self.cbdma_list[0],\n+ self.cbdma_list[0],\n+ self.cbdma_list[1],\n+ self.cbdma_list[1],\n+ self.cbdma_list[2],\n+ self.cbdma_list[2],\n+ self.cbdma_list[3],\n+ self.cbdma_list[3],\n+ self.cbdma_list[4],\n+ self.cbdma_list[4],\n+ self.cbdma_list[5],\n+ self.cbdma_list[5],\n )\n- self.start_vhost_testpmd(\n- cores=self.vhost_core_list,\n- ports=self.cbdma_list,\n- eal_param=eal_param,\n- param=param,\n- iova_mode=\"pa\",\n+ )\n+ dmas2 = (\n+ \"txq2@%s;\"\n+ \"txq3@%s;\"\n+ \"txq4@%s;\"\n+ \"txq5@%s;\"\n+ \"txq6@%s;\"\n+ \"txq7@%s;\"\n+ \"rxq0@%s;\"\n+ \"rxq1@%s;\"\n+ \"rxq2@%s;\"\n+ \"rxq3@%s;\"\n+ \"rxq4@%s;\"\n+ \"rxq5@%s\"\n+ % (\n+ self.cbdma_list[8],\n+ self.cbdma_list[8],\n+ self.cbdma_list[9],\n+ self.cbdma_list[9],\n+ self.cbdma_list[10],\n+ self.cbdma_list[10],\n+ self.cbdma_list[11],\n+ self.cbdma_list[11],\n+ self.cbdma_list[12],\n+ self.cbdma_list[12],\n+ self.cbdma_list[13],\n+ self.cbdma_list[13],\n )\n- self.vm_args = \"disable-modern=false,mrg_rxbuf=on,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on,packed=on\"\n- self.start_vms(server_mode=False, vm_queue=8)\n- self.config_vm_ip()\n- self.check_ping_between_vms()\n- for _ in range(1):\n- self.check_scp_file_valid_between_vms()\n- self.start_iperf()\n- self.get_perf_result()\n+ )\n+ eal_param = (\n+ \"--vdev 'net_vhost0,iface=vhost-net0,queues=8,tso=1,legacy-ol-flags=1,dmas=[%s]' \"\n+ \"--vdev 'net_vhost1,iface=vhost-net1,queues=8,tso=1,legacy-ol-flags=1,dmas=[%s]'\"\n+ % (dmas1, dmas2)\n+ )\n+ param = \" --nb-cores=4 --txd=1024 --rxd=1024 --txq=8 --rxq=8\"\n+ self.start_vhost_testpmd(\n+ cores=self.vhost_core_list,\n+ ports=self.cbdma_list,\n+ eal_param=eal_param,\n+ param=param,\n+ iova_mode=\"va\",\n+ )\n+ self.vm_args = \"disable-modern=false,mrg_rxbuf=on,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on,packed=on\"\n+ self.start_vms(server_mode=False, vm_queue=8)\n+ self.config_vm_ip()\n+ self.check_ping_between_vms()\n+ for _ in range(3):\n+ self.check_scp_file_valid_between_vms()\n+ self.start_iperf()\n+ self.get_perf_result()\n \n def stop_all_apps(self):\n for i in range(len(self.vm)):\n", "prefixes": [ "V2", "2/2" ] }{ "id": 120070, "url": "