[dts] [PATCH V1 0/7] fix l3fwd-power quit failed

[dts] [PATCH V1 0/7] fix l3fwd-power quit failed

[Xiao Qimai]

*. use killall to quit l3fwd-power

Xiao Qimai (7):
  fix kill l3fwd-power
  fix kill l3fwd-power
  fix kill l3fwd-power
  fix kill l3fwd-power
  fix kill l3fwd-power
  fix kill l3fwd-power
  fix kill l3fwd-power

 tests/TestSuite_iavf.py                        |  6 ++++--
 tests/TestSuite_kernelpf_iavf.py               |  2 +-
 tests/TestSuite_vf_interrupt_pmd.py            |  2 +-
 tests/TestSuite_vhost_enqueue_interrupt.py     |  4 ++--
 tests/TestSuite_vhost_event_idx_interrupt.py   |  4 ++--
 tests/TestSuite_vhost_virtio_pmd_interrupt.py  | 15 ++++++++++-----
 tests/TestSuite_vhost_virtio_user_interrupt.py |  4 ++--
 7 files changed, 22 insertions(+), 15 deletions(-)

-- 
1.8.3.1

[dts] [PATCH V1 1/7]tests/TestSuite_iavf: fix kill l3fwd-power

[Xiao Qimai]

Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
---
 tests/TestSuite_iavf.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/TestSuite_iavf.py b/tests/TestSuite_iavf.py
index dedabbd..248bd8d 100644
--- a/tests/TestSuite_iavf.py
+++ b/tests/TestSuite_iavf.py
@@ -729,6 +729,7 @@ class TestIavf(TestCase):
 
     def test_vf_rx_interrupt(self):
         # build l3fwd-power
+        self.vm_dut_alt = self.vm_dut_0.create_session(name="vm_dut_alt")
         out = self.vm_dut_0.build_dpdk_apps("./examples/l3fwd-power")
         self.verify("Error" not in out, "Compilation error")
         self.verify("No such" not in out, "Compilation error")
@@ -755,13 +756,14 @@ class TestIavf(TestCase):
         out = self.vm_dut_0.get_session_output()
         self.verify('L3FWD_POWER: lcore 0 is waked up from rx interrupt' in out, 'lcore 0 is not waked up')
         self.verify('L3FWD_POWER: lcore 1 is waked up from rx interrupt' in out, 'lcore 1 is not waked up')
-        self.vm_dut_0.send_expect("^C", "# ", 60)
+        self.vm_dut_alt.send_expect("killall l3fwd-power", "# ", 10)
         self.vm_dut_0.bind_interfaces_linux(driver="igb_uio")
         self.interrupt_flag = True
 
     def tear_down(self):
         if self.running_case == "test_vf_rx_interrupt":
-            self.vm_dut_0.send_expect("^C", "# ", 60)
+            self.vm_dut_alt.send_expect("killall l3fwd-power", "# ", 10)
+            self.vm_dut_alt.close()
         else:
             self.vm0_testpmd.quit()
 
-- 
1.8.3.1

[dts] [PATCH V1 2/7]tests/TestSuite_kernelpf_iavf: fix kill l3fwd-power

[Xiao Qimai]

Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
---
 tests/TestSuite_kernelpf_iavf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/TestSuite_kernelpf_iavf.py b/tests/TestSuite_kernelpf_iavf.py
index d5b2c7b..4e6af81 100644
--- a/tests/TestSuite_kernelpf_iavf.py
+++ b/tests/TestSuite_kernelpf_iavf.py
@@ -836,7 +836,7 @@ class TestKernelpfIavf(TestCase):
         out = self.dut.get_session_output()
         self.verify('L3FWD_POWER: lcore 6 is waked up from rx interrupt' in out, 'lcore 6 is not waked up')
         self.verify('L3FWD_POWER: lcore 7 is waked up from rx interrupt' in out, 'lcore 7 is not waked up')
-        self.dut.send_expect("^C", "# ", 60)
+        self.dut.send_expect("killall l3fwd-power", "# ", 60, alt_session=True)
         self.interrupt_flag = True
         time.sleep(1)
         self.destroy_2vf_in_2pf()
-- 
1.8.3.1

[dts] [PATCH V1 3/7]tests/TestSuite_vf_interrupt_pmd: fix kill l3fwd-power

[Xiao Qimai]

Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
---
 tests/TestSuite_vf_interrupt_pmd.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/TestSuite_vf_interrupt_pmd.py b/tests/TestSuite_vf_interrupt_pmd.py
index 00aa2c6..a76d38c 100644
--- a/tests/TestSuite_vf_interrupt_pmd.py
+++ b/tests/TestSuite_vf_interrupt_pmd.py
@@ -397,7 +397,7 @@ class TestVfInterruptPmd(TestCase):
         """
         Run after each test case.
         """
-        self.dut.send_expect("^c", "#", 20)
+        self.dut.send_expect("killall l3fwd-power", "# ", 10, alt_session=True)
 
     def tear_down_all(self):
         """
-- 
1.8.3.1

[dts] [PATCH V1 4/7]tests/TestSuite_vhost_enqueue_interrupt: fix kill l3fwd-power

[Xiao Qimai]

Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
---
 tests/TestSuite_vhost_enqueue_interrupt.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/TestSuite_vhost_enqueue_interrupt.py b/tests/TestSuite_vhost_enqueue_interrupt.py
index 9d0e024..7c6368a 100644
--- a/tests/TestSuite_vhost_enqueue_interrupt.py
+++ b/tests/TestSuite_vhost_enqueue_interrupt.py
@@ -59,7 +59,7 @@ class TestVhostEnqueueInterrupt(TestCase):
         # Clean the execution ENV
         self.verify_info = []
         self.dut.send_expect("killall -s INT testpmd", "#")
-        self.dut.send_expect("killall -s INT l3fwd-power", "#")
+        self.dut.send_expect("killall l3fwd-power", "#")
         self.dut.send_expect("rm -rf ./vhost-net*", "#")
         self.vhost = self.dut.new_session(suite="vhost-l3fwd")
         self.virtio_user = self.dut.new_session(suite="virtio-user")
@@ -201,7 +201,7 @@ class TestVhostEnqueueInterrupt(TestCase):
         Run after each test case.
         """
         self.close_testpmd_and_session()
-        self.dut.send_expect("killall -s INT l3fwd-power", "#")
+        self.dut.send_expect("killall l3fwd-power", "#")
         self.dut.send_expect("killall -s INT testpmd", "#")
         self.dut.kill_all()
 
-- 
1.8.3.1

[dts] [PATCH V1 5/7]tests/TestSuite_vhost_event_idx_interrupt: fix kill l3fwd-power

[Xiao Qimai]

Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
---
 tests/TestSuite_vhost_event_idx_interrupt.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/TestSuite_vhost_event_idx_interrupt.py b/tests/TestSuite_vhost_event_idx_interrupt.py
index 5a9f932..d6b0b3d 100644
--- a/tests/TestSuite_vhost_event_idx_interrupt.py
+++ b/tests/TestSuite_vhost_event_idx_interrupt.py
@@ -61,7 +61,7 @@ class TestVhostEventIdxInterrupt(TestCase):
         """
         # Clean the execution ENV
         self.verify_info = []
-        self.dut.send_expect("killall -s INT l3fwd-power", "#")
+        self.dut.send_expect("killall l3fwd-power", "#")
         self.dut.send_expect("killall -s INT qemu-system-x86_64", "#")
         self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#")
         self.vhost = self.dut.new_session(suite="vhost-l3fwd")
@@ -339,7 +339,7 @@ class TestVhostEventIdxInterrupt(TestCase):
         Run after each test case.
         """
         self.dut.close_session(self.vhost)
-        self.dut.send_expect("killall -s INT l3fwd-power", "#")
+        self.dut.send_expect("killall l3fwd-power", "#")
         self.dut.send_expect("killall -s INT qemu-system-x86_64", "#")
 
     def tear_down_all(self):
-- 
1.8.3.1

[dts] [PATCH V1 6/7]tests/TestSuite_vhost_virtio_pmd_interrupt: fix kill l3fwd-power

[Xiao Qimai]

Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
---
 tests/TestSuite_vhost_virtio_pmd_interrupt.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tests/TestSuite_vhost_virtio_pmd_interrupt.py b/tests/TestSuite_vhost_virtio_pmd_interrupt.py
index ca69932..bf50b07 100644
--- a/tests/TestSuite_vhost_virtio_pmd_interrupt.py
+++ b/tests/TestSuite_vhost_virtio_pmd_interrupt.py
@@ -268,13 +268,18 @@ class TestVhostVirtioPmdInterrupt(TestCase):
         """
         close all vms
         """
-        self.vm_dut.send_expect("^c", "#", 15)
-        self.vm_dut.send_expect("cp /tmp/main.c ./examples/l3fwd-power/", "#", 15)
-        out = self.vm_dut.build_dpdk_apps('examples/l3fwd-power')
-        self.vm.stop()
+        if self.vm_dut is not None:
+            vm_dut2 = self.vm_dut.create_session(name="vm_dut2")
+            vm_dut2.send_expect("killall l3fwd-power", "# ", 10)
+            # self.vm_dut.send_expect("killall l3fwd-power", "# ", 60, alt_session=True)
+            self.vm_dut.send_expect("cp /tmp/main.c ./examples/l3fwd-power/", "#", 15)
+            out = self.vm_dut.build_dpdk_apps('examples/l3fwd-power')
+            self.vm.stop()
+            self.dut.close_session(vm_dut2)
         self.vhost_user.send_expect("quit", "#", 10)
         self.dut.close_session(self.vhost_user)
 
+
     def test_perf_virtio_pmd_interrupt_with_4queues(self):
         """
         wake up virtio_user 0.95 core with l3fwd-power sample
@@ -329,7 +334,7 @@ class TestVhostVirtioPmdInterrupt(TestCase):
         Run after each test case.
         """
         self.stop_all_apps()
-        self.dut.send_expect("killall -s INT testpmd", "#")
+        self.dut.kill_all()
         self.dut.send_expect("killall -s INT qemu-system-x86_64", "#")
 
     def tear_down_all(self):
-- 
1.8.3.1

[dts] [PATCH V1 7/7]tests/TestSuite_vhost_virtio_user_interrupt: fix kill l3fwd-power

[Xiao Qimai]

Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
---
 tests/TestSuite_vhost_virtio_user_interrupt.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/TestSuite_vhost_virtio_user_interrupt.py b/tests/TestSuite_vhost_virtio_user_interrupt.py
index 69d5668..59b9b2f 100644
--- a/tests/TestSuite_vhost_virtio_user_interrupt.py
+++ b/tests/TestSuite_vhost_virtio_user_interrupt.py
@@ -68,7 +68,7 @@ class TestVirtioUserInterrupt(TestCase):
         run before each test case.
         """
         self.dut.send_expect("killall -s INT testpmd", "#")
-        self.dut.send_expect("killall -s INT l3fwd-power", "#")
+        self.dut.send_expect("killall l3fwd-power", "#")
         self.dut.send_expect("rm -rf vhost-net*", "#")
 
         self.l3fwd = self.dut.new_session(suite="l3fwd")
@@ -250,7 +250,7 @@ class TestVirtioUserInterrupt(TestCase):
         """
         run after each test case.
         """
-        self.dut.send_expect("killall -s INT l3fwd-power", "#")
+        self.dut.send_expect("killall l3fwd-power", "#")
         self.dut.send_expect("killall -s INT testpmd", "#")
         self.close_all_session()
 
-- 
1.8.3.1

Re: [dts] [PATCH V1 0/7] fix l3fwd-power quit failed

[Zhao, XinfengX]

Tested-by:  Zhao, Xinfeng<xinfengx.zhao@intel.com>

-----Original Message-----
From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Xiao Qimai
Sent: Wednesday, April 8, 2020 5:19 PM
To: dts@dpdk.org
Cc: Xiao, QimaiX <qimaix.xiao@intel.com>
Subject: [dts] [PATCH V1 0/7] fix l3fwd-power quit failed

*. use killall to quit l3fwd-power

Xiao Qimai (7):
  fix kill l3fwd-power
  fix kill l3fwd-power
  fix kill l3fwd-power
  fix kill l3fwd-power
  fix kill l3fwd-power
  fix kill l3fwd-power
  fix kill l3fwd-power

 tests/TestSuite_iavf.py                        |  6 ++++--
 tests/TestSuite_kernelpf_iavf.py               |  2 +-
 tests/TestSuite_vf_interrupt_pmd.py            |  2 +-
 tests/TestSuite_vhost_enqueue_interrupt.py     |  4 ++--
 tests/TestSuite_vhost_event_idx_interrupt.py   |  4 ++--
 tests/TestSuite_vhost_virtio_pmd_interrupt.py  | 15 ++++++++++-----  tests/TestSuite_vhost_virtio_user_interrupt.py |  4 ++--
 7 files changed, 22 insertions(+), 15 deletions(-)

--
1.8.3.1

Re: [dts] [PATCH V1 0/7] fix l3fwd-power quit failed

[Tu, Lijuan]

Applied the series, thanks

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Xiao Qimai
> Sent: Wednesday, April 8, 2020 5:19 PM
> To: dts@dpdk.org
> Cc: Xiao, QimaiX <qimaix.xiao@intel.com>
> Subject: [dts] [PATCH V1 0/7] fix l3fwd-power quit failed
> 
> *. use killall to quit l3fwd-power
> 
> Xiao Qimai (7):
>   fix kill l3fwd-power
>   fix kill l3fwd-power
>   fix kill l3fwd-power
>   fix kill l3fwd-power
>   fix kill l3fwd-power
>   fix kill l3fwd-power
>   fix kill l3fwd-power
> 
>  tests/TestSuite_iavf.py                        |  6 ++++--
>  tests/TestSuite_kernelpf_iavf.py               |  2 +-
>  tests/TestSuite_vf_interrupt_pmd.py            |  2 +-
>  tests/TestSuite_vhost_enqueue_interrupt.py     |  4 ++--
>  tests/TestSuite_vhost_event_idx_interrupt.py   |  4 ++--
>  tests/TestSuite_vhost_virtio_pmd_interrupt.py  | 15 ++++++++++-----
> tests/TestSuite_vhost_virtio_user_interrupt.py |  4 ++--
>  7 files changed, 22 insertions(+), 15 deletions(-)
> 
> --
> 1.8.3.1