From patchwork Thu May 19 08:13:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 111390 Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id BF805A0503; Thu, 19 May 2022 10:15:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B72DF42B6D; Thu, 19 May 2022 10:15:07 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id BC29A40222 for ; Thu, 19 May 2022 10:15:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652948106; x=1684484106; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=2cy/PgUT3TKo0wnXxn8LbehE1pWyfdAlynuhz4Ae9EI=; b=HbqLODKX9ufEVluKkeXEJoEFbGS7MY0t7sUfmATjgQL28FJFrAVU/tag qMPOi/AFb9eWl4z1sdjFPY0XK9KfH0FvefHEtiq5lnLCBIERGS7AwAp/J fFOovMLmCv30TSeYqi4DTMLnp9RK3t7uVW7JLmDr9XYj0+A+NMhR/Qafd ajJ03BgX9MzhdY78phrM4sXYiUS8s2GdJW9XhNLTJkK3ggC8Z7JkfcQrU vMrVA/X4Fb6kUWfR7EfDBmwXoJ2eetzQsRCpIbB/39qYZmQN19qcZl8WR WmR/9JjL5FEmjErCqmxRGRZUTJKmQvAPPwpRtoRSR1w5iehovzMf31MDw w==; X-IronPort-AV: E=McAfee;i="6400,9594,10351"; a="270910446" X-IronPort-AV: E=Sophos;i="5.91,237,1647327600"; d="scan'208";a="270910446" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 May 2022 01:15:05 -0700 X-IronPort-AV: E=Sophos;i="5.91,237,1647327600"; d="scan'208";a="714871683" Received: from unknown (HELO localhost.localdomain) ([10.239.251.222]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 May 2022 01:15:04 -0700 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V1 1/5] test_plans/index: add vhost_user_interrupt_cbdma testsuite Date: Thu, 19 May 2022 04:13:43 -0400 Message-Id: <20220519081343.2815993-1-weix.ling@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Add vhost_user_interrupt_cbdma_test_plan into test_plans/index.rst. Signed-off-by: Wei Ling --- test_plans/index.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/test_plans/index.rst b/test_plans/index.rst index 6978a2ef..00118a4b 100644 --- a/test_plans/index.rst +++ b/test_plans/index.rst @@ -169,6 +169,7 @@ The following are the test plans for the DPDK DTS automated test system. speed_capabilities_test_plan vhost_cbdma_test_plan vhost_user_interrupt_test_plan + vhost_user_interrupt_cbdma_test_plan sriov_kvm_test_plan stability_test_plan stats_checks_test_plan From patchwork Thu May 19 08:13:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 111391 Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id E0B62A0503; Thu, 19 May 2022 10:15:17 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DBF5042B6E; Thu, 19 May 2022 10:15:17 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id 61B5640222 for ; Thu, 19 May 2022 10:15:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652948116; x=1684484116; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=jeFSDjJAqODRQBZlg9f3vlLWxl7+zIVw0GJ6KRW12/U=; b=lqxW9eWSqZjv6z75yExsdqmQRH+avc+hECoLUobbTcQnKviHbDlvLNjH 2bXqMz5JwH4jqldwX2DalHLRXAuDo8+gv1+Ay24wnzcomYuJfDejg1baC 7Cb1oql6LInxB86ot5vI8FxAJtDmWKi7260QmKRygM/k/bS4Q1Kh5k9wp mcsToUb63/Hi19dAlGK8UrIQVkEoO9oGp2g4y/vld6cy7QVeTrK22enfH OzFbadLmLDiSLZKzAww8RuGh7VdSwMA2BFdv86muSyuguca8nct11F9Cr J3KyxjaqYDNZ8N6cm5dWQ4YjY0SywR0skUlii1CIpnUZepSQZRQStERTK A==; X-IronPort-AV: E=McAfee;i="6400,9594,10351"; a="272044988" X-IronPort-AV: E=Sophos;i="5.91,237,1647327600"; d="scan'208";a="272044988" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 May 2022 01:15:15 -0700 X-IronPort-AV: E=Sophos;i="5.91,237,1647327600"; d="scan'208";a="714871721" Received: from unknown (HELO localhost.localdomain) ([10.239.251.222]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 May 2022 01:15:14 -0700 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V1 2/5] test_plans/vhost_user_interrupt_test_plan: migrate CBDMA related testcase to new testsuite Date: Thu, 19 May 2022 04:13:53 -0400 Message-Id: <20220519081353.2816053-1-weix.ling@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Migrate CBDMA related testcase to new testsuite. Signed-off-by: Wei Ling --- test_plans/vhost_user_interrupt_test_plan.rst | 42 ------------------- 1 file changed, 42 deletions(-) diff --git a/test_plans/vhost_user_interrupt_test_plan.rst b/test_plans/vhost_user_interrupt_test_plan.rst index fd9394c3..cb2dae75 100644 --- a/test_plans/vhost_user_interrupt_test_plan.rst +++ b/test_plans/vhost_user_interrupt_test_plan.rst @@ -127,45 +127,3 @@ Test Case4: Wake up packed ring vhost-user cores with l3fwd-power sample when m testpmd>start 4. Stop and restart testpmd again, check vhost-user cores will sleep and wakeup again. - -Test Case5: Wake up split ring vhost-user cores with l3fwd-power sample when multi queues and cbdma are enabled -=============================================================================================================== - -1. Launch virtio-user with server mode:: - - ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --no-pci --file-prefix=virtio \ - --vdev=net_virtio_user0,mac=00:11:22:33:44:10,path=/tmp/sock0,server=1,queues=4 -- -i --rxq=4 --txq=4 --rss-ip - -2. Bind 4 cbdma ports to vfio-pci driver, then launch l3fwd-power with a virtual vhost device:: - - ./x86_64-native-linuxapp-gcc/examples/dpdk-l3fwd-power -l 9-12 -n 4 --log-level=9 \ - --vdev 'eth_vhost0,iface=/tmp/sock0,queues=4,client=1,dmas=[txq0@80:04.0;txq1@80:04.1;txq2@80:04.2;txq3@80:04.3]' -- -p 0x1 --parse-ptype 1 \ - --config "(0,0,9),(0,1,10),(0,2,11),(0,3,12)" - -3. Send packet by testpmd, check vhost-user multi-cores will keep wakeup status:: - - testpmd>set fwd txonly - testpmd>start - -4. Stop and restart testpmd again, check vhost-user cores will sleep and wakeup again. - -Test Case6: Wake up packed ring vhost-user cores with l3fwd-power sample when multi queues and cbdma are enabled -================================================================================================================ - -1. Launch virtio-user with server mode:: - - ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --no-pci --file-prefix=virtio \ - --vdev=net_virtio_user0,mac=00:11:22:33:44:10,path=/tmp/sock0,server=1,queues=4,packed_vq=1 -- -i --rxq=4 --txq=4 --rss-ip - -2. Bind 4 cbdma ports to vfio-pci driver, then launch l3fwd-power with a virtual vhost device:: - - ./x86_64-native-linuxapp-gcc/examples/dpdk-l3fwd-power -l 9-12 -n 4 --log-level=9 \ - --vdev 'eth_vhost0,iface=/tmp/sock0,queues=4,client=1,dmas=[txq0@80:04.0;txq1@80:04.1;txq2@80:04.2;txq3@80:04.3]' -- -p 0x1 --parse-ptype 1 \ - --config "(0,0,9),(0,1,10),(0,2,11),(0,3,12)" - -3. Send packet by testpmd, check vhost-user multi-cores will keep wakeup status:: - - testpmd>set fwd txonly - testpmd>start - -4. Stop and restart testpmd again, check vhost-user cores will sleep and wakeup again. \ No newline at end of file From patchwork Thu May 19 08:14:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 111392 Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id 0D55BA0503; Thu, 19 May 2022 10:15:27 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 07F7342B73; Thu, 19 May 2022 10:15:27 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 2BEE940222 for ; Thu, 19 May 2022 10:15:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652948125; x=1684484125; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=55AcUF6Exch4BpErEZhgZwP9TDOqnYd5F/jaL69Mm6k=; b=Z811Kt2RB1ZaIUwADFW+nPF971HGLSmbQw6zEFbuffDlc9nDZkiyMs9A zTKYTFXobMUTlf4b8Gl8yphjviynyRa6Y/00I2ItSTdUHLYq+3tzC2gVx 7LmmgLuOpmqWqNykb45beTBG8MgxnFkFLj1ZnPRrzX6K+HB7fByNk/ivM wTgEB84EkOuer1Ko/w6a2avbj5YTvnRgG6rhZg+uFnzrJMahekr0kHJTi 4pDICLkkl86o0HRE3MQkWeSenSejXIyjqWKxdRbvY89Ufd4+3fRWGbW/T nMow+Z5angK97hmPz8THJGr6Tcvp2EEbY10XULg0Vig8p2d6azOGeDdOi g==; X-IronPort-AV: E=McAfee;i="6400,9594,10351"; a="271783791" X-IronPort-AV: E=Sophos;i="5.91,237,1647327600"; d="scan'208";a="271783791" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 May 2022 01:15:24 -0700 X-IronPort-AV: E=Sophos;i="5.91,237,1647327600"; d="scan'208";a="714871785" Received: from unknown (HELO localhost.localdomain) ([10.239.251.222]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 May 2022 01:15:23 -0700 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V1 3/5] tests/vhost_user_interrupt: migrate CBDMA related testcase to new testsuite Date: Thu, 19 May 2022 04:14:02 -0400 Message-Id: <20220519081402.2816113-1-weix.ling@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Migrate CBDMA related testcase to new testsuite. Signed-off-by: Wei Ling --- tests/TestSuite_vhost_user_interrupt.py | 129 +++--------------------- 1 file changed, 13 insertions(+), 116 deletions(-) diff --git a/tests/TestSuite_vhost_user_interrupt.py b/tests/TestSuite_vhost_user_interrupt.py index cba66294..cf55e382 100644 --- a/tests/TestSuite_vhost_user_interrupt.py +++ b/tests/TestSuite_vhost_user_interrupt.py @@ -56,13 +56,8 @@ class TestVhostUserInterrupt(TestCase): self.app_testpmd_path = self.dut.apps_name["test-pmd"] self.testpmd_name = self.app_testpmd_path.split("/")[-1] self.l3fwdpower_name = self.app_l3fwd_power_path.split("/")[-1] - self.dut_ports = self.dut.get_ports() self.ports_socket = self.dut.get_numa_id(self.dut_ports[0]) - # get cbdma device - self.cbdma_dev_infos = [] - self.dmas_info = None - self.device_str = None def set_up(self): """ @@ -93,7 +88,7 @@ class TestVhostUserInterrupt(TestCase): self.core_list_virtio = core_list[0 : self.queues + 1] self.core_list_l3fwd = core_list[self.queues + 1 : need_num] - def lanuch_virtio_user(self, packed=False, cbdma=False): + def lanuch_virtio_user(self, packed=False): """ launch virtio-user with server mode """ @@ -104,18 +99,13 @@ class TestVhostUserInterrupt(TestCase): else "net_virtio_user0,mac=%s,path=./vhost-net,server=1,queues=%d,packed_vq=1" % (self.vmac, self.queues) ) - if cbdma == True: - eal_params = self.dut.create_eal_parameters( - cores=self.core_list_virtio, prefix="virtio", no_pci=True, vdevs=[vdev] - ) - else: - eal_params = self.dut.create_eal_parameters( - cores=self.core_list_virtio, - prefix="virtio", - no_pci=True, - ports=[self.pci_info], - vdevs=[vdev], - ) + eal_params = self.dut.create_eal_parameters( + cores=self.core_list_virtio, + prefix="virtio", + no_pci=True, + ports=[self.pci_info], + vdevs=[vdev], + ) if self.check_2M_env: eal_params += " --single-file-segments" para = " -- -i --rxq=%d --txq=%d --rss-ip" % (self.queues, self.queues) @@ -124,59 +114,6 @@ class TestVhostUserInterrupt(TestCase): command_line_client, "waiting for client connection...", 120 ) - def get_cbdma_ports_info_and_bind_to_dpdk(self, cbdma_num): - """ - get all cbdma ports - """ - out = self.dut.send_expect( - "./usertools/dpdk-devbind.py --status-dev dma", "# ", 30 - ) - device_info = out.split("\n") - for device in device_info: - pci_info = re.search("\s*(0000:\S*:\d*.\d*)", device) - if pci_info is not None: - dev_info = pci_info.group(1) - # the numa id of ioat dev, only add the device which - # on same socket with nic dev - bus = int(dev_info[5:7], base=16) - if bus >= 128: - cur_socket = 1 - else: - cur_socket = 0 - if self.ports_socket == cur_socket: - self.cbdma_dev_infos.append(pci_info.group(1)) - self.verify( - len(self.cbdma_dev_infos) >= cbdma_num, - "There no enough cbdma device to run this suite", - ) - used_cbdma = self.cbdma_dev_infos[0:cbdma_num] - dmas_info = "" - for dmas in used_cbdma: - number = used_cbdma.index(dmas) - dmas = "txq{}@{};".format(number, dmas) - dmas_info += dmas - self.dmas_info = dmas_info[:-1] - self.device_str = " ".join(used_cbdma) - self.dut.send_expect( - "./usertools/dpdk-devbind.py --force --bind=%s %s" - % (self.drivername, self.device_str), - "# ", - 60, - ) - - def bind_cbdma_device_to_kernel(self): - if self.device_str is not None: - self.dut.send_expect("modprobe ioatdma", "# ") - self.dut.send_expect( - "./usertools/dpdk-devbind.py -u %s" % self.device_str, "# ", 30 - ) - self.dut.send_expect( - "./usertools/dpdk-devbind.py --force --bind=ioatdma %s" - % self.device_str, - "# ", - 60, - ) - @property def check_2M_env(self): out = self.dut.send_expect( @@ -184,7 +121,7 @@ class TestVhostUserInterrupt(TestCase): ) return True if out == "2048" else False - def lanuch_l3fwd_power(self, cbdma=False): + def lanuch_l3fwd_power(self): """ launch l3fwd-power with a virtual vhost device """ @@ -199,23 +136,10 @@ class TestVhostUserInterrupt(TestCase): self.verify_info.append(info) example_cmd = self.app_l3fwd_power_path + " " - if cbdma == True: - example_cmd += " --log-level=9 " - self.get_cbdma_ports_info_and_bind_to_dpdk(4) - vdev = "'net_vhost0,iface=vhost-net,queues=%d,client=1,dmas=[%s]'" % ( - self.queues, - self.dmas_info, - ) - eal_params = self.dut.create_eal_parameters( - cores=self.core_list_l3fwd, - ports=self.cbdma_dev_infos[0:4], - vdevs=[vdev], - ) - else: - vdev = "net_vhost0,iface=vhost-net,queues=%d,client=1" % self.queues - eal_params = self.dut.create_eal_parameters( - cores=self.core_list_l3fwd, no_pci=True, vdevs=[vdev] - ) + vdev = "net_vhost0,iface=vhost-net,queues=%d,client=1" % self.queues + eal_params = self.dut.create_eal_parameters( + cores=self.core_list_l3fwd, no_pci=True, vdevs=[vdev] + ) para = " -- -p 0x1 --parse-ptype 1 --config '%s' --interrupt-only" % config_info command_line_client = example_cmd + eal_params + para self.vhost.get_session_before(timeout=2) @@ -315,32 +239,6 @@ class TestVhostUserInterrupt(TestCase): self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20) self.send_and_verify() - def test_wake_up_split_ring_vhost_user_core_with_l3fwd_power_sample_when_multi_queues_enabled_and_cbdma_enabled( - self, - ): - """ - Test Case5: Wake up split ring vhost-user cores with l3fwd-power sample when multi queues and cbdma are enabled - """ - self.queues = 4 - self.get_core_list() - self.lanuch_virtio_user(cbdma=True) - self.lanuch_l3fwd_power(cbdma=True) - self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20) - self.send_and_verify() - - def test_wake_up_packed_ring_vhost_user_core_with_l3fwd_power_sample_when_multi_queues_enabled_and_cbdma_enabled( - self, - ): - """ - Test Case6: Wake up packed ring vhost-user cores with l3fwd-power sample when multi queues and cbdma are enabled - """ - self.queues = 4 - self.get_core_list() - self.lanuch_virtio_user(packed=True, cbdma=True) - self.lanuch_l3fwd_power(cbdma=True) - self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20) - self.send_and_verify() - def tear_down(self): """ Run after each test case. @@ -349,7 +247,6 @@ class TestVhostUserInterrupt(TestCase): self.dut.send_expect("killall %s" % self.l3fwdpower_name, "#") self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#") self.dut.kill_all() - self.bind_cbdma_device_to_kernel() def tear_down_all(self): """ From patchwork Thu May 19 08:14:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 111393 Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id 33A93A0503; Thu, 19 May 2022 10:15:42 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2E4C740222; Thu, 19 May 2022 10:15:42 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id 17A1940156 for ; Thu, 19 May 2022 10:15:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652948140; x=1684484140; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=c0j70kNAfqK1R2sWMjB02m39Zgg2FVvhtizK1aRtRwg=; b=Rl4Pxr60WtAg8as+1HbW8dKboJFn+nuIdjVvwt7kIc9j5uw1XZHid67s hRJ38flXlVro1KhYksgcqbrS47LnPFWxQmgFNAWSlS0I9IGu0RJ/YluEh H502aSMe2SMHoK0BWP3QylXl9yo5zyB55DAYYqcS2BY7Y4d23eMBAFvEA b63HkLwVLQTxbt4SrP091GXI+8ff73jArDsmF2uDWVYS5lvO1X5cDEWMF kbEjnkWWnkioUCjKua/HexT4Wnl/ubZTx3++cI7ol4Yao/mxQzmMGJm6V ScoGIOovcicsFw89TMLJ80kf1UVkRjznoa2OWMBPyE5gtzmPHkyBBsOkO Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10351"; a="259661266" X-IronPort-AV: E=Sophos;i="5.91,237,1647327600"; d="scan'208";a="259661266" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 May 2022 01:15:39 -0700 X-IronPort-AV: E=Sophos;i="5.91,237,1647327600"; d="scan'208";a="714871844" Received: from unknown (HELO localhost.localdomain) ([10.239.251.222]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 May 2022 01:15:37 -0700 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V1 4/5] test_plans/vhost_user_interrupt_cbdma_test_plan: add new testsuite for CBDMA related testcases Date: Thu, 19 May 2022 04:14:16 -0400 Message-Id: <20220519081416.2816173-1-weix.ling@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Add new testsuite for CBDMA related testcases. Signed-off-by: Wei Ling --- .../vhost_user_interrupt_cbdma_test_plan.rst | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 test_plans/vhost_user_interrupt_cbdma_test_plan.rst diff --git a/test_plans/vhost_user_interrupt_cbdma_test_plan.rst b/test_plans/vhost_user_interrupt_cbdma_test_plan.rst new file mode 100644 index 00000000..b29e0bb3 --- /dev/null +++ b/test_plans/vhost_user_interrupt_cbdma_test_plan.rst @@ -0,0 +1,89 @@ +.. Copyright (c) <2022>, Intel Corporation + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + - Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + - Neither the name of Intel Corporation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + OF THE POSSIBILITY OF SUCH DAMAGE. + +=================================== +vhost-user interrupt mode test plan +=================================== + +Description +=========== + +Vhost-user interrupt need test with l3fwd-power sample with CBDMA channel, small packets send from virtio-user to vhost side， +check vhost-user cores can be wakeup，and vhost-user cores should be back to sleep after stop sending packets +from virtio side. + +Test flow +========= + +Virtio-user --> Vhost-user + +Test Case1: Wake up split ring vhost-user cores with l3fwd-power sample when multi queues and cbdma are enabled +=============================================================================================================== + +1. Launch virtio-user with server mode:: + + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --no-pci --file-prefix=virtio \ + --vdev=net_virtio_user0,mac=00:11:22:33:44:10,path=/tmp/sock0,server=1,queues=4 -- -i --rxq=4 --txq=4 --rss-ip + +2. Bind 4 cbdma ports to vfio-pci driver, then launch l3fwd-power with a virtual vhost device:: + + ./x86_64-native-linuxapp-gcc/examples/dpdk-l3fwd-power -l 9-12 -n 4 --log-level=9 \ + --vdev 'eth_vhost0,iface=/tmp/sock0,queues=4,client=1,dmas=[txq0@80:04.0;txq1@80:04.1;txq2@80:04.2;txq3@80:04.3]' -- -p 0x1 --parse-ptype 1 \ + --config "(0,0,9),(0,1,10),(0,2,11),(0,3,12)" + +3. Send packet by testpmd, check vhost-user multi-cores will keep wakeup status:: + + testpmd>set fwd txonly + testpmd>start + +4. Stop and restart testpmd again, check vhost-user cores will sleep and wakeup again. + +Test Case2: Wake up packed ring vhost-user cores with l3fwd-power sample when multi queues and cbdma are enabled +================================================================================================================ + +1. Launch virtio-user with server mode:: + + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --no-pci --file-prefix=virtio \ + --vdev=net_virtio_user0,mac=00:11:22:33:44:10,path=/tmp/sock0,server=1,queues=4,packed_vq=1 -- -i --rxq=4 --txq=4 --rss-ip + +2. Bind 4 cbdma ports to vfio-pci driver, then launch l3fwd-power with a virtual vhost device:: + + ./x86_64-native-linuxapp-gcc/examples/dpdk-l3fwd-power -l 9-12 -n 4 --log-level=9 \ + --vdev 'eth_vhost0,iface=/tmp/sock0,queues=4,client=1,dmas=[txq0@80:04.0;txq1@80:04.1;txq2@80:04.2;txq3@80:04.3]' -- -p 0x1 --parse-ptype 1 \ + --config "(0,0,9),(0,1,10),(0,2,11),(0,3,12)" + +3. Send packet by testpmd, check vhost-user multi-cores will keep wakeup status:: + + testpmd>set fwd txonly + testpmd>start + +4. Stop and restart testpmd again, check vhost-user cores will sleep and wakeup again. \ No newline at end of file From patchwork Thu May 19 08:14:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 111394 Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id 5A51CA0503; Thu, 19 May 2022 10:15:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5470140156; Thu, 19 May 2022 10:15:51 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 8A45740140 for ; Thu, 19 May 2022 10:15:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652948149; x=1684484149; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=IyXaCcEaqhFqm15Lwn9o7EIHv1vtLJ42qBHS0jMSJHA=; b=VAXk9xVr8CDYApoGPzxs+6YXodpOcSW8nDM7vQnQ4pJRPijecDf4wXwg 9Ubt7P2xQhahdpWOwlGNCRCr2dGjmjPCTgWKcSIfS61NzqrvfC0/x/8pY TAOwvs3mdZBbaHYCprSbW0DPu+Z/Bk7HEtM8lanMRhfT1lBErw7JwY8NC ibejenYyECgUkrG6TP9AmvbHBs3uzouP9mUT1d7/zFjlXJd0I9HRmORBi q0L7IVJd6S0sYexUI2MNIoWbyMpVLfShb/sP3rMM+iMzeKz6plbRqNxkP v+v/torUBljs+TEt8sXt2a1yJ4XfqCcPpSO0mqG5Q+Yh/cNxZ+OAPn7mo Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10351"; a="251984501" X-IronPort-AV: E=Sophos;i="5.91,237,1647327600"; d="scan'208";a="251984501" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 May 2022 01:15:48 -0700 X-IronPort-AV: E=Sophos;i="5.91,237,1647327600"; d="scan'208";a="714871897" Received: from unknown (HELO localhost.localdomain) ([10.239.251.222]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 May 2022 01:15:47 -0700 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V1 5/5] tests/vhost_user_interrupt_cbdma: add new testsuite for CBDMA related testcases Date: Thu, 19 May 2022 04:14:26 -0400 Message-Id: <20220519081426.2816233-1-weix.ling@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Add new testsuite for CBDMA related testcases. Signed-off-by: Wei Ling Tested-by: Chenyu Huang Acked-by: Xingguang He --- tests/TestSuite_vhost_user_interrupt_cbdma.py | 296 ++++++++++++++++++ 1 file changed, 296 insertions(+) create mode 100644 tests/TestSuite_vhost_user_interrupt_cbdma.py diff --git a/tests/TestSuite_vhost_user_interrupt_cbdma.py b/tests/TestSuite_vhost_user_interrupt_cbdma.py new file mode 100644 index 00000000..ca0b6ee8 --- /dev/null +++ b/tests/TestSuite_vhost_user_interrupt_cbdma.py @@ -0,0 +1,296 @@ +# BSD LICENSE +# +# Copyright (c) <2022>, Intel Corporation. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Intel Corporation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +""" +DPDK Test suite. +Vhost enqueue interrupt need test with l3fwd-power sample +""" + +import re +import time + +import framework.utils as utils +from framework.test_case import TestCase + + +class TestVhostUserInterruptCbdma(TestCase): + def set_up_all(self): + """ + Run at the start of each test suite. + + """ + self.queues = 1 + self.cores_num = len([n for n in self.dut.cores if int(n["socket"]) == 0]) + self.vmac = "00:11:22:33:44:10" + self.pci_info = self.dut.ports_info[0]["pci"] + self.prepare_l3fwd_power() + self.app_l3fwd_power_path = self.dut.apps_name["l3fwd-power"] + self.app_testpmd_path = self.dut.apps_name["test-pmd"] + self.testpmd_name = self.app_testpmd_path.split("/")[-1] + self.l3fwdpower_name = self.app_l3fwd_power_path.split("/")[-1] + + self.dut_ports = self.dut.get_ports() + self.ports_socket = self.dut.get_numa_id(self.dut_ports[0]) + # get cbdma device + self.cbdma_dev_infos = [] + self.dmas_info = None + self.device_str = None + + def set_up(self): + """ + Run before each test case. + """ + # Clean the execution ENV + self.verify_info = [] + self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#") + self.dut.send_expect("killall %s" % self.l3fwdpower_name, "#") + self.dut.send_expect("rm -rf ./vhost-net*", "#") + self.vhost = self.dut.new_session(suite="vhost-l3fwd") + self.virtio_user = self.dut.new_session(suite="virtio-user") + + def prepare_l3fwd_power(self): + out = self.dut.build_dpdk_apps("examples/l3fwd-power") + self.verify("Error" not in out, "compilation l3fwd-power error") + + def get_core_list(self): + """ + get core list depend on the core number + """ + need_num = 2 * self.queues + 1 + self.core_config = "1S/%dC/1T" % need_num + self.verify( + self.cores_num >= need_num, "There has not enought cores to test this case" + ) + core_list = self.dut.get_core_list(self.core_config) + self.core_list_virtio = core_list[0 : self.queues + 1] + self.core_list_l3fwd = core_list[self.queues + 1 : need_num] + + def lanuch_virtio_user(self, packed=False): + """ + launch virtio-user with server mode + """ + vdev = ( + "net_virtio_user0,mac=%s,path=./vhost-net,server=1,queues=%d" + % (self.vmac, self.queues) + if not packed + else "net_virtio_user0,mac=%s,path=./vhost-net,server=1,queues=%d,packed_vq=1" + % (self.vmac, self.queues) + ) + eal_params = self.dut.create_eal_parameters( + cores=self.core_list_virtio, prefix="virtio", no_pci=True, vdevs=[vdev] + ) + + if self.check_2M_env: + eal_params += " --single-file-segments" + para = " -- -i --rxq=%d --txq=%d --rss-ip" % (self.queues, self.queues) + command_line_client = self.app_testpmd_path + " " + eal_params + para + self.virtio_user.send_expect( + command_line_client, "waiting for client connection...", 120 + ) + + def get_cbdma_ports_info_and_bind_to_dpdk(self, cbdma_num): + """ + get all cbdma ports + """ + out = self.dut.send_expect( + "./usertools/dpdk-devbind.py --status-dev dma", "# ", 30 + ) + device_info = out.split("\n") + for device in device_info: + pci_info = re.search("\s*(0000:\S*:\d*.\d*)", device) + if pci_info is not None: + dev_info = pci_info.group(1) + # the numa id of ioat dev, only add the device which + # on same socket with nic dev + bus = int(dev_info[5:7], base=16) + if bus >= 128: + cur_socket = 1 + else: + cur_socket = 0 + if self.ports_socket == cur_socket: + self.cbdma_dev_infos.append(pci_info.group(1)) + self.verify( + len(self.cbdma_dev_infos) >= cbdma_num, + "There no enough cbdma device to run this suite", + ) + used_cbdma = self.cbdma_dev_infos[0:cbdma_num] + dmas_info = "" + for dmas in used_cbdma: + number = used_cbdma.index(dmas) + dmas = "txq{}@{};".format(number, dmas) + dmas_info += dmas + self.dmas_info = dmas_info[:-1] + self.device_str = " ".join(used_cbdma) + self.dut.send_expect( + "./usertools/dpdk-devbind.py --force --bind=%s %s" + % (self.drivername, self.device_str), + "# ", + 60, + ) + + def bind_cbdma_device_to_kernel(self): + if self.device_str is not None: + self.dut.send_expect("modprobe ioatdma", "# ") + self.dut.send_expect( + "./usertools/dpdk-devbind.py -u %s" % self.device_str, "# ", 30 + ) + self.dut.send_expect( + "./usertools/dpdk-devbind.py --force --bind=ioatdma %s" + % self.device_str, + "# ", + 60, + ) + + @property + def check_2M_env(self): + out = self.dut.send_expect( + "cat /proc/meminfo |grep Hugepagesize|awk '{print($2)}'", "# " + ) + return True if out == "2048" else False + + def lanuch_l3fwd_power(self): + """ + launch l3fwd-power with a virtual vhost device + """ + self.logger.info("Launch l3fwd_sample sample:") + # config the interrupt cores + config_info = "" + for i in range(self.queues): + if config_info != "": + config_info += "," + config_info += "(0,%d,%s)" % (i, self.core_list_l3fwd[i]) + info = {"core": self.core_list_l3fwd[i], "port": 0, "queue": i} + self.verify_info.append(info) + + example_cmd = self.app_l3fwd_power_path + " " + example_cmd += " --log-level=9 " + self.get_cbdma_ports_info_and_bind_to_dpdk(4) + vdev = "'net_vhost0,iface=vhost-net,queues=%d,client=1,dmas=[%s]'" % ( + self.queues, + self.dmas_info, + ) + eal_params = self.dut.create_eal_parameters( + cores=self.core_list_l3fwd, + ports=self.cbdma_dev_infos[0:4], + vdevs=[vdev], + ) + para = " -- -p 0x1 --parse-ptype 1 --config '%s' --interrupt-only" % config_info + command_line_client = example_cmd + eal_params + para + self.vhost.get_session_before(timeout=2) + self.vhost.send_expect(command_line_client, "POWER", 40) + time.sleep(10) + out = self.vhost.get_session_before() + if "Error" in out and "Error opening" not in out: + self.logger.error("Launch l3fwd-power sample error") + else: + self.logger.info("Launch l3fwd-power sample finished") + + def check_vhost_core_status(self, status): + """ + check the cpu status + """ + out = self.vhost.get_session_before() + for i in range(len(self.verify_info)): + if status == "waked up": + info = "lcore %s is waked up from rx interrupt on port %d queue %d" + info = info % ( + self.verify_info[i]["core"], + self.verify_info[i]["port"], + self.verify_info[i]["queue"], + ) + elif status == "sleeps": + info = ( + "lcore %s sleeps until interrupt triggers" + % self.verify_info[i]["core"] + ) + self.verify(info in out, "The CPU status not right for %s" % info) + self.logger.info(info) + + def send_and_verify(self): + """ + start to send packets and check the cpu status + stop and restart to send packets and check the cpu status + """ + self.virtio_user.send_expect("start", "testpmd> ", 20) + self.check_vhost_core_status("waked up") + + self.virtio_user.send_expect("stop", "testpmd> ", 20) + self.check_vhost_core_status("sleeps") + + self.virtio_user.send_expect("start", "testpmd> ", 20) + self.check_vhost_core_status("waked up") + + def close_testpmd_and_session(self): + self.virtio_user.send_expect("quit", "#", 20) + self.dut.close_session(self.vhost) + self.dut.close_session(self.virtio_user) + + def test_wake_up_split_ring_vhost_user_core_with_l3fwd_power_sample_when_multi_queues_enabled_and_cbdma_enabled( + self, + ): + """ + Test Case1: Wake up split ring vhost-user cores with l3fwd-power sample when multi queues and cbdma are enabled + """ + self.queues = 4 + self.get_core_list() + self.lanuch_virtio_user(packed=False) + self.lanuch_l3fwd_power() + self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20) + self.send_and_verify() + + def test_wake_up_packed_ring_vhost_user_core_with_l3fwd_power_sample_when_multi_queues_enabled_and_cbdma_enabled( + self, + ): + """ + Test Case2: Wake up packed ring vhost-user cores with l3fwd-power sample when multi queues and cbdma are enabled + """ + self.queues = 4 + self.get_core_list() + self.lanuch_virtio_user(packed=True) + self.lanuch_l3fwd_power() + self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20) + self.send_and_verify() + + def tear_down(self): + """ + Run after each test case. + """ + self.close_testpmd_and_session() + self.dut.send_expect("killall %s" % self.l3fwdpower_name, "#") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#") + self.dut.kill_all() + self.bind_cbdma_device_to_kernel() + + def tear_down_all(self): + """ + Run after each test suite. + """ + pass