* [dts] [PATCH V2] Add testsuite vhost virtio user interrupt
@ 2019-05-08 1:03 lihong
2019-05-08 13:48 ` Wang, Yinan
2019-05-13 7:24 ` Tu, Lijuan
0 siblings, 2 replies; 4+ messages in thread
From: lihong @ 2019-05-08 1:03 UTC (permalink / raw)
To: dts; +Cc: yinan.wang, lihong
Signed-off-by: lihong <lihongx.ma@intel.com>
---
tests/TestSuite_vhost_virtio_user_interrupt.py | 217 +++++++++++++++++++++++++
1 file changed, 217 insertions(+)
create mode 100644 tests/TestSuite_vhost_virtio_user_interrupt.py
diff --git a/tests/TestSuite_vhost_virtio_user_interrupt.py b/tests/TestSuite_vhost_virtio_user_interrupt.py
new file mode 100644
index 0000000..6713590
--- /dev/null
+++ b/tests/TestSuite_vhost_virtio_user_interrupt.py
@@ -0,0 +1,217 @@
+# BSD LICENSE
+#
+# Copyright (c) <2019>, Intel Corporation.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Intel Corporation nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""
+DPDK Test suite.
+Virtio-user interrupt need test with l3fwd-power sample
+"""
+
+import re
+import time
+import utils
+from test_case import TestCase
+
+
+class TestVirtioUserInterrupt(TestCase):
+
+ def set_up_all(self):
+ """
+ run at the start of each test suite.
+ """
+ self.core_config = "1S/4C/1T"
+ self.dut_ports = self.dut.get_ports()
+ self.cores_num = len([n for n in self.dut.cores if int(n['socket']) == 0])
+ self.verify(len(self.dut_ports) >= 1, "Insufficient ports for testing")
+ self.verify(self.cores_num >= 4, "There has not enought cores to test this case")
+ self.core_list = self.dut.get_core_list(self.core_config)
+ self.core_list_vhost = self.core_list[0:2]
+ self.core_list_l3fwd = self.core_list[2:4]
+ self.core_mask_vhost = utils.create_mask(self.core_list_vhost)
+ self.core_mask_l3fwd = utils.create_mask(self.core_list_l3fwd)
+ self.core_mask_virtio = self.core_mask_l3fwd
+ self.mem_channel = self.dut.get_memory_channels()
+
+ self.prepare_l3fwd_power()
+ self.tx_port = self.tester.get_local_port(self.dut_ports[0])
+ self.tx_interface = self.tester.get_interface(self.tx_port)
+
+ def set_up(self):
+ """
+ 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("rm -rf vhost-net*", "#")
+
+ self.l3fwd = self.dut.new_session(suite="l3fwd")
+ self.vhost = self.dut.new_session(suite="vhost")
+ self.virtio = self.dut.new_session(suite="virito")
+
+ def close_all_session(self):
+ self.dut.close_session(self.vhost)
+ self.dut.close_session(self.virtio)
+ self.dut.close_session(self.l3fwd)
+
+ def prepare_l3fwd_power(self):
+ self.dut.send_expect("cp ./examples/l3fwd-power/main.c .", "#")
+ self.dut.send_expect(
+ "sed -i '/DEV_RX_OFFLOAD_CHECKSUM/d' ./examples/l3fwd-power/main.c", "#", 10)
+ out = self.dut.build_dpdk_apps("./examples/l3fwd-power")
+ self.verify("Error" not in out, "compilation l3fwd-power error")
+
+ def launch_l3fwd(self, path):
+ self.core_interrupt = self.core_list_l3fwd[0]
+ cmd_l3fwd = "./examples/l3fwd-power/build/l3fwd-power " + \
+ "-n %d -c %s --socket-mem 1024,1024 --legacy-mem " + \
+ "--log-level='user1,7' --no-pci --file-prefix=l3fwd-pwd " + \
+ "--vdev=virtio_user0,path=%s -- -p 1 " + \
+ " -P --config='(0,0,%s)' --parse-ptype "
+ cmd_l3fwd = cmd_l3fwd % (self.mem_channel, self.core_mask_l3fwd,
+ path, self.core_interrupt)
+ self.l3fwd.send_expect(cmd_l3fwd, "POWER", 40)
+ time.sleep(10)
+ out = self.l3fwd.get_session_before()
+ if ("Error" in out and "Error opening" not in out):
+ self.logger.error("Launch l3fwd-power sample error")
+ else:
+ self.logger.info("Launch l3fwd-power sample finished")
+
+ def start_vhost_testpmd(self, pci=""):
+ """
+ start testpmd on vhost side
+ """
+ cmd_vhost_user = self.dut.target + "/app/testpmd -n %d -c %s " + \
+ "--socket-mem 1024,1024 --legacy-mem %s " + \
+ "--file-prefix=vhost " + \
+ "--vdev 'net_vhost0,iface=vhost-net,queues=1,client=0' " + \
+ "-- -i --rxq=1 --txq=1"
+ cmd_vhost_user = cmd_vhost_user % (self.mem_channel,
+ self.core_mask_vhost, pci)
+
+ self.vhost.send_expect(cmd_vhost_user, "testpmd>", 30)
+ self.vhost.send_expect("set fwd mac", "testpmd>", 30)
+ self.vhost.send_expect("start", "testpmd>", 30)
+
+ def start_virtio_user(self):
+ """
+ start testpmd on virtio side
+ """
+ cmd_virtio_user = self.dut.target + "/app/testpmd -n %d -c %s " + \
+ " --socket-mem 1024,1024 --legacy-mem --no-pci " + \
+ "--file-prefix=virtio " + \
+ " --vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net" + \
+ " -- -i --txd=512 --rxd=128 --tx-offloads=0x00"
+ cmd_virtio_user = cmd_virtio_user % (self.mem_channel,
+ self.core_mask_virtio)
+
+ self.virtio.send_expect(cmd_virtio_user, "testpmd>", 120)
+ self.virtio.send_expect("set fwd mac", "testpmd>", 20)
+ self.virtio.send_expect("start", "testpmd>", 20)
+
+ def check_interrupt_log(self, status):
+ out = self.l3fwd.get_session_before()
+ if status == "waked up":
+ info = "lcore %s is waked up from rx interrupt on port 0 queue 0"
+ elif status == "sleeps":
+ info = "lcore %s sleeps until interrupt triggers"
+ info = info % self.core_interrupt
+ self.logger.info(info)
+ self.verify(info in out, "The CPU status not right for %s" % info)
+
+ def check_virtio_side_link_status(self, status):
+ out = self.virtio.send_expect("show port info 0", "testpmd> ", 20)
+ rinfo = re.search("Link\s*status:\s*([a-z]*)", out)
+ result = rinfo.group(1)
+ if status in result:
+ self.logger.info("Link status is right, status is %s" % status)
+ else:
+ self.logger.error("Wrong link status not right, status is %s" % result)
+
+ def test_interrupt_with_vhost_net_as_backed(self):
+ """
+ Check the virtio-user interrupt can work when use vhost-net as backend
+ """
+ self.launch_l3fwd(path="/dev/vhost-net")
+ self.virtio.send_expect("ifconfig tap0 up", "#", 20)
+ self.virtio.send_expect("ifconfig tap0 1.1.1.2", "#", 20)
+ # start to ping, check the status of interrupt core
+ self.virtio.send_command("ping -I tap0 1.1.1.1 > aa &", 20)
+ time.sleep(3)
+ self.check_interrupt_log(status="waked up")
+ # stop ping, check the status of interrupt core
+ self.dut.send_expect("killall -s INT ping", "#")
+ time.sleep(2)
+ self.check_interrupt_log(status="sleeps")
+ # restart ping, check the status of interrupt core
+ self.virtio.send_command("ping -I tap0 1.1.1.1 > aa &", 20)
+ time.sleep(3)
+ self.check_interrupt_log(status="waked up")
+ self.dut.send_expect("killall -s INT ping", "#")
+
+ def test_interrupt_with_vhost_user_as_backed(self):
+ """
+ Check the virtio-user interrupt can work when use vhost-user as backend
+ """
+ self.start_vhost_testpmd(pci="")
+ self.launch_l3fwd(path="./vhost-net")
+ # double check the status of interrupt core
+ for i in range(2):
+ self.tester.scapy_append('pk=[Ether(dst="52:54:00:00:00:01")/IP()/("X"*64)]')
+ self.tester.scapy_append('sendp(pk, iface="%s", count=100)' % self.tx_interface)
+ self.tester.scapy_execute()
+ time.sleep(3)
+ self.check_interrupt_log(status="waked up")
+
+ def test_lsc_event_between_vhost_and_virtio_user(self):
+ """
+ LSC event between vhost-user and virtio-user
+ """
+ self.start_vhost_testpmd(pci="--no-pci")
+ self.start_virtio_user()
+ self.check_virtio_side_link_status("up")
+
+ self.vhost.send_expect("quit", "#", 20)
+ self.check_virtio_side_link_status("down")
+
+ def tear_down(self):
+ """
+ run after each test case.
+ """
+ self.dut.send_expect("killall -s INT l3fwd-power", "#")
+ self.dut.send_expect("killall -s INT testpmd", "#")
+ self.close_all_session()
+
+ def tear_down_all(self):
+ """
+ run after each test suite.
+ """
+ self.dut.send_expect("mv ./main.c ./examples/l3fwd-power/", "#")
+ self.dut.build_dpdk_apps('examples/l3fwd-power')
--
2.7.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dts] [PATCH V2] Add testsuite vhost virtio user interrupt
2019-05-08 1:03 [dts] [PATCH V2] Add testsuite vhost virtio user interrupt lihong
@ 2019-05-08 13:48 ` Wang, Yinan
2019-05-09 1:01 ` Ma, LihongX
2019-05-13 7:24 ` Tu, Lijuan
1 sibling, 1 reply; 4+ messages in thread
From: Wang, Yinan @ 2019-05-08 13:48 UTC (permalink / raw)
To: Ma, LihongX, dts
Acked-by: Wang, Yinan <yinan.wang@intel.com>
> -----Original Message-----
> From: Ma, LihongX
> Sent: 2019年5月8日 9:04
> To: dts@dpdk.org
> Cc: Wang, Yinan <yinan.wang@intel.com>; Ma, LihongX
> <lihongx.ma@intel.com>
> Subject: [dts][PATCH V2] Add testsuite vhost virtio user interrupt
>
> Signed-off-by: lihong <lihongx.ma@intel.com>
> ---
> tests/TestSuite_vhost_virtio_user_interrupt.py | 217
> +++++++++++++++++++++++++
> 1 file changed, 217 insertions(+)
> create mode 100644 tests/TestSuite_vhost_virtio_user_interrupt.py
>
> diff --git a/tests/TestSuite_vhost_virtio_user_interrupt.py
> b/tests/TestSuite_vhost_virtio_user_interrupt.py
> new file mode 100644
> index 0000000..6713590
> --- /dev/null
> +++ b/tests/TestSuite_vhost_virtio_user_interrupt.py
> @@ -0,0 +1,217 @@
> +# BSD LICENSE
> +#
> +# Copyright (c) <2019>, Intel Corporation.
> +# All rights reserved.
> +#
> +# Redistribution and use in source and binary forms, with or without #
> +modification, are permitted provided that the following conditions #
> +are met:
> +#
> +# * Redistributions of source code must retain the above copyright
> +# notice, this list of conditions and the following disclaimer.
> +# * Redistributions in binary form must reproduce the above copyright
> +# notice, this list of conditions and the following disclaimer in
> +# the documentation and/or other materials provided with the
> +# distribution.
> +# * Neither the name of Intel Corporation nor the names of its
> +# contributors may be used to endorse or promote products derived
> +# from this software without specific prior written permission.
> +#
> +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS #
> +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT #
> +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
> FOR #
> +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
> COPYRIGHT #
> +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
> INCIDENTAL, #
> +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
> #
> +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
> USE, #
> +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
> ON ANY #
> +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT #
> +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
> USE #
> +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> +
> +"""
> +DPDK Test suite.
> +Virtio-user interrupt need test with l3fwd-power sample """
> +
> +import re
> +import time
> +import utils
> +from test_case import TestCase
> +
> +
> +class TestVirtioUserInterrupt(TestCase):
> +
> + def set_up_all(self):
> + """
> + run at the start of each test suite.
> + """
> + self.core_config = "1S/4C/1T"
> + self.dut_ports = self.dut.get_ports()
> + self.cores_num = len([n for n in self.dut.cores if int(n['socket']) == 0])
> + self.verify(len(self.dut_ports) >= 1, "Insufficient ports for testing")
> + self.verify(self.cores_num >= 4, "There has not enought cores to test
> this case")
> + self.core_list = self.dut.get_core_list(self.core_config)
> + self.core_list_vhost = self.core_list[0:2]
> + self.core_list_l3fwd = self.core_list[2:4]
> + self.core_mask_vhost = utils.create_mask(self.core_list_vhost)
> + self.core_mask_l3fwd = utils.create_mask(self.core_list_l3fwd)
> + self.core_mask_virtio = self.core_mask_l3fwd
> + self.mem_channel = self.dut.get_memory_channels()
> +
> + self.prepare_l3fwd_power()
> + self.tx_port = self.tester.get_local_port(self.dut_ports[0])
> + self.tx_interface = self.tester.get_interface(self.tx_port)
> +
> + def set_up(self):
> + """
> + 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("rm -rf vhost-net*", "#")
> +
> + self.l3fwd = self.dut.new_session(suite="l3fwd")
> + self.vhost = self.dut.new_session(suite="vhost")
> + self.virtio = self.dut.new_session(suite="virito")
> +
> + def close_all_session(self):
> + self.dut.close_session(self.vhost)
> + self.dut.close_session(self.virtio)
> + self.dut.close_session(self.l3fwd)
> +
> + def prepare_l3fwd_power(self):
> + self.dut.send_expect("cp ./examples/l3fwd-power/main.c .", "#")
> + self.dut.send_expect(
> + "sed -i
> '/DEV_RX_OFFLOAD_CHECKSUM/d' ./examples/l3fwd-power/main.c", "#", 10)
> + out = self.dut.build_dpdk_apps("./examples/l3fwd-power")
> + self.verify("Error" not in out, "compilation l3fwd-power
> + error")
> +
> + def launch_l3fwd(self, path):
> + self.core_interrupt = self.core_list_l3fwd[0]
> + cmd_l3fwd = "./examples/l3fwd-power/build/l3fwd-power " + \
> + "-n %d -c %s --socket-mem 1024,1024 --legacy-mem "
> + \
> + "--log-level='user1,7' --no-pci --file-prefix=l3fwd-pwd "
> + \
> + "--vdev=virtio_user0,path=%s -- -p 1 " + \
> + " -P --config='(0,0,%s)' --parse-ptype "
> + cmd_l3fwd = cmd_l3fwd % (self.mem_channel,
> self.core_mask_l3fwd,
> + path, self.core_interrupt)
> + self.l3fwd.send_expect(cmd_l3fwd, "POWER", 40)
> + time.sleep(10)
> + out = self.l3fwd.get_session_before()
> + if ("Error" in out and "Error opening" not in out):
> + self.logger.error("Launch l3fwd-power sample error")
> + else:
> + self.logger.info("Launch l3fwd-power sample finished")
> +
> + def start_vhost_testpmd(self, pci=""):
> + """
> + start testpmd on vhost side
> + """
> + cmd_vhost_user = self.dut.target + "/app/testpmd -n %d -c %s " + \
> + "--socket-mem 1024,1024 --legacy-mem %s " + \
> + "--file-prefix=vhost " + \
> + "--vdev 'net_vhost0,iface=vhost-net,queues=1,client=0' " + \
> + "-- -i --rxq=1 --txq=1"
> + cmd_vhost_user = cmd_vhost_user % (self.mem_channel,
> + self.core_mask_vhost, pci)
> +
> + self.vhost.send_expect(cmd_vhost_user, "testpmd>", 30)
> + self.vhost.send_expect("set fwd mac", "testpmd>", 30)
> + self.vhost.send_expect("start", "testpmd>", 30)
> +
> + def start_virtio_user(self):
> + """
> + start testpmd on virtio side
> + """
> + cmd_virtio_user = self.dut.target + "/app/testpmd -n %d -c %s " + \
> + " --socket-mem 1024,1024 --legacy-mem
> --no-pci " + \
> + "--file-prefix=virtio " + \
> + "
> --vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net" + \
> + " -- -i --txd=512 --rxd=128 --tx-offloads=0x00"
> + cmd_virtio_user = cmd_virtio_user % (self.mem_channel,
> + self.core_mask_virtio)
> +
> + self.virtio.send_expect(cmd_virtio_user, "testpmd>", 120)
> + self.virtio.send_expect("set fwd mac", "testpmd>", 20)
> + self.virtio.send_expect("start", "testpmd>", 20)
> +
> + def check_interrupt_log(self, status):
> + out = self.l3fwd.get_session_before()
> + if status == "waked up":
> + info = "lcore %s is waked up from rx interrupt on port 0 queue
> 0"
> + elif status == "sleeps":
> + info = "lcore %s sleeps until interrupt triggers"
> + info = info % self.core_interrupt
> + self.logger.info(info)
> + self.verify(info in out, "The CPU status not right for %s" %
> + info)
> +
> + def check_virtio_side_link_status(self, status):
> + out = self.virtio.send_expect("show port info 0", "testpmd> ", 20)
> + rinfo = re.search("Link\s*status:\s*([a-z]*)", out)
> + result = rinfo.group(1)
> + if status in result:
> + self.logger.info("Link status is right, status is %s" % status)
> + else:
> + self.logger.error("Wrong link status not right, status is
> + %s" % result)
> +
> + def test_interrupt_with_vhost_net_as_backed(self):
> + """
> + Check the virtio-user interrupt can work when use vhost-net as
> backend
> + """
> + self.launch_l3fwd(path="/dev/vhost-net")
> + self.virtio.send_expect("ifconfig tap0 up", "#", 20)
> + self.virtio.send_expect("ifconfig tap0 1.1.1.2", "#", 20)
> + # start to ping, check the status of interrupt core
> + self.virtio.send_command("ping -I tap0 1.1.1.1 > aa &", 20)
> + time.sleep(3)
> + self.check_interrupt_log(status="waked up")
> + # stop ping, check the status of interrupt core
> + self.dut.send_expect("killall -s INT ping", "#")
> + time.sleep(2)
> + self.check_interrupt_log(status="sleeps")
> + # restart ping, check the status of interrupt core
> + self.virtio.send_command("ping -I tap0 1.1.1.1 > aa &", 20)
> + time.sleep(3)
> + self.check_interrupt_log(status="waked up")
> + self.dut.send_expect("killall -s INT ping", "#")
> +
> + def test_interrupt_with_vhost_user_as_backed(self):
> + """
> + Check the virtio-user interrupt can work when use vhost-user as
> backend
> + """
> + self.start_vhost_testpmd(pci="")
> + self.launch_l3fwd(path="./vhost-net")
> + # double check the status of interrupt core
> + for i in range(2):
> +
> self.tester.scapy_append('pk=[Ether(dst="52:54:00:00:00:01")/IP()/("X"*64)]')
> + self.tester.scapy_append('sendp(pk, iface="%s", count=100)' %
> self.tx_interface)
> + self.tester.scapy_execute()
> + time.sleep(3)
> + self.check_interrupt_log(status="waked up")
> +
> + def test_lsc_event_between_vhost_and_virtio_user(self):
> + """
> + LSC event between vhost-user and virtio-user
> + """
> + self.start_vhost_testpmd(pci="--no-pci")
> + self.start_virtio_user()
> + self.check_virtio_side_link_status("up")
> +
> + self.vhost.send_expect("quit", "#", 20)
> + self.check_virtio_side_link_status("down")
> +
> + def tear_down(self):
> + """
> + run after each test case.
> + """
> + self.dut.send_expect("killall -s INT l3fwd-power", "#")
> + self.dut.send_expect("killall -s INT testpmd", "#")
> + self.close_all_session()
> +
> + def tear_down_all(self):
> + """
> + run after each test suite.
> + """
> + self.dut.send_expect("mv ./main.c ./examples/l3fwd-power/", "#")
> + self.dut.build_dpdk_apps('examples/l3fwd-power')
> --
> 2.7.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dts] [PATCH V2] Add testsuite vhost virtio user interrupt
2019-05-08 13:48 ` Wang, Yinan
@ 2019-05-09 1:01 ` Ma, LihongX
0 siblings, 0 replies; 4+ messages in thread
From: Ma, LihongX @ 2019-05-09 1:01 UTC (permalink / raw)
To: Wang, Yinan, dts
Tested-by :lihong<lihongx.ma@intel.com>
-----Original Message-----
From: Wang, Yinan
Sent: Wednesday, May 8, 2019 9:48 PM
To: Ma, LihongX <lihongx.ma@intel.com>; dts@dpdk.org
Subject: RE: [dts][PATCH V2] Add testsuite vhost virtio user interrupt
Acked-by: Wang, Yinan <yinan.wang@intel.com>
> -----Original Message-----
> From: Ma, LihongX
> Sent: 2019年5月8日 9:04
> To: dts@dpdk.org
> Cc: Wang, Yinan <yinan.wang@intel.com>; Ma, LihongX
> <lihongx.ma@intel.com>
> Subject: [dts][PATCH V2] Add testsuite vhost virtio user interrupt
>
> Signed-off-by: lihong <lihongx.ma@intel.com>
> ---
> tests/TestSuite_vhost_virtio_user_interrupt.py | 217
> +++++++++++++++++++++++++
> 1 file changed, 217 insertions(+)
> create mode 100644 tests/TestSuite_vhost_virtio_user_interrupt.py
>
> diff --git a/tests/TestSuite_vhost_virtio_user_interrupt.py
> b/tests/TestSuite_vhost_virtio_user_interrupt.py
> new file mode 100644
> index 0000000..6713590
> --- /dev/null
> +++ b/tests/TestSuite_vhost_virtio_user_interrupt.py
> @@ -0,0 +1,217 @@
> +# BSD LICENSE
> +#
> +# Copyright (c) <2019>, Intel Corporation.
> +# All rights reserved.
> +#
> +# Redistribution and use in source and binary forms, with or without
> +# modification, are permitted provided that the following conditions
> +# are met:
> +#
> +# * Redistributions of source code must retain the above copyright
> +# notice, this list of conditions and the following disclaimer.
> +# * Redistributions in binary form must reproduce the above copyright
> +# notice, this list of conditions and the following disclaimer in
> +# the documentation and/or other materials provided with the
> +# distribution.
> +# * Neither the name of Intel Corporation nor the names of its
> +# contributors may be used to endorse or promote products derived
> +# from this software without specific prior written permission.
> +#
> +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS #
> +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT #
> +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
> FOR #
> +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
> COPYRIGHT #
> +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
> INCIDENTAL, #
> +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
> #
> +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
> USE, #
> +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
> ON ANY #
> +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT #
> +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
> USE #
> +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> +
> +"""
> +DPDK Test suite.
> +Virtio-user interrupt need test with l3fwd-power sample """
> +
> +import re
> +import time
> +import utils
> +from test_case import TestCase
> +
> +
> +class TestVirtioUserInterrupt(TestCase):
> +
> + def set_up_all(self):
> + """
> + run at the start of each test suite.
> + """
> + self.core_config = "1S/4C/1T"
> + self.dut_ports = self.dut.get_ports()
> + self.cores_num = len([n for n in self.dut.cores if int(n['socket']) == 0])
> + self.verify(len(self.dut_ports) >= 1, "Insufficient ports for testing")
> + self.verify(self.cores_num >= 4, "There has not enought cores
> + to test
> this case")
> + self.core_list = self.dut.get_core_list(self.core_config)
> + self.core_list_vhost = self.core_list[0:2]
> + self.core_list_l3fwd = self.core_list[2:4]
> + self.core_mask_vhost = utils.create_mask(self.core_list_vhost)
> + self.core_mask_l3fwd = utils.create_mask(self.core_list_l3fwd)
> + self.core_mask_virtio = self.core_mask_l3fwd
> + self.mem_channel = self.dut.get_memory_channels()
> +
> + self.prepare_l3fwd_power()
> + self.tx_port = self.tester.get_local_port(self.dut_ports[0])
> + self.tx_interface = self.tester.get_interface(self.tx_port)
> +
> + def set_up(self):
> + """
> + 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("rm -rf vhost-net*", "#")
> +
> + self.l3fwd = self.dut.new_session(suite="l3fwd")
> + self.vhost = self.dut.new_session(suite="vhost")
> + self.virtio = self.dut.new_session(suite="virito")
> +
> + def close_all_session(self):
> + self.dut.close_session(self.vhost)
> + self.dut.close_session(self.virtio)
> + self.dut.close_session(self.l3fwd)
> +
> + def prepare_l3fwd_power(self):
> + self.dut.send_expect("cp ./examples/l3fwd-power/main.c .", "#")
> + self.dut.send_expect(
> + "sed -i
> '/DEV_RX_OFFLOAD_CHECKSUM/d' ./examples/l3fwd-power/main.c", "#", 10)
> + out = self.dut.build_dpdk_apps("./examples/l3fwd-power")
> + self.verify("Error" not in out, "compilation l3fwd-power
> + error")
> +
> + def launch_l3fwd(self, path):
> + self.core_interrupt = self.core_list_l3fwd[0]
> + cmd_l3fwd = "./examples/l3fwd-power/build/l3fwd-power " + \
> + "-n %d -c %s --socket-mem 1024,1024 --legacy-mem "
> + \
> + "--log-level='user1,7' --no-pci --file-prefix=l3fwd-pwd "
> + \
> + "--vdev=virtio_user0,path=%s -- -p 1 " + \
> + " -P --config='(0,0,%s)' --parse-ptype "
> + cmd_l3fwd = cmd_l3fwd % (self.mem_channel,
> self.core_mask_l3fwd,
> + path, self.core_interrupt)
> + self.l3fwd.send_expect(cmd_l3fwd, "POWER", 40)
> + time.sleep(10)
> + out = self.l3fwd.get_session_before()
> + if ("Error" in out and "Error opening" not in out):
> + self.logger.error("Launch l3fwd-power sample error")
> + else:
> + self.logger.info("Launch l3fwd-power sample finished")
> +
> + def start_vhost_testpmd(self, pci=""):
> + """
> + start testpmd on vhost side
> + """
> + cmd_vhost_user = self.dut.target + "/app/testpmd -n %d -c %s " + \
> + "--socket-mem 1024,1024 --legacy-mem %s " + \
> + "--file-prefix=vhost " + \
> + "--vdev 'net_vhost0,iface=vhost-net,queues=1,client=0' " + \
> + "-- -i --rxq=1 --txq=1"
> + cmd_vhost_user = cmd_vhost_user % (self.mem_channel,
> + self.core_mask_vhost, pci)
> +
> + self.vhost.send_expect(cmd_vhost_user, "testpmd>", 30)
> + self.vhost.send_expect("set fwd mac", "testpmd>", 30)
> + self.vhost.send_expect("start", "testpmd>", 30)
> +
> + def start_virtio_user(self):
> + """
> + start testpmd on virtio side
> + """
> + cmd_virtio_user = self.dut.target + "/app/testpmd -n %d -c %s " + \
> + " --socket-mem 1024,1024 --legacy-mem
> --no-pci " + \
> + "--file-prefix=virtio " + \
> + "
> --vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net" + \
> + " -- -i --txd=512 --rxd=128 --tx-offloads=0x00"
> + cmd_virtio_user = cmd_virtio_user % (self.mem_channel,
> + self.core_mask_virtio)
> +
> + self.virtio.send_expect(cmd_virtio_user, "testpmd>", 120)
> + self.virtio.send_expect("set fwd mac", "testpmd>", 20)
> + self.virtio.send_expect("start", "testpmd>", 20)
> +
> + def check_interrupt_log(self, status):
> + out = self.l3fwd.get_session_before()
> + if status == "waked up":
> + info = "lcore %s is waked up from rx interrupt on port 0
> + queue
> 0"
> + elif status == "sleeps":
> + info = "lcore %s sleeps until interrupt triggers"
> + info = info % self.core_interrupt
> + self.logger.info(info)
> + self.verify(info in out, "The CPU status not right for %s" %
> + info)
> +
> + def check_virtio_side_link_status(self, status):
> + out = self.virtio.send_expect("show port info 0", "testpmd> ", 20)
> + rinfo = re.search("Link\s*status:\s*([a-z]*)", out)
> + result = rinfo.group(1)
> + if status in result:
> + self.logger.info("Link status is right, status is %s" % status)
> + else:
> + self.logger.error("Wrong link status not right, status is
> + %s" % result)
> +
> + def test_interrupt_with_vhost_net_as_backed(self):
> + """
> + Check the virtio-user interrupt can work when use vhost-net
> + as
> backend
> + """
> + self.launch_l3fwd(path="/dev/vhost-net")
> + self.virtio.send_expect("ifconfig tap0 up", "#", 20)
> + self.virtio.send_expect("ifconfig tap0 1.1.1.2", "#", 20)
> + # start to ping, check the status of interrupt core
> + self.virtio.send_command("ping -I tap0 1.1.1.1 > aa &", 20)
> + time.sleep(3)
> + self.check_interrupt_log(status="waked up")
> + # stop ping, check the status of interrupt core
> + self.dut.send_expect("killall -s INT ping", "#")
> + time.sleep(2)
> + self.check_interrupt_log(status="sleeps")
> + # restart ping, check the status of interrupt core
> + self.virtio.send_command("ping -I tap0 1.1.1.1 > aa &", 20)
> + time.sleep(3)
> + self.check_interrupt_log(status="waked up")
> + self.dut.send_expect("killall -s INT ping", "#")
> +
> + def test_interrupt_with_vhost_user_as_backed(self):
> + """
> + Check the virtio-user interrupt can work when use vhost-user
> + as
> backend
> + """
> + self.start_vhost_testpmd(pci="")
> + self.launch_l3fwd(path="./vhost-net")
> + # double check the status of interrupt core
> + for i in range(2):
> +
> self.tester.scapy_append('pk=[Ether(dst="52:54:00:00:00:01")/IP()/("X"
> *64)]')
> + self.tester.scapy_append('sendp(pk, iface="%s",
> + count=100)' %
> self.tx_interface)
> + self.tester.scapy_execute()
> + time.sleep(3)
> + self.check_interrupt_log(status="waked up")
> +
> + def test_lsc_event_between_vhost_and_virtio_user(self):
> + """
> + LSC event between vhost-user and virtio-user
> + """
> + self.start_vhost_testpmd(pci="--no-pci")
> + self.start_virtio_user()
> + self.check_virtio_side_link_status("up")
> +
> + self.vhost.send_expect("quit", "#", 20)
> + self.check_virtio_side_link_status("down")
> +
> + def tear_down(self):
> + """
> + run after each test case.
> + """
> + self.dut.send_expect("killall -s INT l3fwd-power", "#")
> + self.dut.send_expect("killall -s INT testpmd", "#")
> + self.close_all_session()
> +
> + def tear_down_all(self):
> + """
> + run after each test suite.
> + """
> + self.dut.send_expect("mv ./main.c ./examples/l3fwd-power/", "#")
> + self.dut.build_dpdk_apps('examples/l3fwd-power')
> --
> 2.7.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dts] [PATCH V2] Add testsuite vhost virtio user interrupt
2019-05-08 1:03 [dts] [PATCH V2] Add testsuite vhost virtio user interrupt lihong
2019-05-08 13:48 ` Wang, Yinan
@ 2019-05-13 7:24 ` Tu, Lijuan
1 sibling, 0 replies; 4+ messages in thread
From: Tu, Lijuan @ 2019-05-13 7:24 UTC (permalink / raw)
To: Ma, LihongX, dts; +Cc: Wang, Yinan, Ma, LihongX
Applied, thanks
> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of lihong
> Sent: Wednesday, May 8, 2019 9:04 AM
> To: dts@dpdk.org
> Cc: Wang, Yinan <yinan.wang@intel.com>; Ma, LihongX
> <lihongx.ma@intel.com>
> Subject: [dts] [PATCH V2] Add testsuite vhost virtio user interrupt
>
> Signed-off-by: lihong <lihongx.ma@intel.com>
> ---
> tests/TestSuite_vhost_virtio_user_interrupt.py | 217
> +++++++++++++++++++++++++
> 1 file changed, 217 insertions(+)
> create mode 100644 tests/TestSuite_vhost_virtio_user_interrupt.py
>
> diff --git a/tests/TestSuite_vhost_virtio_user_interrupt.py
> b/tests/TestSuite_vhost_virtio_user_interrupt.py
> new file mode 100644
> index 0000000..6713590
> --- /dev/null
> +++ b/tests/TestSuite_vhost_virtio_user_interrupt.py
> @@ -0,0 +1,217 @@
> +# BSD LICENSE
> +#
> +# Copyright (c) <2019>, Intel Corporation.
> +# All rights reserved.
> +#
> +# Redistribution and use in source and binary forms, with or without #
> +modification, are permitted provided that the following conditions #
> +are met:
> +#
> +# * Redistributions of source code must retain the above copyright
> +# notice, this list of conditions and the following disclaimer.
> +# * Redistributions in binary form must reproduce the above copyright
> +# notice, this list of conditions and the following disclaimer in
> +# the documentation and/or other materials provided with the
> +# distribution.
> +# * Neither the name of Intel Corporation nor the names of its
> +# contributors may be used to endorse or promote products derived
> +# from this software without specific prior written permission.
> +#
> +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS #
> +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT #
> +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
> FOR #
> +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
> COPYRIGHT #
> +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
> INCIDENTAL, #
> +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
> #
> +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
> USE, #
> +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
> ON ANY #
> +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT #
> +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
> USE #
> +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> +
> +"""
> +DPDK Test suite.
> +Virtio-user interrupt need test with l3fwd-power sample """
> +
> +import re
> +import time
> +import utils
> +from test_case import TestCase
> +
> +
> +class TestVirtioUserInterrupt(TestCase):
> +
> + def set_up_all(self):
> + """
> + run at the start of each test suite.
> + """
> + self.core_config = "1S/4C/1T"
> + self.dut_ports = self.dut.get_ports()
> + self.cores_num = len([n for n in self.dut.cores if int(n['socket']) == 0])
> + self.verify(len(self.dut_ports) >= 1, "Insufficient ports for testing")
> + self.verify(self.cores_num >= 4, "There has not enought cores to test
> this case")
> + self.core_list = self.dut.get_core_list(self.core_config)
> + self.core_list_vhost = self.core_list[0:2]
> + self.core_list_l3fwd = self.core_list[2:4]
> + self.core_mask_vhost = utils.create_mask(self.core_list_vhost)
> + self.core_mask_l3fwd = utils.create_mask(self.core_list_l3fwd)
> + self.core_mask_virtio = self.core_mask_l3fwd
> + self.mem_channel = self.dut.get_memory_channels()
> +
> + self.prepare_l3fwd_power()
> + self.tx_port = self.tester.get_local_port(self.dut_ports[0])
> + self.tx_interface = self.tester.get_interface(self.tx_port)
> +
> + def set_up(self):
> + """
> + 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("rm -rf vhost-net*", "#")
> +
> + self.l3fwd = self.dut.new_session(suite="l3fwd")
> + self.vhost = self.dut.new_session(suite="vhost")
> + self.virtio = self.dut.new_session(suite="virito")
> +
> + def close_all_session(self):
> + self.dut.close_session(self.vhost)
> + self.dut.close_session(self.virtio)
> + self.dut.close_session(self.l3fwd)
> +
> + def prepare_l3fwd_power(self):
> + self.dut.send_expect("cp ./examples/l3fwd-power/main.c .", "#")
> + self.dut.send_expect(
> + "sed -i '/DEV_RX_OFFLOAD_CHECKSUM/d' ./examples/l3fwd-
> power/main.c", "#", 10)
> + out = self.dut.build_dpdk_apps("./examples/l3fwd-power")
> + self.verify("Error" not in out, "compilation l3fwd-power
> + error")
> +
> + def launch_l3fwd(self, path):
> + self.core_interrupt = self.core_list_l3fwd[0]
> + cmd_l3fwd = "./examples/l3fwd-power/build/l3fwd-power " + \
> + "-n %d -c %s --socket-mem 1024,1024 --legacy-mem " + \
> + "--log-level='user1,7' --no-pci --file-prefix=l3fwd-pwd " + \
> + "--vdev=virtio_user0,path=%s -- -p 1 " + \
> + " -P --config='(0,0,%s)' --parse-ptype "
> + cmd_l3fwd = cmd_l3fwd % (self.mem_channel, self.core_mask_l3fwd,
> + path, self.core_interrupt)
> + self.l3fwd.send_expect(cmd_l3fwd, "POWER", 40)
> + time.sleep(10)
> + out = self.l3fwd.get_session_before()
> + if ("Error" in out and "Error opening" not in out):
> + self.logger.error("Launch l3fwd-power sample error")
> + else:
> + self.logger.info("Launch l3fwd-power sample finished")
> +
> + def start_vhost_testpmd(self, pci=""):
> + """
> + start testpmd on vhost side
> + """
> + cmd_vhost_user = self.dut.target + "/app/testpmd -n %d -c %s " + \
> + "--socket-mem 1024,1024 --legacy-mem %s " + \
> + "--file-prefix=vhost " + \
> + "--vdev 'net_vhost0,iface=vhost-net,queues=1,client=0' " + \
> + "-- -i --rxq=1 --txq=1"
> + cmd_vhost_user = cmd_vhost_user % (self.mem_channel,
> + self.core_mask_vhost, pci)
> +
> + self.vhost.send_expect(cmd_vhost_user, "testpmd>", 30)
> + self.vhost.send_expect("set fwd mac", "testpmd>", 30)
> + self.vhost.send_expect("start", "testpmd>", 30)
> +
> + def start_virtio_user(self):
> + """
> + start testpmd on virtio side
> + """
> + cmd_virtio_user = self.dut.target + "/app/testpmd -n %d -c %s " + \
> + " --socket-mem 1024,1024 --legacy-mem --no-pci " + \
> + "--file-prefix=virtio " + \
> + " --
> vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net" + \
> + " -- -i --txd=512 --rxd=128 --tx-offloads=0x00"
> + cmd_virtio_user = cmd_virtio_user % (self.mem_channel,
> + self.core_mask_virtio)
> +
> + self.virtio.send_expect(cmd_virtio_user, "testpmd>", 120)
> + self.virtio.send_expect("set fwd mac", "testpmd>", 20)
> + self.virtio.send_expect("start", "testpmd>", 20)
> +
> + def check_interrupt_log(self, status):
> + out = self.l3fwd.get_session_before()
> + if status == "waked up":
> + info = "lcore %s is waked up from rx interrupt on port 0 queue 0"
> + elif status == "sleeps":
> + info = "lcore %s sleeps until interrupt triggers"
> + info = info % self.core_interrupt
> + self.logger.info(info)
> + self.verify(info in out, "The CPU status not right for %s" %
> + info)
> +
> + def check_virtio_side_link_status(self, status):
> + out = self.virtio.send_expect("show port info 0", "testpmd> ", 20)
> + rinfo = re.search("Link\s*status:\s*([a-z]*)", out)
> + result = rinfo.group(1)
> + if status in result:
> + self.logger.info("Link status is right, status is %s" % status)
> + else:
> + self.logger.error("Wrong link status not right, status is
> + %s" % result)
> +
> + def test_interrupt_with_vhost_net_as_backed(self):
> + """
> + Check the virtio-user interrupt can work when use vhost-net as
> backend
> + """
> + self.launch_l3fwd(path="/dev/vhost-net")
> + self.virtio.send_expect("ifconfig tap0 up", "#", 20)
> + self.virtio.send_expect("ifconfig tap0 1.1.1.2", "#", 20)
> + # start to ping, check the status of interrupt core
> + self.virtio.send_command("ping -I tap0 1.1.1.1 > aa &", 20)
> + time.sleep(3)
> + self.check_interrupt_log(status="waked up")
> + # stop ping, check the status of interrupt core
> + self.dut.send_expect("killall -s INT ping", "#")
> + time.sleep(2)
> + self.check_interrupt_log(status="sleeps")
> + # restart ping, check the status of interrupt core
> + self.virtio.send_command("ping -I tap0 1.1.1.1 > aa &", 20)
> + time.sleep(3)
> + self.check_interrupt_log(status="waked up")
> + self.dut.send_expect("killall -s INT ping", "#")
> +
> + def test_interrupt_with_vhost_user_as_backed(self):
> + """
> + Check the virtio-user interrupt can work when use vhost-user as
> backend
> + """
> + self.start_vhost_testpmd(pci="")
> + self.launch_l3fwd(path="./vhost-net")
> + # double check the status of interrupt core
> + for i in range(2):
> +
> self.tester.scapy_append('pk=[Ether(dst="52:54:00:00:00:01")/IP()/("X"*64)]')
> + self.tester.scapy_append('sendp(pk, iface="%s", count=100)' %
> self.tx_interface)
> + self.tester.scapy_execute()
> + time.sleep(3)
> + self.check_interrupt_log(status="waked up")
> +
> + def test_lsc_event_between_vhost_and_virtio_user(self):
> + """
> + LSC event between vhost-user and virtio-user
> + """
> + self.start_vhost_testpmd(pci="--no-pci")
> + self.start_virtio_user()
> + self.check_virtio_side_link_status("up")
> +
> + self.vhost.send_expect("quit", "#", 20)
> + self.check_virtio_side_link_status("down")
> +
> + def tear_down(self):
> + """
> + run after each test case.
> + """
> + self.dut.send_expect("killall -s INT l3fwd-power", "#")
> + self.dut.send_expect("killall -s INT testpmd", "#")
> + self.close_all_session()
> +
> + def tear_down_all(self):
> + """
> + run after each test suite.
> + """
> + self.dut.send_expect("mv ./main.c ./examples/l3fwd-power/", "#")
> + self.dut.build_dpdk_apps('examples/l3fwd-power')
> --
> 2.7.4
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-13 7:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-08 1:03 [dts] [PATCH V2] Add testsuite vhost virtio user interrupt lihong
2019-05-08 13:48 ` Wang, Yinan
2019-05-09 1:01 ` Ma, LihongX
2019-05-13 7:24 ` 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).