From patchwork Tue Nov 22 07:13:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 120053 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 96119A057F; Tue, 22 Nov 2022 08:19:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 90E9042D4B; Tue, 22 Nov 2022 08:19:24 +0100 (CET) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id CDB30427EB for ; Tue, 22 Nov 2022 08:19:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669101563; x=1700637563; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=w5Mz7bQdkTzIqtbo05MygBOVTvNXoFjGm1MX0CHdE+c=; b=JmTzPmxovslEV0gVQqTZIUulvGG4h//W/HHOwfMT56ydbKKXJTEMXZhu RfNM6fHbUnQRA8aZ8hp+GaNZP0qK417D0LlU4KJA2d6msdyRBvrszGxYm Hdsi/Tj0h4h7+8Y21vUwjt6xEF6tZreNpzPbEeU6ETEV0vaXAzmmG56jy 7DCcANmycf2zujQvqvOIpvYV84dTlOqReZEfqddJs+it9n0VsjXjJCAZ8 7TL9uy3agS8hiaaA7h/pJ2tVEjd60gK2deg8UsMRgUuoRjHnnAeTmrrQv XenchhoHJrGcuU75wYYXVPjNmWGFTjzvXIxu4TaAUkWbE1JRB2WtafWft g==; X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="375896386" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208,223";a="375896386" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 23:19:22 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="747235817" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208,223";a="747235817" Received: from unknown (HELO localhost.localdomain) ([10.239.252.222]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 23:19:19 -0800 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V3 2/2] tests/virtio_event_idx_interrupt_cbdma: modify the dmas parameter by DPDK changed Date: Tue, 22 Nov 2022 15:13:31 +0800 Message-Id: <20221122071331.2895321-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 From DPDK-22.11, the dmas parameter have changed, so modify the dmas parameter in the testuite. Signed-off-by: Wei Ling --- ...tSuite_virtio_event_idx_interrupt_cbdma.py | 244 ++++++++++-------- 1 file changed, 140 insertions(+), 104 deletions(-) diff --git a/tests/TestSuite_virtio_event_idx_interrupt_cbdma.py b/tests/TestSuite_virtio_event_idx_interrupt_cbdma.py index c5d7af18..20919131 100644 --- a/tests/TestSuite_virtio_event_idx_interrupt_cbdma.py +++ b/tests/TestSuite_virtio_event_idx_interrupt_cbdma.py @@ -260,9 +260,12 @@ class TestVirtioIdxInterruptCbdma(TestCase): Test Case1: Split ring virtio-pci driver reload test with CBDMA enable """ self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=1) - lcore_dma = "lcore%s@%s" % (self.vhost_core_list[1], self.cbdma_list[0]) - vhost_param = "--nb-cores=1 --txd=1024 --rxd=1024 --lcore-dma=[%s]" % lcore_dma - vhost_eal_param = "--vdev 'net_vhost,iface=vhost-net,queues=1,dmas=[txq0;rxq0]'" + dmas = "txq0@%s;rxq0@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], + ) + vhost_param = "--nb-cores=1 --txd=1024 --rxd=1024" + vhost_eal_param = "--vdev 'net_vhost,iface=vhost-net,queues=1,dmas=[%s]'" % dmas ports = self.cbdma_list ports.append(self.dut.ports_info[0]["pci"]) self.vhost_pmd.start_testpmd( @@ -287,63 +290,78 @@ class TestVirtioIdxInterruptCbdma(TestCase): Test Case2: Split ring 16 queues virtio-net event idx interrupt mode test with cbdma enable """ self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True) - lcore_dma = ( - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s" + dmas = ( + "txq0@%s;" + "txq1@%s;" + "txq2@%s;" + "txq3@%s;" + "txq4@%s;" + "txq5@%s;" + "txq6@%s;" + "txq7@%s;" + "txq8@%s;" + "txq9@%s;" + "txq10@%s;" + "txq11@%s;" + "txq12@%s;" + "txq13@%s;" + "txq14@%s;" + "txq15@%s;" + "rxq0@%s;" + "rxq1@%s;" + "rxq2@%s;" + "rxq3@%s;" + "rxq4@%s;" + "rxq5@%s;" + "rxq6@%s;" + "rxq7@%s;" + "rxq8@%s;" + "rxq9@%s;" + "rxq10@%s;" + "rxq11@%s;" + "rxq12@%s;" + "rxq13@%s;" + "rxq14@%s;" + "rxq15@%s" % ( - self.vhost_core_list[1], self.cbdma_list[0], - self.vhost_core_list[2], + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[1], + self.cbdma_list[1], + self.cbdma_list[1], + self.cbdma_list[1], + self.cbdma_list[1], + self.cbdma_list[1], self.cbdma_list[1], - self.vhost_core_list[3], self.cbdma_list[2], - self.vhost_core_list[4], + self.cbdma_list[2], + self.cbdma_list[2], + self.cbdma_list[2], + self.cbdma_list[2], + self.cbdma_list[2], + self.cbdma_list[2], + self.cbdma_list[2], + self.cbdma_list[3], + self.cbdma_list[3], + self.cbdma_list[3], + self.cbdma_list[3], + self.cbdma_list[3], + self.cbdma_list[3], + self.cbdma_list[3], self.cbdma_list[3], - self.vhost_core_list[5], - self.cbdma_list[4], - self.vhost_core_list[6], - self.cbdma_list[5], - self.vhost_core_list[7], - self.cbdma_list[6], - self.vhost_core_list[8], - self.cbdma_list[7], - self.vhost_core_list[9], - self.cbdma_list[8], - self.vhost_core_list[10], - self.cbdma_list[9], - self.vhost_core_list[11], - self.cbdma_list[10], - self.vhost_core_list[12], - self.cbdma_list[11], - self.vhost_core_list[13], - self.cbdma_list[12], - self.vhost_core_list[14], - self.cbdma_list[13], - self.vhost_core_list[15], - self.cbdma_list[14], - self.vhost_core_list[16], - self.cbdma_list[15], ) ) - vhost_param = ( - "--nb-cores=16 --txd=1024 --rxd=1024 --rxq=16 --txq=16 --lcore-dma=[%s]" - % lcore_dma + vhost_param = "--nb-cores=16 --txd=1024 --rxd=1024 --rxq=16 --txq=16" + vhost_eal_param = ( + "--vdev 'net_vhost,iface=vhost-net,queues=16,client=1,dmas=[%s]'" % dmas ) - vhost_eal_param = "--vdev 'net_vhost,iface=vhost-net,queues=16,client=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]'" ports = self.cbdma_list ports.append(self.dut.ports_info[0]["pci"]) self.vhost_pmd.start_testpmd( @@ -369,9 +387,12 @@ class TestVirtioIdxInterruptCbdma(TestCase): Test Case3: Packed ring virtio-pci driver reload test with CBDMA enable """ self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=1) - lcore_dma = "lcore%s@%s" % (self.vhost_core_list[1], self.cbdma_list[0]) - vhost_param = "--nb-cores=1 --txd=1024 --rxd=1024 --lcore-dma=[%s]" % lcore_dma - vhost_eal_param = "--vdev 'net_vhost,iface=vhost-net,queues=1,dmas=[txq0;rxq0]'" + dmas = "txq0@%s;rxq0@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], + ) + vhost_param = "--nb-cores=1 --txd=1024 --rxd=1024" + vhost_eal_param = "--vdev 'net_vhost,iface=vhost-net,queues=1,dmas=[%s]'" % dmas ports = self.cbdma_list ports.append(self.dut.ports_info[0]["pci"]) self.vhost_pmd.start_testpmd( @@ -396,63 +417,78 @@ class TestVirtioIdxInterruptCbdma(TestCase): Test Case4: Packed ring 16 queues virtio-net event idx interrupt mode test with cbdma enable """ self.get_cbdma_ports_info_and_bind_to_dpdk(16, allow_diff_socket=True) - lcore_dma = ( - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s" + dmas = ( + "txq0@%s;" + "txq1@%s;" + "txq2@%s;" + "txq3@%s;" + "txq4@%s;" + "txq5@%s;" + "txq6@%s;" + "txq7@%s;" + "txq8@%s;" + "txq9@%s;" + "txq10@%s;" + "txq11@%s;" + "txq12@%s;" + "txq13@%s;" + "txq14@%s;" + "txq15@%s;" + "rxq0@%s;" + "rxq1@%s;" + "rxq2@%s;" + "rxq3@%s;" + "rxq4@%s;" + "rxq5@%s;" + "rxq6@%s;" + "rxq7@%s;" + "rxq8@%s;" + "rxq9@%s;" + "rxq10@%s;" + "rxq11@%s;" + "rxq12@%s;" + "rxq13@%s;" + "rxq14@%s;" + "rxq15@%s" % ( - self.vhost_core_list[1], self.cbdma_list[0], - self.vhost_core_list[2], + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[1], + self.cbdma_list[1], + self.cbdma_list[1], + self.cbdma_list[1], + self.cbdma_list[1], + self.cbdma_list[1], self.cbdma_list[1], - self.vhost_core_list[3], self.cbdma_list[2], - self.vhost_core_list[4], + self.cbdma_list[2], + self.cbdma_list[2], + self.cbdma_list[2], + self.cbdma_list[2], + self.cbdma_list[2], + self.cbdma_list[2], + self.cbdma_list[2], + self.cbdma_list[3], + self.cbdma_list[3], + self.cbdma_list[3], + self.cbdma_list[3], + self.cbdma_list[3], + self.cbdma_list[3], + self.cbdma_list[3], self.cbdma_list[3], - self.vhost_core_list[5], - self.cbdma_list[4], - self.vhost_core_list[6], - self.cbdma_list[5], - self.vhost_core_list[7], - self.cbdma_list[6], - self.vhost_core_list[8], - self.cbdma_list[7], - self.vhost_core_list[9], - self.cbdma_list[8], - self.vhost_core_list[10], - self.cbdma_list[9], - self.vhost_core_list[11], - self.cbdma_list[10], - self.vhost_core_list[12], - self.cbdma_list[11], - self.vhost_core_list[13], - self.cbdma_list[12], - self.vhost_core_list[14], - self.cbdma_list[13], - self.vhost_core_list[15], - self.cbdma_list[14], - self.vhost_core_list[16], - self.cbdma_list[15], ) ) - vhost_param = ( - "--nb-cores=16 --txd=1024 --rxd=1024 --rxq=16 --txq=16 --lcore-dma=[%s]" - % lcore_dma + vhost_param = "--nb-cores=16 --txd=1024 --rxd=1024 --rxq=16 --txq=16" + vhost_eal_param = ( + "--vdev 'net_vhost,iface=vhost-net,queues=16,client=1,dmas=[%s]'" % dmas ) - vhost_eal_param = "--vdev 'net_vhost,iface=vhost-net,queues=16,client=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]'" ports = self.cbdma_list ports.append(self.dut.ports_info[0]["pci"]) self.vhost_pmd.start_testpmd(