[dts] [PATCH V1] Add test suite about vhost multi queue qemu

[Liu, Yong]

Lihong, my comments are inline.

Thanks,
Marvin

> -----Original Message-----
> From: dts [mailto:dts-bounces at dpdk.org] On Behalf Of lihong
> Sent: Sunday, April 12, 2020 7:53 PM
> To: dts at dpdk.org
> Cc: Ma, LihongX <lihongx.ma at intel.com>
> Subject: [dts] [PATCH V1] Add test suite about vhost multi queue qemu
> 
> Signed-off-by: lihong <lihongx.ma at intel.com>
> ---
>  tests/TestSuite_vhost_multi_queue_qemu.py | 297
> ++++++++++++++++++++++++++++++
>  1 file changed, 297 insertions(+)
>  create mode 100644 tests/TestSuite_vhost_multi_queue_qemu.py
> 
> diff --git a/tests/TestSuite_vhost_multi_queue_qemu.py
> b/tests/TestSuite_vhost_multi_queue_qemu.py
> new file mode 100644
> index 0000000..4538fd0
> --- /dev/null
> +++ b/tests/TestSuite_vhost_multi_queue_qemu.py
> @@ -0,0 +1,297 @@
> +# BSD LICENSE
> +#
> +# Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
> +# All rights reserved.

Please update the date.

> +#
> +# 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.
> +
> +Vhost PVP performance using Qemu test suite.
> +"""
> +import os
> +import re
> +import time
> +import utils
> +from scapy.utils import wrpcap, rdpcap
> +from test_case import TestCase
> +from exception import VerifyFailure
> +from settings import HEADER_SIZE
> +from etgen import IxiaPacketGenerator

Please remove unused import. 

> +from qemu_kvm import QEMUKvm
> +
Now we have wrapper function for virtual machine object import. Please not use QEMU object directly. 
from virt_common import VM


> +
> +class TestVhostUserOneCopyOneVm(TestCase):
> +
> +    def set_up_all(self):
> +        # Get and verify the ports
> +        self.dut_ports = self.dut.get_ports()
> +        self.verify(len(self.dut_ports) >= 1, "Insufficient ports for
> testing")
> +        local_port = self.tester.get_local_port(self.dut_ports[0])
> +        self.tx_interface = self.tester.get_interface(local_port)
> +        # Get the port's socket
> +        self.pf = self.dut_ports[0]
> +        netdev = self.dut.ports_info[self.pf]['port']
> +        self.socket = netdev.get_nic_socket()
> +        self.cores = self.dut.get_core_list("1S/3C/1T",
> socket=self.socket)

You may need to check whether return core is sufficient.

> +
> +        self.queue_number = 2
> +
> +        # Using file to save the vhost sample output since in jumboframe
> case,
> +        # there will be lots of output
> +
> +        self.virtio1 = "eth1"
> +        self.virtio1_mac = "52:54:00:00:00:01"
> +        self.vm_dut = None
> +
> +        self.number_of_ports = 1
> +        self.header_row = ["FrameSize(B)", "Throughput(Mpps)",
> "LineRate(%)", "Cycle"]
> +        self.memory_channel = 4

You can get dut channel by function call "self.dut.get_memory_channels()".

> +        if self.dut.cores[len(self.dut.cores)-1]['socket'] == '0':
> +            self.socket_mem = '1024'
> +        else:
> +            self.socket_mem = '1024,1024'

If socket number is required, I'd like add new function in crb object to do that. 

> +
> +    def set_up(self):
> +        #
> +        # Run before each test case.
> +        #
> +        self.dut.send_expect("rm -rf ./vhost.out", "#")
> +        self.dut.send_expect("rm -rf ./vhost-net*", "#")
> +        self.dut.send_expect("killall -s INT vhost-switch", "#")
> +
> +        self.frame_sizes = [64, 128, 256, 512, 1024, 1500]
> +        self.vm_testpmd_vector = self.target + "/app/testpmd -c 0x07 -n
> 3" + \
> +                                 " -- -i --tx-offloads=0x0 " + \
> +                                 " --rxq=%d --txq=%d --rss-ip --nb-
> cores=2" % (self.queue_number, self.queue_number)
> +
> +    def launch_testpmd(self, queue=2):
> +        #
> +        # Launch the vhost sample with different parameters
> +        #
> +        self.testcmd = "./x86_64-native-linuxapp-gcc/app/testpmd -c %s -
> n %d --socket-mem %s" + \
> +                       " --vdev 'net_vhost0,iface=vhost-net,queues=%d' --
> -i --rxq=%d --txq=%d --nb-cores=2"

Please use self.target for DPDK target.

> +        self.coremask = utils.create_mask(self.cores)
> +        self.testcmd_start = self.testcmd % (self.coremask,
> self.memory_channel, self.socket_mem, queue, queue, queue)
> +
Local variable should be enough, testcmd_start won't be used in other places.

> +        self.vhost_user = self.dut.new_session(suite="user")


Please remember to close this session in tear_down function. 
> +
> +        self.vhost_user.send_expect("cd /root/dpdk", "#", 120)
> +        self.vhost_user.send_expect(self.testcmd_start, "testpmd> ", 120)
> +        self.vhost_user.send_expect("set fwd mac", "testpmd> ", 120)
> +        self.vhost_user.send_expect("start", "testpmd> ", 120)
> +
> +    def start_onevm(self, path="", modem=0):
> +        #
> +        # Start One VM with one virtio device
> +        #
> +        self.vm = QEMUKvm(self.dut, 'vm0', 'vhost_sample')
> +        if(path != ""):
> +            self.vm.set_qemu_emulator(path)
> +        vm_params = {}
> +        vm_params['driver'] = 'vhost-user'
> +        vm_params['opt_path'] = './vhost-net'
> +        vm_params['opt_mac'] = self.virtio1_mac
> +        vm_params['opt_queue'] = self.queue_number
> +        vm_params['opt_settings'] = 'mrg_rxbuf=on,mq=on,vectors=6'
> +        if(modem == 1):
> +            vm_params['opt_settings'] = 'disable-modern=false'
> +        self.vm.set_vm_device(**vm_params)
> +
> +        try:
> +            self.vm_dut = self.vm.start()
> +            if self.vm_dut is None:
> +                raise Exception("Set up VM ENV failed")
> +        except Exception as e:
> +            self.logger.error("ERROR: Failure for %s" % str(e))
> +
> +        return True
> +
> +    def vm_testpmd_start(self):
> +        #
> +        # Start testpmd in vm
> +        #
> +        if self.vm_dut is not None:
> +            self.vm_dut.send_expect(self.vm_testpmd_vector, "testpmd>",
> 20)
> +            self.vm_dut.send_expect("set fwd mac", "testpmd>", 20)
> +            self.vm_dut.send_expect("start tx_first", "testpmd>")
> +
> +    def send_verify(self, case, frame_sizes, tag="Performance"):

Look like nothing is verified in this function, you may need to change the function name.

> +        self.result_table_create(self.header_row)
> +        for frame_size in frame_sizes:
> +            info = "Running test %s, and %d frame size." % (case,
> frame_size)
> +            self.logger.info(info)
> +            payload_size = frame_size - HEADER_SIZE['eth'] -
> HEADER_SIZE['ip'] - HEADER_SIZE['udp']
> +            tgenInput = []
> +
> +            self.tester.scapy_append('a=
> [Ether(dst="%s")/IP(dst="1.1.1.1")/UDP()/("X"*%d)]' % (self.virtio1_mac,
> payload_size))
> +            self.tester.scapy_append('b=
> [Ether(dst="%s")/IP(dst="1.1.1.20")/UDP()/("X"*%d)]' % (self.virtio1_mac,
> payload_size))
> +            self.tester.scapy_append('c=
> [Ether(dst="%s")/IP(dst="1.1.1.7")/UDP()/("X"*%d)]' % (self.virtio1_mac,
> payload_size))
> +            self.tester.scapy_append('d=
> [Ether(dst="%s")/IP(dst="1.1.1.8")/UDP()/("X"*%d)]' % (self.virtio1_mac,
> payload_size))
> +            self.tester.scapy_append('a= a + b + c + d')
> +            self.tester.scapy_append('wrpcap("multiqueue_2.pcap", a)')
> +            self.tester.scapy_execute()
> +
> +            port = self.tester.get_local_port(self.pf)
> +            tgenInput.append((port, port, "multiqueue_2.pcap"))
> +
> +            _, pps = self.tester.traffic_generator_throughput(tgenInput,
> delay=30)
> +            Mpps = pps / 1000000.0
> +            pct = Mpps * 100 / float(self.wirespeed(self.nic, frame_size,
> +                                     self.number_of_ports))
> +            data_row = [frame_size, str(Mpps), str(pct), tag]
> +            self.result_table_add(data_row)
> +            #self.verify(Mpps != 0, "The recive data of pak-size: %d is
> 0")

Please fix typo here.

> +        self.result_table_print()
> +
> +    def send_scapy(self, verify_type = 1):

Please add comment this function.
Please use string for verify_type argument which is more readable.

> +        payload_size = 256 - HEADER_SIZE['eth'] - HEADER_SIZE['ip'] -
> HEADER_SIZE['udp']
> +        self.tester.scapy_append('pk1 =
> [Ether(dst="%s")/IP(dst="1.1.1.1")/UDP()/("X"*%d)]' % (self.virtio1_mac,
> payload_size))
> +        self.tester.scapy_append('pk2 =
> [Ether(dst="%s")/IP(dst="1.1.1.20")/UDP()/("X"*%d)]' % (self.virtio1_mac,
> payload_size))
> +        self.tester.scapy_append('pk3 =
> [Ether(dst="%s")/IP(dst="1.1.1.7")/UDP()/("X"*%d)]' % (self.virtio1_mac,
> payload_size))
> +        self.tester.scapy_append('pk4 =
> [Ether(dst="%s")/IP(dst="1.1.1.8")/UDP()/("X"*%d)]' % (self.virtio1_mac,
> payload_size))
> +        self.tester.scapy_append('pk = pk1 + pk2 + pk3 + pk4')
> +        self.tester.scapy_append('sendp(pk, iface="%s", count=10)' %
> (self.tx_interface))
> +        self.tester.scapy_execute()
> +
> +        out = self.vhost_user.send_expect("show port stats 0", "testpmd>
> ", 120)
> +        print out
> +        rx_packet = re.search("RX-packets:\s*(\d*)", out)
> +        rx_num = int(rx_packet.group(1))
> +        tx_packet = re.search("TX-packets:\s*(\d*)", out)
> +        tx_num = int(tx_packet.group(1))
> +        if verify_type == 1:
> +            verify_rx_num = 40
> +            verify_tx_num = 40
> +        else:	
> +            verify_rx_num = 40
> +            verify_tx_num = 10
> +
> +        self.verify(rx_num >= verify_rx_num and tx_num >= verify_tx_num,
> "The vm port lost some packets")
> +
> +    def test_perf_pvp_multiqemu_mergeable_pmd(self):
> +        #
> +        # Test the performance for mergeable path
> +        #
> +        self.launch_testpmd()
> +        self.start_onevm()
> +        self.vm_dut.send_expect(self.vm_testpmd_vector, "testpmd>", 20)
> +        self.vm_dut.send_expect("set fwd mac", "testpmd>", 20)
> +        self.vm_dut.send_expect("start", "testpmd>")
> +
> +        self.vhost_user.send_expect("stop", "testpmd> ", 120)
> +        self.vhost_user.send_expect("start", "testpmd> ", 120)
> +        time.sleep(5)
> +        self.send_verify(self.running_case, self.frame_sizes, "Virtio
> 0.95 Mergeable Multiqueue Performance")
> +        self.vm_dut.kill_all()
> +
> +    def test_dynamic_change_virtio_queue_size(self):
> +        #
> +        # Test the performance for change vritio queue size
> +        #
> +        self.launch_testpmd()
> +        self.start_onevm()
> +        self.vm_testpmd_queue_1 = self.target + "/app/testpmd -c 0x07 -n
> 3" + \
> +                                  " -- -i --tx-offloads=0x0 " + \
> +                                  " --rxq=1 --txq=1 --rss-ip --nb-
> cores=1"
> +
> +        self.vm_dut.send_expect(self.vm_testpmd_queue_1, "testpmd>", 20)
> +        self.vm_dut.send_expect("set fwd mac", "testpmd>", 20)
> +        self.vm_dut.send_expect("start", "testpmd>")
> +
> +        self.vhost_user.send_expect("clear port stats all", "testpmd> ",
> 120)
> +        self.send_scapy(verify_type = 2)
> +
> +        self.vm_dut.send_expect("stop", "testpmd>", 20)
> +        self.vm_dut.send_expect("port stop all", "testpmd>")
> +        self.vm_dut.send_expect("port config all rxq 2", "testpmd>", 20)
> +        self.vm_dut.send_expect("port config all txq 2", "testpmd>")
> +        self.vm_dut.send_expect("port start all", "testpmd>", 20)
> +        self.vm_dut.send_expect("start", "testpmd>")
> +
> +        self.vhost_user.send_expect("stop", "testpmd> ", 120)
> +        self.vhost_user.send_expect("start", "testpmd> ", 120)
> +
> +        self.vhost_user.send_expect("clear port stats all", "testpmd> ",
> 120)
> +        self.send_scapy(verify_type = 1)
> +
> +        self.vm_dut.kill_all()
> +        self.vhost_user.send_expect("quit", "# ", 120)
> +
> +    def test_dynamic_change_vhost_queue_size(self):
> +        #
> +        # Test the performance for change vhost queue size
> +        #
> +        self.queue_number = 2
> +        self.testcmd = "./x86_64-native-linuxapp-gcc/app/testpmd -c %s -
> n %d --socket-mem %s" + \
> +                       " --vdev 'net_vhost0,iface=vhost-net,queues=2' --
> -i --rxq=1 --txq=1 --nb-cores=1"
> +        self.coremask = utils.create_mask(self.cores)
> +        self.testcmd_start = self.testcmd % (self.coremask,
> self.memory_channel, self.socket_mem)
> +
> +        self.vhost_user = self.dut.new_session(suite="user")
> +
> +        self.vhost_user.send_expect("cd /root/dpdk", "#", 120)
> +        self.vhost_user.send_expect(self.testcmd_start, "testpmd> ", 120)
> +        self.vhost_user.send_expect("set fwd mac", "testpmd> ", 120)
> +        self.vhost_user.send_expect("start", "testpmd> ", 120)
> +
> +        self.start_onevm()
> +
> +        self.vm_dut.send_expect(self.vm_testpmd_vector, "testpmd>", 20)
> +        self.vm_dut.send_expect("set fwd mac", "testpmd>", 20)
> +        self.vm_dut.send_expect("start", "testpmd>")
> +        self.vhost_user.send_expect("clear port stats all", "testpmd> ",
> 120)
> +
> +        self.send_scapy(verify_type = 1)
> +
> +        self.vhost_user.send_expect("stop", "testpmd>", 20)
> +        self.vhost_user.send_expect("port stop all", "testpmd>")
> +        self.vhost_user.send_expect("port config all rxq 2", "testpmd>",
> 20)
> +        self.vhost_user.send_expect("port config all txq 2", "testpmd>")
> +        self.vhost_user.send_expect("port start all", "testpmd>", 20)
> +        self.vhost_user.send_expect("start", "testpmd>")
> +        self.vhost_user.send_expect("clear port stats all", "testpmd>")
> +
> +        self.send_scapy(verify_type = 1)
> +
> +        self.vm_dut.kill_all()
> +        self.vhost_user.send_expect("quit", "# ", 120)
> +
> +    def tear_down(self):
> +        #
> +        # Run after each test case.
> +        # Clear vhost-switch and qemu to avoid blocking the following TCs
> +        #
> +        self.vm.stop()
> +        time.sleep(2)
> +
> +    def tear_down_all(self):
> +        """
> +        Run after each test suite.
> +        """
> +        pass
> --
> 2.7.4