From: Xiao Qimai <qimaix.xiao@intel.com>
To: dts@dpdk.org
Cc: Xiao Qimai <qimaix.xiao@intel.com>
Subject: [dts] [PATCH V1 07/11]vhost_user_live_migration: update script according to testplan's update
Date: Wed, 25 Mar 2020 16:10:53 +0800 [thread overview]
Message-ID: <1585123857-130281-7-git-send-email-qimaix.xiao@intel.com> (raw)
In-Reply-To: <1585123857-130281-1-git-send-email-qimaix.xiao@intel.com>
Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
---
tests/TestSuite_vhost_user_live_migration.py | 71 +++++++++++++++++++++++++---
1 file changed, 65 insertions(+), 6 deletions(-)
diff --git a/tests/TestSuite_vhost_user_live_migration.py b/tests/TestSuite_vhost_user_live_migration.py
index 5c5db0d..cb6789c 100644
--- a/tests/TestSuite_vhost_user_live_migration.py
+++ b/tests/TestSuite_vhost_user_live_migration.py
@@ -151,7 +151,7 @@ class TestVhostUserLiveMigration(TestCase):
if zero_copy is True:
zero_copy_str = ',dequeue-zero-copy=1'
testcmd = self.dut.target + "/app/testpmd "
- vdev = [r"'eth_vhost0,iface=%s/vhost-net,queues=%d%s'" % (self.base_dir, self.queue_number, zero_copy_str)]
+ vdev = ['eth_vhost0,iface=%s/vhost-net,queues=%d%s' % (self.base_dir, self.queue_number, zero_copy_str)]
para = " -- -i --nb-cores=%d --rxq=%d --txq=%d" % (self.queue_number, self.queue_number, self.queue_number)
eal_params_first = self.dut.create_eal_parameters(cores=self.core_list0, prefix='vhost', ports=[self.host_pci_info], vdevs=vdev)
eal_params_secondary = self.dut.create_eal_parameters(cores=self.core_list1, prefix='vhost', ports=[self.backup_pci_info], vdevs=vdev)
@@ -166,7 +166,7 @@ class TestVhostUserLiveMigration(TestCase):
self.backup_dut.send_expect('set fwd %s' % fwd_mode, 'testpmd> ', 30)
self.backup_dut.send_expect('start', 'testpmd> ', 30)
- def setup_vm_env_on_both_dut(self, driver='default'):
+ def setup_vm_env_on_both_dut(self, driver='default', packed=False):
"""
Create testing environment on Host and Backup
"""
@@ -183,6 +183,8 @@ class TestVhostUserLiveMigration(TestCase):
if self.queue_number > 1:
vhost_params['opt_queue'] = self.queue_number
opt_params = 'mrg_rxbuf=on,mq=on,vectors=%d' % (2*self.queue_number + 2)
+ if packed:
+ opt_params = opt_params + ',packed=on'
vhost_params['opt_settings'] = opt_params
self.host_vm.set_vm_device(**vhost_params)
@@ -385,7 +387,7 @@ class TestVhostUserLiveMigration(TestCase):
# make sure still can receive packets
verify_fun(self.vm_dut_backup)
- def test_migrate_with_virtio_net(self):
+ def test_migrate_with_split_ring_virtio_net(self):
"""
Verify migrate virtIO device from host to backup host,
Verify before/in/after migration, device with kernel driver can receive packets
@@ -402,7 +404,7 @@ class TestVhostUserLiveMigration(TestCase):
self.send_and_verify(self.verify_kernel)
- def test_migrete_with_vritio_net_with_multi_queue(self):
+ def test_adjust_split_ring_virtio_net_queue_numbers_while_migreting_with_virtio_net(self):
self.queue_number = 4
self.launch_testpmd_as_vhost_on_both_dut()
self.start_testpmd_with_fwd_mode_on_both_dut()
@@ -414,7 +416,7 @@ class TestVhostUserLiveMigration(TestCase):
self.send_and_verify(self.verify_kernel, True)
- def test_migrate_with_virtio_pmd(self):
+ def test_migrate_with_split_ring_virtio_pmd(self):
self.queue_number = 1
self.launch_testpmd_as_vhost_on_both_dut()
self.start_testpmd_with_fwd_mode_on_both_dut()
@@ -426,7 +428,7 @@ class TestVhostUserLiveMigration(TestCase):
self.send_and_verify(self.verify_dpdk)
- def test_migrate_with_zero_copy_virtio_pmd(self):
+ def test_migrate_with_split_ring_virtio_pmd_zero_copy(self):
self.queue_number = 1
zero_copy = True
# start testpmd and qemu on dut
@@ -442,6 +444,63 @@ class TestVhostUserLiveMigration(TestCase):
self.send_and_verify(self.verify_dpdk)
+ def test_migrate_with_packed_ring_virtio_pmd(self):
+ self.queue_number = 1
+ self.launch_testpmd_as_vhost_on_both_dut()
+ self.start_testpmd_with_fwd_mode_on_both_dut()
+ self.setup_vm_env_on_both_dut(packed=True)
+
+ # bind virtio-net to igb_uio
+ self.bind_nic_driver_of_vm(self.vm_dut_host, driver="igb_uio")
+ self.start_testpmd_on_vm(self.vm_dut_host)
+
+ self.send_and_verify(self.verify_dpdk)
+
+ def test_migrate_with_packed_ring_virtio_pmd_zero_copy(self):
+ self.queue_number = 1
+ zero_copy = True
+ # start testpmd and qemu on dut
+ # after qemu start ok, then send 'start' command to testpmd
+ # if send 'start' command before start qemu, maybe qemu will start failed
+ self.launch_testpmd_as_vhost_on_both_dut(zero_copy)
+ self.setup_vm_env_on_both_dut(packed=True)
+ self.start_testpmd_with_fwd_mode_on_both_dut()
+
+ # bind virtio-net to igb_uio
+ self.bind_nic_driver_of_vm(self.vm_dut_host, driver="igb_uio")
+ self.start_testpmd_on_vm(self.vm_dut_host)
+
+ self.send_and_verify(self.verify_dpdk)
+
+ def test_migrate_with_packed_ring_virtio_net(self):
+ """
+ Verify migrate virtIO device from host to backup host,
+ Verify before/in/after migration, device with kernel driver can receive packets
+ """
+ self.queue_number = 1
+ self.launch_testpmd_as_vhost_on_both_dut()
+ self.start_testpmd_with_fwd_mode_on_both_dut()
+ self.setup_vm_env_on_both_dut(packed=True)
+
+ # bind virtio-net back to virtio-pci
+ self.bind_nic_driver_of_vm(self.vm_dut_host, driver="")
+ # start screen and tcpdump on vm
+ self.start_tcpdump_on_vm(self.vm_dut_host)
+
+ self.send_and_verify(self.verify_kernel)
+
+ def test_adjust_packed_ring_virtio_net_queue_numbers_while_migreting_with_virtio_net(self):
+ self.queue_number = 4
+ self.launch_testpmd_as_vhost_on_both_dut()
+ self.start_testpmd_with_fwd_mode_on_both_dut()
+ self.setup_vm_env_on_both_dut(packed=True)
+
+ # bind virtio-net back to virtio-pci
+ self.bind_nic_driver_of_vm(self.vm_dut_host, driver="")
+ self.start_tcpdump_on_vm(self.vm_dut_host)
+
+ self.send_and_verify(self.verify_kernel, True)
+
def tear_down(self):
self.destroy_vm_env()
# stop send packet on tester
--
1.8.3.1
next prev parent reply other threads:[~2020-03-25 8:17 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-25 8:10 [dts] [PATCH V1 01/11]loopback_multi_paths_port_restart: " Xiao Qimai
2020-03-25 8:10 ` [dts] [PATCH V1 02/11]loopback_multi_queues: " Xiao Qimai
2020-03-25 8:23 ` Wang, Yinan
2020-03-31 3:00 ` Xiao, QimaiX
2020-03-25 8:10 ` [dts] [PATCH V1 03/11]pvp_virtio_user_2M_hugepages: " Xiao Qimai
2020-03-25 8:23 ` Wang, Yinan
2020-03-31 3:00 ` Xiao, QimaiX
2020-03-25 8:10 ` [dts] [PATCH V1 04/11]pvp_virtio_user_4k_pages: " Xiao Qimai
2020-03-25 8:20 ` Wang, Yinan
2020-03-31 3:00 ` Xiao, QimaiX
2020-03-25 8:10 ` [dts] [PATCH V1 05/11]vhost_enqueue_interrupt: " Xiao Qimai
2020-03-25 8:22 ` Wang, Yinan
2020-03-31 3:00 ` Xiao, QimaiX
2020-03-25 8:10 ` [dts] [PATCH V1 06/11]vhost_event_idx_interrupt: " Xiao Qimai
2020-03-25 8:21 ` Wang, Yinan
2020-03-31 2:59 ` Xiao, QimaiX
2020-03-25 8:10 ` Xiao Qimai [this message]
2020-03-25 8:22 ` [dts] [PATCH V1 07/11]vhost_user_live_migration: " Wang, Yinan
2020-03-31 2:59 ` Xiao, QimaiX
2020-03-25 8:10 ` [dts] [PATCH V1 08/11]vhost_virtio_pmd_interrupt: " Xiao Qimai
2020-03-25 8:22 ` Wang, Yinan
2020-03-31 3:00 ` Xiao, QimaiX
2020-03-25 8:10 ` [dts] [PATCH V1 09/11]vhost_virtio_user_interrupt: " Xiao Qimai
2020-03-25 8:22 ` Wang, Yinan
2020-03-31 3:00 ` Xiao, QimaiX
2020-03-25 8:10 ` [dts] [PATCH V1 10/11]virtio_event_idx_interrupt: " Xiao Qimai
2020-03-25 8:22 ` Wang, Yinan
2020-03-31 2:59 ` Xiao, QimaiX
2020-03-25 8:10 ` [dts] [PATCH V1 11/11]virtio_pvp_regression: " Xiao Qimai
2020-03-25 8:22 ` Wang, Yinan
2020-03-31 2:59 ` Xiao, QimaiX
2020-03-25 8:22 ` [dts] [PATCH V1 01/11]loopback_multi_paths_port_restart: " Wang, Yinan
2020-03-31 3:00 ` Xiao, QimaiX
2020-03-31 3:06 ` Tu, Lijuan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1585123857-130281-7-git-send-email-qimaix.xiao@intel.com \
--to=qimaix.xiao@intel.com \
--cc=dts@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).