From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 93EA0A058A; Wed, 25 Mar 2020 09:22:58 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 870131BE8A; Wed, 25 Mar 2020 09:22:58 +0100 (CET) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 9BC862C15 for ; Wed, 25 Mar 2020 09:22:57 +0100 (CET) IronPort-SDR: yFRvHwhBzZJ17BVm8zQ9YqIz4yxXMZAR24ew8gSTdpno2BDXMixGZ6SyGLiWg7cCCrvo+9/feL jwRO9khR6kVA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2020 01:22:56 -0700 IronPort-SDR: chljTQHDYTWR0CYWcXEvgXK9+LvWiz4kNl95PWA4rqat99WF98BQ3lknDLU7Bt463hUahdEsGb f6WWrU2kod9g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,303,1580803200"; d="scan'208";a="240336151" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga008.fm.intel.com with ESMTP; 25 Mar 2020 01:22:56 -0700 Received: from shsmsx602.ccr.corp.intel.com (10.109.6.142) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 25 Mar 2020 01:22:56 -0700 Received: from shsmsx603.ccr.corp.intel.com (10.109.6.143) by SHSMSX602.ccr.corp.intel.com (10.109.6.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 25 Mar 2020 16:22:54 +0800 Received: from shsmsx603.ccr.corp.intel.com ([10.109.6.143]) by SHSMSX603.ccr.corp.intel.com ([10.109.6.143]) with mapi id 15.01.1713.004; Wed, 25 Mar 2020 16:22:54 +0800 From: "Wang, Yinan" To: "Xiao, QimaiX" , "dts@dpdk.org" CC: "Xiao, QimaiX" Thread-Topic: [dts] [PATCH V1 07/11]vhost_user_live_migration: update script according to testplan's update Thread-Index: AQHWAn3ijYgujsjT+kWCg5ru/1VGQKhY+Ciw Date: Wed, 25 Mar 2020 08:22:54 +0000 Message-ID: References: <1585123857-130281-1-git-send-email-qimaix.xiao@intel.com> <1585123857-130281-7-git-send-email-qimaix.xiao@intel.com> In-Reply-To: <1585123857-130281-7-git-send-email-qimaix.xiao@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.2.0.6 dlp-product: dlpe-windows x-originating-ip: [10.239.127.36] Content-Type: text/plain; charset="iso-2022-jp" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dts] [PATCH V1 07/11]vhost_user_live_migration: update script according to testplan's update 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" Acked-by: Wang, Yinan > -----Original Message----- > From: dts On Behalf Of Xiao Qimai > Sent: 2020=1B$BG/=1B(B3=1B$B7n=1B(B25=1B$BF|=1B(B 16:11 > To: dts@dpdk.org > Cc: Xiao, QimaiX > Subject: [dts] [PATCH V1 07/11]vhost_user_live_migration: update script > according to testplan's update >=20 > Signed-off-by: Xiao Qimai > --- > tests/TestSuite_vhost_user_live_migration.py | 71 > +++++++++++++++++++++++++--- > 1 file changed, 65 insertions(+), 6 deletions(-) >=20 > 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 =3D ',dequeue-zero-copy=3D1' > testcmd =3D self.dut.target + "/app/testpmd " > - vdev =3D [r"'eth_vhost0,iface=3D%s/vhost-net,queues=3D%d%s'" % > (self.base_dir, self.queue_number, zero_copy_str)] > + vdev =3D ['eth_vhost0,iface=3D%s/vhost-net,queues=3D%d%s' % > + (self.base_dir, self.queue_number, zero_copy_str)] > para =3D " -- -i --nb-cores=3D%d --rxq=3D%d --txq=3D%d" % > (self.queue_number, self.queue_number, self.queue_number) > eal_params_first =3D > self.dut.create_eal_parameters(cores=3Dself.core_list0, prefix=3D'vhost', > ports=3D[self.host_pci_info], vdevs=3Dvdev) > eal_params_secondary =3D > self.dut.create_eal_parameters(cores=3Dself.core_list1, prefix=3D'vhost', > ports=3D[self.backup_pci_info], vdevs=3Dvdev) @@ -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) >=20 > - def setup_vm_env_on_both_dut(self, driver=3D'default'): > + def setup_vm_env_on_both_dut(self, driver=3D'default', packed=3DFals= e): > """ > Create testing environment on Host and Backup > """ > @@ -183,6 +183,8 @@ class TestVhostUserLiveMigration(TestCase): > if self.queue_number > 1: > vhost_params['opt_queue'] =3D self.queue_number > opt_params =3D 'mrg_rxbuf=3Don,mq=3Don,vectors=3D%d' % > (2*self.queue_number + 2) > + if packed: > + opt_params =3D opt_params + ',packed=3Don' > vhost_params['opt_settings'] =3D opt_params > self.host_vm.set_vm_device(**vhost_params) >=20 > @@ -385,7 +387,7 @@ class TestVhostUserLiveMigration(TestCase): > # make sure still can receive packets > verify_fun(self.vm_dut_backup) >=20 > - 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): >=20 > self.send_and_verify(self.verify_kernel) >=20 > - def test_migrete_with_vritio_net_with_multi_queue(self): > + def > test_adjust_split_ring_virtio_net_queue_numbers_while_migreting_with_virt= io > _net(self): > self.queue_number =3D 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): >=20 > self.send_and_verify(self.verify_kernel, True) >=20 > - def test_migrate_with_virtio_pmd(self): > + def test_migrate_with_split_ring_virtio_pmd(self): > self.queue_number =3D 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): >=20 > self.send_and_verify(self.verify_dpdk) >=20 > - def test_migrate_with_zero_copy_virtio_pmd(self): > + def test_migrate_with_split_ring_virtio_pmd_zero_copy(self): > self.queue_number =3D 1 > zero_copy =3D True > # start testpmd and qemu on dut @@ -442,6 +444,63 @@ class > TestVhostUserLiveMigration(TestCase): >=20 > self.send_and_verify(self.verify_dpdk) >=20 > + def test_migrate_with_packed_ring_virtio_pmd(self): > + self.queue_number =3D 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=3DTrue) > + > + # bind virtio-net to igb_uio > + self.bind_nic_driver_of_vm(self.vm_dut_host, driver=3D"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 =3D 1 > + zero_copy =3D 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 sta= rt > failed > + self.launch_testpmd_as_vhost_on_both_dut(zero_copy) > + self.setup_vm_env_on_both_dut(packed=3DTrue) > + 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=3D"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 =3D 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=3DTrue) > + > + # bind virtio-net back to virtio-pci > + self.bind_nic_driver_of_vm(self.vm_dut_host, driver=3D"") > + # 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_vi > rtio_net(self): > + self.queue_number =3D 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=3DTrue) > + > + # bind virtio-net back to virtio-pci > + self.bind_nic_driver_of_vm(self.vm_dut_host, driver=3D"") > + 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