[V1,2/2] tests/vhost_virtio_user_interrupt_cbdma: modify the dmas parameter

Message ID 20221109053907.1207084-1-weix.ling@intel.com (mailing list archive)
State Superseded
Headers
Series modify the dmas parameter by DPDK changed |

Checks

Context Check Description
ci/Intel-dts-pylama-test success Testing OK
ci/Intel-dts-doc-test success Testing OK
ci/Intel-dts-suite-test warning SKIPPED
ci/Intel-dts-format-test success Testing OK

Commit Message

Ling, WeiX Nov. 9, 2022, 5:39 a.m. UTC
  From DPDK-22.11, the dmas parameter have changed, so modify the dmas
parameter in the testsuite.

Signed-off-by: Wei Ling <weix.ling@intel.com>
---
 ...Suite_vhost_virtio_user_interrupt_cbdma.py | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)
  

Patch

diff --git a/tests/TestSuite_vhost_virtio_user_interrupt_cbdma.py b/tests/TestSuite_vhost_virtio_user_interrupt_cbdma.py
index e3dc51a9..d9f8280c 100644
--- a/tests/TestSuite_vhost_virtio_user_interrupt_cbdma.py
+++ b/tests/TestSuite_vhost_virtio_user_interrupt_cbdma.py
@@ -175,10 +175,13 @@  class TestVirtioUserInterruptCbdma(TestCase):
         Test Case1: Split ring LSC event between vhost-user and virtio-user with cbdma enable
         """
         self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=1)
-        lcore_dma = "lcore%s@%s" % (self.vhost_core_list[1], self.cbdma_list[0])
-        vhost_param = "--lcore-dma=[%s]" % lcore_dma
+        dmas = "txq0@%s;rxq0@%s" % (
+            self.cbdma_list[0],
+            self.cbdma_list[0],
+        )
+        vhost_param = ""
         vhost_eal_param = (
-            "--vdev 'net_vhost0,iface=vhost-net,queues=1,client=0,dmas=[txq0;rxq0]'"
+            "--vdev 'net_vhost0,iface=vhost-net,queues=1,client=0,dmas=[%s]'" % dmas
         )
         ports = self.cbdma_list
         self.vhost_pmd.start_testpmd(
@@ -214,15 +217,13 @@  class TestVirtioUserInterruptCbdma(TestCase):
         Test Case2: Split ring virtio-user interrupt test with vhost-user as backend and cbdma enable
         """
         self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=2)
-        lcore_dma = "lcore%s@%s,lcore%s@%s" % (
-            self.vhost_core_list[1],
+        dmas = "txq0@%s;rxq0@%s" % (
+            self.cbdma_list[0],
             self.cbdma_list[0],
-            self.vhost_core_list[1],
-            self.cbdma_list[1],
         )
-        vhost_param = "--rxq=1 --txq=1 --lcore-dma=[%s]" % lcore_dma
+        vhost_param = "--rxq=1 --txq=1"
         vhost_eal_param = (
-            "--vdev 'net_vhost0,iface=vhost-net,queues=1,dmas=[txq0;rxq0]'"
+            "--vdev 'net_vhost0,iface=vhost-net,queues=1,dmas=[%s]'" % dmas
         )
         ports = self.cbdma_list
         ports.append(self.dut.ports_info[0]["pci"])
@@ -258,10 +259,13 @@  class TestVirtioUserInterruptCbdma(TestCase):
         Test Case3: Packed ring LSC event between vhost-user and virtio-user with cbdma enable
         """
         self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=1)
-        lcore_dma = "lcore%s@%s" % (self.vhost_core_list[1], self.cbdma_list[0])
-        vhost_param = "--lcore-dma=[%s]" % lcore_dma
+        dmas = "txq0@%s;rxq0@%s" % (
+            self.cbdma_list[0],
+            self.cbdma_list[0],
+        )
+        vhost_param = "--tx-offloads=0x00"
         vhost_eal_param = (
-            "--vdev 'net_vhost0,iface=vhost-net,queues=1,client=0,dmas=[txq0;rxq0]'"
+            "--vdev 'net_vhost0,iface=vhost-net,queues=1,client=0,dmas=[%s]'" % dmas
         )
         ports = self.cbdma_list
         self.vhost_pmd.start_testpmd(
@@ -296,16 +300,14 @@  class TestVirtioUserInterruptCbdma(TestCase):
         """
         Test Case4: Packed ring virtio-user interrupt test with vhost-user as backend and cbdma enable
         """
-        self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=2)
-        lcore_dma = "lcore%s@%s,lcore%s@%s" % (
-            self.vhost_core_list[1],
+        self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=1)
+        dmas = "txq0@%s;rxq0@%s" % (
+            self.cbdma_list[0],
             self.cbdma_list[0],
-            self.vhost_core_list[1],
-            self.cbdma_list[1],
         )
-        vhost_param = "--rxq=1 --txq=1 --lcore-dma=[%s]" % lcore_dma
+        vhost_param = "--rxq=1 --txq=1"
         vhost_eal_param = (
-            "--vdev 'net_vhost0,iface=vhost-net,queues=1,dmas=[txq0;rxq0]'"
+            "--vdev 'net_vhost0,iface=vhost-net,queues=1,dmas=[%s]'" % dmas
         )
         ports = self.cbdma_list
         ports.append(self.dut.ports_info[0]["pci"])