Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/120028/?format=api
{ "id": 120028, "url": "http://patches.dpdk.org/api/patches/120028/?format=api", "web_url": "http://patches.dpdk.org/project/dts/patch/20221122061337.2891957-1-weix.ling@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": "<20221122061337.2891957-1-weix.ling@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dts/20221122061337.2891957-1-weix.ling@intel.com", "date": "2022-11-22T06:13:37", "name": "[V2,2/2] tests/vhost_virtio_user_interrupt_cbdma: modify testsuite by DPDK changed", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "776b7c76f38f15c5d67dc28cee5fc32ed4c37d84", "submitter": { "id": 1828, "url": "http://patches.dpdk.org/api/people/1828/?format=api", "name": "Ling, WeiX", "email": "weix.ling@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dts/patch/20221122061337.2891957-1-weix.ling@intel.com/mbox/", "series": [ { "id": 25845, "url": "http://patches.dpdk.org/api/series/25845/?format=api", "web_url": "http://patches.dpdk.org/project/dts/list/?series=25845", "date": "2022-11-22T06:13:11", "name": "modify the dmas parameter by DPDK changed", "version": 2, "mbox": "http://patches.dpdk.org/series/25845/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/120028/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/120028/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 982BAA057D;\n\tTue, 22 Nov 2022 07:19:29 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 9333942D3E;\n\tTue, 22 Nov 2022 07:19:29 +0100 (CET)", "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n by mails.dpdk.org (Postfix) with ESMTP id E664D427EB\n for <dts@dpdk.org>; Tue, 22 Nov 2022 07:19:27 +0100 (CET)", "from orsmga002.jf.intel.com ([10.7.209.21])\n by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 21 Nov 2022 22:19:27 -0800", "from unknown (HELO localhost.localdomain) ([10.239.252.222])\n by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 21 Nov 2022 22:19:24 -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=1669097968; x=1700633968;\n h=from:to:cc:subject:date:message-id:mime-version:\n content-transfer-encoding;\n bh=XgQiJKTOiT47rfz9ba4LyNeoxFG6HkHf34yxg53zLeU=;\n b=Qz9vwvk83qt7AHmPknWQRP/wqgdR9kOhBamkSMz1x+XOUYO+gI2LQvnl\n BQylt0HdaWOgH0Q9aSMgrBGU0sWjDsduDmrN4PxtM2QuxUENsITmKLFBK\n 8vuXnCYZSXS8hHO/IC3Pswu8z0VjLeZms9odFLssnaVPFWKQ+Emhqcxj/\n sQM9pt67tysNeXQY284SL6iJ8laUE2rtIb/02n9jgpkF5hgkXIHuDCUYy\n W5PhzKBJ9Wsm7BI+T0DoSHLjUA7iQyKlB+P/fF8d2zFJN1OzfCrrlQl2q\n 8/iw0P7l5Ox5XqFaDKluxrplMMEzGjob2iX90jRZFko1SyOlUjCGZqCJu g==;", "X-IronPort-AV": [ "E=McAfee;i=\"6500,9779,10538\"; a=\"297099562\"", "E=Sophos;i=\"5.96,183,1665471600\"; d=\"scan'208\";a=\"297099562\"", "E=McAfee;i=\"6500,9779,10538\"; a=\"641303368\"", "E=Sophos;i=\"5.96,183,1665471600\"; d=\"scan'208\";a=\"641303368\"" ], "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/vhost_virtio_user_interrupt_cbdma: modify\n testsuite by DPDK changed", "Date": "Tue, 22 Nov 2022 14:13:37 +0800", "Message-Id": "<20221122061337.2891957-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": "1.From DPDK-22.11, the dmas parameter have changed, so modify the dmas\nparameter in the testuite.\n2.Add new testcase 4 and 5 to test split and packed ring path with\nmulti-queues scene.\n\nSigned-off-by: Wei Ling <weix.ling@intel.com>\n---\n ...Suite_vhost_virtio_user_interrupt_cbdma.py | 207 +++++++++++++-----\n 1 file changed, 151 insertions(+), 56 deletions(-)", "diff": "diff --git a/tests/TestSuite_vhost_virtio_user_interrupt_cbdma.py b/tests/TestSuite_vhost_virtio_user_interrupt_cbdma.py\nindex e3dc51a9..19a45589 100644\n--- a/tests/TestSuite_vhost_virtio_user_interrupt_cbdma.py\n+++ b/tests/TestSuite_vhost_virtio_user_interrupt_cbdma.py\n@@ -10,6 +10,7 @@ Virtio-user interrupt need test with l3fwd-power sample\n import re\n import time\n \n+import framework.packet as packet\n import framework.utils as utils\n from framework.pmd_output import PmdOutput\n from framework.test_case import TestCase\n@@ -77,21 +78,29 @@ class TestVirtioUserInterruptCbdma(TestCase):\n )\n return True if out == \"2048\" else False\n \n- def launch_l3fwd(self, path, packed=False):\n- self.core_interrupt = self.l3fwd_core_list[0]\n+ def launch_l3fwd(self, path, packed=False, multi_queue=False):\n+ if multi_queue:\n+ queues = 2\n+ else:\n+ queues = 1\n example_para = \"./%s \" % self.app_l3fwd_power_path\n if not packed:\n- vdev = \"virtio_user0,path=%s,cq=1\" % path\n+ vdev = \"virtio_user0,path=%s,queues=%d\" % (path, queues)\n else:\n- vdev = \"virtio_user0,path=%s,cq=1,packed_vq=1\" % path\n+ vdev = \"virtio_user0,path=%s,queues=%d,packed_vq=1\" % (path, queues)\n eal_params = self.dut.create_eal_parameters(\n cores=self.l3fwd_core_list, prefix=\"l3fwd-pwd\", no_pci=True, vdevs=[vdev]\n )\n if self.check_2M_env:\n eal_params += \" --single-file-segments\"\n- para = (\n- \" --config='(0,0,%s)' --parse-ptype --interrupt-only\" % self.core_interrupt\n- )\n+ if not multi_queue:\n+ config = \" --config='(0,0,%s)'\" % self.l3fwd_core_list[0]\n+ else:\n+ config = \" --config='(0,0,%s),(0,1,%s)'\" % (\n+ self.l3fwd_core_list[0],\n+ self.l3fwd_core_list[1],\n+ )\n+ para = config + \" --parse-ptype --interrupt-only\"\n cmd_l3fwd = example_para + eal_params + \" --log-level='user1,7' -- -p 1 \" + para\n self.l3fwd.get_session_before(timeout=2)\n self.l3fwd.send_expect(cmd_l3fwd, \"POWER\", 40)\n@@ -102,13 +111,19 @@ class TestVirtioUserInterruptCbdma(TestCase):\n else:\n self.logger.info(\"Launch l3fwd-power sample finished\")\n \n- def check_interrupt_log(self, status, out):\n+ def check_interrupt_log(self, status, out, multi_queue=False):\n if status == \"waked up\":\n info = \"lcore %s is waked up from rx interrupt on port 0 queue 0\"\n elif status == \"sleeps\":\n info = \"lcore %s sleeps until interrupt triggers\"\n- info = info % self.core_interrupt\n- self.verify(info in out, \"The CPU status not right for %s\" % info)\n+ if not multi_queue:\n+ info = info % self.l3fwd_core_list[0]\n+ self.verify(info in out, \"The CPU status not right for %s\" % info)\n+ else:\n+ info1 = info % self.l3fwd_core_list[0]\n+ self.verify(info1 in out, \"The CPU status not right for %s\" % info)\n+ info2 = info % self.l3fwd_core_list[0]\n+ self.verify(info2 in out, \"The CPU status not right for %s\" % info)\n \n def check_virtio_side_link_status(self, status):\n out = self.virtio_pmd.execute_cmd(\"show port info 0\")\n@@ -168,6 +183,24 @@ class TestVirtioUserInterruptCbdma(TestCase):\n 60,\n )\n \n+ def send_packet(self, multi_queue=False):\n+ pkt_count = 100\n+ pkt = packet.Packet()\n+ if not multi_queue:\n+ scapy_pkt = 'Ether(dst=\"52:54:00:00:00:01\")/IP(src=\"192.168.0.1\")/(\"X\"*64)'\n+ pkt.update_pkt(scapy_pkt)\n+ pkt.send_pkt(crb=self.tester, tx_port=self.tx_interface, count=pkt_count)\n+ else:\n+ pkt_list = []\n+ for i in range(pkt_count):\n+ scapy_pkt = (\n+ 'Ether(dst=\"52:54:00:00:00:01\")/IP(src=\"192.168.0.%d\")/(\"X\"*64)'\n+ % (i + 1)\n+ )\n+ pkt_list.append(scapy_pkt)\n+ pkt.update_pkt(pkt_list)\n+ pkt.send_pkt(crb=self.tester, tx_port=self.tx_interface)\n+\n def test_split_ring_lsc_event_between_vhost_user_and_virtio_user_with_cbdma_enable(\n self,\n ):\n@@ -175,10 +208,13 @@ class TestVirtioUserInterruptCbdma(TestCase):\n Test Case1: Split ring LSC event between vhost-user and virtio-user with cbdma enable\n \"\"\"\n self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=1)\n- lcore_dma = \"lcore%s@%s\" % (self.vhost_core_list[1], self.cbdma_list[0])\n- vhost_param = \"--lcore-dma=[%s]\" % lcore_dma\n+ dmas = \"txq0@%s;\" \"rxq0@%s\" % (\n+ self.cbdma_list[0],\n+ self.cbdma_list[0],\n+ )\n+ vhost_param = \"\"\n vhost_eal_param = (\n- \"--vdev 'net_vhost0,iface=vhost-net,queues=1,client=0,dmas=[txq0;rxq0]'\"\n+ \"--vdev 'net_vhost0,iface=vhost-net,queues=1,client=0,dmas=[%s]'\" % dmas\n )\n ports = self.cbdma_list\n self.vhost_pmd.start_testpmd(\n@@ -213,16 +249,14 @@ class TestVirtioUserInterruptCbdma(TestCase):\n \"\"\"\n Test Case2: Split ring virtio-user interrupt test with vhost-user as backend and cbdma enable\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.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=1)\n+ dmas = \"txq0@%s;\" \"rxq0@%s\" % (\n+ self.cbdma_list[0],\n self.cbdma_list[0],\n- self.vhost_core_list[1],\n- self.cbdma_list[1],\n )\n- vhost_param = \"--rxq=1 --txq=1 --lcore-dma=[%s]\" % lcore_dma\n+ vhost_param = \"--rxq=1 --txq=1\"\n vhost_eal_param = (\n- \"--vdev 'net_vhost0,iface=vhost-net,queues=1,dmas=[txq0;rxq0]'\"\n+ \"--vdev 'net_vhost0,iface=vhost-net,queues=1,dmas=[%s]'\" % dmas\n )\n ports = self.cbdma_list\n ports.append(self.dut.ports_info[0][\"pci\"])\n@@ -236,20 +270,10 @@ class TestVirtioUserInterruptCbdma(TestCase):\n )\n self.vhost_pmd.execute_cmd(\"start\")\n self.launch_l3fwd(path=\"./vhost-net\")\n- # double check the status of interrupt core\n- for _ in range(2):\n- self.tester.scapy_append(\n- 'pk=[Ether(dst=\"52:54:00:00:00:01\")/IP()/(\"X\"*64)]'\n- )\n- self.tester.scapy_append(\n- 'sendp(pk, iface=\"%s\", count=100)' % self.tx_interface\n- )\n- self.tester.scapy_execute()\n- time.sleep(3)\n- out = self.l3fwd.get_session_before()\n- self.logger.info(out)\n- self.check_interrupt_log(status=\"waked up\", out=out)\n- self.check_interrupt_log(status=\"sleeps\", out=out)\n+ self.send_packet()\n+ out = self.l3fwd.get_session_before()\n+ self.check_interrupt_log(status=\"waked up\", out=out)\n+ self.check_interrupt_log(status=\"sleeps\", out=out)\n \n def test_packed_ring_lsc_event_between_vhost_user_and_virtio_user_with_cbdma_enable(\n self,\n@@ -258,10 +282,13 @@ class TestVirtioUserInterruptCbdma(TestCase):\n Test Case3: Packed ring LSC event between vhost-user and virtio-user with cbdma enable\n \"\"\"\n self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=1)\n- lcore_dma = \"lcore%s@%s\" % (self.vhost_core_list[1], self.cbdma_list[0])\n- vhost_param = \"--lcore-dma=[%s]\" % lcore_dma\n+ dmas = \"txq0@%s;\" \"rxq0@%s\" % (\n+ self.cbdma_list[0],\n+ self.cbdma_list[0],\n+ )\n+ vhost_param = \"--tx-offloads=0x00\"\n vhost_eal_param = (\n- \"--vdev 'net_vhost0,iface=vhost-net,queues=1,client=0,dmas=[txq0;rxq0]'\"\n+ \"--vdev 'net_vhost0,iface=vhost-net,queues=1,client=0,dmas=[%s]'\" % dmas\n )\n ports = self.cbdma_list\n self.vhost_pmd.start_testpmd(\n@@ -296,16 +323,14 @@ class TestVirtioUserInterruptCbdma(TestCase):\n \"\"\"\n Test Case4: Packed ring virtio-user interrupt test with vhost-user as backend and cbdma enable\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.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=1)\n+ dmas = \"txq0@%s;\" \"rxq0@%s\" % (\n+ self.cbdma_list[0],\n self.cbdma_list[0],\n- self.vhost_core_list[1],\n- self.cbdma_list[1],\n )\n- vhost_param = \"--rxq=1 --txq=1 --lcore-dma=[%s]\" % lcore_dma\n+ vhost_param = \"--rxq=1 --txq=1\"\n vhost_eal_param = (\n- \"--vdev 'net_vhost0,iface=vhost-net,queues=1,dmas=[txq0;rxq0]'\"\n+ \"--vdev 'net_vhost0,iface=vhost-net,queues=1,dmas=[%s]'\" % dmas\n )\n ports = self.cbdma_list\n ports.append(self.dut.ports_info[0][\"pci\"])\n@@ -318,20 +343,90 @@ class TestVirtioUserInterruptCbdma(TestCase):\n )\n self.vhost_pmd.execute_cmd(\"start\")\n self.launch_l3fwd(path=\"./vhost-net\", packed=True)\n- # double check the status of interrupt core\n- for _ in range(2):\n- self.tester.scapy_append(\n- 'pk=[Ether(dst=\"52:54:00:00:00:01\")/IP()/(\"X\"*64)]'\n+ self.send_packet()\n+ out = self.l3fwd.get_session_before()\n+ self.check_interrupt_log(status=\"waked up\", out=out)\n+ self.check_interrupt_log(status=\"sleeps\", out=out)\n+\n+ def test_split_ring_multi_queues_virtio_user_interrupt_test_with_vhost_user_as_backend_and_cbdma_enable(\n+ self,\n+ ):\n+ \"\"\"\n+ Test Case 5: Split ring multi-queues virtio-user interrupt test with vhost-user as backend and cbdma enable\n+ \"\"\"\n+ self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=1)\n+ dmas = (\n+ \"txq0@%s;\"\n+ \"rxq0@%s;\"\n+ \"txq1@%s;\"\n+ \"rxq1@%s\"\n+ % (\n+ self.cbdma_list[0],\n+ self.cbdma_list[0],\n+ self.cbdma_list[0],\n+ self.cbdma_list[0],\n )\n- self.tester.scapy_append(\n- 'sendp(pk, iface=\"%s\", count=100)' % self.tx_interface\n+ )\n+ vhost_param = \"--rxq=2 --txq=2\"\n+ vhost_eal_param = (\n+ \"--vdev 'net_vhost0,iface=vhost-net,queues=2,dmas=[%s]'\" % dmas\n+ )\n+ ports = self.cbdma_list\n+ ports.append(self.dut.ports_info[0][\"pci\"])\n+ self.logger.info(ports)\n+ self.vhost_pmd.start_testpmd(\n+ cores=self.vhost_core_list,\n+ ports=ports,\n+ prefix=\"vhost\",\n+ eal_param=vhost_eal_param,\n+ param=vhost_param,\n+ )\n+ self.vhost_pmd.execute_cmd(\"start\")\n+ self.launch_l3fwd(path=\"./vhost-net\", multi_queue=True)\n+ self.send_packet(multi_queue=True)\n+ out = self.l3fwd.get_session_before()\n+ self.check_interrupt_log(status=\"waked up\", out=out)\n+ self.check_interrupt_log(status=\"sleeps\", out=out)\n+\n+ def test_packed_ring_multi_queues_virtio_user_interrupt_test_with_vhost_user_as_backend_and_cbdma_enable(\n+ self,\n+ ):\n+ \"\"\"\n+ Test Case 6: Packed ring multi-queues virtio-user interrupt test with vhost-user as backend and cbdma enable\n+ \"\"\"\n+ self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=1)\n+ dmas = (\n+ \"txq0@%s;\"\n+ \"rxq0@%s;\"\n+ \"txq1@%s;\"\n+ \"rxq1@%s\"\n+ % (\n+ self.cbdma_list[0],\n+ self.cbdma_list[0],\n+ self.cbdma_list[0],\n+ self.cbdma_list[0],\n )\n- self.tester.scapy_execute()\n- time.sleep(3)\n- out = self.l3fwd.get_session_before()\n- self.logger.info(out)\n- self.check_interrupt_log(status=\"waked up\", out=out)\n- self.check_interrupt_log(status=\"sleeps\", out=out)\n+ )\n+ vhost_param = \"--rxq=2 --txq=2\"\n+ vhost_eal_param = (\n+ \"--vdev 'net_vhost0,iface=vhost-net,queues=2,dmas=[%s]'\" % dmas\n+ )\n+ ports = self.cbdma_list\n+ ports.append(self.dut.ports_info[0][\"pci\"])\n+ self.logger.info(ports)\n+ self.vhost_pmd.start_testpmd(\n+ cores=self.vhost_core_list,\n+ ports=ports,\n+ prefix=\"vhost\",\n+ eal_param=vhost_eal_param,\n+ param=vhost_param,\n+ )\n+ self.vhost_pmd.execute_cmd(\"start\")\n+ self.launch_l3fwd(path=\"./vhost-net\", packed=True, multi_queue=True)\n+ self.send_packet(multi_queue=True)\n+ out = self.l3fwd.get_session_before()\n+ self.check_interrupt_log(status=\"waked up\", out=out)\n+ self.check_interrupt_log(status=\"sleeps\", out=out)\n \n def tear_down(self):\n \"\"\"\n", "prefixes": [ "V2", "2/2" ] }