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 8594EA034F; Mon, 22 Feb 2021 08:31:56 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5796D22A23E; Mon, 22 Feb 2021 08:31:56 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id C67DD4069C for ; Mon, 22 Feb 2021 08:31:54 +0100 (CET) IronPort-SDR: 4bBZNm90Z4SMCqajMy3/iCGuA+Ic6WXikovjx81nmC9Hujvr25hlN2O/wcMbBb7inNecsg7Chm NRd+sGpwLa0g== X-IronPort-AV: E=McAfee;i="6000,8403,9902"; a="184472525" X-IronPort-AV: E=Sophos;i="5.81,196,1610438400"; d="scan'208";a="184472525" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Feb 2021 23:31:53 -0800 IronPort-SDR: 8VnMJhCv/ttSEBQ3P75zmZLenBiYMv24T6CoVkwR4ZRKyYklSv9R9USNadLs5andPESBDVxTHt ahKwG4SJAK/g== X-IronPort-AV: E=Sophos;i="5.81,196,1610438400"; d="scan'208";a="402454882" Received: from unknown (HELO localhost.localdomain) ([10.240.183.222]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Feb 2021 23:31:51 -0800 From: Ling Wei To: dts@dpdk.org Cc: Ling Wei Date: Mon, 22 Feb 2021 15:31:13 +0800 Message-Id: <20210222073113.5927-1-weix.ling@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dts] [PATCH V1] tests/vm2vm_virtio_user:fix send packet count wrong issue 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 Sender: "dts" 1.Fix send packet count wrong issue. 2.After send packet from testpmd, execute 'stop' and 'port stop all' command to make sure all packets can be received. 3.Insmod igb_uio before bind to make sure bind normally. Signed-off-by: Ling Wei --- tests/TestSuite_vm2vm_virtio_user.py | 42 +++++++++++++++++----------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/tests/TestSuite_vm2vm_virtio_user.py b/tests/TestSuite_vm2vm_virtio_user.py index 815afbdd..accec6f9 100644 --- a/tests/TestSuite_vm2vm_virtio_user.py +++ b/tests/TestSuite_vm2vm_virtio_user.py @@ -671,9 +671,9 @@ class TestVM2VMVirtioUser(TestCase): self.cbdma_nic_dev_num = 4 self.bind_nic_driver(self.dut_ports) self.get_cbdma_ports_info_and_bind_to_dpdk() - small_pkts_num = 512 + total_pkts_num = 566 large_8k_pkts_num = 502 - large_2k_pkts_num = 10 + large_2k_pkts_num = 64 self.queue_num=2 self.nopci=False path_mode = 'server=1,packed_vq=0,mrg_rxbuf=1,in_order=1' @@ -687,16 +687,20 @@ class TestVM2VMVirtioUser(TestCase): 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, + self.vhost_user_pmd.execute_cmd('stop') + self.vhost_user_pmd.execute_cmd('port stop all') + self.check_packet_payload_valid_with_cbdma(self.dump_virtio_pcap, total_pkts_num, large_8k_pkts_num, large_2k_pkts_num) # get dump pcap file of vhost self.logger.info('check pcap file info about vhost') - small_pkts_num = 512 + total_pkts_num = 566 large_8k_pkts_num = 54 - large_2k_pkts_num = 458 + large_2k_pkts_num = 512 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) + self.vhost_user_pmd.execute_cmd('stop') + self.vhost_user_pmd.execute_cmd('port stop all') + self.check_packet_payload_valid_with_cbdma(self.dump_virtio_pcap, total_pkts_num, large_8k_pkts_num, large_2k_pkts_num) self.logger.info('diff the pcap file of vhost and virtio') @@ -708,9 +712,9 @@ class TestVM2VMVirtioUser(TestCase): self.cbdma_nic_dev_num = 4 self.bind_nic_driver(self.dut_ports) self.get_cbdma_ports_info_and_bind_to_dpdk() - small_pkts_num = 448 + total_pkts_num = 502 large_8k_pkts_num = 54 - large_2k_pkts_num = 394 + large_2k_pkts_num = 448 self.queue_num=2 self.nopci=False path_mode = 'server=1,packed_vq=0,mrg_rxbuf=1,in_order=0' @@ -723,20 +727,25 @@ class TestVM2VMVirtioUser(TestCase): 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, 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) + # self.send_multiple_pkt_with_8k54_2k394() + self.send_multiple_pkt_with_8k54_2k448() + self.vhost_user_pmd.execute_cmd('stop') + self.vhost_user_pmd.execute_cmd('port stop all') + self.check_packet_payload_valid_with_cbdma(self.dump_virtio_pcap, total_pkts_num, large_8k_pkts_num, large_2k_pkts_num) # get dump pcap file of vhost self.logger.info('check pcap file info about vhost') - small_pkts_num = 448 - large_8k_pkts_num = 448 + total_pkts_num = 502 + large_8k_pkts_num = 502 large_2k_pkts_num = 0 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) + self.send_multiple_pkt_with_8k502() + self.vhost_user_pmd.execute_cmd('stop') + self.vhost_user_pmd.execute_cmd('port stop all') + self.check_packet_payload_valid_with_cbdma(self.dump_virtio_pcap, total_pkts_num, large_8k_pkts_num, large_2k_pkts_num) self.logger.info('diff the pcap file of vhost and virtio') - def send_multiple_pkt_with_8k54_2k394(self): + def send_multiple_pkt_with_8k54_2k448(self): self.virtio_user0_pmd.execute_cmd('set burst 1') self.virtio_user0_pmd.execute_cmd('set txpkts 2000,2000,2000,2000') self.virtio_user0_pmd.execute_cmd('start tx_first 27') @@ -746,7 +755,7 @@ class TestVM2VMVirtioUser(TestCase): self.virtio_user0_pmd.execute_cmd('start tx_first 7') self.vhost_user_pmd.execute_cmd('start') - def send_multiple_pkt_with_8k448(self): + def send_multiple_pkt_with_8k502(self): self.virtio_user0_pmd.execute_cmd('set burst 1') self.virtio_user0_pmd.execute_cmd('set txpkts 2000,2000,2000,2000') self.virtio_user0_pmd.execute_cmd('start tx_first 27') @@ -804,4 +813,5 @@ class TestVM2VMVirtioUser(TestCase): self.cbdma_dev_infos.append(pci_info.group(1)) self.verify(len(self.cbdma_dev_infos) >= 8, 'There no enough cbdma device to run this suite') self.device_str = ' '.join(self.cbdma_dev_infos[0:self.cbdma_nic_dev_num]) + self.dut.setup_modules(self.target, "igb_uio", "None") self.dut.send_expect('./usertools/dpdk-devbind.py --force --bind=igb_uio %s' % self.device_str, '# ', 60) -- 2.25.1