From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 7F18B5934 for ; Mon, 13 Jul 2015 03:25:40 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP; 12 Jul 2015 18:25:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,459,1432623600"; d="scan'208";a="763137406" Received: from kmsmsx151.gar.corp.intel.com ([172.21.73.86]) by orsmga002.jf.intel.com with ESMTP; 12 Jul 2015 18:25:38 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by KMSMSX151.gar.corp.intel.com (172.21.73.86) with Microsoft SMTP Server (TLS) id 14.3.224.2; Mon, 13 Jul 2015 09:25:37 +0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.46]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.246]) with mapi id 14.03.0224.002; Mon, 13 Jul 2015 09:25:36 +0800 From: "Liu, Yong" To: "Xu, Qian Q" , "dts@dpdk.org" Thread-Topic: [dts] [PATCH 5/5] add vhost-user one vm sample case Thread-Index: AQHQvQlX2PIxMBzeKkeRnyicODTbZp3Ymhvw Date: Mon, 13 Jul 2015 01:25:34 +0000 Message-ID: <86228AFD5BCD8E4EBFD2B90117B5E81E10E5FE1C@SHSMSX103.ccr.corp.intel.com> References: <1436750050-2479-1-git-send-email-qian.q.xu@intel.com> <1436750050-2479-6-git-send-email-qian.q.xu@intel.com> In-Reply-To: <1436750050-2479-6-git-send-email-qian.q.xu@intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dts] [PATCH 5/5] add vhost-user one vm sample case X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jul 2015 01:25:41 -0000 Qian, please use pep8 tool to check with this patch. Please also remove tho= se useless code start with "#".=20 > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Qian Xu > Sent: Monday, July 13, 2015 9:14 AM > To: dts@dpdk.org > Subject: [dts] [PATCH 5/5] add vhost-user one vm sample case >=20 > Signed-off-by: Qian Xu >=20 > diff --git a/tests/TestSuite_vhost_sample.py > b/tests/TestSuite_vhost_sample.py > new file mode 100644 > index 0000000..2769c3a > --- /dev/null > +++ b/tests/TestSuite_vhost_sample.py > @@ -0,0 +1,398 @@ > +#BSD LICENSE > +# > +# Copyright(c) 2010-2015 Intel Corporation. All rights reserved. > +# 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. > + > +Vhost user one-copy sample test suite. > +""" > +import os > +import dts > +import string > +import re > +import time > +from scapy.utils import wrpcap, rdpcap > +from test_case import TestCase > +from exception import VerifyFailure > +from settings import HEADER_SIZE > +from etgen import IxiaPacketGenerator > +from qemu_kvm import QEMUKvm > + > +class TestVhostSample(TestCase, IxiaPacketGenerator): > + > + def set_up_all(self): > + # To Extend IXIA packet generator method, call the tester's > method. > + > self.tester.extend_external_packet_generator(TestVhostSample,self) > + > + # Change config file,no need now since the default is y. > + #self.dut.send_expect("sed -i -e > 's/CONFIG_RTE_LIBRTE_VHOST=3D.*$/CONFIG_RTE_LIBRTE_VHOST=3Dy/' ./config/c= ommon > _linuxapp", "# ", 30) > + > + # Build target with modified config file > + self.dut.build_install_dpdk(self.target) > + > + > + # Get and verify the ports > + self.dut_ports =3D self.dut.get_ports() > + self.verify(len(self.dut_ports) >=3D 1, "Insufficient ports for > testing") > + > + # Get the port's socket > + self.pf =3D self.dut_ports[0] > + netdev =3D self.dut.ports_info[self.pf]['port'] > + self.socket =3D netdev.get_nic_socket() > + self.cores =3D self.dut.get_core_list("1S/2C/1T", > socket=3Dself.socket) > + > + # Set the params of vhost sample > + self.vhost_app =3D "./examples/vhost/build/vhost-switch" > + self.zero_copy =3D 0 > + self.vm2vm =3D 0 > + self.jumbo =3D 0 > + #self.rxq =3D 1 > + # Using file to save the vhost sample output since in > jumboframe case, there will be lots of output > + self.vhost_test =3D self.vhost_app + " -c %s -n %d --socket-mem > 1024,1024 -- -p 0x1 --mergeable %d --zero-copy %d --vm2vm %d > 2 > ./vhost.out &" > + # build the vhost sample in vhost-user mode. > + self.dut.send_expect("sed -i -e 's/define MAX_QUEUES > 512/define MAX_QUEUES 128/' ./examples/vhost/main.c", "#") > + out =3D self.dut.send_expect("make -C examples/vhost", "#") > + self.verify("Error" not in out, "compilation error") > + self.verify("No such file" not in out, "Not found file error") > + > + # Define the virtio/VM variables > + self.virtio1 =3D "eth1" > + self.virtio2 =3D "eth2" > + self.virtio1_mac =3D "52:54:00:00:00:01" > + self.virtio2_mac =3D "52:54:00:00:00:02" > + self.src1 =3D "192.168.4.1" > + self.src2 =3D "192.168.3.1" > + self.dst1 =3D "192.168.3.1" > + self.dst2 =3D "192.168.4.1" > + self.vm_dut =3D None > + > + self.header_row =3D ["Test","Mode", "Frame", "Mpps", "% > linerate"] > + self.memory_channel =3D 4 > + > + def set_up(self): > + ###################################### > + ## Run before each test case. > + ###################################### Please use """ for function description. This will be used for function's d= oc string. > + # Launch vhost sample using default params > + > + if "jumbo" in self.running_case: > + self.jumbo =3D 1 > + self.frame_sizes =3D > [68,128,256,512,1024,1280,1518,1522,2048,5000,9000] > + #self.frame_sizes =3D [256,5000] > + self.vm_testpmd =3D "./x86_64-native-linuxapp- > gcc/app/testpmd -c f -n 3" \ > + + " -- -i --txqflags=3D0xf00 --disable-hw-vlan= - > filter --max-pkt-len 9600" > + else: > + self.jumbo =3D 0 > + self.frame_sizes =3D [68,128,256,512,1024,1280,1518] > + #self.frame_sizes =3D [68, 128] > + self.vm_testpmd =3D "./x86_64-native-linuxapp- > gcc/app/testpmd -c f -n 3" \ > + + " -- -i --txqflags=3D0xf00 --disable-hw-vlan= - > filter" > + self.dut.send_expect("rm -rf ./vhost.out", "#") > + > + self.launch_vhost_sample() > + > + print "Start VM with 2virtio\n" > + # start VM with 2virtio > + self.start_onevm() > + Please use dts.GREEN to emphasize the log. > + > + def launch_vhost_sample(self): > + #################################################################### > + ## Launch the vhost sample with different parameters > + #################################################################### >=20 > + self.coremask =3D dts.create_mask(self.cores) > + self.vhostapp_testcmd =3D self.vhost_test %(self.coremask, > self.memory_channel, self.jumbo, self.zero_copy, > + self.vm2vm) > +# self.dut.send_expect(self.vhostapp_testcmd, "VHOST_CONFIG: > bind to vhost-net", 120) > + self.dut.send_expect(self.vhostapp_testcmd, "# ", 40) > + time.sleep(30) > + try: > + print "Launch vhost sample\n" > + out =3D self.dut.send_expect("cat ./vhost.out", > "VHOST_CONFIG: bind to vhost-net", 20) > + if "Error" in out: > + raise Exception("Launch vhost sample failed") > + except Exception as e: > + print dts.RED("Failed to launch vhost > sample: %s" %str(e)) > + self.dut.send_expect("rm -rf ./vhost-net" ,"#", 20) > + > + def start_onevm(self): > + ##################################### > + ## Start One VM with 2 virtio devices > + ##################################### > + > + self.vm =3D QEMUKvm(self.dut, 'vm0', 'vhost_sample') > + #qemu_path =3D "/home/qxu10/qemu-2.2.0/x86_64-softmmu/qemu- > system-x86_64" > + #self.vm.set_qemu_emulator(qemu_path) > + if "user" in self.running_case: > + vm_params =3D{} > + vm_params['driver'] =3D 'vhost-user' > + vm_params['opt_path'] =3D './vhost-net' > + vm_params['opt_mac'] =3D self.virtio1_mac > + self.vm.set_vm_device(**vm_params) > + vm_params['opt_mac'] =3D self.virtio2_mac > + self.vm.set_vm_device(**vm_params) > + > + try: > + self.vm_dut =3D self.vm.start(auto_portmap=3DFalse) > + if self.vm_dut is None: > + raise Exception("Set up VM ENV failed") > + except Exception as e: > + print dts.RED("Failure for %s" % str(e)) > + > + return True > + > + def vm_testpmd_start(self): > + ####################################################### > + ## Start testpmd in vm > + ####################################################### > + if self.vm_dut is not None: > + # Start testpmd with user > + self.vm_dut.send_expect(self.vm_testpmd, "testpmd>", 20) > + # Start tx_first > + self.vm_dut.send_expect("start tx_first", "testpmd>") > + > + def clear_vhost_env(self): > + ######################################################### > + ## Kill all vhost sample, shutdown VM > + ####################################################### > + if self.vm_dut: > + self.vm_dut.kill_all() > + time.sleep(1) > + self.vm_dut.close() > + self.vm_dut.logger.logger_exit() > + self.vm_dut =3D None > + if self.vm: > + self.vm.stop() > + self.vm =3D None > + > + > + def set_legacy_disablefw(self): > + ############################################### > + ## Disable firewall and iptables in legacy case > + ################################################ > + if self.vm_dut is not None: > + self.vm_dut.send_expect("systemctl stop > firewalld.service", "#") > + self.vm_dut.send_expect("systemctl disable > firewalld.service", "#") > + self.vm_dut.send_expect("systemctl stop > ip6tables.service", "#") > + self.vm_dut.send_expect("systemctl disable > ip6tables.service", "#") > + self.vm_dut.send_expect("systemctl stop > iptables.service", "#") > + self.vm_dut.send_expect("systemctl disable > iptables.service", "#") > + self.vm_dut.send_expect("systemctl stop > NetworkManager.service", "#") > + self.vm_dut.send_expect("systemctl disable > NetworkManager.service", "#") > + self.vm_dut.send_expect("echo > 1 >/proc/sys/net/ipv4/ip_forward", "#") > + > + def set_onevm_legacy_fwd(self): > + if self.vm_dut is not None: > + ifcfg =3D self.vm_dut.send_expect("ifconfig -a", "#", 10) > + intfs =3D re.compile('eth\d').findall(ifcfg) > + # Find the virtio1 and virtio2's interface names > + for intf in intfs: > + out_mac =3D > self.vm_dut.send_expect("ifconfig %s" %intf, "#", 10) > + if self.virtio1_mac in out_mac: > + self.virtio1 =3D intf > + if self.virtio2_mac in out_mac: > + self.virtio2 =3D intf > + print "\nvirtio1's intf is %s" %self.virtio1 > + print "\nvirtio2's intf is %s" %self.virtio2 > + # Set the mtu 9000 if jumboframe is enabled. > + if self.jumbo =3D=3D 1: > + self.vm_dut.send_expect("ifconfig %s mtu > 9000" %self.virtio1, "#") > + self.vm_dut.send_expect("ifconfig %s mtu > 9000" %self.virtio2, "#") > + # Set up the ip address/ipv4 fwd tables > + self.vm_dut.send_expect("ip addr add 192.168.4.2/24 > dev %s" %self.virtio1,"#") > + self.vm_dut.send_expect("ip addr add 192.168.3.2/24 > dev %s" %self.virtio2,"#") > + self.vm_dut.send_expect("ip link set dev %s > up" %self.virtio1, "#") > + self.vm_dut.send_expect("ip link set dev %s > up" %self.virtio2, "#") > + self.vm_dut.send_expect("ip neigh add 192.168.4.1 lladd= r > 52:00:00:00:00:01 dev %s"%self.virtio1, "#") > + self.vm_dut.send_expect("ip neigh add 192.168.3.1 lladd= r > 52:00:00:00:00:02 dev %s"%self.virtio2, "#") > + self.vm_dut.send_expect("ip route show", "#") > + print self.vm_dut.send_expect("arp -a", "#") > + > + > + > + def test_perf_user_one_vm_legacy_fwd(self): > + > #################################################################### > # > + ## Test the performance of one vm with 2virtio devices in legacy fwd > + > #################################################################### > # > + # Restore the virtio interfaces to use legacy driver > + self.vm_dut.restore_interfaces() > + > + self.set_legacy_disablefw() > + # Set the legacy fwd rules then get the VLAN id from vhost > sample output > + self.set_onevm_legacy_fwd() > + > + time.sleep(5) > + outdebug =3D self.dut.get_session_output(timeout=3D2) > + out =3D self.dut.send_expect("cat ./vhost.out", "# ", 20= ) > + # Get the VLAN ID for virtio > + print out, "\ncheck the vlan info: \n" > + l1 =3D > re.findall('MAC_ADDRESS.*?%s.*?and.*?VLAN_TAG.*?(\d+).*?registered'%(str(= s > elf.virtio1_mac)),out) > + if len(l1)>0: > + vlan_id1=3Dl1[0] > + print "vlan_id1 is ", vlan_id1 > + l2 =3D > re.findall('MAC_ADDRESS.*?%s.*?and.*?VLAN_TAG.*?(\d+).*?registered'%(str(= s > elf.virtio2_mac)),out) > + if len(l2)>0: > + vlan_id2=3Dl2[0] > + print "vlan_id2 is ", vlan_id2 > + > + #vlan_id1 =3D 1000 > + #vlan_id2 =3D 1001 > + dts.results_table_add_header(self.header_row) > + > + # Create pcap file and ixia traffic > + for frame_size in self.frame_sizes: > + info =3D "Running test %s, and %d frame size.\n"= % > (self.running_case, frame_size) > + self.logger.info(info) > + > + payload_size=3Dframe_size - HEADER_SIZE['eth']- > HEADER_SIZE['ip'] > + > flow1=3D'[Ether(dst=3D"%s")/Dot1Q(vlan=3D%s)/IP(src=3D"%s",dst=3D"%s")/("= X"*%d)]' %( > self.virtio1_mac,vlan_id1,self.src1,self.dst1,payload_size) > + > flow2=3D'[Ether(dst=3D"%s")/Dot1Q(vlan=3D%s)/IP(src=3D"%s",dst=3D"%s")/("= X"*%d)]' %( > self.virtio2_mac,vlan_id2,self.src2,self.dst2,payload_size) > + > + > self.tester.scapy_append('wrpcap("flow1.pcap", %s)' %flow1) > + > self.tester.scapy_append('wrpcap("flow2.pcap",%s)' %flow2) > + self.tester.scapy_execute() > + > + # Capture the performance > + #self.ip=3Dself.ip_virtio > + tgenInput =3D [] > + port =3D self.tester.get_local_port(self.pf) > + tgenInput.append((port,port,"flow2.pcap")) > + > + > + _, pps =3D > self.tester.traffic_generator_throughput(tgenInput,delay=3D15) > + #self.verify(pps > 0, "No traffic detected") > + pps /=3D1000000.0 > + linerate =3D self.wirespeed(self.nic, frame_size= , 1) > + pct =3D pps *100/ linerate > + scenario =3D self.running_case > + mode =3D "vhost user" > + data_row =3D [scenario, mode, frame_size, str(pp= s), > str(pct)] > + dts.results_table_add_row(data_row) > + > + dts.results_table_print() > + > + # Stop the Vhost sample > + #self.dut.send_expect("^C", "#") > + self.dut.send_expect("killall -s INT vhost-switch", "#", 20) > + > + > + > + def test_perf_user_one_vm_dpdk_fwd(self): > + > #################################################################### > ## > + ## Test the performance of one vm with 2virtio devices in legacy > fwd > + > ##################################################################### > + > + # start testpmd on VM > + self.vm_testpmd_start() > + time.sleep(5) > + # Clean the output to ensure the commands cat ./vhost.out can > be sent and got answered correctly. > + out_debug =3D self.dut.get_session_output(timeout=3D2) > + out =3D self.dut.send_expect("cat ./vhost.out", "# ", 20) > + #out =3D self.dut.get_session_output(timeout=3D2) > + # Get the VLAN ID for virtio > + print out, "\ncheck the vlan info: \n" > + l1 =3D > re.findall('MAC_ADDRESS.*?%s.*?and.*?VLAN_TAG.*?(\d+).*?registered'%(str(= s > elf.virtio1_mac)),out) > + if len(l1)>0: > + vlan_id1=3Dl1[0] > + print vlan_id1 > + l2 =3D > re.findall('MAC_ADDRESS.*?%s.*?and.*?VLAN_TAG.*?(\d+).*?registered'%(str(= s > elf.virtio2_mac)),out) > + if len(l2)>0: > + vlan_id2=3Dl2[0] > + print vlan_id2 > + > + #vlan_id1 =3D 1000 > + #vlan_id2 =3D 1001 > + dts.results_table_add_header(self.header_row) > + > + # Create pcap file and ixia traffic > + for frame_size in self.frame_sizes: > + info =3D "Running test %s, and %d frame size.\n" % > (self.running_case, frame_size) > + self.logger.info(info) > + > + payload_size=3Dframe_size - HEADER_SIZE['eth']- > HEADER_SIZE['ip'] > + > flow1=3D'[Ether(dst=3D"%s")/Dot1Q(vlan=3D%s)/IP(src=3D"%s",dst=3D"%s")/(= "X"*%d > )]' %(self.virtio1_mac,vlan_id1,self.src1,self.dst1,payload_size) > + > flow2=3D'[Ether(dst=3D"%s")/Dot1Q(vlan=3D%s)/IP(src=3D"%s",dst=3D"%s")/(= "X"*%d > )]' %(self.virtio2_mac,vlan_id2,self.src2,self.dst2,payload_size) > + > self.tester.scapy_append('wrpcap("flow1.pcap", %s)' %flow1) > + > self.tester.scapy_append('wrpcap("flow2.pcap",%s)' %flow2) > + self.tester.scapy_execute() > + > + # Capture the performance > + #self.ip=3Dself.ip_virtio > + tgenInput =3D [] > + port =3D self.tester.get_local_port(self.pf) > + tgenInput.append((port,port,"flow1.pcap")) > + tgenInput.append((port,port,"flow2.pcap")) > + > + _, pps =3D > self.tester.traffic_generator_throughput(tgenInput,delay=3D15) > +# self.verify(pps > 0, "No traffic detected") > + pps /=3D1000000.0 > + linerate =3D self.wirespeed(self.nic, frame_size, 1) > + pct =3D pps *100/ linerate > + scenario =3D self.running_case > + mode =3D "vhost user" > + data_row =3D [scenario, mode, frame_size, str(pps), > str(pct)] > + dts.results_table_add_row(data_row) > + > + dts.results_table_print() > + # Stop testpmd > + print self.vm_dut.send_expect("stop", "testpmd>") > + time.sleep(1) > + self.vm_dut.send_expect("quit", "# ") > + > + # Stop the Vhost sample > + self.dut.send_expect("killall -s INT vhost-switch", "#") > + > + def test_perf_user_one_vm_legacy_fwd_jumboframe(self): > + self.test_perf_user_one_vm_legacy_fwd() > + > + def test_perf_user_one_vm_dpdk_fwd_jumboframe(self): > + self.test_perf_user_one_vm_dpdk_fwd() > + > + > + def tear_down(self): > + ################################### > + ## Run after each test case. > + ################################ > + self.clear_vhost_env() > + self.dut.kill_all() > + time.sleep(2) > + > + > + def tear_down_all(self): > + """ > + Run after each test suite. > + """ > + # Restore the config file and recompile the package > +# self.dut.send_expect("sed -i -e > 's/RTE_LIBRTE_VHOST=3Dy$/RTE_LIBRTE_VHOST=3Dn/' config/common_linuxapp", = "#", > 30) > + #self.dut.send_expect("sed -i -e > 's/CONFIG_RTE_LIBRTE_VHOST_USER=3D.*$/CONFIG_RTE_LIBRTE_VHOST_USER=3Dn/' = ./con > fig/common_linuxapp", "# ", 30) > + #self.dut.build_install_dpdk(self.target) > +# time.sleep(20) > + pass > -- > 2.1.0