[dts] [PATCH V2] tests/vhost_user_live_migration: delete upsupport zero-copy parameter

[dts] [PATCH V2] tests/vhost_user_live_migration: delete upsupport zero-copy parameter

[Ling Wei]

As DPDK community has removed support dequeue-zero-copy feature in
20.11,so remove dequeue-zero-copy parameter when start testpmd.

Signed-off-by: Ling Wei <weix.ling@intel.com>
---
 test_plans/vhost_user_live_migration_test_plan.rst | 12 ++++++------
 tests/TestSuite_vhost_user_live_migration.py       |  7 ++-----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/test_plans/vhost_user_live_migration_test_plan.rst b/test_plans/vhost_user_live_migration_test_plan.rst
index 22ff76d5..7ee5fa87 100644
--- a/test_plans/vhost_user_live_migration_test_plan.rst
+++ b/test_plans/vhost_user_live_migration_test_plan.rst
@@ -164,7 +164,7 @@ On the backup server, run the vhost testpmd on the host and launch VM:
      backup server # ssh -p 5555 127.0.0.1
      backup VM # screen -r vm
 
-Test Case 2: migrate with split ring virtio-pmd zero-copy enabled
+Test Case 2: migrate with split ring virtio-pmd enabled
 =================================================================
 
 On host server side:
@@ -177,7 +177,7 @@ On host server side:
 2. Bind host port to igb_uio and start testpmd with vhost port,note not start vhost port before launching qemu::
 
     host server# ./tools/dpdk-devbind.py -b igb_uio 82:00.1
-    host server# ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xc0000 -n 4 --vdev 'eth_vhost0,iface=./vhost-net,queues=1,dequeue-zero-copy=1' -- -i
+    host server# ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xc0000 -n 4 --vdev 'eth_vhost0,iface=./vhost-net,queues=1' -- -i
 
 3. Start VM on host, here we set 5432 as the serial port, 3333 as the qemu monitor port, 5555 as the SSH port::
 
@@ -199,7 +199,7 @@ On the backup server, run the vhost testpmd on the host and launch VM:
     backup server # mkdir /mnt/huge
     backup server # mount -t hugetlbfs hugetlbfs /mnt/huge
     backup server # ./tools/dpdk-devbind.py -b igb_uio 82:00.0
-    backup server # ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xc0000 -n 4 --vdev 'eth_vhost0,iface=./vhost-net,queues=1,dequeue-zero-copy=1' -- -i
+    backup server # ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xc0000 -n 4 --vdev 'eth_vhost0,iface=./vhost-net,queues=1' -- -i
 
 5. Launch VM on the backup server, the script is similar to host, need add " -incoming tcp:0:4444 " for live migration and make sure the VM image is the NFS mounted folder, VM image is the exact one on host server::
 
@@ -544,7 +544,7 @@ On the backup server, run the vhost testpmd on the host and launch VM:
      backup server # ssh -p 5555 127.0.0.1
      backup VM # screen -r vm
 
-Test Case 6: migrate with packed ring virtio-pmd zero-copy enabled
+Test Case 6: migrate with packed ring virtio-pmd enabled
 ==================================================================
 
 On host server side:
@@ -557,7 +557,7 @@ On host server side:
 2. Bind host port to igb_uio and start testpmd with vhost port,note not start vhost port before launching qemu::
 
     host server# ./tools/dpdk-devbind.py -b igb_uio 82:00.1
-    host server# ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xc0000 -n 4 --vdev 'eth_vhost0,iface=./vhost-net,queues=1,dequeue-zero-copy=1' -- -i
+    host server# ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xc0000 -n 4 --vdev 'eth_vhost0,iface=./vhost-net,queues=1' -- -i
 
 3. Start VM on host, here we set 5432 as the serial port, 3333 as the qemu monitor port, 5555 as the SSH port::
 
@@ -579,7 +579,7 @@ On the backup server, run the vhost testpmd on the host and launch VM:
     backup server # mkdir /mnt/huge
     backup server # mount -t hugetlbfs hugetlbfs /mnt/huge
     backup server # ./tools/dpdk-devbind.py -b igb_uio 82:00.0
-    backup server # ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xc0000 -n 4 --vdev 'eth_vhost0,iface=./vhost-net,queues=1,dequeue-zero-copy=1' -- -i
+    backup server # ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xc0000 -n 4 --vdev 'eth_vhost0,iface=./vhost-net,queues=1' -- -i
 
 5. Launch VM on the backup server, the script is similar to host, need add " -incoming tcp:0:4444 " for live migration and make sure the VM image is the NFS mounted folder, VM image is the exact one on host server::
 
diff --git a/tests/TestSuite_vhost_user_live_migration.py b/tests/TestSuite_vhost_user_live_migration.py
index 6d524db7..f73411e5 100644
--- a/tests/TestSuite_vhost_user_live_migration.py
+++ b/tests/TestSuite_vhost_user_live_migration.py
@@ -142,16 +142,13 @@ class TestVhostUserLiveMigration(TestCase):
         self.verify(len(self.core_list0) >= core_number and len(self.core_list1) >= core_number,
                     'There have not enough cores to start testpmd on duts')
 
-    def launch_testpmd_as_vhost_on_both_dut(self, zero_copy=False):
+    def launch_testpmd_as_vhost_on_both_dut(self):
         """
         start testpmd as vhost user on host_dut and backup_dut
         """
         self.get_core_list()
-        zero_copy_str = ''
-        if zero_copy is True:
-            zero_copy_str = ',dequeue-zero-copy=1'
         testcmd = self.testpmd_path + " "
-        vdev = ['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' % (self.base_dir, self.queue_number)]
         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)
-- 
2.25.1

Re: [dts] [PATCH V2] tests/vhost_user_live_migration: delete upsupport zero-copy parameter

[Ling, WeiX]

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

> -----Original Message-----
> From: Ling, WeiX <weix.ling@intel.com>
> Sent: Wednesday, March 31, 2021 01:40 PM
> To: dts@dpdk.org
> Cc: Ling, WeiX <weix.ling@intel.com>
> Subject: [dts][PATCH V2] tests/vhost_user_live_migration: delete upsupport
> zero-copy parameter
> 
Tested-by: Wei Ling <weix.ling@intel.com>

[-- Attachment #2: TestVhostUserLiveMigration.log --]
[-- Type: application/octet-stream, Size: 788671 bytes --]

Re: [dts] [PATCH V2] tests/vhost_user_live_migration: delete upsupport zero-copy parameter

[Tu, Lijuan]

> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Ling, WeiX
> Sent: 2021年3月31日 13:43
> To: dts@dpdk.org
> Subject: Re: [dts] [PATCH V2] tests/vhost_user_live_migration: delete upsupport
> zero-copy parameter
> 
> > -----Original Message-----
> > From: Ling, WeiX <weix.ling@intel.com>
> > Sent: Wednesday, March 31, 2021 01:40 PM
> > To: dts@dpdk.org
> > Cc: Ling, WeiX <weix.ling@intel.com>
> > Subject: [dts][PATCH V2] tests/vhost_user_live_migration: delete
> > upsupport zero-copy parameter
> >
> Tested-by: Wei Ling <weix.ling@intel.com>

Applied, thanks