From patchwork Tue Dec 15 17:58:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 85208 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6441AA09EE; Tue, 15 Dec 2020 11:03:34 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 22DBECA04; Tue, 15 Dec 2020 11:03:33 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 8AC8BCA00 for ; Tue, 15 Dec 2020 11:03:30 +0100 (CET) IronPort-SDR: 3MeHN5fKnD3HsyBDe67ddQcH+Fp/tXm9fWBPcC1wh8ODuMneegw6MHH63IbjvVn3GzqKn1H+sF hUzew22jTnUQ== X-IronPort-AV: E=McAfee;i="6000,8403,9835"; a="259581969" X-IronPort-AV: E=Sophos;i="5.78,420,1599548400"; d="scan'208";a="259581969" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2020 02:03:27 -0800 IronPort-SDR: 1gcj1bV+EVB2CFjr+qPFtfIcpUHwiQTNmH2lqgZggdV0CKmajv+bvlhBM854vZiG7900eZkHH4 yGbuFiUDHaBA== X-IronPort-AV: E=Sophos;i="5.78,420,1599548400"; d="scan'208";a="336758815" Received: from unknown (HELO localhost.localdomain) ([10.240.183.222]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2020 02:03:26 -0800 From: lingwei To: dts@dpdk.org Cc: lingwei Date: Wed, 16 Dec 2020 01:58:52 +0800 Message-Id: <20201215175852.42904-1-weix.ling@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dts] [PATCH V2] tests/vm2vm_virtio_user:sync CBDMA case code with test plan X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "dts" V1:sync CBDMA case code with test plan V2:fix code issue Signed-off-by: lingwei Tested-by: Wei Ling --- tests/TestSuite_vm2vm_virtio_user.py | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/TestSuite_vm2vm_virtio_user.py b/tests/TestSuite_vm2vm_virtio_user.py index 910552c0..815afbdd 100644 --- a/tests/TestSuite_vm2vm_virtio_user.py +++ b/tests/TestSuite_vm2vm_virtio_user.py @@ -132,8 +132,8 @@ class TestVM2VMVirtioUser(TestCase): launch the testpmd as virtio with vhost_net0 and start to send 251 small packets with diff burst """ - eal_params = ' --socket-mem {} --vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net0,queues=1,' \ - '{},queue_size={} '.format(self.socket_mem, path_mode, ringsize) + eal_params = ' --socket-mem {} --vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net0,queues={},' \ + '{},queue_size={} '.format(self.socket_mem, self.queue_num, path_mode, ringsize) if self.check_2M_env: eal_params += " --single-file-segments" if 'vectorized_path' in self.running_case: @@ -152,8 +152,8 @@ class TestVM2VMVirtioUser(TestCase): launch the testpmd as virtio with vhost_net0 and start to send 251 small packets with diff burst """ - eal_params = ' --socket-mem {} --vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net0,' \ - 'queues={},{},queue_size={} '.format(self.socket_mem, self.queue_num, path_mode, ringsize) + eal_params = ' --socket-mem {} --vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net0,queues={},' \ + '{},queue_size={} '.format(self.socket_mem, self.queue_num, path_mode, ringsize) if self.check_2M_env: eal_params += " --single-file-segments " params = "--nb-cores=1 --txd={} --rxd={} {}".format(ringsize, ringsize, extern_params) @@ -189,7 +189,7 @@ class TestVM2VMVirtioUser(TestCase): self.verify(large_2k_pkts_num == actual_2k_pkt_num, f"2K packet quantity error,expected value:{large_2k_pkts_num}" f", actual value : {actual_2k_pkt_num}") - def get_dump_file_of_virtio_user_cbdma(self, path_mode, extern_param, ringsize, vdevs=None, no_pci=False): + def get_dump_file_of_virtio_user_cbdma(self, path_mode, extern_param, ringsize, vdevs=None, no_pci=True): dump_port = 'device_id=net_virtio_user1' self.launch_vhost_testpmd(vdev_num=2, vdevs=vdevs, no_pci=no_pci) self.start_virtio_testpmd_with_vhost_net1(path_mode, extern_param, ringsize) @@ -676,16 +676,16 @@ class TestVM2VMVirtioUser(TestCase): large_2k_pkts_num = 10 self.queue_num=2 self.nopci=False - path_mode = 'packed_vq=0,mrg_rxbuf=1,in_order=1,server=0' + path_mode = 'server=1,packed_vq=0,mrg_rxbuf=1,in_order=1' ringsize = 4096 extern_params = '--rxq=2 --txq=2' # get dump pcap file of virtio # the virtio0 will send 283 pkts, but the virtio only will received 252 pkts self.logger.info('check pcap file info about virtio') - vdevs = f"--vdev 'eth_vhost0,iface=vhost-net0,queues=2,client=0,dmas=[txq0@{self.cbdma_dev_infos[0]};txq1@{self.cbdma_dev_infos[1]}],dmathr=512' " \ - f"--vdev 'eth_vhost1,iface=vhost-net1,queues=2,client=0,dmas=[txq0@{self.cbdma_dev_infos[2]};txq1@{self.cbdma_dev_infos[3]}],dmathr=512'" + vdevs = f"--vdev 'eth_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[txq0@{self.cbdma_dev_infos[0]};txq1@{self.cbdma_dev_infos[1]}],dmathr=512' " \ + f"--vdev 'eth_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[txq0@{self.cbdma_dev_infos[2]};txq1@{self.cbdma_dev_infos[3]}],dmathr=512'" - self.get_dump_file_of_virtio_user_cbdma(path_mode, extern_params, ringsize, vdevs) + self.get_dump_file_of_virtio_user_cbdma(path_mode, extern_params, ringsize, vdevs, no_pci=False) self.send_8k_pkt() self.check_packet_payload_valid_with_cbdma(self.dump_virtio_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num) @@ -694,7 +694,7 @@ class TestVM2VMVirtioUser(TestCase): small_pkts_num = 512 large_8k_pkts_num = 54 large_2k_pkts_num = 458 - self.get_dump_file_of_virtio_user_cbdma(path_mode, extern_params, ringsize, vdevs) + self.get_dump_file_of_virtio_user_cbdma(path_mode, extern_params, ringsize, vdevs, no_pci=False) self.send_multiple_pkt() self.check_packet_payload_valid_with_cbdma(self.dump_virtio_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num) @@ -713,16 +713,16 @@ class TestVM2VMVirtioUser(TestCase): large_2k_pkts_num = 394 self.queue_num=2 self.nopci=False - path_mode = 'packed_vq=0,mrg_rxbuf=1,in_order=0,server=0' + path_mode = 'server=1,packed_vq=0,mrg_rxbuf=1,in_order=0' ringsize = 4096 extern_params = '--rxq=2 --txq=2' # get dump pcap file of virtio # the virtio0 will send 283 pkts, but the virtio only will received 252 pkts self.logger.info('check pcap file info about virtio') - vdevs = f"--vdev 'eth_vhost0,iface=vhost-net0,queues=2,client=0,dmas=[txq0@{self.cbdma_dev_infos[0]};txq1@{self.cbdma_dev_infos[1]}],dmathr=512' " \ - f"--vdev 'eth_vhost1,iface=vhost-net1,queues=2,client=0,dmas=[txq0@{self.cbdma_dev_infos[2]};txq1@{self.cbdma_dev_infos[3]}],dmathr=512'" + vdevs = f"--vdev 'eth_vhost0,iface=vhost-net0,queues=2,client=1,dmas=[txq0@{self.cbdma_dev_infos[0]};txq1@{self.cbdma_dev_infos[1]}],dmathr=512' " \ + f"--vdev 'eth_vhost1,iface=vhost-net1,queues=2,client=1,dmas=[txq0@{self.cbdma_dev_infos[2]};txq1@{self.cbdma_dev_infos[3]}],dmathr=512'" - self.get_dump_file_of_virtio_user_cbdma(path_mode, extern_params, ringsize, vdevs) + self.get_dump_file_of_virtio_user_cbdma(path_mode, extern_params, ringsize, vdevs, no_pci=False) self.send_multiple_pkt_with_8k54_2k394() self.check_packet_payload_valid_with_cbdma(self.dump_virtio_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num) # get dump pcap file of vhost @@ -730,7 +730,7 @@ class TestVM2VMVirtioUser(TestCase): small_pkts_num = 448 large_8k_pkts_num = 448 large_2k_pkts_num = 0 - self.get_dump_file_of_virtio_user_cbdma(path_mode, extern_params, ringsize, vdevs) + self.get_dump_file_of_virtio_user_cbdma(path_mode, extern_params, ringsize, vdevs, no_pci=False) self.send_multiple_pkt_with_8k448() self.check_packet_payload_valid_with_cbdma(self.dump_virtio_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num)