From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A838BA057F; Tue, 22 Nov 2022 09:48:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9D7A942D4E; Tue, 22 Nov 2022 09:48:38 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id B23DB427EB for ; Tue, 22 Nov 2022 09:48:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669106916; x=1700642916; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=gIDrdD2+HOURaq5b7NMVTRJpapRruzD5uJdEXHVVZXY=; b=btQ+FgaW1Txvtuqc8b4689ib2Do+5PhAxC2hdsz9HYyF6GHYW7zBUdvO xxNGsfd+Wauy6+HtVLT4dLFn0/WZdEN9qPnD64HJBnP61qshJ4O+wwLnu +Uxww5W12X0mybiJ7r/gw4/WSffMEOHPnxW4rIu0mmzfRW4U4kp6hJXoG Khz+Pegn4HvGek5MnLTl/552K/vdVptyd1aJPvoZ3jOBlJPBm5xhTQrAG BqUEGizHuAzUHONRgsIoNYVAKe7QzSj1zL9tewB6NQU9+1yhqeoACZJKD QenYFF3eBlLT7Aa0vKSWRNdt/dqE4ZYmJmNZuW+dEpJL30+OExymPaHKs g==; X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="400056865" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208,223";a="400056865" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Nov 2022 00:48:26 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="641344439" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208,223";a="641344439" Received: from unknown (HELO localhost.localdomain) ([10.239.252.222]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Nov 2022 00:48:21 -0800 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V2 2/2] tests/vm2vm_virtio_user_cbdma: modify the dmas parameter by DPDK changed Date: Tue, 22 Nov 2022 16:42:36 +0800 Message-Id: <20221122084236.2897661-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 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 testsuite. Signed-off-by: Wei Ling --- tests/TestSuite_vm2vm_virtio_user_cbdma.py | 1150 ++++++++++---------- 1 file changed, 596 insertions(+), 554 deletions(-) diff --git a/tests/TestSuite_vm2vm_virtio_user_cbdma.py b/tests/TestSuite_vm2vm_virtio_user_cbdma.py index 47d67846..cac9fe82 100644 --- a/tests/TestSuite_vm2vm_virtio_user_cbdma.py +++ b/tests/TestSuite_vm2vm_virtio_user_cbdma.py @@ -29,7 +29,7 @@ class TestVM2VMVirtioUserCbdma(TestCase): self.cores_list = self.dut.get_core_list(config="all", socket=self.ports_socket) self.vhost_core_list = self.cores_list[0:9] self.virtio0_core_list = self.cores_list[10:13] - self.virtio1_core_list = self.cores_list[13:15] + self.virtio1_core_list = self.cores_list[13:16] self.vhost_user = self.dut.new_session(suite="vhost-user") self.virtio_user0 = self.dut.new_session(suite="virtio-user0") self.virtio_user1 = self.dut.new_session(suite="virtio-user1") @@ -328,32 +328,35 @@ class TestVM2VMVirtioUserCbdma(TestCase): """ Test Case 1: VM2VM split ring non-mergeable path multi-queues payload check with cbdma enable """ - self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=2) - lcore_dma = "lcore%s@%s," "lcore%s@%s" % ( - self.vhost_core_list[1], + self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=4) + dmas1 = "txq0@%s;txq1@%s;rxq0@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + ) + dmas2 = "txq1@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], self.cbdma_list[0], - self.vhost_core_list[1], - self.cbdma_list[1], ) vhost_eal_param = ( - "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[txq0;txq1;rxq0]'" - + " --vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[txq0;rxq0;rxq1]'" + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) ) vhost_param = ( - " --nb-cores=1 --rxq=2 --txq=2 --txd=4096 --rxd=4096 --no-flush-rx" - + " --lcore-dma=[%s]" % lcore_dma + " --nb-cores=2 --rxq=2 --txq=2 --txd=4096 --rxd=4096 --no-flush-rx" ) self.start_vhost_testpmd( cores=self.vhost_core_list, eal_param=vhost_eal_param, param=vhost_param, - ports=self.cbdma_list, + ports=self.cbdma_list[0:1], iova_mode="va", ) - virtio1_eal_param = "--vdev=net_virtio_user1,mac=00:01:02:03:04:05,path=./vhost-net1,queues=2,server=1,mrg_rxbuf=0,in_order=0,queue_size=4096" virtio1_param = ( - " --enable-hw-vlan-strip --nb-cores=1 --rxq=2 --txq=2 --txd=4096 --rxd=4096" + " --enable-hw-vlan-strip --nb-cores=2 --rxq=2 --txq=2 --txd=4096 --rxd=4096" ) self.start_virtio_testpmd_with_vhost_net1( cores=self.virtio1_core_list, @@ -364,7 +367,7 @@ class TestVM2VMVirtioUserCbdma(TestCase): virtio0_eal_param = "--vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net0,queues=2,server=1,mrg_rxbuf=0,in_order=0,queue_size=4096" virtio0_param = ( - " --enable-hw-vlan-strip --nb-cores=1 --rxq=2 --txq=2 --txd=4096 --rxd=4096" + " --enable-hw-vlan-strip --nb-cores=2 --rxq=2 --txq=2 --txd=4096 --rxd=4096" ) self.start_virtio_testpmd_with_vhost_net0( cores=self.virtio0_core_list, @@ -377,22 +380,41 @@ class TestVM2VMVirtioUserCbdma(TestCase): self.check_virtio_user1_stats(check_dict) self.check_packet_payload_valid(check_dict) - if not self.check_2M_env: - self.vhost_user_pmd.execute_cmd("quit", "#", 60) - self.clear_virtio_user1_stats() - self.start_vhost_testpmd( - cores=self.vhost_core_list, - eal_param=vhost_eal_param, - param=vhost_param, - ports=self.cbdma_list, - iova_mode="pa", - ) - self.start_pdump_to_capture_pkt() + self.vhost_user_pmd.execute_cmd("quit", "#", 60) + self.clear_virtio_user1_stats() + dmas1 = "txq0@%s;txq1@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[1], + ) + dmas2 = "txq0@%s;txq1@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[2], + self.cbdma_list[2], + self.cbdma_list[3], + self.cbdma_list[3], + ) + vhost_eal_param = ( + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) + ) + vhost_param = ( + " --nb-cores=2 --rxq=2 --txq=2 --txd=4096 --rxd=4096 --no-flush-rx" + ) + self.start_vhost_testpmd( + cores=self.vhost_core_list, + eal_param=vhost_eal_param, + param=vhost_param, + ports=self.cbdma_list, + iova_mode="va", + ) + self.start_pdump_to_capture_pkt() - self.send_502_960byte_and_64_64byte_pkts() - check_dict = {960: 502, 64: 64} - self.check_virtio_user1_stats(check_dict) - self.check_packet_payload_valid(check_dict) + self.send_502_960byte_and_64_64byte_pkts() + check_dict = {960: 502, 64: 64} + self.check_virtio_user1_stats(check_dict) + self.check_packet_payload_valid(check_dict) def test_split_ping_inorder_non_mergeable_path_multi_queues_payload_check_with_cbdma_enable( self, @@ -400,39 +422,30 @@ class TestVM2VMVirtioUserCbdma(TestCase): """ Test Case 2: VM2VM split ring inorder non-mergeable path multi-queues payload check with cbdma enable """ - self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=5) - lcore_dma = ( - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s" - % ( - self.vhost_core_list[1], - self.cbdma_list[0], - self.vhost_core_list[1], - self.cbdma_list[1], - self.vhost_core_list[1], - self.cbdma_list[2], - self.vhost_core_list[1], - self.cbdma_list[3], - self.vhost_core_list[1], - self.cbdma_list[4], - ) + self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=4) + dmas1 = "txq0@%s;txq1@%s;rxq0@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + ) + dmas2 = "txq1@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], ) vhost_eal_param = ( - "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[txq0;txq1;rxq0]'" - + " --vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[txq0;rxq0;rxq1]'" + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) ) vhost_param = ( - " --nb-cores=1 --rxq=2 --txq=2 --txd=4096 --rxd=4096 --no-flush-rx" - + " --lcore-dma=[%s]" % lcore_dma + " --nb-cores=1 --rxq=2 --txq=2 --txd=4096 --rxd=4096 --no-flush-rx" ) self.start_vhost_testpmd( cores=self.vhost_core_list, eal_param=vhost_eal_param, param=vhost_param, - ports=self.cbdma_list, + ports=self.cbdma_list[0:1], iova_mode="va", ) @@ -458,22 +471,41 @@ class TestVM2VMVirtioUserCbdma(TestCase): self.check_virtio_user1_stats(check_dict) self.check_packet_payload_valid(check_dict) - if not self.check_2M_env: - self.vhost_user_pmd.execute_cmd("quit", "#", 60) - self.clear_virtio_user1_stats() - self.start_vhost_testpmd( - cores=self.vhost_core_list, - eal_param=vhost_eal_param, - param=vhost_param, - ports=self.cbdma_list, - iova_mode="pa", - ) - self.start_pdump_to_capture_pkt() + self.vhost_user_pmd.execute_cmd("quit", "#", 60) + self.clear_virtio_user1_stats() + dmas1 = "txq0@%s;txq1@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[1], + ) + dmas2 = "txq0@%s;txq1@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[2], + self.cbdma_list[2], + self.cbdma_list[3], + self.cbdma_list[3], + ) + vhost_eal_param = ( + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) + ) + vhost_param = ( + " --nb-cores=1 --rxq=2 --txq=2 --txd=4096 --rxd=4096 --no-flush-rx" + ) + self.start_vhost_testpmd( + cores=self.vhost_core_list, + eal_param=vhost_eal_param, + param=vhost_param, + ports=self.cbdma_list, + iova_mode="va", + ) + self.start_pdump_to_capture_pkt() - self.send_502_64byte_and_64_4640byte_pkts() - check_dict = {64: 502, 4640: 0} - self.check_virtio_user1_stats(check_dict) - self.check_packet_payload_valid(check_dict) + self.send_502_64byte_and_64_4640byte_pkts() + check_dict = {64: 502, 4640: 0} + self.check_virtio_user1_stats(check_dict) + self.check_packet_payload_valid(check_dict) def test_split_ring_verctorized_path_multi_queues_payload_check_with_cbdma_enabled( self, @@ -482,47 +514,29 @@ class TestVM2VMVirtioUserCbdma(TestCase): Test Case 3: VM2VM split ring vectorized path multi-queues payload check with cbdma enable """ self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=8) - 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" - % ( - self.vhost_core_list[1], - self.cbdma_list[0], - self.vhost_core_list[1], - self.cbdma_list[1], - self.vhost_core_list[1], - self.cbdma_list[2], - self.vhost_core_list[1], - self.cbdma_list[3], - self.vhost_core_list[1], - self.cbdma_list[4], - self.vhost_core_list[1], - self.cbdma_list[5], - self.vhost_core_list[1], - self.cbdma_list[6], - self.vhost_core_list[1], - self.cbdma_list[7], - ) + dmas1 = "txq0@%s;txq1@%s;rxq0@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + ) + dmas2 = "txq1@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], ) vhost_eal_param = ( - "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[txq0;txq1;rxq0]'" - + " --vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[txq0;rxq0;rxq1]'" + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) ) vhost_param = ( " --nb-cores=1 --rxq=2 --txq=2 --txd=4096 --rxd=4096 --no-flush-rx" - + " --lcore-dma=[%s]" % lcore_dma ) self.start_vhost_testpmd( cores=self.vhost_core_list, eal_param=vhost_eal_param, param=vhost_param, - ports=self.cbdma_list, + ports=self.cbdma_list[0:1], iova_mode="va", ) @@ -548,22 +562,41 @@ class TestVM2VMVirtioUserCbdma(TestCase): self.check_virtio_user1_stats(check_dict) self.check_packet_payload_valid(check_dict) - if not self.check_2M_env: - self.vhost_user_pmd.execute_cmd("quit", "#", 60) - self.clear_virtio_user1_stats() - self.start_vhost_testpmd( - cores=self.vhost_core_list, - eal_param=vhost_eal_param, - param=vhost_param, - ports=self.cbdma_list, - iova_mode="pa", - ) - self.start_pdump_to_capture_pkt() + self.vhost_user_pmd.execute_cmd("quit", "#", 60) + self.clear_virtio_user1_stats() + dmas1 = "txq0@%s;txq1@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[2], + self.cbdma_list[3], + ) + dmas2 = "txq0@%s;txq1@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[4], + self.cbdma_list[5], + self.cbdma_list[6], + self.cbdma_list[7], + ) + vhost_eal_param = ( + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) + ) + vhost_param = ( + " --nb-cores=1 --rxq=2 --txq=2 --txd=4096 --rxd=4096 --no-flush-rx" + ) + self.start_vhost_testpmd( + cores=self.vhost_core_list, + eal_param=vhost_eal_param, + param=vhost_param, + ports=self.cbdma_list, + iova_mode="va", + ) + self.start_pdump_to_capture_pkt() - self.send_448_64byte_and_54_4640byte_pkts() - check_dict = {64: 448, 4640: 0} - self.check_virtio_user1_stats(check_dict) - self.check_packet_payload_valid(check_dict) + self.send_448_64byte_and_54_4640byte_pkts() + check_dict = {64: 448, 4640: 0} + self.check_virtio_user1_stats(check_dict) + self.check_packet_payload_valid(check_dict) def test_split_ring_inorder_mergeable_path_test_non_indirect_descriptor_with_cbdma_enabled( self, @@ -571,36 +604,28 @@ class TestVM2VMVirtioUserCbdma(TestCase): """ Test Case 4: VM2VM split ring inorder mergeable path test non-indirect descriptor with cbdma enable """ - self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=4) - lcore_dma = ( - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s" - % ( - self.vhost_core_list[1], - self.cbdma_list[0], - self.vhost_core_list[1], - self.cbdma_list[1], - self.vhost_core_list[1], - self.cbdma_list[2], - self.vhost_core_list[1], - self.cbdma_list[3], - ) + self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=8) + dmas1 = "txq0@%s;txq1@%s;rxq0@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], ) - vhost_eal_param = ( - "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[txq0;txq1;rxq0]'" - + " --vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[txq0;rxq0;rxq1]'" + dmas2 = "txq0@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], ) - vhost_param = ( - " --nb-cores=1 --txq=2 --rxq=2 --txd=256 --rxd=256 --no-flush-rx" - + " --lcore-dma=[%s]" % lcore_dma + vhost_eal_param = ( + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) ) + vhost_param = " --nb-cores=1 --rxq=2 --txq=2 --txd=256 --rxd=256 --no-flush-rx" self.start_vhost_testpmd( cores=self.vhost_core_list, eal_param=vhost_eal_param, param=vhost_param, - ports=self.cbdma_list, + ports=self.cbdma_list[0:2], iova_mode="va", ) @@ -626,69 +651,78 @@ class TestVM2VMVirtioUserCbdma(TestCase): self.check_virtio_user1_stats(check_dict) self.check_packet_payload_valid(check_dict) - if not self.check_2M_env: - self.vhost_user_pmd.execute_cmd("quit", "#", 60) - self.virtio_user1_pmd.execute_cmd("quit", "#", 60) - self.virtio_user0_pmd.execute_cmd("quit", "#", 60) - self.start_vhost_testpmd( - cores=self.vhost_core_list, - eal_param=vhost_eal_param, - param=vhost_param, - ports=self.cbdma_list, - iova_mode="pa", - ) - self.start_virtio_testpmd_with_vhost_net1( - cores=self.virtio1_core_list, - eal_param=virtio1_eal_param, - param=virtio1_param, - ) - self.start_pdump_to_capture_pkt() + self.vhost_user_pmd.execute_cmd("quit", "#", 60) + self.virtio_user1_pmd.execute_cmd("quit", "#", 60) + self.virtio_user0_pmd.execute_cmd("quit", "#", 60) + dmas1 = "txq0@%s;txq1@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[2], + self.cbdma_list[3], + ) + dmas2 = "txq0@%s;txq1@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[4], + self.cbdma_list[5], + self.cbdma_list[6], + self.cbdma_list[7], + ) + vhost_eal_param = ( + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) + ) + vhost_param = " --nb-cores=1 --rxq=2 --txq=2 --txd=256 --rxd=256 --no-flush-rx" + self.start_vhost_testpmd( + cores=self.vhost_core_list, + eal_param=vhost_eal_param, + param=vhost_param, + ports=self.cbdma_list, + iova_mode="va", + ) + self.start_virtio_testpmd_with_vhost_net1( + cores=self.virtio1_core_list, + eal_param=virtio1_eal_param, + param=virtio1_param, + ) + self.start_pdump_to_capture_pkt() - self.start_virtio_testpmd_with_vhost_net0( - cores=self.virtio0_core_list, - eal_param=virtio0_eal_param, - param=virtio0_param, - ) + self.start_virtio_testpmd_with_vhost_net0( + cores=self.virtio0_core_list, + eal_param=virtio0_eal_param, + param=virtio0_param, + ) - self.send_502_64byte_and_64_8000byte_pkts() - check_dict = {64: 502, 8000: 2} - self.check_virtio_user1_stats(check_dict) - self.check_packet_payload_valid(check_dict) + self.send_502_64byte_and_64_8000byte_pkts() + check_dict = {64: 502, 8000: 2} + self.check_virtio_user1_stats(check_dict) + self.check_packet_payload_valid(check_dict) def test_split_ring_mergeable_path_test_indirect_descriptor_with_cbdma_enable(self): """ Test Case 5: VM2VM split ring mergeable path test indirect descriptor with cbdma enable """ - self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=4) - lcore_dma = ( - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s" - % ( - self.vhost_core_list[1], - self.cbdma_list[0], - self.vhost_core_list[1], - self.cbdma_list[1], - self.vhost_core_list[1], - self.cbdma_list[2], - self.vhost_core_list[1], - self.cbdma_list[3], - ) + self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=8) + dmas1 = "txq0@%s;txq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], ) - vhost_eal_param = ( - "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[txq0;rxq0;rxq1]'" - + " --vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[txq0;txq1;rxq0]'" + dmas2 = "txq0@%s;rxq1@%s;rxq0@%s" % ( + self.cbdma_list[1], + self.cbdma_list[1], + self.cbdma_list[1], ) - vhost_param = ( - " --nb-cores=1 --rxq=2 --txq=2 --txd=256 --rxd=256 --no-flush-rx" - + " --lcore-dma=[%s]" % lcore_dma + vhost_eal_param = ( + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) ) + vhost_param = " --nb-cores=1 --rxq=2 --txq=2 --txd=256 --rxd=256 --no-flush-rx" self.start_vhost_testpmd( cores=self.vhost_core_list, eal_param=vhost_eal_param, param=vhost_param, - ports=self.cbdma_list, + ports=self.cbdma_list[0:2], iova_mode="va", ) @@ -714,37 +748,50 @@ class TestVM2VMVirtioUserCbdma(TestCase): self.check_virtio_user1_stats(check_dict) self.check_packet_payload_valid(check_dict) - if not self.check_2M_env: - self.vhost_user_pmd.execute_cmd("quit", "#", 60) - self.virtio_user1_pmd.execute_cmd("quit", "#", 60) - self.virtio_user0_pmd.execute_cmd("quit", "#", 60) - vhost_eal_param = ( - "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[txq0;txq1;rxq0;rxq1]'" - + " --vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[txq0;txq1;rxq0;rxq1]'" - ) - self.start_vhost_testpmd( - cores=self.vhost_core_list, - eal_param=vhost_eal_param, - param=vhost_param, - ports=self.cbdma_list, - iova_mode="pa", - ) - self.start_virtio_testpmd_with_vhost_net1( - cores=self.virtio1_core_list, - eal_param=virtio1_eal_param, - param=virtio1_param, - ) - self.start_pdump_to_capture_pkt() - self.start_virtio_testpmd_with_vhost_net0( - cores=self.virtio0_core_list, - eal_param=virtio0_eal_param, - param=virtio0_param, - ) + self.vhost_user_pmd.execute_cmd("quit", "#", 60) + self.virtio_user1_pmd.execute_cmd("quit", "#", 60) + self.virtio_user0_pmd.execute_cmd("quit", "#", 60) + dmas1 = "txq0@%s;txq0@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[2], + self.cbdma_list[3], + ) + dmas2 = "txq0@%s;txq0@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[4], + self.cbdma_list[5], + self.cbdma_list[6], + self.cbdma_list[7], + ) + vhost_eal_param = ( + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) + ) + vhost_param = " --nb-cores=1 --rxq=2 --txq=2 --txd=256 --rxd=256 --no-flush-rx" + self.start_vhost_testpmd( + cores=self.vhost_core_list, + eal_param=vhost_eal_param, + param=vhost_param, + ports=self.cbdma_list, + iova_mode="va", + ) + self.start_virtio_testpmd_with_vhost_net1( + cores=self.virtio1_core_list, + eal_param=virtio1_eal_param, + param=virtio1_param, + ) + self.start_pdump_to_capture_pkt() + self.start_virtio_testpmd_with_vhost_net0( + cores=self.virtio0_core_list, + eal_param=virtio0_eal_param, + param=virtio0_param, + ) - self.send_502_64byte_and_64_8000byte_pkts() - check_dict = {64: 502, 8000: 10} - self.check_virtio_user1_stats(check_dict) - self.check_packet_payload_valid(check_dict) + self.send_502_64byte_and_64_8000byte_pkts() + check_dict = {64: 502, 8000: 10} + self.check_virtio_user1_stats(check_dict) + self.check_packet_payload_valid(check_dict) def test_packed_ring_non_mergeable_path_multi_queues_payload_check_with_cbdma_enable( self, @@ -753,19 +800,25 @@ class TestVM2VMVirtioUserCbdma(TestCase): Test Case 6: VM2VM packed ring non-mergeable path multi-queues payload check with cbdma enable """ self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=2) - lcore_dma = "lcore%s@%s," "lcore%s@%s" % ( - self.vhost_core_list[1], + dmas1 = "txq0@%s;txq1@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[0], + self.cbdma_list[1], + ) + dmas2 = "txq0@%s;txq1@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[1], self.cbdma_list[0], - self.vhost_core_list[1], self.cbdma_list[1], ) vhost_eal_param = ( - "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[txq0;txq1;rxq0;rxq1]'" - + " --vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[txq0;txq1;rxq0;rxq1]'" + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) ) vhost_param = ( " --nb-cores=1 --rxq=2 --txq=2 --txd=4096 --rxd=4096 --no-flush-rx" - + " --lcore-dma=[%s]" % lcore_dma ) self.start_vhost_testpmd( cores=self.vhost_core_list, @@ -801,26 +854,39 @@ class TestVM2VMVirtioUserCbdma(TestCase): self.check_virtio_user1_stats(check_dict) self.check_packet_payload_valid(check_dict) - if not self.check_2M_env: - self.vhost_user_pmd.execute_cmd("quit", "#", 60) - self.clear_virtio_user1_stats() - vhost_eal_param = ( - "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[txq0;rxq0;rxq1]'" - + " --vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[txq0;txq1;rxq0]'" - ) - self.start_vhost_testpmd( - cores=self.vhost_core_list, - eal_param=vhost_eal_param, - param=vhost_param, - ports=self.cbdma_list, - iova_mode="pa", - ) - self.start_pdump_to_capture_pkt() + self.vhost_user_pmd.execute_cmd("quit", "#", 60) + self.clear_virtio_user1_stats() + dmas1 = "txq0@%s;txq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[1], + ) + dmas2 = "txq0@%s;rxq1@%s;rxq0@%s" % ( + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[0], + ) + vhost_eal_param = ( + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) + ) + vhost_param = ( + " --nb-cores=1 --rxq=2 --txq=2 --txd=4096 --rxd=4096 --no-flush-rx" + ) + self.start_vhost_testpmd( + cores=self.vhost_core_list, + eal_param=vhost_eal_param, + param=vhost_param, + ports=self.cbdma_list, + iova_mode="va", + ) + self.start_pdump_to_capture_pkt() - self.send_448_64byte_and_54_4640byte_pkts() - check_dict = {64: 448, 4640: 0} - self.check_virtio_user1_stats(check_dict) - self.check_packet_payload_valid(check_dict) + self.send_448_64byte_and_54_4640byte_pkts() + check_dict = {64: 448, 4640: 0} + self.check_virtio_user1_stats(check_dict) + self.check_packet_payload_valid(check_dict) def test_packed_ring_mergeable_path_multi_queues_payload_check_with_cbdma_enabled( self, @@ -828,21 +894,30 @@ class TestVM2VMVirtioUserCbdma(TestCase): """ Test Case 7: VM2VM packed ring mergeable path multi-queues payload check 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]) + self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=8) + dmas1 = "txq0@%s;txq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + ) + dmas2 = "txq0@%s;rxq1@%s;rxq0@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + ) vhost_eal_param = ( - "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[txq0;rxq0;rxq1]'" - + " --vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[txq0;txq1;rxq0]'" + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) ) vhost_param = ( " --nb-cores=1 --rxq=2 --txq=2 --txd=4096 --rxd=4096 --no-flush-rx" - + " --lcore-dma=[%s]" % lcore_dma ) self.start_vhost_testpmd( cores=self.vhost_core_list, eal_param=vhost_eal_param, param=vhost_param, - ports=self.cbdma_list, + ports=self.cbdma_list[0:1], iova_mode="va", ) @@ -868,26 +943,41 @@ class TestVM2VMVirtioUserCbdma(TestCase): self.check_virtio_user1_stats(check_dict) self.check_packet_payload_valid(check_dict) - if not self.check_2M_env: - self.vhost_user_pmd.execute_cmd("quit", "#", 60) - self.clear_virtio_user1_stats() - vhost_eal_param = ( - "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[txq0;txq1;rxq0;rxq1]'" - + " --vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[txq0;txq1;rxq0;rxq1]'" - ) - self.start_vhost_testpmd( - cores=self.vhost_core_list, - eal_param=vhost_eal_param, - param=vhost_param, - ports=self.cbdma_list, - iova_mode="pa", - ) - self.start_pdump_to_capture_pkt() + self.vhost_user_pmd.execute_cmd("quit", "#", 60) + self.clear_virtio_user1_stats() + dmas1 = "txq0@%s;txq0@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[2], + self.cbdma_list[3], + ) + dmas2 = "txq0@%s;txq0@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[4], + self.cbdma_list[5], + self.cbdma_list[6], + self.cbdma_list[7], + ) + vhost_eal_param = ( + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) + ) + vhost_param = ( + " --nb-cores=1 --rxq=2 --txq=2 --txd=4096 --rxd=4096 --no-flush-rx" + ) + self.start_vhost_testpmd( + cores=self.vhost_core_list, + eal_param=vhost_eal_param, + param=vhost_param, + ports=self.cbdma_list, + iova_mode="va", + ) + self.start_pdump_to_capture_pkt() - self.send_54_4640byte_and_448_64byte_pkts() - check_dict = {4640: 54, 64: 448} - self.check_virtio_user1_stats(check_dict) - self.check_packet_payload_valid(check_dict) + self.send_54_4640byte_and_448_64byte_pkts() + check_dict = {4640: 54, 64: 448} + self.check_virtio_user1_stats(check_dict) + self.check_packet_payload_valid(check_dict) def test_packed_ring_inorder_mergeable_path_multi_queues_payload_check_with_cbdma_enabled( self, @@ -895,39 +985,30 @@ class TestVM2VMVirtioUserCbdma(TestCase): """ Test Case 8: VM2VM packed ring inorder mergeable path multi-queues payload check with cbdma enable """ - self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=5) - lcore_dma = ( - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s" - % ( - self.vhost_core_list[1], - self.cbdma_list[0], - self.vhost_core_list[1], - self.cbdma_list[1], - self.vhost_core_list[1], - self.cbdma_list[2], - self.vhost_core_list[1], - self.cbdma_list[3], - self.vhost_core_list[1], - self.cbdma_list[4], - ) + self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=4) + dmas1 = "txq0@%s;txq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + ) + dmas2 = "txq0@%s;rxq1@%s;rxq0@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], ) vhost_eal_param = ( - "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[txq0;rxq0;rxq1]'" - + " --vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[txq0;txq1;rxq0]'" + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) ) vhost_param = ( - " --nb-cores=1 --txd=4096 --rxd=4096 --txq=2 --rxq=2 --no-flush-rx" - + " --lcore-dma=[%s]" % lcore_dma + " --nb-cores=1 --rxq=2 --txq=2 --txd=4096 --rxd=4096 --no-flush-rx" ) self.start_vhost_testpmd( cores=self.vhost_core_list, eal_param=vhost_eal_param, param=vhost_param, - ports=self.cbdma_list, + ports=self.cbdma_list[0:1], iova_mode="va", ) @@ -953,22 +1034,41 @@ class TestVM2VMVirtioUserCbdma(TestCase): self.check_virtio_user1_stats(check_dict) self.check_packet_payload_valid(check_dict) - if not self.check_2M_env: - self.vhost_user_pmd.execute_cmd("quit", "#", 60) - self.clear_virtio_user1_stats() - self.start_vhost_testpmd( - cores=self.vhost_core_list, - eal_param=vhost_eal_param, - param=vhost_param, - ports=self.cbdma_list, - iova_mode="pa", - ) - self.start_pdump_to_capture_pkt() + self.vhost_user_pmd.execute_cmd("quit", "#", 60) + self.clear_virtio_user1_stats() + dmas1 = "txq0@%s;txq0@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[2], + self.cbdma_list[3], + ) + dmas2 = "txq0@%s;txq0@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[2], + self.cbdma_list[3], + ) + vhost_eal_param = ( + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) + ) + vhost_param = ( + " --nb-cores=1 --rxq=2 --txq=2 --txd=4096 --rxd=4096 --no-flush-rx" + ) + self.start_vhost_testpmd( + cores=self.vhost_core_list, + eal_param=vhost_eal_param, + param=vhost_param, + ports=self.cbdma_list, + iova_mode="va", + ) + self.start_pdump_to_capture_pkt() - self.send_54_4640byte_and_448_64byte_pkts() - check_dict = {4640: 54, 64: 448} - self.check_virtio_user1_stats(check_dict) - self.check_packet_payload_valid(check_dict) + self.send_54_4640byte_and_448_64byte_pkts() + check_dict = {4640: 54, 64: 448} + self.check_virtio_user1_stats(check_dict) + self.check_packet_payload_valid(check_dict) def test_packed_ring_inorder_non_mergeable_path_multi_queues_payload_check_with_cbdma_enabled( self, @@ -976,48 +1076,22 @@ class TestVM2VMVirtioUserCbdma(TestCase): """ Test Case 9: VM2VM packed ring inorder non-mergeable path multi-queues payload check with cbdma enable """ - self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=8) - 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" - % ( - self.vhost_core_list[1], - self.cbdma_list[0], - self.vhost_core_list[1], - self.cbdma_list[1], - self.vhost_core_list[1], - self.cbdma_list[2], - self.vhost_core_list[1], - self.cbdma_list[3], - self.vhost_core_list[1], - self.cbdma_list[4], - self.vhost_core_list[1], - self.cbdma_list[5], - self.vhost_core_list[1], - self.cbdma_list[6], - self.vhost_core_list[1], - self.cbdma_list[7], - ) - ) + self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=4) + dmas1 = "txq0@%s;txq0@%s" % (self.cbdma_list[0], self.cbdma_list[1]) + dmas2 = "txq1@%s;rxq1@%s" % (self.cbdma_list[0], self.cbdma_list[1]) vhost_eal_param = ( - "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[txq0;rxq0]'" - + " --vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[txq1;rxq1]'" + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) ) vhost_param = ( " --nb-cores=1 --rxq=2 --txq=2 --txd=4096 --rxd=4096 --no-flush-rx" - + " --lcore-dma=[%s]" % lcore_dma ) self.start_vhost_testpmd( cores=self.vhost_core_list, eal_param=vhost_eal_param, param=vhost_param, - ports=self.cbdma_list, + ports=self.cbdma_list[0:2], iova_mode="va", ) @@ -1043,22 +1117,41 @@ class TestVM2VMVirtioUserCbdma(TestCase): self.check_virtio_user1_stats(check_dict) self.check_packet_payload_valid(check_dict) - if not self.check_2M_env: - self.vhost_user_pmd.execute_cmd("quit", "#", 60) - self.clear_virtio_user1_stats() - self.start_vhost_testpmd( - cores=self.vhost_core_list, - eal_param=vhost_eal_param, - param=vhost_param, - ports=self.cbdma_list, - iova_mode="pa", - ) - self.start_pdump_to_capture_pkt() + self.vhost_user_pmd.execute_cmd("quit", "#", 60) + self.clear_virtio_user1_stats() + dmas1 = "txq0@%s;txq0@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[2], + self.cbdma_list[3], + ) + dmas2 = "txq0@%s;txq0@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[2], + self.cbdma_list[3], + ) + vhost_eal_param = ( + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) + ) + vhost_param = ( + " --nb-cores=1 --rxq=2 --txq=2 --txd=4096 --rxd=4096 --no-flush-rx" + ) + self.start_vhost_testpmd( + cores=self.vhost_core_list, + eal_param=vhost_eal_param, + param=vhost_param, + ports=self.cbdma_list, + iova_mode="va", + ) + self.start_pdump_to_capture_pkt() - self.send_448_64byte_and_54_4640byte_pkts() - check_dict = {64: 448, 4640: 0} - self.check_virtio_user1_stats(check_dict) - self.check_packet_payload_valid(check_dict) + self.send_448_64byte_and_54_4640byte_pkts() + check_dict = {64: 448, 4640: 0} + self.check_virtio_user1_stats(check_dict) + self.check_packet_payload_valid(check_dict) def test_packed_ring_vectorized_rx_path_multi_queues_payload_check_with_cbdma_enabled( self, @@ -1066,48 +1159,22 @@ class TestVM2VMVirtioUserCbdma(TestCase): """ Test Case 10: VM2VM packed ring vectorized-rx path multi-queues payload check with cbdma enable """ - self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=8) - 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" - % ( - self.vhost_core_list[1], - self.cbdma_list[0], - self.vhost_core_list[1], - self.cbdma_list[1], - self.vhost_core_list[1], - self.cbdma_list[2], - self.vhost_core_list[1], - self.cbdma_list[3], - self.vhost_core_list[2], - self.cbdma_list[4], - self.vhost_core_list[2], - self.cbdma_list[5], - self.vhost_core_list[2], - self.cbdma_list[6], - self.vhost_core_list[2], - self.cbdma_list[7], - ) - ) + self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=4) + dmas1 = "txq0@%s;txq0@%s" % (self.cbdma_list[0], self.cbdma_list[0]) + dmas2 = "txq1@%s;rxq1@%s" % (self.cbdma_list[0], self.cbdma_list[0]) vhost_eal_param = ( - "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[txq0;rxq0]'" - + " --vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[txq1;rxq1]'" + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) ) vhost_param = ( " --nb-cores=2 --rxq=2 --txq=2 --txd=4096 --rxd=4096 --no-flush-rx" - + " --lcore-dma=[%s]" % lcore_dma ) self.start_vhost_testpmd( cores=self.vhost_core_list, eal_param=vhost_eal_param, param=vhost_param, - ports=self.cbdma_list, + ports=self.cbdma_list[0:1], iova_mode="va", ) @@ -1133,22 +1200,41 @@ class TestVM2VMVirtioUserCbdma(TestCase): self.check_virtio_user1_stats(check_dict) self.check_packet_payload_valid(check_dict) - if not self.check_2M_env: - self.vhost_user_pmd.execute_cmd("quit", "#", 60) - self.clear_virtio_user1_stats() - self.start_vhost_testpmd( - cores=self.vhost_core_list, - eal_param=vhost_eal_param, - param=vhost_param, - ports=self.cbdma_list, - iova_mode="pa", - ) - self.start_pdump_to_capture_pkt() + self.vhost_user_pmd.execute_cmd("quit", "#", 60) + self.clear_virtio_user1_stats() + dmas1 = "txq0@%s;txq0@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[2], + self.cbdma_list[3], + ) + dmas2 = "txq0@%s;txq0@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[2], + self.cbdma_list[3], + ) + vhost_eal_param = ( + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) + ) + vhost_param = ( + " --nb-cores=2 --rxq=2 --txq=2 --txd=4096 --rxd=4096 --no-flush-rx" + ) + self.start_vhost_testpmd( + cores=self.vhost_core_list, + eal_param=vhost_eal_param, + param=vhost_param, + ports=self.cbdma_list, + iova_mode="va", + ) + self.start_pdump_to_capture_pkt() - self.send_448_64byte_and_54_4640byte_pkts() - check_dict = {64: 448, 4640: 0} - self.check_virtio_user1_stats(check_dict) - self.check_packet_payload_valid(check_dict) + self.send_448_64byte_and_54_4640byte_pkts() + check_dict = {64: 448, 4640: 0} + self.check_virtio_user1_stats(check_dict) + self.check_packet_payload_valid(check_dict) def test_packed_ring_vectorized_path_multi_queues_payload_check_with_cbdma_enabled( self, @@ -1157,47 +1243,31 @@ class TestVM2VMVirtioUserCbdma(TestCase): Test Case 11: VM2VM packed ring vectorized path multi-queues payload check test with ring size is not power of 2 with cbdma enable """ self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=8) - 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" - % ( - self.vhost_core_list[1], - self.cbdma_list[0], - self.vhost_core_list[1], - self.cbdma_list[1], - self.vhost_core_list[1], - self.cbdma_list[2], - self.vhost_core_list[1], - self.cbdma_list[3], - self.vhost_core_list[1], - self.cbdma_list[4], - self.vhost_core_list[1], - self.cbdma_list[5], - self.vhost_core_list[1], - self.cbdma_list[6], - self.vhost_core_list[1], - self.cbdma_list[7], - ) + dmas1 = "txq0@%s;txq1@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + ) + dmas2 = "txq0@%s;txq1@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], ) vhost_eal_param = ( - "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[txq0;txq1;rxq0;rxq1]'" - + " --vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[txq0;txq1;rxq0;rxq1]'" + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) ) vhost_param = ( " --nb-cores=1 --rxq=2 --txq=2 --txd=4096 --rxd=4096 --no-flush-rx" - + " --lcore-dma=[%s]" % lcore_dma ) self.start_vhost_testpmd( cores=self.vhost_core_list, eal_param=vhost_eal_param, param=vhost_param, - ports=self.cbdma_list, + ports=self.cbdma_list[0:1], iova_mode="va", ) @@ -1223,26 +1293,41 @@ class TestVM2VMVirtioUserCbdma(TestCase): self.check_virtio_user1_stats(check_dict) self.check_packet_payload_valid(check_dict) - if not self.check_2M_env: - self.vhost_user_pmd.execute_cmd("quit", "#", 60) - self.clear_virtio_user1_stats() - vhost_eal_param = ( - "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[rxq0]'" - + " --vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[txq1]'" - ) - self.start_vhost_testpmd( - cores=self.vhost_core_list, - eal_param=vhost_eal_param, - param=vhost_param, - ports=self.cbdma_list, - iova_mode="pa", - ) - self.start_pdump_to_capture_pkt() + self.vhost_user_pmd.execute_cmd("quit", "#", 60) + self.clear_virtio_user1_stats() + dmas1 = "txq0@%s;txq1@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[0], + self.cbdma_list[1], + ) + dmas2 = "txq0@%s;txq1@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[2], + self.cbdma_list[3], + self.cbdma_list[2], + self.cbdma_list[3], + ) + vhost_eal_param = ( + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) + ) + vhost_param = ( + " --nb-cores=1 --rxq=2 --txq=2 --txd=4096 --rxd=4096 --no-flush-rx" + ) + self.start_vhost_testpmd( + cores=self.vhost_core_list, + eal_param=vhost_eal_param, + param=vhost_param, + ports=self.cbdma_list[0:4], + iova_mode="va", + ) + self.start_pdump_to_capture_pkt() - self.send_448_64byte_and_54_4640byte_pkts() - check_dict = {64: 448, 4640: 0} - self.check_virtio_user1_stats(check_dict) - self.check_packet_payload_valid(check_dict) + self.send_448_64byte_and_54_4640byte_pkts() + check_dict = {64: 448, 4640: 0} + self.check_virtio_user1_stats(check_dict) + self.check_packet_payload_valid(check_dict) def test_pakced_packed_ring_vectorized_tx_path_multi_queues_test_indirect_descriptor_with_cbdma_enabled( self, @@ -1250,48 +1335,20 @@ class TestVM2VMVirtioUserCbdma(TestCase): """ Test Case 12: VM2VM packed ring vectorized-tx path multi-queues test indirect descriptor and payload check with cbdma enable """ - self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=8) - 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" - % ( - self.vhost_core_list[1], - self.cbdma_list[0], - self.vhost_core_list[1], - self.cbdma_list[1], - self.vhost_core_list[1], - self.cbdma_list[2], - self.vhost_core_list[1], - self.cbdma_list[3], - self.vhost_core_list[1], - self.cbdma_list[4], - self.vhost_core_list[1], - self.cbdma_list[5], - self.vhost_core_list[1], - self.cbdma_list[6], - self.vhost_core_list[1], - self.cbdma_list[7], - ) - ) + self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=4) + dmas1 = "rxq0@%s" % (self.cbdma_list[0]) + dmas2 = "txq1@%s" % (self.cbdma_list[0]) vhost_eal_param = ( - "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[rxq0]'" - + " --vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[txq1]'" - ) - vhost_param = ( - " --nb-cores=1 --rxq=2 --txq=2 --txd=256 --rxd=256 --no-flush-rx" - + " --lcore-dma=[%s]" % lcore_dma + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) ) + vhost_param = " --nb-cores=1 --rxq=2 --txq=2 --txd=256 --rxd=256 --no-flush-rx" self.start_vhost_testpmd( cores=self.vhost_core_list, eal_param=vhost_eal_param, param=vhost_param, - ports=self.cbdma_list, + ports=self.cbdma_list[0:1], iova_mode="va", ) @@ -1317,37 +1374,50 @@ class TestVM2VMVirtioUserCbdma(TestCase): self.check_virtio_user1_stats(check_dict) self.check_packet_payload_valid(check_dict) - if not self.check_2M_env: - self.vhost_user_pmd.execute_cmd("quit", "#", 60) - self.virtio_user1_pmd.execute_cmd("quit", "#", 60) - self.virtio_user0_pmd.execute_cmd("quit", "#", 60) - vhost_eal_param = ( - "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[rxq0;rxq1]'" - + " --vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[txq0;txq1]'" - ) - self.start_vhost_testpmd( - cores=self.vhost_core_list, - eal_param=vhost_eal_param, - param=vhost_param, - ports=self.cbdma_list, - iova_mode="pa", - ) - self.start_virtio_testpmd_with_vhost_net1( - cores=self.virtio1_core_list, - eal_param=virtio1_eal_param, - param=virtio1_param, - ) - self.start_pdump_to_capture_pkt() - self.start_virtio_testpmd_with_vhost_net0( - cores=self.virtio0_core_list, - eal_param=virtio0_eal_param, - param=virtio0_param, - ) + self.vhost_user_pmd.execute_cmd("quit", "#", 60) + self.virtio_user1_pmd.execute_cmd("quit", "#", 60) + self.virtio_user0_pmd.execute_cmd("quit", "#", 60) + dmas1 = "txq0@%s;txq0@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[2], + self.cbdma_list[3], + ) + dmas2 = "txq0@%s;txq0@%s;rxq0@%s;rxq1@%s" % ( + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[2], + self.cbdma_list[3], + ) + vhost_eal_param = ( + "--vdev 'net_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[%s]'" + % (dmas1, dmas2) + ) + vhost_param = " --nb-cores=1 --rxq=2 --txq=2 --txd=256 --rxd=256 --no-flush-rx" + self.start_vhost_testpmd( + cores=self.vhost_core_list, + eal_param=vhost_eal_param, + param=vhost_param, + ports=self.cbdma_list, + iova_mode="va", + ) + self.start_virtio_testpmd_with_vhost_net1( + cores=self.virtio1_core_list, + eal_param=virtio1_eal_param, + param=virtio1_param, + ) + self.start_pdump_to_capture_pkt() + self.start_virtio_testpmd_with_vhost_net0( + cores=self.virtio0_core_list, + eal_param=virtio0_eal_param, + param=virtio0_param, + ) - self.send_502_64byte_and_64_8000byte_pkts() - check_dict = {64: 502, 8000: 10} - self.check_virtio_user1_stats(check_dict) - self.check_packet_payload_valid(check_dict) + self.send_502_64byte_and_64_8000byte_pkts() + check_dict = {64: 502, 8000: 10} + self.check_virtio_user1_stats(check_dict) + self.check_packet_payload_valid(check_dict) def test_packed_ring_vectorized_tx_path_test_batch_processing_with_cbdma_enabled( self, @@ -1355,43 +1425,15 @@ class TestVM2VMVirtioUserCbdma(TestCase): """ Test Case 13: VM2VM packed ring vectorized-tx path test batch processing with cbdma enable """ - self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=8) - 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" - % ( - self.vhost_core_list[1], - self.cbdma_list[0], - self.vhost_core_list[1], - self.cbdma_list[1], - self.vhost_core_list[1], - self.cbdma_list[2], - self.vhost_core_list[1], - self.cbdma_list[3], - self.vhost_core_list[1], - self.cbdma_list[4], - self.vhost_core_list[1], - self.cbdma_list[5], - self.vhost_core_list[1], - self.cbdma_list[6], - self.vhost_core_list[1], - self.cbdma_list[7], - ) - ) + self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=1) + dmas1 = "txq0@%s;rxq0@%s" % (self.cbdma_list[0], self.cbdma_list[0]) + dmas2 = "txq0@%s;rxq0@%s" % (self.cbdma_list[0], self.cbdma_list[0]) vhost_eal_param = ( - "--vdev 'net_vhost0,iface=vhost-net0,queues=1,client=1,dmas=[txq0;rxq0]'" - + " --vdev 'net_vhost1,iface=vhost-net1,queues=1,client=1,dmas=[txq0;rxq0]'" - ) - vhost_param = ( - " --nb-cores=1 --txd=256 --rxd=256 --txq=1 --rxq=1 --no-flush-rx" - + " --lcore-dma=[%s]" % lcore_dma + "--vdev 'net_vhost0,iface=vhost-net0,queues=1,client=1,dmas=[%s]' " + "--vdev 'net_vhost1,iface=vhost-net1,queues=1,client=1,dmas=[%s]'" + % (dmas1, dmas2) ) + vhost_param = " --nb-cores=1 --txd=256 --rxd=256 --no-flush-rx" self.start_vhost_testpmd( cores=self.vhost_core_list, eal_param=vhost_eal_param, @@ -1401,7 +1443,7 @@ class TestVM2VMVirtioUserCbdma(TestCase): ) virtio1_eal_param = "--force-max-simd-bitwidth=512 --vdev=net_virtio_user1,mac=00:01:02:03:04:05,path=./vhost-net1,queues=1,server=1,packed_vq=1,mrg_rxbuf=1,in_order=1,vectorized=1,queue_size=256" - virtio1_param = " --nb-cores=1 --rxq=1 --txq=1 --txd=256 --rxd=256" + virtio1_param = " --nb-cores=1 --txd=256 --rxd=256" self.start_virtio_testpmd_with_vhost_net1( cores=self.virtio1_core_list, eal_param=virtio1_eal_param, @@ -1410,7 +1452,7 @@ class TestVM2VMVirtioUserCbdma(TestCase): self.start_pdump_to_capture_pkt() virtio0_eal_param = "--force-max-simd-bitwidth=512 --vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net0,queues=1,server=1,packed_vq=1,mrg_rxbuf=1,in_order=1,vectorized=1,queue_size=256" - virtio0_param = " --nb-cores=1 --rxq=1 --txq=1 --txd=256 --rxd=256" + virtio0_param = " --nb-cores=1 --txd=256 --rxd=256" self.start_virtio_testpmd_with_vhost_net0( cores=self.virtio0_core_list, eal_param=virtio0_eal_param, -- 2.25.1