From patchwork Thu May 19 06:19:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 111349 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 E7655A0503; Thu, 19 May 2022 08:21:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E13DA40DF7; Thu, 19 May 2022 08:21:23 +0200 (CEST) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id C913240140 for ; Thu, 19 May 2022 08:21:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652941283; x=1684477283; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=Fa/WafxLS7k0X5GMnaASi6BKERoAUBbZHw/iiM5+kcM=; b=MU4e7jk1PkMLo/ulVs0NGLSWhZEm36nQ07qNHzmO8d1SIeN2MUOWS0W8 K5ALC0xKiRIW5xcZJxIDmhD7WJj4KvDagl+XwcjxKxkMzV8txk/+1m8qR ORQA6gqBp3zOQdUez8skkEjtS3RiefXNfj46GqbzWHo5riVw3AWjCoA2U DKvsdyqbtOW+dMNqrNWk9Sg8UMH2uGy9WkVGrnxzG8zeOc97UcFQJkGI6 1f5V/cFrW4bo81ob4sI59ZFLTa6GQUa9BEXbR87NNXTqk8UwHtpf+/Nvv fWu3cAgIwC7V3RuvT4Q4pBj9XdOzWWTFgc4dc6Rt2SpFjvDGq5NnwyQDY g==; X-IronPort-AV: E=McAfee;i="6400,9594,10351"; a="332663578" X-IronPort-AV: E=Sophos;i="5.91,236,1647327600"; d="scan'208";a="332663578" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 May 2022 23:21:20 -0700 X-IronPort-AV: E=Sophos;i="5.91,236,1647327600"; d="scan'208";a="714829380" Received: from unknown (HELO localhost.localdomain) ([10.239.251.222]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 May 2022 23:21:19 -0700 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V1 2/2] tests/vhost_virtio_pmd_interrupt: delete CBDMA related testcases and code Date: Thu, 19 May 2022 02:19:58 -0400 Message-Id: <20220519061958.2812767-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 Delete CBDMA related testcases and code. Signed-off-by: Wei Ling Tested-by: Chenyu Huang Acked-by: Xingguang He --- tests/TestSuite_vhost_virtio_pmd_interrupt.py | 111 ++---------------- 1 file changed, 7 insertions(+), 104 deletions(-) diff --git a/tests/TestSuite_vhost_virtio_pmd_interrupt.py b/tests/TestSuite_vhost_virtio_pmd_interrupt.py index e541b5e3..147877fc 100644 --- a/tests/TestSuite_vhost_virtio_pmd_interrupt.py +++ b/tests/TestSuite_vhost_virtio_pmd_interrupt.py @@ -75,7 +75,6 @@ class TestVhostVirtioPmdInterrupt(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.device_str = None def set_up(self): """ @@ -110,30 +109,19 @@ class TestVhostVirtioPmdInterrupt(TestCase): self.vm_dut.send_expect("modprobe vfio-pci", "#") self.vm_dut.ports_info[0]["port"].bind_driver("vfio-pci") - def start_testpmd_on_vhost(self, dmas=None): + def start_testpmd_on_vhost(self): """ start testpmd on vhost side """ # get the core list depend on current nb_cores number self.get_core_list() testcmd = self.app_testpmd_path + " " - if dmas: - device_str = self.device_str.split(" ") - device_str.append(self.pci_info) - vdev = [ - "'net_vhost0,iface=%s/vhost-net,queues=%d,dmas=[%s]'" - % (self.base_dir, self.queues, dmas) - ] - eal_params = self.dut.create_eal_parameters( - cores=self.core_list, ports=device_str, vdevs=vdev - ) - else: - vdev = [ - "net_vhost0,iface=%s/vhost-net,queues=%d" % (self.base_dir, self.queues) - ] - eal_params = self.dut.create_eal_parameters( - cores=self.core_list, ports=[self.pci_info], vdevs=vdev - ) + vdev = [ + "net_vhost0,iface=%s/vhost-net,queues=%d" % (self.base_dir, self.queues) + ] + eal_params = self.dut.create_eal_parameters( + cores=self.core_list, ports=[self.pci_info], vdevs=vdev + ) para = " -- -i --nb-cores=%d --rxq=%d --txq=%d --rss-ip" % ( self.nb_cores, self.queues, @@ -307,47 +295,6 @@ class TestVhostVirtioPmdInterrupt(TestCase): self.check_related_cores_status_in_l3fwd(out, "waked up", fix_ip=True) self.check_related_cores_status_in_l3fwd(out, "sleeps", fix_ip=True) - 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 - ) - cbdma_dev_infos = re.findall("\s*(0000:\S+:\d+.\d+)", out) - self.verify( - len(cbdma_dev_infos) >= cbdma_num, - "There no enough cbdma device to run this suite", - ) - - used_cbdma = 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, - ) - def stop_all_apps(self): """ close all vms @@ -355,7 +302,6 @@ class TestVhostVirtioPmdInterrupt(TestCase): if self.vm_dut is not None: vm_dut2 = self.vm_dut.create_session(name="vm_dut2") vm_dut2.send_expect("killall %s" % self.l3fwdpower_name, "# ", 10) - # self.vm_dut.send_expect("killall l3fwd-power", "# ", 60, alt_session=True) self.vm_dut.send_expect("cp /tmp/main.c ./examples/l3fwd-power/", "#", 15) out = self.vm_dut.build_dpdk_apps("examples/l3fwd-power") self.vm.stop() @@ -411,48 +357,6 @@ class TestVhostVirtioPmdInterrupt(TestCase): self.launch_l3fwd_power_in_vm() self.send_and_verify() - def test_perf_virtio_interrupt_with_16_queues_and_cbdma_enabled(self): - """ - Test Case 5: Basic virtio interrupt test with 16 queues and cbdma enabled - """ - used_cbdma_num = 16 - self.queues = 16 - self.nb_cores = 16 - self.get_cbdma_ports_info_and_bind_to_dpdk(used_cbdma_num) - self.start_testpmd_on_vhost(self.dmas_info) - self.start_vms(mode=0) - self.prepare_vm_env() - self.launch_l3fwd_power_in_vm() - self.send_and_verify() - - def test_perf_virtio10_interrupt_with_4_queues_and_cbdma_enabled(self): - """ - Test Case 6: Basic virtio-1.0 interrupt test with 4 queues and cbdma enabled - """ - used_cbdma_num = 4 - self.queues = 4 - self.nb_cores = 4 - self.get_cbdma_ports_info_and_bind_to_dpdk(used_cbdma_num) - self.start_testpmd_on_vhost(self.dmas_info) - self.start_vms(mode=1) - self.prepare_vm_env() - self.launch_l3fwd_power_in_vm() - self.send_and_verify() - - def test_perf_packed_ring_virtio_interrupt_with_16_queues_and_cbdma_enabled(self): - """ - Test Case 7: Packed ring virtio interrupt test with 16 queues and cbdma enabled - """ - used_cbdma_num = 16 - self.queues = 16 - self.nb_cores = 16 - self.get_cbdma_ports_info_and_bind_to_dpdk(used_cbdma_num) - self.start_testpmd_on_vhost(self.dmas_info) - self.start_vms(mode=0, packed=True) - self.prepare_vm_env() - self.launch_l3fwd_power_in_vm() - self.send_and_verify() - def tear_down(self): """ Run after each test case. @@ -461,7 +365,6 @@ class TestVhostVirtioPmdInterrupt(TestCase): self.dut.kill_all() self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#") self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") - self.bind_cbdma_device_to_kernel() def tear_down_all(self): """