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 <weix.ling@intel.com> --- 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
[-- Attachment #1: Type: text/plain, Size: 334 bytes --] Tested-by: Wei Ling <weix.ling@intel.com> Regards, Ling Wei > -----Original Message----- > From: Ling, WeiX <weix.ling@intel.com> > Sent: Monday, February 22, 2021 03:31 PM > To: dts@dpdk.org > Cc: Ling, WeiX <weix.ling@intel.com> > Subject: [dts][PATCH V1] tests/vm2vm_virtio_user:fix send packet count > wrong issue [-- Attachment #2: TestVM2VMVirtioUser.log --] [-- Type: application/octet-stream, Size: 10637 bytes --] 22/02/2021 10:22:35 dts: TEST SUITE : TestVM2VMVirtioUser 22/02/2021 10:22:35 dts: NIC : fortville_spirit 22/02/2021 10:22:35 dut.10.240.183.214: 22/02/2021 10:22:35 tester: 22/02/2021 10:22:44 dut.10.240.183.214: echo 0000:af:00.0 > /sys/bus/pci/devices/0000\:af\:00.0/driver/unbind 22/02/2021 10:22:44 dut.10.240.183.214: 22/02/2021 10:22:44 dut.10.240.183.214: modprobe i40e 22/02/2021 10:22:44 dut.10.240.183.214: 22/02/2021 10:22:44 dut.10.240.183.214: echo 0000:af:00.0 > /sys/bus/pci/drivers/i40e/bind 22/02/2021 10:22:44 dut.10.240.183.214: 22/02/2021 10:22:44 dut.10.240.183.214: ifconfig ens801f0 up 22/02/2021 10:22:44 dut.10.240.183.214: 22/02/2021 10:22:44 dut.10.240.183.214: cat /proc/meminfo |grep Hugepagesize|awk '{print($2)}' 22/02/2021 10:22:45 dut.10.240.183.214: 2048 22/02/2021 10:22:45 TestVM2VMVirtioUser: Test Case test_vm2vm_virtio_user_split_virtqueue_inorder_mergeable_path_with_cbdma Begin 22/02/2021 10:22:45 dut.10.240.183.214: 22/02/2021 10:22:45 tester: 22/02/2021 10:22:45 dut.10.240.183.214: rm -rf ./vhost-net* 22/02/2021 10:22:45 dut.10.240.183.214: 22/02/2021 10:22:45 dut.10.240.183.214: rm -rf /tmp/pdump-virtio-rx.pcap 22/02/2021 10:22:45 dut.10.240.183.214: 22/02/2021 10:22:45 dut.10.240.183.214: rm -rf /tmp/pdump-vhost-rx.pcap 22/02/2021 10:22:45 dut.10.240.183.214: 22/02/2021 10:22:45 dut.10.240.183.214: ./usertools/dpdk-devbind.py --status-dev misc 22/02/2021 10:22:45 dut.10.240.183.214: Misc (rawdev) devices using kernel driver ========================================= 0000:00:04.0 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci 0000:00:04.1 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci 0000:00:04.2 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci 0000:00:04.3 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci 0000:00:04.4 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci 0000:00:04.5 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci 0000:00:04.6 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci 0000:00:04.7 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci 0000:80:04.1 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci 0000:80:04.3 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci 0000:80:04.5 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci 0000:80:04.6 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci 0000:80:04.7 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci Other Misc (rawdev) devices =========================== 0000:80:04.0 'Sky Lake-E CBDMA Registers 2021' unused=ioatdma,igb_uio,vfio-pci 0000:80:04.2 'Sky Lake-E CBDMA Registers 2021' unused=ioatdma,igb_uio,vfio-pci 0000:80:04.4 'Sky Lake-E CBDMA Registers 2021' unused=ioatdma,igb_uio,vfio-pci 22/02/2021 10:22:45 dut.10.240.183.214: modprobe uio 22/02/2021 10:22:45 dut.10.240.183.214: 22/02/2021 10:22:45 dut.10.240.183.214: lsmod | grep igb_uio 22/02/2021 10:22:46 dut.10.240.183.214: igb_uio 20480 0 uio 20480 1 igb_uio 22/02/2021 10:22:46 dut.10.240.183.214: rmmod -f igb_uio 22/02/2021 10:22:46 dut.10.240.183.214: 22/02/2021 10:22:46 dut.10.240.183.214: insmod ./x86_64-native-linuxapp-gcc/kmod/igb_uio.ko 22/02/2021 10:22:46 dut.10.240.183.214: 22/02/2021 10:22:46 dut.10.240.183.214: lsmod | grep igb_uio 22/02/2021 10:22:46 dut.10.240.183.214: igb_uio 20480 0 uio 20480 1 igb_uio 22/02/2021 10:22:46 dut.10.240.183.214: ./usertools/dpdk-devbind.py --force --bind=igb_uio 0000:80:04.1 0000:80:04.3 0000:80:04.5 0000:80:04.6 22/02/2021 10:22:46 dut.10.240.183.214: 22/02/2021 10:22:46 TestVM2VMVirtioUser: check pcap file info about virtio 22/02/2021 10:22:57 dut.10.240.183.214: cat /proc/meminfo |grep Hugepagesize|awk '{print($2)}' 22/02/2021 10:22:57 dut.10.240.183.214: 2048 22/02/2021 10:23:09 dut.10.240.183.214: cat /proc/meminfo |grep Hugepagesize|awk '{print($2)}' 22/02/2021 10:23:09 dut.10.240.183.214: 2048 22/02/2021 10:23:46 dut.10.240.183.214: scp -v root@10.240.183.214:/tmp/pdump-virtio-rx.pcap /tmp/pdump-virtio-rx.pcap 22/02/2021 10:23:48 TestVM2VMVirtioUser: check pcap file info about vhost 22/02/2021 10:23:59 dut.10.240.183.214: cat /proc/meminfo |grep Hugepagesize|awk '{print($2)}' 22/02/2021 10:23:59 dut.10.240.183.214: 2048 22/02/2021 10:24:11 dut.10.240.183.214: cat /proc/meminfo |grep Hugepagesize|awk '{print($2)}' 22/02/2021 10:24:11 dut.10.240.183.214: 2048 22/02/2021 10:24:48 dut.10.240.183.214: scp -v root@10.240.183.214:/tmp/pdump-virtio-rx.pcap /tmp/pdump-virtio-rx.pcap 22/02/2021 10:24:50 TestVM2VMVirtioUser: diff the pcap file of vhost and virtio 22/02/2021 10:24:50 TestVM2VMVirtioUser: Test Case test_vm2vm_virtio_user_split_virtqueue_inorder_mergeable_path_with_cbdma Result PASSED: 22/02/2021 10:24:54 dut.10.240.183.214: kill_all: called by dut and prefix list has value. 22/02/2021 10:24:58 TestVM2VMVirtioUser: Test Case test_vm2vm_virtio_user_split_virtqueue_mergeable_path_with_cbdma Begin 22/02/2021 10:24:58 dut.10.240.183.214: 22/02/2021 10:24:58 tester: 22/02/2021 10:24:58 dut.10.240.183.214: rm -rf ./vhost-net* 22/02/2021 10:24:58 dut.10.240.183.214: 22/02/2021 10:24:58 dut.10.240.183.214: rm -rf /tmp/pdump-virtio-rx.pcap 22/02/2021 10:24:58 dut.10.240.183.214: 22/02/2021 10:24:58 dut.10.240.183.214: rm -rf /tmp/pdump-vhost-rx.pcap 22/02/2021 10:24:58 dut.10.240.183.214: 22/02/2021 10:25:00 dut.10.240.183.214: ./usertools/dpdk-devbind.py --status-dev misc 22/02/2021 10:25:00 dut.10.240.183.214: Misc (rawdev) devices using DPDK-compatible driver ================================================== 0000:80:04.1 'Sky Lake-E CBDMA Registers 2021' drv=igb_uio unused=ioatdma,vfio-pci 0000:80:04.3 'Sky Lake-E CBDMA Registers 2021' drv=igb_uio unused=ioatdma,vfio-pci 0000:80:04.5 'Sky Lake-E CBDMA Registers 2021' drv=igb_uio unused=ioatdma,vfio-pci 0000:80:04.6 'Sky Lake-E CBDMA Registers 2021' drv=igb_uio unused=ioatdma,vfio-pci Misc (rawdev) devices using kernel driver ========================================= 0000:00:04.0 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci 0000:00:04.1 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci 0000:00:04.2 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci 0000:00:04.3 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci 0000:00:04.4 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci 0000:00:04.5 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci 0000:00:04.6 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci 0000:00:04.7 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci 0000:80:04.7 'Sky Lake-E CBDMA Registers 2021' drv=ioatdma unused=igb_uio,vfio-pci Other Misc (rawdev) devices =========================== 0000:80:04.0 'Sky Lake-E CBDMA Registers 2021' unused=ioatdma,igb_uio,vfio-pci 0000:80:04.2 'Sky Lake-E CBDMA Registers 2021' unused=ioatdma,igb_uio,vfio-pci 0000:80:04.4 'Sky Lake-E CBDMA Registers 2021' unused=ioatdma,igb_uio,vfio-pci 22/02/2021 10:25:00 dut.10.240.183.214: modprobe uio 22/02/2021 10:25:01 dut.10.240.183.214: 22/02/2021 10:25:01 dut.10.240.183.214: lsmod | grep igb_uio 22/02/2021 10:25:01 dut.10.240.183.214: igb_uio 20480 0 uio 20480 1 igb_uio 22/02/2021 10:25:01 dut.10.240.183.214: rmmod -f igb_uio 22/02/2021 10:25:01 dut.10.240.183.214: 22/02/2021 10:25:01 dut.10.240.183.214: insmod ./x86_64-native-linuxapp-gcc/kmod/igb_uio.ko 22/02/2021 10:25:01 dut.10.240.183.214: 22/02/2021 10:25:01 dut.10.240.183.214: lsmod | grep igb_uio 22/02/2021 10:25:01 dut.10.240.183.214: igb_uio 20480 0 uio 20480 1 igb_uio 22/02/2021 10:25:01 dut.10.240.183.214: ./usertools/dpdk-devbind.py --force --bind=igb_uio 0000:80:04.1 0000:80:04.3 0000:80:04.5 0000:80:04.6 22/02/2021 10:25:01 dut.10.240.183.214: 22/02/2021 10:25:01 TestVM2VMVirtioUser: check pcap file info about virtio 22/02/2021 10:25:12 dut.10.240.183.214: cat /proc/meminfo |grep Hugepagesize|awk '{print($2)}' 22/02/2021 10:25:12 dut.10.240.183.214: 2048 22/02/2021 10:25:24 dut.10.240.183.214: cat /proc/meminfo |grep Hugepagesize|awk '{print($2)}' 22/02/2021 10:25:24 dut.10.240.183.214: 2048 22/02/2021 10:26:01 dut.10.240.183.214: scp -v root@10.240.183.214:/tmp/pdump-virtio-rx.pcap /tmp/pdump-virtio-rx.pcap 22/02/2021 10:26:03 TestVM2VMVirtioUser: check pcap file info about vhost 22/02/2021 10:26:14 dut.10.240.183.214: cat /proc/meminfo |grep Hugepagesize|awk '{print($2)}' 22/02/2021 10:26:14 dut.10.240.183.214: 2048 22/02/2021 10:26:26 dut.10.240.183.214: cat /proc/meminfo |grep Hugepagesize|awk '{print($2)}' 22/02/2021 10:26:26 dut.10.240.183.214: 2048 22/02/2021 10:27:03 dut.10.240.183.214: scp -v root@10.240.183.214:/tmp/pdump-virtio-rx.pcap /tmp/pdump-virtio-rx.pcap 22/02/2021 10:27:05 TestVM2VMVirtioUser: diff the pcap file of vhost and virtio 22/02/2021 10:27:05 TestVM2VMVirtioUser: Test Case test_vm2vm_virtio_user_split_virtqueue_mergeable_path_with_cbdma Result PASSED: 22/02/2021 10:27:09 dut.10.240.183.214: kill_all: called by dut and prefix list has value. 22/02/2021 10:27:13 dts: TEST SUITE ENDED: TestVM2VMVirtioUser
Acked-by: Wang, Yinan <yinan.wang@intel.com>
> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Ling, WeiX
> Sent: 2021?2?22? 15:36
> To: dts@dpdk.org
> Subject: Re: [dts] [PATCH V1] tests/vm2vm_virtio_user:fix send packet count
> wrong issue
>
> Tested-by: Wei Ling <weix.ling@intel.com>
>
> Regards,
> Ling Wei
>
> > -----Original Message-----
> > From: Ling, WeiX <weix.ling@intel.com>
> > Sent: Monday, February 22, 2021 03:31 PM
> > To: dts@dpdk.org
> > Cc: Ling, WeiX <weix.ling@intel.com>
> > Subject: [dts][PATCH V1] tests/vm2vm_virtio_user:fix send packet count
> > wrong issue