* [dts] [PATCH V1] tests/virtio_event_idx_interrupt:add create_eal_parameters function.
2020-02-25 9:32 [dts] [PATCH V1] tests/vdev_primary_secondary:add create_eal_parameters function zhu,shuai
@ 2020-02-25 9:32 ` zhu,shuai
2020-02-27 9:50 ` Zhu, ShuaiX
2020-03-03 5:24 ` Tu, Lijuan
2020-02-25 9:32 ` [dts] [PATCH V1] tests/virtio_user_as_exceptional_path:add " zhu,shuai
` (5 subsequent siblings)
6 siblings, 2 replies; 12+ messages in thread
From: zhu,shuai @ 2020-02-25 9:32 UTC (permalink / raw)
To: dts; +Cc: yinan.wang, zhu,shuai
Signed-off-by: zhu,shuai <shuaix.zhu@intel.com>
---
tests/TestSuite_virtio_event_idx_interrupt.py | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/tests/TestSuite_virtio_event_idx_interrupt.py b/tests/TestSuite_virtio_event_idx_interrupt.py
index 022cb6d..1fb0622 100644
--- a/tests/TestSuite_virtio_event_idx_interrupt.py
+++ b/tests/TestSuite_virtio_event_idx_interrupt.py
@@ -57,7 +57,6 @@ class TestVirtioIdxInterrupt(TestCase):
self.ports_socket = self.dut.get_numa_id(self.dut_ports[0])
self.cores_num = len([n for n in self.dut.cores if int(n['socket'])
== self.ports_socket])
- self.mem_channels = self.dut.get_memory_channels()
self.dst_mac = self.dut.get_mac_address(self.dut_ports[0])
self.base_dir = self.dut.base_dir.replace('~', '/root')
self.pf_pci = self.dut.ports_info[0]['pci']
@@ -86,7 +85,6 @@ class TestVirtioIdxInterrupt(TestCase):
"There has not enough cores to test this case %s" %
self.running_case)
self.core_list = self.dut.get_core_list(self.core_config)
- self.core_mask = utils.create_mask(self.core_list)
def start_vhost_testpmd(self):
"""
@@ -94,12 +92,11 @@ class TestVirtioIdxInterrupt(TestCase):
"""
# get the core mask depend on the nb_cores number
self.get_core_mask()
- command_line = self.dut.target + "/app/testpmd -c %s -n %d -w %s " + \
- "--socket-mem 2048,2048 --legacy-mem --file-prefix=vhost " + \
- "--vdev 'net_vhost,iface=%s/vhost-net,queues=%d' -- -i " + \
- "--nb-cores=%d --txd=1024 --rxd=1024 --rxq=%d --txq=%d"
- command_line = command_line % (self.core_mask, self.mem_channels, self.pf_pci,
- self.base_dir, self.queues, self.nb_cores, self.queues, self.queues)
+ testcmd = self.dut.target + "/app/testpmd "
+ vdev = [r"--vdev 'net_vhost,iface=%s/vhost-net,queues=%d' -- -i " % (self.base_dir, self.queues)]
+ eal_params = self.dut.create_eal_parameters(cores=self.core_list, prefix='vhost', ports=[self.pf_pci], vdevs=vdev)
+ para = " --nb-cores=%d --txd=1024 --rxd=1024 --rxq=%d --txq=%d" % (self.nb_cores, self.queues, self.queues)
+ command_line = testcmd + eal_params + para
self.vhost.send_expect(command_line, "testpmd> ", 30)
self.vhost.send_expect("start", "testpmd> ", 30)
--
2.17.2
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [dts] [PATCH V1] tests/virtio_event_idx_interrupt:add create_eal_parameters function.
2020-02-25 9:32 ` [dts] [PATCH V1] tests/virtio_event_idx_interrupt:add " zhu,shuai
@ 2020-02-27 9:50 ` Zhu, ShuaiX
2020-03-03 5:24 ` Tu, Lijuan
1 sibling, 0 replies; 12+ messages in thread
From: Zhu, ShuaiX @ 2020-02-27 9:50 UTC (permalink / raw)
To: dts; +Cc: Zhu, ShuaiX
[-- Attachment #1: Type: text/plain, Size: 3014 bytes --]
Tested-by: Zhu, ShuaiX <shuaix.zhu@intel.com>
> -----Original Message-----
> From: Zhu, ShuaiX
> Sent: Tuesday, February 25, 2020 5:32 PM
> To: dts@dpdk.org
> Cc: Wang, Yinan <yinan.wang@intel.com>; Zhu, ShuaiX <shuaix.zhu@intel.com>
> Subject: [dts][PATCH V1] tests/virtio_event_idx_interrupt:add
> create_eal_parameters function.
>
>
>
> Signed-off-by: zhu,shuai <shuaix.zhu@intel.com>
> ---
> tests/TestSuite_virtio_event_idx_interrupt.py | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/tests/TestSuite_virtio_event_idx_interrupt.py
> b/tests/TestSuite_virtio_event_idx_interrupt.py
> index 022cb6d..1fb0622 100644
> --- a/tests/TestSuite_virtio_event_idx_interrupt.py
> +++ b/tests/TestSuite_virtio_event_idx_interrupt.py
> @@ -57,7 +57,6 @@ class TestVirtioIdxInterrupt(TestCase):
> self.ports_socket = self.dut.get_numa_id(self.dut_ports[0])
> self.cores_num = len([n for n in self.dut.cores if int(n['socket'])
> == self.ports_socket])
> - self.mem_channels = self.dut.get_memory_channels()
> self.dst_mac = self.dut.get_mac_address(self.dut_ports[0])
> self.base_dir = self.dut.base_dir.replace('~', '/root')
> self.pf_pci = self.dut.ports_info[0]['pci'] @@ -86,7 +85,6 @@ class
> TestVirtioIdxInterrupt(TestCase):
> "There has not enough cores to test this case %s" %
> self.running_case)
> self.core_list = self.dut.get_core_list(self.core_config)
> - self.core_mask = utils.create_mask(self.core_list)
>
> def start_vhost_testpmd(self):
> """
> @@ -94,12 +92,11 @@ class TestVirtioIdxInterrupt(TestCase):
> """
> # get the core mask depend on the nb_cores number
> self.get_core_mask()
> - command_line = self.dut.target + "/app/testpmd -c %s -n %d -w %s " +
> \
> - "--socket-mem 2048,2048 --legacy-mem --file-prefix=vhost "
> + \
> - "--vdev 'net_vhost,iface=%s/vhost-net,queues=%d' -- -i " + \
> - "--nb-cores=%d --txd=1024 --rxd=1024 --rxq=%d --txq=%d"
> - command_line = command_line % (self.core_mask,
> self.mem_channels, self.pf_pci,
> - self.base_dir, self.queues, self.nb_cores,
> self.queues, self.queues)
> + testcmd = self.dut.target + "/app/testpmd "
> + vdev = [r"--vdev 'net_vhost,iface=%s/vhost-net,queues=%d' -- -i " %
> (self.base_dir, self.queues)]
> + eal_params = self.dut.create_eal_parameters(cores=self.core_list,
> prefix='vhost', ports=[self.pf_pci], vdevs=vdev)
> + para = " --nb-cores=%d --txd=1024 --rxd=1024 --rxq=%d --txq=%d" %
> (self.nb_cores, self.queues, self.queues)
> + command_line = testcmd + eal_params + para
> self.vhost.send_expect(command_line, "testpmd> ", 30)
> self.vhost.send_expect("start", "testpmd> ", 30)
>
> --
> 2.17.2
[-- Attachment #2: TestVhostEventIdxInterrupt.log --]
[-- Type: application/octet-stream, Size: 247952 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [dts] [PATCH V1] tests/virtio_event_idx_interrupt:add create_eal_parameters function.
2020-02-25 9:32 ` [dts] [PATCH V1] tests/virtio_event_idx_interrupt:add " zhu,shuai
2020-02-27 9:50 ` Zhu, ShuaiX
@ 2020-03-03 5:24 ` Tu, Lijuan
1 sibling, 0 replies; 12+ messages in thread
From: Tu, Lijuan @ 2020-03-03 5:24 UTC (permalink / raw)
To: Zhu, ShuaiX, dts; +Cc: Wang, Yinan, Zhu, ShuaiX
Applied, thanks
> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of zhu,shuai
> Sent: Tuesday, February 25, 2020 5:32 PM
> To: dts@dpdk.org
> Cc: Wang, Yinan <yinan.wang@intel.com>; Zhu, ShuaiX
> <shuaix.zhu@intel.com>
> Subject: [dts] [PATCH V1] tests/virtio_event_idx_interrupt:add
> create_eal_parameters function.
>
>
>
> Signed-off-by: zhu,shuai <shuaix.zhu@intel.com>
> ---
> tests/TestSuite_virtio_event_idx_interrupt.py | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/tests/TestSuite_virtio_event_idx_interrupt.py
> b/tests/TestSuite_virtio_event_idx_interrupt.py
> index 022cb6d..1fb0622 100644
> --- a/tests/TestSuite_virtio_event_idx_interrupt.py
> +++ b/tests/TestSuite_virtio_event_idx_interrupt.py
> @@ -57,7 +57,6 @@ class TestVirtioIdxInterrupt(TestCase):
> self.ports_socket = self.dut.get_numa_id(self.dut_ports[0])
> self.cores_num = len([n for n in self.dut.cores if int(n['socket'])
> == self.ports_socket])
> - self.mem_channels = self.dut.get_memory_channels()
> self.dst_mac = self.dut.get_mac_address(self.dut_ports[0])
> self.base_dir = self.dut.base_dir.replace('~', '/root')
> self.pf_pci = self.dut.ports_info[0]['pci'] @@ -86,7 +85,6 @@ class
> TestVirtioIdxInterrupt(TestCase):
> "There has not enough cores to test this case %s" %
> self.running_case)
> self.core_list = self.dut.get_core_list(self.core_config)
> - self.core_mask = utils.create_mask(self.core_list)
>
> def start_vhost_testpmd(self):
> """
> @@ -94,12 +92,11 @@ class TestVirtioIdxInterrupt(TestCase):
> """
> # get the core mask depend on the nb_cores number
> self.get_core_mask()
> - command_line = self.dut.target + "/app/testpmd -c %s -n %d -w %s " + \
> - "--socket-mem 2048,2048 --legacy-mem --file-prefix=vhost " + \
> - "--vdev 'net_vhost,iface=%s/vhost-net,queues=%d' -- -i " + \
> - "--nb-cores=%d --txd=1024 --rxd=1024 --rxq=%d --txq=%d"
> - command_line = command_line % (self.core_mask, self.mem_channels,
> self.pf_pci,
> - self.base_dir, self.queues, self.nb_cores, self.queues,
> self.queues)
> + testcmd = self.dut.target + "/app/testpmd "
> + vdev = [r"--vdev 'net_vhost,iface=%s/vhost-net,queues=%d' -- -i " %
> (self.base_dir, self.queues)]
> + eal_params = self.dut.create_eal_parameters(cores=self.core_list,
> prefix='vhost', ports=[self.pf_pci], vdevs=vdev)
> + para = " --nb-cores=%d --txd=1024 --rxd=1024 --rxq=%d --txq=%d" %
> (self.nb_cores, self.queues, self.queues)
> + command_line = testcmd + eal_params + para
> self.vhost.send_expect(command_line, "testpmd> ", 30)
> self.vhost.send_expect("start", "testpmd> ", 30)
>
> --
> 2.17.2
^ permalink raw reply [flat|nested] 12+ messages in thread
* [dts] [PATCH V1] tests/virtio_user_as_exceptional_path:add create_eal_parameters function.
2020-02-25 9:32 [dts] [PATCH V1] tests/vdev_primary_secondary:add create_eal_parameters function zhu,shuai
2020-02-25 9:32 ` [dts] [PATCH V1] tests/virtio_event_idx_interrupt:add " zhu,shuai
@ 2020-02-25 9:32 ` zhu,shuai
2020-02-25 9:32 ` [dts] [PATCH V1] tests/vm2vm_virtio_net_perf:add " zhu,shuai
` (4 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: zhu,shuai @ 2020-02-25 9:32 UTC (permalink / raw)
To: dts; +Cc: yinan.wang, zhu,shuai
Signed-off-by: zhu,shuai <shuaix.zhu@intel.com>
---
...stSuite_virtio_user_as_exceptional_path.py | 24 +++++++++----------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/tests/TestSuite_virtio_user_as_exceptional_path.py b/tests/TestSuite_virtio_user_as_exceptional_path.py
index 3605900..9759c7f 100644
--- a/tests/TestSuite_virtio_user_as_exceptional_path.py
+++ b/tests/TestSuite_virtio_user_as_exceptional_path.py
@@ -48,7 +48,6 @@ class TestVirtioUserAsExceptionalPath(TestCase):
# Get and verify the ports
self.dut_ports = self.dut.get_ports()
self.verify(len(self.dut_ports) >= 1, "Insufficient ports for testing")
- self.memory_channel = self.dut.get_memory_channels()
self.pci0 = self.dut.ports_info[0]['pci']
pf_info = self.dut_ports[0]
netdev = self.dut.ports_info[pf_info]['port']
@@ -112,12 +111,12 @@ class TestVirtioUserAsExceptionalPath(TestCase):
cores_config = '1S/%sC/1T' % cores_number
cores_list = self.dut.get_core_list(cores_config, socket=self.socket)
self.verify(len(cores_list) >= cores_number, "Failed to get cores list")
- core_mask = utils.create_mask(cores_list[0:2])
- self.testcmd = self.target + "/app/testpmd -c %s -n %d -w %s --socket-mem %s" \
- + " --vdev=virtio_user0,mac=%s,path=/dev/vhost-net,"\
- "queue_size=1024,queues=%s -- -i --rxd=1024 --txd=1024 %s"
- self.testcmd_start = self.testcmd % (core_mask, self.memory_channel,
- self.pci0, self.socket_mem, self.virtio_mac, self.queue, comment)
+ core_mask = cores_list[0:2]
+ testcmd = self.target + "/app/testpmd "
+ vdev = [r"--vdev=virtio_user0,mac=%s,path=/dev/vhost-net," % self.virtio_mac]
+ eal_params = self.dut.create_eal_parameters(cores=core_mask, ports=[self.pci0], vdevs=vdev)
+ para = " queue_size=1024,queues=%s -- -i --rxd=1024 --txd=1024 %s" % (self.queue, comment)
+ self.testcmd_start = testcmd + eal_params + para
self.vhost_user = self.dut.new_session(suite="user")
self.vhost_user.send_expect(self.testcmd_start, "testpmd> ", 120)
self.vhost_user.send_expect("start", "testpmd>", 120)
@@ -128,12 +127,11 @@ class TestVirtioUserAsExceptionalPath(TestCase):
self.dut.send_expect("taskset -pc %s %s" % (cores_list[-2], vhost_pid_list[2]), "# ")
def launch_testpmd_exception_path(self):
- self.testcmd = self.target + "/app/testpmd -c %s -n %d --socket-mem %s --legacy-mem" \
- + " --vdev=virtio_user0,mac=%s,path=/dev/vhost-net,queue_size=1024 -- -i" \
- + " --rxd=1024 --txd=1024"
- self.coremask = utils.create_mask(self.cores)
- self.testcmd_start = self.testcmd % (self.coremask, self.memory_channel,
- self.socket_mem, self.virtio_mac)
+ testcmd = self.target + "/app/testpmd "
+ vdev = [r"--vdev=virtio_user0,mac=%s,path=/dev/vhost-net,queue_size=1024" % self.virtio_mac]
+ eal_params = self.dut.create_eal_parameters(cores=self.cores, ports=[self.pci0], vdevs=vdev)
+ para = " -- -i --rxd=1024 --txd=1024"
+ self.testcmd_start = testcmd + eal_params + para
self.vhost_user = self.dut.new_session(suite="user")
self.vhost_user.send_expect("modprobe vhost-net", "#", 120)
self.vhost_user.send_expect(self.testcmd_start, "testpmd> ", 120)
--
2.17.2
^ permalink raw reply [flat|nested] 12+ messages in thread* [dts] [PATCH V1] tests/vm2vm_virtio_net_perf:add create_eal_parameters function.
2020-02-25 9:32 [dts] [PATCH V1] tests/vdev_primary_secondary:add create_eal_parameters function zhu,shuai
2020-02-25 9:32 ` [dts] [PATCH V1] tests/virtio_event_idx_interrupt:add " zhu,shuai
2020-02-25 9:32 ` [dts] [PATCH V1] tests/virtio_user_as_exceptional_path:add " zhu,shuai
@ 2020-02-25 9:32 ` zhu,shuai
2020-02-27 9:49 ` Zhu, ShuaiX
2020-03-03 5:24 ` Tu, Lijuan
2020-02-25 9:32 ` [dts] [PATCH V1] tests/vm2vm_virtio_pmd:add " zhu,shuai
` (3 subsequent siblings)
6 siblings, 2 replies; 12+ messages in thread
From: zhu,shuai @ 2020-02-25 9:32 UTC (permalink / raw)
To: dts; +Cc: yinan.wang, zhu,shuai
Signed-off-by: zhu,shuai <shuaix.zhu@intel.com>
---
tests/TestSuite_vm2vm_virtio_net_perf.py | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/tests/TestSuite_vm2vm_virtio_net_perf.py b/tests/TestSuite_vm2vm_virtio_net_perf.py
index 13640a3..cc48905 100644
--- a/tests/TestSuite_vm2vm_virtio_net_perf.py
+++ b/tests/TestSuite_vm2vm_virtio_net_perf.py
@@ -84,17 +84,12 @@ class TestVM2VMVirtioNetPerf(TestCase):
zerocopy_arg = ",dequeue-zero-copy=1"
else:
zerocopy_arg = ""
- eal_params = self.dut.create_eal_parameters(cores=self.cores_list,
- prefix='vhost', no_pci=True)
- self.command_line = self.dut.target + "/app/testpmd %s " + \
- "--socket-mem %s --legacy-mem " + \
- "--vdev 'net_vhost0,iface=%s/vhost-net0,queues=1%s' " + \
- "--vdev 'net_vhost1,iface=%s/vhost-net1,queues=1%s' " + \
- "-- -i --nb-cores=1 --txd=1024 --rxd=1024"
-
- self.command_line = self.command_line % (
- eal_params, self.socket_mem, self.base_dir,
- zerocopy_arg, self.base_dir, zerocopy_arg)
+ testcmd = self.dut.target + "/app/testpmd "
+ vdev1 = "--vdev 'net_vhost0,iface=%s/vhost-net0,queues=1%s' " % (self.base_dir, zerocopy_arg)
+ vdev2 = "--vdev 'net_vhost1,iface=%s/vhost-net1,queues=1%s' " % (self.base_dir, zerocopy_arg)
+ eal_params = self.dut.create_eal_parameters(cores=self.cores_list, prefix='vhost', no_pci=True)
+ para = " -- -i --nb-cores=1 --txd=1024 --rxd=1024"
+ self.command_line = testcmd + eal_params + vdev1 + vdev2 + para
self.pmd_vhost.execute_cmd(self.command_line, timeout=30)
self.pmd_vhost.execute_cmd('start', timeout=30)
--
2.17.2
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [dts] [PATCH V1] tests/vm2vm_virtio_net_perf:add create_eal_parameters function.
2020-02-25 9:32 ` [dts] [PATCH V1] tests/vm2vm_virtio_net_perf:add " zhu,shuai
@ 2020-02-27 9:49 ` Zhu, ShuaiX
2020-03-03 5:24 ` Tu, Lijuan
1 sibling, 0 replies; 12+ messages in thread
From: Zhu, ShuaiX @ 2020-02-27 9:49 UTC (permalink / raw)
To: dts; +Cc: Zhu, ShuaiX
[-- Attachment #1: Type: text/plain, Size: 2299 bytes --]
Tested-by: Zhu, ShuaiX <shuaix.zhu@intel.com>
> -----Original Message-----
> From: Zhu, ShuaiX
> Sent: Tuesday, February 25, 2020 5:32 PM
> To: dts@dpdk.org
> Cc: Wang, Yinan <yinan.wang@intel.com>; Zhu, ShuaiX <shuaix.zhu@intel.com>
> Subject: [dts][PATCH V1] tests/vm2vm_virtio_net_perf:add
> create_eal_parameters function.
>
>
>
> Signed-off-by: zhu,shuai <shuaix.zhu@intel.com>
> ---
> tests/TestSuite_vm2vm_virtio_net_perf.py | 17 ++++++-----------
> 1 file changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/tests/TestSuite_vm2vm_virtio_net_perf.py
> b/tests/TestSuite_vm2vm_virtio_net_perf.py
> index 13640a3..cc48905 100644
> --- a/tests/TestSuite_vm2vm_virtio_net_perf.py
> +++ b/tests/TestSuite_vm2vm_virtio_net_perf.py
> @@ -84,17 +84,12 @@ class TestVM2VMVirtioNetPerf(TestCase):
> zerocopy_arg = ",dequeue-zero-copy=1"
> else:
> zerocopy_arg = ""
> - eal_params = self.dut.create_eal_parameters(cores=self.cores_list,
> - prefix='vhost', no_pci=True)
> - self.command_line = self.dut.target + "/app/testpmd %s " + \
> - "--socket-mem %s --legacy-mem " + \
> - "--vdev 'net_vhost0,iface=%s/vhost-net0,queues=1%s' " + \
> - "--vdev 'net_vhost1,iface=%s/vhost-net1,queues=1%s' " + \
> - "-- -i --nb-cores=1 --txd=1024 --rxd=1024"
> -
> - self.command_line = self.command_line % (
> - eal_params, self.socket_mem, self.base_dir,
> - zerocopy_arg, self.base_dir, zerocopy_arg)
> + testcmd = self.dut.target + "/app/testpmd "
> + vdev1 = "--vdev 'net_vhost0,iface=%s/vhost-net0,queues=1%s' " %
> (self.base_dir, zerocopy_arg)
> + vdev2 = "--vdev 'net_vhost1,iface=%s/vhost-net1,queues=1%s' " %
> (self.base_dir, zerocopy_arg)
> + eal_params = self.dut.create_eal_parameters(cores=self.cores_list,
> prefix='vhost', no_pci=True)
> + para = " -- -i --nb-cores=1 --txd=1024 --rxd=1024"
> + self.command_line = testcmd + eal_params + vdev1 + vdev2 + para
> self.pmd_vhost.execute_cmd(self.command_line, timeout=30)
> self.pmd_vhost.execute_cmd('start', timeout=30)
>
> --
> 2.17.2
[-- Attachment #2: TestVM2VMVirtioNetPerf.log --]
[-- Type: application/octet-stream, Size: 659147 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [dts] [PATCH V1] tests/vm2vm_virtio_net_perf:add create_eal_parameters function.
2020-02-25 9:32 ` [dts] [PATCH V1] tests/vm2vm_virtio_net_perf:add " zhu,shuai
2020-02-27 9:49 ` Zhu, ShuaiX
@ 2020-03-03 5:24 ` Tu, Lijuan
1 sibling, 0 replies; 12+ messages in thread
From: Tu, Lijuan @ 2020-03-03 5:24 UTC (permalink / raw)
To: Zhu, ShuaiX, dts; +Cc: Wang, Yinan, Zhu, ShuaiX
Applied, thanks
> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of zhu,shuai
> Sent: Tuesday, February 25, 2020 5:32 PM
> To: dts@dpdk.org
> Cc: Wang, Yinan <yinan.wang@intel.com>; Zhu, ShuaiX
> <shuaix.zhu@intel.com>
> Subject: [dts] [PATCH V1] tests/vm2vm_virtio_net_perf:add
> create_eal_parameters function.
>
>
>
> Signed-off-by: zhu,shuai <shuaix.zhu@intel.com>
> ---
> tests/TestSuite_vm2vm_virtio_net_perf.py | 17 ++++++-----------
> 1 file changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/tests/TestSuite_vm2vm_virtio_net_perf.py
> b/tests/TestSuite_vm2vm_virtio_net_perf.py
> index 13640a3..cc48905 100644
> --- a/tests/TestSuite_vm2vm_virtio_net_perf.py
> +++ b/tests/TestSuite_vm2vm_virtio_net_perf.py
> @@ -84,17 +84,12 @@ class TestVM2VMVirtioNetPerf(TestCase):
> zerocopy_arg = ",dequeue-zero-copy=1"
> else:
> zerocopy_arg = ""
> - eal_params = self.dut.create_eal_parameters(cores=self.cores_list,
> - prefix='vhost', no_pci=True)
> - self.command_line = self.dut.target + "/app/testpmd %s " + \
> - "--socket-mem %s --legacy-mem " + \
> - "--vdev 'net_vhost0,iface=%s/vhost-net0,queues=1%s' " + \
> - "--vdev 'net_vhost1,iface=%s/vhost-net1,queues=1%s' " + \
> - "-- -i --nb-cores=1 --txd=1024 --rxd=1024"
> -
> - self.command_line = self.command_line % (
> - eal_params, self.socket_mem, self.base_dir,
> - zerocopy_arg, self.base_dir, zerocopy_arg)
> + testcmd = self.dut.target + "/app/testpmd "
> + vdev1 = "--vdev 'net_vhost0,iface=%s/vhost-net0,queues=1%s' " %
> (self.base_dir, zerocopy_arg)
> + vdev2 = "--vdev 'net_vhost1,iface=%s/vhost-net1,queues=1%s' " %
> (self.base_dir, zerocopy_arg)
> + eal_params = self.dut.create_eal_parameters(cores=self.cores_list,
> prefix='vhost', no_pci=True)
> + para = " -- -i --nb-cores=1 --txd=1024 --rxd=1024"
> + self.command_line = testcmd + eal_params + vdev1 + vdev2 + para
> self.pmd_vhost.execute_cmd(self.command_line, timeout=30)
> self.pmd_vhost.execute_cmd('start', timeout=30)
>
> --
> 2.17.2
^ permalink raw reply [flat|nested] 12+ messages in thread
* [dts] [PATCH V1] tests/vm2vm_virtio_pmd:add create_eal_parameters function.
2020-02-25 9:32 [dts] [PATCH V1] tests/vdev_primary_secondary:add create_eal_parameters function zhu,shuai
` (2 preceding siblings ...)
2020-02-25 9:32 ` [dts] [PATCH V1] tests/vm2vm_virtio_net_perf:add " zhu,shuai
@ 2020-02-25 9:32 ` zhu,shuai
2020-02-25 9:32 ` [dts] [PATCH V1] tests/vm2vm_virtio_user:add " zhu,shuai
` (2 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: zhu,shuai @ 2020-02-25 9:32 UTC (permalink / raw)
To: dts; +Cc: yinan.wang, zhu,shuai
Signed-off-by: zhu,shuai <shuaix.zhu@intel.com>
---
tests/TestSuite_vm2vm_virtio_pmd.py | 44 +++++++++++++----------------
1 file changed, 20 insertions(+), 24 deletions(-)
diff --git a/tests/TestSuite_vm2vm_virtio_pmd.py b/tests/TestSuite_vm2vm_virtio_pmd.py
index c1703b9..f307391 100644
--- a/tests/TestSuite_vm2vm_virtio_pmd.py
+++ b/tests/TestSuite_vm2vm_virtio_pmd.py
@@ -60,6 +60,7 @@ class TestVM2VMVirtioPMD(TestCase):
self.virtio_user1 = None
self.flag_compiled = False
self.backup_speed = self.dut.skip_setup
+ self.pci_info = self.dut.ports_info[0]['pci']
def set_up(self):
"""
@@ -102,16 +103,13 @@ class TestVM2VMVirtioPMD(TestCase):
"""
launch the testpmd on vhost side
"""
- vhost_mask = utils.create_mask(self.cores_list[0:2])
- self.command_line = self.dut.target + "/app/testpmd -c %s -n %d " + \
- "--socket-mem %s --legacy-mem --no-pci --file-prefix=vhost " + \
- "--vdev 'net_vhost0,iface=%s/vhost-net0,queues=1' " + \
- "--vdev 'net_vhost1,iface=%s/vhost-net1,queues=1' " + \
- "-- -i --nb-cores=1 --txd=1024 --rxd=1024"
-
- self.command_line = self.command_line % (
- vhost_mask, self.memory_channel, self.socket_mem,
- self.base_dir, self.base_dir)
+ vhost_mask = self.cores_list[0:2]
+ testcmd = self.dut.target + "/app/testpmd "
+ vdev1 = "--vdev 'net_vhost0,iface=%s/vhost-net0,queues=1' "
+ vdev2 = "--vdev 'net_vhost1,iface=%s/vhost-net1,queues=1' "
+ eal_params = self.dut.create_eal_parameters(cores=vhost_mask, no_pci=True, prefix='vhost', ports=[self.pci_info])
+ para = " -- -i --nb-cores=1 --txd=1024 --rxd=1024"
+ self.command_line = testcmd + eal_params + vdev1 + vdev2 + para
self.vhost_user.send_expect(self.command_line, "testpmd> ", 30)
self.vhost_user.send_expect("set fwd mac", "testpmd> ", 30)
self.vhost_user.send_expect("start", "testpmd> ", 30)
@@ -121,13 +119,12 @@ class TestVM2VMVirtioPMD(TestCase):
launch the testpmd as virtio with vhost_net1
"""
self.virtio_user1 = self.dut.new_session(suite="virtio_user1")
- virtio_mask = utils.create_mask(self.cores_list[2:4])
- command_line = self.dut.target + "/app/testpmd -c %s -n %d " + \
- "--socket-mem %s --no-pci --file-prefix=virtio " + \
- "--vdev=net_virtio_user1,mac=00:01:02:03:04:05,path=./vhost-net1,queues=1,%s " + \
- "-- -i --nb-cores=1 --txd=1024 --rxd=1024 %s"
- command_line = command_line % (virtio_mask, self.memory_channel,
- self.socket_mem, path_mode, extern_param)
+ virtio_mask = self.cores_list[2:4]
+ testcmd = self.dut.target + "/app/testpmd "
+ vdev = [r"--vdev=net_virtio_user1,mac=00:01:02:03:04:05,path=./vhost-net1,queues=1,%s " % path_mode]
+ eal_params = self.dut.create_eal_parameters(cores=virtio_mask, no_pci=True, prefix='virtio', ports=[self.pci_info], vdevs=vdev)
+ para = " -- -i --nb-cores=1 --txd=1024 --rxd=1024 %s" % extern_param
+ command_line = testcmd + eal_params + para
self.virtio_user1.send_expect(command_line, 'testpmd> ', 30)
self.virtio_user1.send_expect('set fwd rxonly', 'testpmd> ', 30)
self.virtio_user1.send_expect('start', 'testpmd> ', 30)
@@ -137,13 +134,12 @@ class TestVM2VMVirtioPMD(TestCase):
launch the testpmd as virtio with vhost_net0
"""
self.virtio_user0 = self.dut.new_session(suite="virtio_user0")
- virtio_mask = utils.create_mask(self.cores_list[4:6])
- command_line = self.dut.target + "/app/testpmd -c %s -n %d " + \
- "--socket-mem %s --no-pci --file-prefix=virtio0 " + \
- "--vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net0,queues=1,%s " + \
- "-- -i --nb-cores=1 --txd=1024 --rxd=1024 %s"
- command_line = command_line % (virtio_mask, self.memory_channel,
- self.socket_mem, path_mode, extern_param)
+ virtio_mask = self.cores_list[4:6]
+ testcmd = self.dut.target + "/app/testpmd "
+ vdev = [r"--vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net0,queues=1,%s " % path_mode]
+ eal_params = self.dut.create_eal_parameters(cores=virtio_mask, no_pci=True, prefix='virtio0', ports=[self.pci_info], vdevs=vdev)
+ para = " -- -i --nb-cores=1 --txd=1024 --rxd=1024 %s" % extern_param
+ command_line = testcmd + eal_params + para
self.virtio_user0.send_expect(command_line, 'testpmd> ', 30)
self.virtio_user0.send_expect('set txpkts 2000,2000,2000,2000', 'testpmd> ', 30)
self.virtio_user0.send_expect('set burst 1', 'testpmd> ', 30)
--
2.17.2
^ permalink raw reply [flat|nested] 12+ messages in thread* [dts] [PATCH V1] tests/vm2vm_virtio_user:add create_eal_parameters function.
2020-02-25 9:32 [dts] [PATCH V1] tests/vdev_primary_secondary:add create_eal_parameters function zhu,shuai
` (3 preceding siblings ...)
2020-02-25 9:32 ` [dts] [PATCH V1] tests/vm2vm_virtio_pmd:add " zhu,shuai
@ 2020-02-25 9:32 ` zhu,shuai
2020-02-27 9:49 ` [dts] [PATCH V1] tests/vdev_primary_secondary:add " Zhu, ShuaiX
2020-03-03 5:24 ` Tu, Lijuan
6 siblings, 0 replies; 12+ messages in thread
From: zhu,shuai @ 2020-02-25 9:32 UTC (permalink / raw)
To: dts; +Cc: yinan.wang, zhu,shuai
Signed-off-by: zhu,shuai <shuaix.zhu@intel.com>
---
tests/TestSuite_vm2vm_virtio_user.py | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/tests/TestSuite_vm2vm_virtio_user.py b/tests/TestSuite_vm2vm_virtio_user.py
index 17bee0e..a9fed78 100644
--- a/tests/TestSuite_vm2vm_virtio_user.py
+++ b/tests/TestSuite_vm2vm_virtio_user.py
@@ -118,10 +118,10 @@ class TestVM2VMVirtioUser(TestCase):
vdev_params += "--vdev 'net_vhost%d,iface=./vhost-net%d,queues=1' " % (i, i)
self.command_line = self.dut.target + '/app/testpmd %s ' + \
- '--socket-mem %s %s -- -i --nb-cores=1 --no-flush-rx'
+ '%s -- -i --nb-cores=1 --no-flush-rx'
self.command_line = self.command_line % (
- eal_params, self.socket_mem, vdev_params)
+ eal_params, vdev_params)
self.pmd_vhost.execute_cmd(self.command_line, timeout=30)
self.pmd_vhost.execute_cmd('set fwd %s' % fwd_mode)
@@ -133,9 +133,8 @@ class TestVM2VMVirtioUser(TestCase):
no_pci=True, prefix=self.virtio_prefix, fixed_prefix=True)
vdev_params = '--vdev=net_virtio_user1,mac=00:01:02:03:04:05,path=./vhost-net1,queues=1,%s ' % path_mode
command_line = self.dut.target + "/app/testpmd %s " + \
- "--socket-mem %s %s -- -i --nb-cores=1 --txd=256 --rxd=256 %s"
- command_line = command_line % (eal_params, self.socket_mem,
- vdev_params, extern_params)
+ "%s -- -i --nb-cores=1 --txd=256 --rxd=256 %s"
+ command_line = command_line % (eal_params, vdev_params, extern_params)
self.pmd_virtio1.execute_cmd(command_line, timeout=30)
self.pmd_virtio1.execute_cmd('set fwd rxonly')
self.pmd_virtio1.execute_cmd('start')
@@ -149,9 +148,8 @@ class TestVM2VMVirtioUser(TestCase):
no_pci=True, prefix='virtio0')
vdev_params = '--vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net0,queues=1,%s ' % path_mode
command_line = self.dut.target + '/app/testpmd %s ' + \
- '--socket-mem %s %s -- -i --nb-cores=1 --txd=256 --rxd=256 %s'
- command_line = command_line % (eal_params, self.socket_mem,
- vdev_params, extern_params)
+ '%s -- -i --nb-cores=1 --txd=256 --rxd=256 %s'
+ command_line = command_line % (eal_params, vdev_params, extern_params)
self.pmd_virtio0.execute_cmd(command_line, timeout=30)
self.pmd_virtio0.execute_cmd('set burst 1')
--
2.17.2
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [dts] [PATCH V1] tests/vdev_primary_secondary:add create_eal_parameters function.
2020-02-25 9:32 [dts] [PATCH V1] tests/vdev_primary_secondary:add create_eal_parameters function zhu,shuai
` (4 preceding siblings ...)
2020-02-25 9:32 ` [dts] [PATCH V1] tests/vm2vm_virtio_user:add " zhu,shuai
@ 2020-02-27 9:49 ` Zhu, ShuaiX
2020-03-03 5:24 ` Tu, Lijuan
6 siblings, 0 replies; 12+ messages in thread
From: Zhu, ShuaiX @ 2020-02-27 9:49 UTC (permalink / raw)
To: dts; +Cc: Zhu, ShuaiX
Tested-by: Zhu, ShuaiX <shuaix.zhu@intel.com>
> -----Original Message-----
> From: Zhu, ShuaiX
> Sent: Tuesday, February 25, 2020 5:32 PM
> To: dts@dpdk.org
> Cc: Wang, Yinan <yinan.wang@intel.com>; Zhu, ShuaiX <shuaix.zhu@intel.com>
> Subject: [dts][PATCH V1] tests/vdev_primary_secondary:add
> create_eal_parameters function.
>
>
>
> Signed-off-by: zhu,shuai <shuaix.zhu@intel.com>
> ---
> tests/TestSuite_vdev_primary_secondary.py | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/tests/TestSuite_vdev_primary_secondary.py
> b/tests/TestSuite_vdev_primary_secondary.py
> index c380bec..7c557ad 100644
> --- a/tests/TestSuite_vdev_primary_secondary.py
> +++ b/tests/TestSuite_vdev_primary_secondary.py
> @@ -63,6 +63,7 @@ class TestVdevPrimarySecondary(TestCase):
> self.coremask = utils.create_mask(cores)
> self.verify(len(self.coremask) >= 6, "The machine has too few cores.")
> self.base_dir = self.dut.base_dir.replace('~', '/root')
> + self.pci_info = self.dut.ports_info[0]['pci']
>
> def set_up(self):
> """
> @@ -103,11 +104,12 @@ class TestVdevPrimarySecondary(TestCase):
> """
> launch testpmd
> """
> - cmd = "./%s/app/testpmd -l 1-6 -n %d --socket-mem 2048,2048
> --legacy-mem --file-prefix=vhost" + \
> - " --vdev
> 'net_vhost0,iface=%s/vhost-net0,queues=%d,client=1'" + \
> - " --vdev
> 'net_vhost1,iface=%s/vhost-net1,queues=%d,client=1'" + \
> - " -- -i --nb-cores=4 --rxq=%d --txq=%d --txd=1024 --rxd=1024"
> - start_cmd = cmd % (self.target, self.mem_channels, self.base_dir,
> self.queues, self.base_dir, self.queues, self.queues, self.queues)
> + testcmd = self.dut.target + "/app/testpmd "
> + vdev1 = " --vdev
> 'net_vhost0,iface=%s/vhost-net0,queues=%d,client=1'" % (self.base_dir,
> self.queues)
> + vdev2 = " --vdev
> 'net_vhost1,iface=%s/vhost-net1,queues=%d,client=1'" % (self.base_dir,
> self.queues)
> + eal_params = self.dut.create_eal_parameters(cores="1S/12C/1T",
> prefix='vhost', ports=[self.pci_info])
> + para = " -- -i --nb-cores=4 --rxq=%d --txq=%d --txd=1024 --rxd=1024" %
> (self.queues, self.queues)
> + start_cmd = testcmd + eal_params + vdev1 + vdev2 + para
> self.dut.send_expect(start_cmd, "testpmd> ", 120)
> self.dut.send_expect("set fwd txonly", "testpmd> ", 120)
> self.dut.send_expect("start", "testpmd> ", 120)
> --
> 2.17.2
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [dts] [PATCH V1] tests/vdev_primary_secondary:add create_eal_parameters function.
2020-02-25 9:32 [dts] [PATCH V1] tests/vdev_primary_secondary:add create_eal_parameters function zhu,shuai
` (5 preceding siblings ...)
2020-02-27 9:49 ` [dts] [PATCH V1] tests/vdev_primary_secondary:add " Zhu, ShuaiX
@ 2020-03-03 5:24 ` Tu, Lijuan
6 siblings, 0 replies; 12+ messages in thread
From: Tu, Lijuan @ 2020-03-03 5:24 UTC (permalink / raw)
To: Zhu, ShuaiX, dts; +Cc: Wang, Yinan, Zhu, ShuaiX
Applied, thanks
> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of zhu,shuai
> Sent: Tuesday, February 25, 2020 5:32 PM
> To: dts@dpdk.org
> Cc: Wang, Yinan <yinan.wang@intel.com>; Zhu, ShuaiX
> <shuaix.zhu@intel.com>
> Subject: [dts] [PATCH V1] tests/vdev_primary_secondary:add
> create_eal_parameters function.
>
>
>
> Signed-off-by: zhu,shuai <shuaix.zhu@intel.com>
> ---
> tests/TestSuite_vdev_primary_secondary.py | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/tests/TestSuite_vdev_primary_secondary.py
> b/tests/TestSuite_vdev_primary_secondary.py
> index c380bec..7c557ad 100644
> --- a/tests/TestSuite_vdev_primary_secondary.py
> +++ b/tests/TestSuite_vdev_primary_secondary.py
> @@ -63,6 +63,7 @@ class TestVdevPrimarySecondary(TestCase):
> self.coremask = utils.create_mask(cores)
> self.verify(len(self.coremask) >= 6, "The machine has too few cores.")
> self.base_dir = self.dut.base_dir.replace('~', '/root')
> + self.pci_info = self.dut.ports_info[0]['pci']
>
> def set_up(self):
> """
> @@ -103,11 +104,12 @@ class TestVdevPrimarySecondary(TestCase):
> """
> launch testpmd
> """
> - cmd = "./%s/app/testpmd -l 1-6 -n %d --socket-mem 2048,2048 --legacy-
> mem --file-prefix=vhost" + \
> - " --vdev 'net_vhost0,iface=%s/vhost-net0,queues=%d,client=1'" + \
> - " --vdev 'net_vhost1,iface=%s/vhost-net1,queues=%d,client=1'" + \
> - " -- -i --nb-cores=4 --rxq=%d --txq=%d --txd=1024 --rxd=1024"
> - start_cmd = cmd % (self.target, self.mem_channels, self.base_dir,
> self.queues, self.base_dir, self.queues, self.queues, self.queues)
> + testcmd = self.dut.target + "/app/testpmd "
> + vdev1 = " --vdev 'net_vhost0,iface=%s/vhost-
> net0,queues=%d,client=1'" % (self.base_dir, self.queues)
> + vdev2 = " --vdev 'net_vhost1,iface=%s/vhost-
> net1,queues=%d,client=1'" % (self.base_dir, self.queues)
> + eal_params = self.dut.create_eal_parameters(cores="1S/12C/1T",
> prefix='vhost', ports=[self.pci_info])
> + para = " -- -i --nb-cores=4 --rxq=%d --txq=%d --txd=1024 --rxd=1024" %
> (self.queues, self.queues)
> + start_cmd = testcmd + eal_params + vdev1 + vdev2 + para
> self.dut.send_expect(start_cmd, "testpmd> ", 120)
> self.dut.send_expect("set fwd txonly", "testpmd> ", 120)
> self.dut.send_expect("start", "testpmd> ", 120)
> --
> 2.17.2
^ permalink raw reply [flat|nested] 12+ messages in thread