[V1] tests/vm2vm_virtio_net_perf: fix script issue
Commit Message
1.Fix testcase 8 iperf test parameter wrong issue.
2.Add 'killall qemu-system-x86_64' step when use
vm.stop() to quit vm exception.
Signed-off-by: Wei Ling <weix.ling@intel.com>
---
tests/TestSuite_vm2vm_virtio_net_perf.py | 41 ++++++++++++------------
1 file changed, 21 insertions(+), 20 deletions(-)
Comments
> -----Original Message-----
> From: Ling, WeiX <weix.ling@intel.com>
> Sent: Tuesday, April 20, 2021 01:32 PM
> To: dts@dpdk.org
> Cc: Ling, WeiX <weix.ling@intel.com>
> Subject: [dts][PATCH V1] tests/vm2vm_virtio_net_perf: fix script issue
>
Tested-by: Wei Ling <weix.ling@intel.com>
Acked-by: Yinan Wang <yinan.wang@intel.com>
> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Ling, WeiX
> Sent: 2021?4?20? 13:59
> To: dts@dpdk.org
> Subject: Re: [dts] [PATCH V1] tests/vm2vm_virtio_net_perf: fix script issue
>
> > -----Original Message-----
> > From: Ling, WeiX <weix.ling@intel.com>
> > Sent: Tuesday, April 20, 2021 01:32 PM
> > To: dts@dpdk.org
> > Cc: Ling, WeiX <weix.ling@intel.com>
> > Subject: [dts][PATCH V1] tests/vm2vm_virtio_net_perf: fix script issue
> >
> Tested-by: Wei Ling <weix.ling@intel.com>
> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Wei Ling
> Sent: 2021年4月20日 13:32
> To: dts@dpdk.org
> Cc: Ling, WeiX <weix.ling@intel.com>
> Subject: [dts] [PATCH V1] tests/vm2vm_virtio_net_perf: fix script issue
>
> 1.Fix testcase 8 iperf test parameter wrong issue.
> 2.Add 'killall qemu-system-x86_64' step when use
> vm.stop() to quit vm exception.
>
> Signed-off-by: Wei Ling <weix.ling@intel.com>
> ---
> tests/TestSuite_vm2vm_virtio_net_perf.py | 41 ++++++++++++------------
> 1 file changed, 21 insertions(+), 20 deletions(-)
>
> diff --git a/tests/TestSuite_vm2vm_virtio_net_perf.py
> b/tests/TestSuite_vm2vm_virtio_net_perf.py
> index d1e94093..bb0ccb32 100644
> --- a/tests/TestSuite_vm2vm_virtio_net_perf.py
> +++ b/tests/TestSuite_vm2vm_virtio_net_perf.py
> @@ -73,12 +73,16 @@ class TestVM2VMVirtioNetPerf(TestCase):
> self.device_str = None
> self.checked_vm = False
> self.dut.restore_interfaces()
> + self.path=self.dut.apps_name['test-pmd']
> + self.testpmd_name=self.path.split("/")[-1]
>
> def set_up(self):
> """
> run before each test case.
> """
> self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#")
> + self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#")
> + self.dut.send_expect("killall qemu-system-x86_64", "#")
> self.vm_dut = []
> self.vm = []
>
> @@ -291,8 +295,12 @@ class TestVM2VMVirtioNetPerf(TestCase):
> return iperfdata
>
> def stop_all_apps(self):
> - for i in range(len(self.vm)):
> - self.vm[i].stop()
> + # add killall qemu-system-x86_64 step when use vm.stop() to quit vm
> exception
> + try:
> + for i in range(len(self.vm)):
> + self.vm[i].stop()
> + except:
> + self.dut.send_expect("killall qemu-system-x86_64", "#")
It's not a good idea to kill all qemu process, DTS records the process id, prefer to kill the specific process but not all.
> self.pmd_vhost.quit()
>
> def offload_capbility_check(self, vm_client):
> @@ -338,20 +346,13 @@ class TestVM2VMVirtioNetPerf(TestCase):
> self.verify(md5_send == md5_revd, 'the received file is different with send
> file')
>
> def bind_nic_driver(self, ports, driver=""):
> - if driver == "igb_uio":
> - for port in ports:
> - netdev = self.dut.ports_info[port]['port']
> - driver = netdev.get_nic_driver()
> - if driver != 'igb_uio':
> - netdev.bind_driver(driver='igb_uio')
> - else:
> - for port in ports:
> - netdev = self.dut.ports_info[port]['port']
> - driver_now = netdev.get_nic_driver()
> - if driver == "":
> - driver = netdev.default_driver
> - if driver != driver_now:
> - netdev.bind_driver(driver=driver)
> + for port in ports:
> + netdev = self.dut.ports_info[port]['port']
> + driver_now = netdev.get_nic_driver()
> + if driver == "":
> + driver = netdev.default_driver
> + if driver != driver_now:
> + netdev.bind_driver(driver=driver)
>
> def test_vm2vm_split_ring_iperf_with_tso(self):
> """
> @@ -490,7 +491,7 @@ class TestVM2VMVirtioNetPerf(TestCase):
> self.vm_args = "disable-
> modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso
> 4=on,guest_ecn=on,packed=on"
> self.prepare_test_env(cbdma=True, no_pci=False, client_mode=False,
> enable_queues=1, nb_cores=2,
> server_mode=False, opt_queue=None, combined=False,
> rxq_txq=None)
> - self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='ufo')
> + self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='tso')
>
> def test_vm2vm_packed_ring_iperf_with_ufo(self):
> """
> @@ -515,7 +516,7 @@ class TestVM2VMVirtioNetPerf(TestCase):
> """
> Test Case 11: VM2VM virtio-net packed ring mergeable 8 queues CBDMA
> enable test with large packet payload valid check
> """
> - # This test case need to use QEMU 3.0 to test
> + # This test case need to use QEMU version >= 4.x to test, but QEMU
> version >= 4.x reconnect vm also have issues.
> ipef_result = []
> self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16,
> allow_diff_socket=True)
>
> @@ -555,7 +556,7 @@ class TestVM2VMVirtioNetPerf(TestCase):
> """
> Test Case 12: VM2VM virtio-net packed ring non-mergeable 8 queues
> CBDMA enable test with large packet payload valid check
> """
> - # This test case need to use QEMU 3.0 to test
> + # This test case need to use QEMU version >= 4.x to test, but QEMU
> version >= 4.x reconnect vm also have issues.
> ipef_result = []
> self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16,
> allow_diff_socket=True)
>
> @@ -595,9 +596,9 @@ class TestVM2VMVirtioNetPerf(TestCase):
> """
> run after each test case.
> """
> + self.bind_cbdma_device_to_kernel()
> self.stop_all_apps()
> self.dut.kill_all()
> - self.bind_cbdma_device_to_kernel()
>
> def tear_down_all(self):
> """
> --
> 2.25.1
@@ -73,12 +73,16 @@ class TestVM2VMVirtioNetPerf(TestCase):
self.device_str = None
self.checked_vm = False
self.dut.restore_interfaces()
+ self.path=self.dut.apps_name['test-pmd']
+ self.testpmd_name=self.path.split("/")[-1]
def set_up(self):
"""
run before each test case.
"""
self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#")
+ self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#")
+ self.dut.send_expect("killall qemu-system-x86_64", "#")
self.vm_dut = []
self.vm = []
@@ -291,8 +295,12 @@ class TestVM2VMVirtioNetPerf(TestCase):
return iperfdata
def stop_all_apps(self):
- for i in range(len(self.vm)):
- self.vm[i].stop()
+ # add killall qemu-system-x86_64 step when use vm.stop() to quit vm exception
+ try:
+ for i in range(len(self.vm)):
+ self.vm[i].stop()
+ except:
+ self.dut.send_expect("killall qemu-system-x86_64", "#")
self.pmd_vhost.quit()
def offload_capbility_check(self, vm_client):
@@ -338,20 +346,13 @@ class TestVM2VMVirtioNetPerf(TestCase):
self.verify(md5_send == md5_revd, 'the received file is different with send file')
def bind_nic_driver(self, ports, driver=""):
- if driver == "igb_uio":
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver = netdev.get_nic_driver()
- if driver != 'igb_uio':
- netdev.bind_driver(driver='igb_uio')
- else:
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver_now = netdev.get_nic_driver()
- if driver == "":
- driver = netdev.default_driver
- if driver != driver_now:
- netdev.bind_driver(driver=driver)
+ for port in ports:
+ netdev = self.dut.ports_info[port]['port']
+ driver_now = netdev.get_nic_driver()
+ if driver == "":
+ driver = netdev.default_driver
+ if driver != driver_now:
+ netdev.bind_driver(driver=driver)
def test_vm2vm_split_ring_iperf_with_tso(self):
"""
@@ -490,7 +491,7 @@ class TestVM2VMVirtioNetPerf(TestCase):
self.vm_args = "disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on"
self.prepare_test_env(cbdma=True, no_pci=False, client_mode=False, enable_queues=1, nb_cores=2,
server_mode=False, opt_queue=None, combined=False, rxq_txq=None)
- self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='ufo')
+ self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='tso')
def test_vm2vm_packed_ring_iperf_with_ufo(self):
"""
@@ -515,7 +516,7 @@ class TestVM2VMVirtioNetPerf(TestCase):
"""
Test Case 11: VM2VM virtio-net packed ring mergeable 8 queues CBDMA enable test with large packet payload valid check
"""
- # This test case need to use QEMU 3.0 to test
+ # This test case need to use QEMU version >= 4.x to test, but QEMU version >= 4.x reconnect vm also have issues.
ipef_result = []
self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True)
@@ -555,7 +556,7 @@ class TestVM2VMVirtioNetPerf(TestCase):
"""
Test Case 12: VM2VM virtio-net packed ring non-mergeable 8 queues CBDMA enable test with large packet payload valid check
"""
- # This test case need to use QEMU 3.0 to test
+ # This test case need to use QEMU version >= 4.x to test, but QEMU version >= 4.x reconnect vm also have issues.
ipef_result = []
self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True)
@@ -595,9 +596,9 @@ class TestVM2VMVirtioNetPerf(TestCase):
"""
run after each test case.
"""
+ self.bind_cbdma_device_to_kernel()
self.stop_all_apps()
self.dut.kill_all()
- self.bind_cbdma_device_to_kernel()
def tear_down_all(self):
"""