diff mbox series

[V1] tests/vhost_virtio_user_interrupt:Add -a option to use expect pci to start testpmd

Message ID 20210114144805.1899603-1-weix.ling@intel.com (mailing list archive)
State Changes Requested
Headers show
Series [V1] tests/vhost_virtio_user_interrupt:Add -a option to use expect pci to start testpmd | expand

Commit Message

Ling, WeiX Jan. 14, 2021, 2:48 p.m. UTC
Add -a option to use expect pci to start testpmd.

Signed-off-by: Ling Wei <weix.ling@intel.com>
---
 tests/TestSuite_vhost_virtio_user_interrupt.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Comments

Ling, WeiX Jan. 14, 2021, 6:58 a.m. UTC | #1
Tested-by: Wei Ling <weix.ling@intel.com>

Regards,
Ling Wei

> -----Original Message-----
> From: Ling Wei <weix.ling@intel.com>
> Sent: Thursday, January 14, 2021 10:48 PM
> To: dts@dpdk.org
> Cc: Ling, WeiX <weix.ling@intel.com>
> Subject: [dts][PATCH V1] tests/vhost_virtio_user_interrupt:Add -a option to
> use expect pci to start testpmd
Zhao, HaiyangX Jan. 14, 2021, 7:05 a.m. UTC | #2
Acked-by: Haiyang Zhao <haiyangx.zhao@intel.com>

Best Regards,
Zhao Haiyang

> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Ling, WeiX
> Sent: Thursday, January 14, 2021 14:59
> To: Ling, WeiX <weix.ling@intel.com>; dts@dpdk.org
> Subject: Re: [dts] [PATCH V1] tests/vhost_virtio_user_interrupt:Add -a
> option to use expect pci to start testpmd
> 
> Tested-by: Wei Ling <weix.ling@intel.com>
> 
> Regards,
> Ling Wei
> 
> > -----Original Message-----
> > From: Ling Wei <weix.ling@intel.com>
> > Sent: Thursday, January 14, 2021 10:48 PM
> > To: dts@dpdk.org
> > Cc: Ling, WeiX <weix.ling@intel.com>
> > Subject: [dts][PATCH V1] tests/vhost_virtio_user_interrupt:Add -a
> > option to use expect pci to start testpmd
Tu, Lijuan Jan. 21, 2021, 7:23 a.m. UTC | #3
> 
> Add -a option to use expect pci to start testpmd.
> 
> Signed-off-by: Ling Wei <weix.ling@intel.com>
> ---
>  tests/TestSuite_vhost_virtio_user_interrupt.py | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/TestSuite_vhost_virtio_user_interrupt.py
> b/tests/TestSuite_vhost_virtio_user_interrupt.py
> index 9f89c460..be02ee52 100644
> --- a/tests/TestSuite_vhost_virtio_user_interrupt.py
> +++ b/tests/TestSuite_vhost_virtio_user_interrupt.py
> @@ -127,17 +127,21 @@ class TestVirtioUserInterrupt(TestCase):
>          testcmd = self.app_testpmd_path + " "
>          vdev = ["net_vhost0,iface=vhost-net,queues=1,client=0"]
>          para = " -- -i --rxq=1 --txq=1"
> +        allow_pci = [self.pci_info]
> +        if dmas:
> +            for item in self.used_cbdma:
> +                allow_pci.append(item)
>          if len(pci) == 0:
>              if dmas:
>                  vdev = ["net_vhost0,iface=vhost-net,queues=1,dmas=[%s]" % dmas]
> -                eal_params =
> self.dut.create_eal_parameters(cores=self.core_list_vhost, vdevs=vdev)
> +                eal_params =
> + self.dut.create_eal_parameters(cores=self.core_list_vhost,
> + ports=allow_pci, vdevs=vdev)
>              else:
> -                eal_params =
> self.dut.create_eal_parameters(cores=self.core_list_vhost,
> ports=[self.pci_info], vdevs=vdev)
> +                eal_params =
> + self.dut.create_eal_parameters(cores=self.core_list_vhost,
> + ports=allow_pci, vdevs=vdev)
>          else:
>              if dmas:
>                  vdev = ["net_vhost0,iface=vhost-
> net,queues=1,client=0,dmas=[%s]" % dmas]
>                  para = " -- -i"
> -                eal_params =
> self.dut.create_eal_parameters(cores=self.core_list_vhost, ports=pci,
> prefix='vhost', vdevs=vdev)
> +                eal_params =
> + self.dut.create_eal_parameters(cores=self.core_list_vhost,
> + ports=allow_pci, prefix='vhost', vdevs=vdev)
>              else:
>                  eal_params =
> self.dut.create_eal_parameters(cores=self.core_list_vhost, prefix='vhost',
> no_pci=True, vdevs=vdev)
>          cmd_vhost_user = testcmd + eal_params + para @@ -160,6 +164,7 @@
> class TestVirtioUserInterrupt(TestCase):
>          self.virtio.send_expect("start", "testpmd>", 20)
> 
>      def check_interrupt_log(self, status):
> +        time.sleep(3)
>          out = self.l3fwd.get_session_before()

    Prefer self.l3fwd.get_session_before(timeout=3) to sleep

>          if status == "waked up":
>              info = "lcore %s is waked up from rx interrupt on port 0 queue 0"
> --
> 2.25.1
diff mbox series

Patch

diff --git a/tests/TestSuite_vhost_virtio_user_interrupt.py b/tests/TestSuite_vhost_virtio_user_interrupt.py
index 9f89c460..be02ee52 100644
--- a/tests/TestSuite_vhost_virtio_user_interrupt.py
+++ b/tests/TestSuite_vhost_virtio_user_interrupt.py
@@ -127,17 +127,21 @@  class TestVirtioUserInterrupt(TestCase):
         testcmd = self.app_testpmd_path + " "
         vdev = ["net_vhost0,iface=vhost-net,queues=1,client=0"]
         para = " -- -i --rxq=1 --txq=1"
+        allow_pci = [self.pci_info]
+        if dmas:
+            for item in self.used_cbdma:
+                allow_pci.append(item)
         if len(pci) == 0:
             if dmas:
                 vdev = ["net_vhost0,iface=vhost-net,queues=1,dmas=[%s]" % dmas]
-                eal_params = self.dut.create_eal_parameters(cores=self.core_list_vhost, vdevs=vdev)
+                eal_params = self.dut.create_eal_parameters(cores=self.core_list_vhost, ports=allow_pci, vdevs=vdev)
             else:
-                eal_params = self.dut.create_eal_parameters(cores=self.core_list_vhost, ports=[self.pci_info], vdevs=vdev)
+                eal_params = self.dut.create_eal_parameters(cores=self.core_list_vhost, ports=allow_pci, vdevs=vdev)
         else:
             if dmas:
                 vdev = ["net_vhost0,iface=vhost-net,queues=1,client=0,dmas=[%s]" % dmas]
                 para = " -- -i"
-                eal_params = self.dut.create_eal_parameters(cores=self.core_list_vhost, ports=pci, prefix='vhost', vdevs=vdev)
+                eal_params = self.dut.create_eal_parameters(cores=self.core_list_vhost, ports=allow_pci, prefix='vhost', vdevs=vdev)
             else:
                 eal_params = self.dut.create_eal_parameters(cores=self.core_list_vhost, prefix='vhost', no_pci=True, vdevs=vdev)
         cmd_vhost_user = testcmd + eal_params + para
@@ -160,6 +164,7 @@  class TestVirtioUserInterrupt(TestCase):
         self.virtio.send_expect("start", "testpmd>", 20)
 
     def check_interrupt_log(self, status):
+        time.sleep(3)
         out = self.l3fwd.get_session_before()
         if status == "waked up":
             info = "lcore %s is waked up from rx interrupt on port 0 queue 0"