* [dts] [PATCH V1] tests/TestSuite_vf_daemon:Improve the way drivers bind
@ 2019-07-11 6:37 zhang,yan
2019-07-11 6:40 ` Yao, BingX Y
2019-08-07 2:58 ` Tu, Lijuan
0 siblings, 2 replies; 3+ messages in thread
From: zhang,yan @ 2019-07-11 6:37 UTC (permalink / raw)
To: dts; +Cc: zhang,yan
Improved the original single binding driver.
Signed-off-by: zhang,yan <yanx.a.zhang@intel.com>
---
tests/TestSuite_vf_daemon.py | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/tests/TestSuite_vf_daemon.py b/tests/TestSuite_vf_daemon.py
index cc55f65..fcbf5b8 100644
--- a/tests/TestSuite_vf_daemon.py
+++ b/tests/TestSuite_vf_daemon.py
@@ -17,6 +17,7 @@ MAX_VLAN = 4095
class TestVfDaemon(TestCase):
+ supported_vf_driver = ['pci-stub', 'vfio-pci']
def set_up_all(self):
@@ -26,6 +27,15 @@ class TestVfDaemon(TestCase):
self.vm1 = None
self.env_done = False
+ self.vf_driver = self.get_suite_cfg()['vf_driver']
+ if self.vf_driver is None:
+ self.vf_driver = 'pci-stub'
+ self.verify(self.vf_driver in self.supported_vf_driver, "Unspported vf driver")
+ if self.vf_driver == 'pci-stub':
+ self.vf_assign_method = 'pci-assign'
+ else:
+ self.vf_assign_method = 'vfio-pci'
+ self.dut.send_expect('modprobe vfio-pci', '#')
def set_up(self):
self.setup_vm_env()
@@ -61,7 +71,7 @@ class TestVfDaemon(TestCase):
netdev.bind_driver(driver=driver)
- def setup_vm_env(self, driver='igb_uio'):
+ def setup_vm_env(self, driver='default'):
"""
Create testing environment with 2VFs generated from 1PF
"""
@@ -78,12 +88,14 @@ class TestVfDaemon(TestCase):
self.sriov_vfs_port = self.dut.ports_info[
self.used_dut_port]['vfs_port']
for port in self.sriov_vfs_port:
- port.bind_driver('pci-stub')
+ port.bind_driver(self.vf_driver)
time.sleep(1)
+ eal_param = '-b %(vf0)s -b %(vf1)s' % {'vf0': self.sriov_vfs_port[0].pci,
+ 'vf1': self.sriov_vfs_port[1].pci}
self.dut_testpmd = PmdOutput(self.dut)
self.dut_testpmd.start_testpmd(
- "Default", "--rxq=4 --txq=4 --port-topology=chained")
+ "Default", "--rxq=4 --txq=4 --port-topology=chained", eal_param=eal_param)
self.dut_testpmd.execute_cmd("start")
time.sleep(5)
@@ -91,7 +103,7 @@ class TestVfDaemon(TestCase):
# set up VM0 ENV
self.vm0 = QEMUKvm(self.dut, 'vm0', 'vf_daemon')
- self.vm0.set_vm_device(driver='pci-assign', **vf0_prop)
+ self.vm0.set_vm_device(driver=self.vf_assign_method, **vf0_prop)
try:
self.vm0_dut = self.vm0.start()
if self.vm0_dut is None:
@@ -105,7 +117,7 @@ class TestVfDaemon(TestCase):
vf1_prop = {'opt_host': self.sriov_vfs_port[1].pci}
self.vm1 = QEMUKvm(self.dut, 'vm1', 'vf_daemon')
- self.vm1.set_vm_device(driver='pci-assign', **vf1_prop)
+ self.vm1.set_vm_device(driver=self.vf_assign_method, **vf1_prop)
try:
self.vm1_dut = self.vm1.start()
if self.vm1_dut is None:
--
2.17.2
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [dts] [PATCH V1] tests/TestSuite_vf_daemon:Improve the way drivers bind
2019-07-11 6:37 [dts] [PATCH V1] tests/TestSuite_vf_daemon:Improve the way drivers bind zhang,yan
@ 2019-07-11 6:40 ` Yao, BingX Y
2019-08-07 2:58 ` Tu, Lijuan
1 sibling, 0 replies; 3+ messages in thread
From: Yao, BingX Y @ 2019-07-11 6:40 UTC (permalink / raw)
To: Zhang, YanX A, dts; +Cc: Zhang, YanX A
Tested-by: Yao, BingX Y <bingx.y.yao@intel.com>
-----Original Message-----
From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of zhang,yan
Sent: Thursday, July 11, 2019 2:37 PM
To: dts@dpdk.org
Cc: Zhang, YanX A <yanx.a.zhang@intel.com>
Subject: [dts] [PATCH V1] tests/TestSuite_vf_daemon:Improve the way drivers bind
Improved the original single binding driver.
Signed-off-by: zhang,yan <yanx.a.zhang@intel.com>
---
tests/TestSuite_vf_daemon.py | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/tests/TestSuite_vf_daemon.py b/tests/TestSuite_vf_daemon.py index cc55f65..fcbf5b8 100644
--- a/tests/TestSuite_vf_daemon.py
+++ b/tests/TestSuite_vf_daemon.py
@@ -17,6 +17,7 @@ MAX_VLAN = 4095
class TestVfDaemon(TestCase):
+ supported_vf_driver = ['pci-stub', 'vfio-pci']
def set_up_all(self):
@@ -26,6 +27,15 @@ class TestVfDaemon(TestCase):
self.vm1 = None
self.env_done = False
+ self.vf_driver = self.get_suite_cfg()['vf_driver']
+ if self.vf_driver is None:
+ self.vf_driver = 'pci-stub'
+ self.verify(self.vf_driver in self.supported_vf_driver, "Unspported vf driver")
+ if self.vf_driver == 'pci-stub':
+ self.vf_assign_method = 'pci-assign'
+ else:
+ self.vf_assign_method = 'vfio-pci'
+ self.dut.send_expect('modprobe vfio-pci', '#')
def set_up(self):
self.setup_vm_env()
@@ -61,7 +71,7 @@ class TestVfDaemon(TestCase):
netdev.bind_driver(driver=driver)
- def setup_vm_env(self, driver='igb_uio'):
+ def setup_vm_env(self, driver='default'):
"""
Create testing environment with 2VFs generated from 1PF
"""
@@ -78,12 +88,14 @@ class TestVfDaemon(TestCase):
self.sriov_vfs_port = self.dut.ports_info[
self.used_dut_port]['vfs_port']
for port in self.sriov_vfs_port:
- port.bind_driver('pci-stub')
+ port.bind_driver(self.vf_driver)
time.sleep(1)
+ eal_param = '-b %(vf0)s -b %(vf1)s' % {'vf0': self.sriov_vfs_port[0].pci,
+ 'vf1':
+ self.sriov_vfs_port[1].pci}
self.dut_testpmd = PmdOutput(self.dut)
self.dut_testpmd.start_testpmd(
- "Default", "--rxq=4 --txq=4 --port-topology=chained")
+ "Default", "--rxq=4 --txq=4 --port-topology=chained",
+ eal_param=eal_param)
self.dut_testpmd.execute_cmd("start")
time.sleep(5)
@@ -91,7 +103,7 @@ class TestVfDaemon(TestCase):
# set up VM0 ENV
self.vm0 = QEMUKvm(self.dut, 'vm0', 'vf_daemon')
- self.vm0.set_vm_device(driver='pci-assign', **vf0_prop)
+ self.vm0.set_vm_device(driver=self.vf_assign_method,
+ **vf0_prop)
try:
self.vm0_dut = self.vm0.start()
if self.vm0_dut is None:
@@ -105,7 +117,7 @@ class TestVfDaemon(TestCase):
vf1_prop = {'opt_host': self.sriov_vfs_port[1].pci}
self.vm1 = QEMUKvm(self.dut, 'vm1', 'vf_daemon')
- self.vm1.set_vm_device(driver='pci-assign', **vf1_prop)
+ self.vm1.set_vm_device(driver=self.vf_assign_method,
+ **vf1_prop)
try:
self.vm1_dut = self.vm1.start()
if self.vm1_dut is None:
--
2.17.2
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [dts] [PATCH V1] tests/TestSuite_vf_daemon:Improve the way drivers bind
2019-07-11 6:37 [dts] [PATCH V1] tests/TestSuite_vf_daemon:Improve the way drivers bind zhang,yan
2019-07-11 6:40 ` Yao, BingX Y
@ 2019-08-07 2:58 ` Tu, Lijuan
1 sibling, 0 replies; 3+ messages in thread
From: Tu, Lijuan @ 2019-08-07 2:58 UTC (permalink / raw)
To: Zhang, YanX A, dts; +Cc: Zhang, YanX A
Applied, thanks
> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of zhang,yan
> Sent: Thursday, July 11, 2019 2:37 PM
> To: dts@dpdk.org
> Cc: Zhang, YanX A <yanx.a.zhang@intel.com>
> Subject: [dts] [PATCH V1] tests/TestSuite_vf_daemon:Improve the way
> drivers bind
>
> Improved the original single binding driver.
>
> Signed-off-by: zhang,yan <yanx.a.zhang@intel.com>
> ---
> tests/TestSuite_vf_daemon.py | 22 +++++++++++++++++-----
> 1 file changed, 17 insertions(+), 5 deletions(-)
>
> diff --git a/tests/TestSuite_vf_daemon.py b/tests/TestSuite_vf_daemon.py
> index cc55f65..fcbf5b8 100644
> --- a/tests/TestSuite_vf_daemon.py
> +++ b/tests/TestSuite_vf_daemon.py
> @@ -17,6 +17,7 @@ MAX_VLAN = 4095
>
>
> class TestVfDaemon(TestCase):
> + supported_vf_driver = ['pci-stub', 'vfio-pci']
>
> def set_up_all(self):
>
> @@ -26,6 +27,15 @@ class TestVfDaemon(TestCase):
> self.vm1 = None
> self.env_done = False
>
> + self.vf_driver = self.get_suite_cfg()['vf_driver']
> + if self.vf_driver is None:
> + self.vf_driver = 'pci-stub'
> + self.verify(self.vf_driver in self.supported_vf_driver, "Unspported vf
> driver")
> + if self.vf_driver == 'pci-stub':
> + self.vf_assign_method = 'pci-assign'
> + else:
> + self.vf_assign_method = 'vfio-pci'
> + self.dut.send_expect('modprobe vfio-pci', '#')
>
> def set_up(self):
> self.setup_vm_env()
> @@ -61,7 +71,7 @@ class TestVfDaemon(TestCase):
> netdev.bind_driver(driver=driver)
>
>
> - def setup_vm_env(self, driver='igb_uio'):
> + def setup_vm_env(self, driver='default'):
> """
> Create testing environment with 2VFs generated from 1PF
> """
> @@ -78,12 +88,14 @@ class TestVfDaemon(TestCase):
> self.sriov_vfs_port = self.dut.ports_info[
> self.used_dut_port]['vfs_port']
> for port in self.sriov_vfs_port:
> - port.bind_driver('pci-stub')
> + port.bind_driver(self.vf_driver)
> time.sleep(1)
> + eal_param = '-b %(vf0)s -b %(vf1)s' % {'vf0': self.sriov_vfs_port[0].pci,
> + 'vf1':
> + self.sriov_vfs_port[1].pci}
>
> self.dut_testpmd = PmdOutput(self.dut)
> self.dut_testpmd.start_testpmd(
> - "Default", "--rxq=4 --txq=4 --port-topology=chained")
> + "Default", "--rxq=4 --txq=4 --port-topology=chained",
> + eal_param=eal_param)
> self.dut_testpmd.execute_cmd("start")
> time.sleep(5)
>
> @@ -91,7 +103,7 @@ class TestVfDaemon(TestCase):
>
> # set up VM0 ENV
> self.vm0 = QEMUKvm(self.dut, 'vm0', 'vf_daemon')
> - self.vm0.set_vm_device(driver='pci-assign', **vf0_prop)
> + self.vm0.set_vm_device(driver=self.vf_assign_method,
> + **vf0_prop)
> try:
> self.vm0_dut = self.vm0.start()
> if self.vm0_dut is None:
> @@ -105,7 +117,7 @@ class TestVfDaemon(TestCase):
>
> vf1_prop = {'opt_host': self.sriov_vfs_port[1].pci}
> self.vm1 = QEMUKvm(self.dut, 'vm1', 'vf_daemon')
> - self.vm1.set_vm_device(driver='pci-assign', **vf1_prop)
> + self.vm1.set_vm_device(driver=self.vf_assign_method,
> + **vf1_prop)
> try:
> self.vm1_dut = self.vm1.start()
> if self.vm1_dut is None:
> --
> 2.17.2
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-08-07 2:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-11 6:37 [dts] [PATCH V1] tests/TestSuite_vf_daemon:Improve the way drivers bind zhang,yan
2019-07-11 6:40 ` Yao, BingX Y
2019-08-07 2:58 ` Tu, Lijuan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).