From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id D4AC68E84 for ; Thu, 21 Jan 2016 07:43:02 +0100 (CET) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 20 Jan 2016 22:43:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,324,1449561600"; d="scan'208";a="897887409" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by fmsmga002.fm.intel.com with ESMTP; 20 Jan 2016 22:43:01 -0800 Received: from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com [10.239.29.90]) by shvmail01.sh.intel.com with ESMTP id u0L6gwc0003627; Thu, 21 Jan 2016 14:42:58 +0800 Received: from shecgisg003.sh.intel.com (localhost [127.0.0.1]) by shecgisg003.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id u0L6guMR030351; Thu, 21 Jan 2016 14:42:58 +0800 Received: (from jingguox@localhost) by shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id u0L6guj7030347; Thu, 21 Jan 2016 14:42:56 +0800 From: Jingguo Fu To: dts@dpdk.org Date: Thu, 21 Jan 2016 14:42:51 +0800 Message-Id: <1453358572-30310-2-git-send-email-jingguox.fu@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1453358572-30310-1-git-send-email-jingguox.fu@intel.com> References: <1453358572-30310-1-git-send-email-jingguox.fu@intel.com> Cc: Jingguo Fu Subject: [dts] [DTS][PATCH 2/3] virtio: update vhost user cases 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: Thu, 21 Jan 2016 06:43:03 -0000 1: optimize case 2: add get rx rate for generator 3: better way to check vhost.out file Signed-off-by: Jingguo Fu --- tests/TestSuite_vhost_user_one_copy_one_vm.py | 202 ++++++++++++-------------- 1 file changed, 94 insertions(+), 108 deletions(-) diff --git a/tests/TestSuite_vhost_user_one_copy_one_vm.py b/tests/TestSuite_vhost_user_one_copy_one_vm.py index 32e47ad..971d9c2 100644 --- a/tests/TestSuite_vhost_user_one_copy_one_vm.py +++ b/tests/TestSuite_vhost_user_one_copy_one_vm.py @@ -47,13 +47,18 @@ from etgen import IxiaPacketGenerator from qemu_kvm import QEMUKvm -class TestVhostSample(TestCase, IxiaPacketGenerator): +class TestVhostUserOneCopyOneVm(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) + self.tester.extend_external_packet_generator(TestVhostUserOneCopyOneVm, self) # Build target with modified config file + self.dut.send_expect( + "sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=.*$/CONFIG_RTE_LIBRTE" + "_VHOST_USER=y/' ./config/common_linuxapp", + "# ", + 30) self.dut.build_install_dpdk(self.target) # Get and verify the ports @@ -78,10 +83,16 @@ class TestVhostSample(TestCase, IxiaPacketGenerator): " -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", - "#") + if self.nic in ['niantic']: + self.dut.send_expect( + "sed -i -e 's/#define MAX_QUEUES.*$/#define MAX_QUEUES 128/' " + "./examples/vhost/main.c", + "#", 10) + else: + self.dut.send_expect( + "sed -i -e 's/#define MAX_QUEUES.*$/#define MAX_QUEUES 512/' " + "./examples/vhost/main.c", + "#", 10) out = 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") @@ -97,7 +108,7 @@ class TestVhostSample(TestCase, IxiaPacketGenerator): self.dst2 = "192.168.4.1" self.vm_dut = None - self.header_row = ["Test", "Mode", "Frame", "Mpps", "% linerate"] + self.header_row = ["FrameSize(B)", "RecvPackets(Mpps)", "SendPackets(Mpps)", "LineRate(%)"] self.memory_channel = 4 def set_up(self): @@ -108,30 +119,19 @@ class TestVhostSample(TestCase, IxiaPacketGenerator): if "jumbo" in self.running_case: self.jumbo = 1 - self.frame_sizes = [ - 68, - 128, - 256, - 512, - 1024, - 1280, - 1518, - 2048, - 5000, - 9000] + self.frame_sizes = [64, 128, 256, 512, 1024, 1280, 1518, 2048, 5000, 9000] self.vm_testpmd = "./x86_64-native-linuxapp-gcc/app/testpmd -c 0x3 -n 3" \ - + \ - " -- -i --txqflags=0xf00 --disable-hw-vlan-filter --max-pkt-len 9600" + + " -- -i --txqflags=0xf00 " \ + + "--disable-hw-vlan-filter --max-pkt-len 9600" else: self.jumbo = 0 - self.frame_sizes = [68, 128, 256, 512, 1024, 1280, 1518] + self.frame_sizes = [64, 128, 256, 512, 1024, 1280, 1518] self.vm_testpmd = "./x86_64-native-linuxapp-gcc/app/testpmd -c 0x3 -n 3" \ + " -- -i --txqflags=0xf00 --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() @@ -146,15 +146,14 @@ class TestVhostSample(TestCase, IxiaPacketGenerator): time.sleep(30) try: print "Launch vhost sample\n" - out = self.dut.send_expect( - "cat ./vhost.out", - "VHOST_CONFIG: bind to vhost-net", - 20) + self.dut.session.copy_file_from("/root/dpdk/vhost.out") + fp = open('./vhost.out', 'r') + out = fp.read() + fp.close() 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): # @@ -172,7 +171,7 @@ class TestVhostSample(TestCase, IxiaPacketGenerator): self.vm.set_vm_device(**vm_params) try: - self.vm_dut = self.vm.start(auto_portmap=False) + self.vm_dut = self.vm.start() if self.vm_dut is None: raise Exception("Set up VM ENV failed") except Exception as e: @@ -267,23 +266,76 @@ class TestVhostSample(TestCase, IxiaPacketGenerator): self.vm_dut.send_expect("ip route show", "#") print self.vm_dut.send_expect("arp -a", "#") + def get_transmission_results(self, rx_port_list, tx_port_list, delay=5): + time.sleep(delay) + recvbpsRate = 0 + recvRate = 0 + txbpsRate = 0 + txRate = 0 + for port in tx_port_list: + self.stat_get_rate_stat_all_stats(port) + out = self.send_expect('stat cget -framesSent', '%', 10) + txRate += int(out.strip()) + self.logger.info("Port %s: TX %f Mpps" % (port, (txRate * 1.0 / 1000000))) + out = self.send_expect('stat cget -bitsSent', '%', 10) + txbpsRate += int(out.strip()) + self.logger.info("Port %s: TX %f Mbps" % (port, (txbpsRate * 1.0 / 1000000))) + for port in rx_port_list: + self.stat_get_rate_stat_all_stats(port) + out = self.send_expect('stat cget -framesReceived', '%', 10) + recvRate += int(out.strip()) + out = self.send_expect('stat cget -oversize', '%', 10) + recvRate += int(out.strip()) + self.logger.info("Port %s: RX %f Mpps" % (port, (recvRate * 1.0 / 1000000))) + out = self.send_expect('stat cget -bitsReceived', '%', 10) + recvbpsRate += int(out.strip()) + self.logger.info("Port %s: RX %f Mbps" % (port, (recvbpsRate * 1.0 / 1000000))) + + return (txRate,recvRate) + + def send_verify(self, case, frame_sizes, vlan_id1=0): + dts.results_table_add_header(self.header_row) + for frame_size in frame_sizes: + info = "Running test %s, and %d frame size.\n" % (case, frame_size) + self.logger.info(info) + payload = frame_size - HEADER_SIZE['eth'] - HEADER_SIZE['ip'] + flow = '[Ether(dst="%s")/Dot1Q(vlan=%s)/IP(src="%s",dst="%s")/("X"*%d)]' % ( + self.virtio1_mac, vlan_id1, self.src1, self.dst1, payload) + self.tester.scapy_append('wrpcap("flow.pcap", %s)' % flow) + self.tester.scapy_execute() + + tgenInput = [] + port = self.tester.get_local_port(self.pf) + tgenInput.append((port, port, "flow.pcap")) + + recvpkt, sendpkt = self.tester.traffic_generator_throughput( + tgenInput, delay=15) + recvpkt /= 1000000.0 + sendpkt /= 1000000.0 + pct = sendpkt * 100 / recvpkt + data_row = [frame_size, str(recvpkt), str(sendpkt), str(pct)] + dts.results_table_add_row(data_row) + dts.results_table_print() + 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) - out_clean = self.dut.get_session_output(timeout=2) - out = self.dut.send_expect("cat ./vhost.out", "# ", 20) + + self.dut.get_session_output(timeout=2) + self.dut.session.copy_file_from("/root/dpdk/vhost.out") + fp = open('./vhost.out', 'r') + out = fp.read() + fp.close() # Get the VLAN ID for virtio - print out, "\ncheck the vlan info: \n" + print "Check the vlan info: \n" l1 = re.findall( 'MAC_ADDRESS.*?%s.*?and.*?VLAN_TAG.*?(\d+).*?registered' % (str(self.virtio1_mac)), out) @@ -297,41 +349,7 @@ class TestVhostSample(TestCase, IxiaPacketGenerator): vlan_id2 = l2[0] print "vlan_id2 is ", vlan_id2 - dts.results_table_add_header(self.header_row) - - # Create pcap file and ixia traffic - for frame_size in self.frame_sizes: - info = "Running test %s, and %d frame size.\n" % ( - self.running_case, frame_size) - self.logger.info(info) - - payload_size = frame_size - HEADER_SIZE['eth'] - HEADER_SIZE['ip'] - flow1 = '[Ether(dst="%s")/Dot1Q(vlan=%s)/IP(src="%s",dst="%s")/("X"*%d)]' % ( - self.virtio1_mac, vlan_id1, self.src1, self.dst1, payload_size) - flow2 = '[Ether(dst="%s")/Dot1Q(vlan=%s)/IP(src="%s",dst="%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 - tgenInput = [] - port = self.tester.get_local_port(self.pf) - tgenInput.append((port, port, "flow2.pcap")) - - _, pps = self.tester.traffic_generator_throughput( - tgenInput, delay=15) - pps /= 1000000.0 - linerate = self.wirespeed(self.nic, frame_size, 1) - pct = pps * 100 / linerate - scenario = self.running_case - mode = "vhost user" - data_row = [scenario, mode, frame_size, str(pps), str(pct)] - dts.results_table_add_row(data_row) - - dts.results_table_print() - + self.send_verify(self.running_case, self.frame_sizes, vlan_id1) # Stop the Vhost sample self.dut.send_expect("killall -s INT vhost-switch", "#", 20) @@ -339,16 +357,18 @@ class TestVhostSample(TestCase, IxiaPacketGenerator): # # 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_clean = self.dut.get_session_output(timeout=2) - out = self.dut.send_expect("cat ./vhost.out", "# ", 20) + self.dut.get_session_output(timeout=2) + self.dut.session.copy_file_from("/root/dpdk/vhost.out") + fp = open('./vhost.out', 'r') + out = fp.read() + fp.close() # Get the VLAN ID for virtio - print out, "\ncheck the vlan info: \n" + print "Check the vlan info: \n" l1 = re.findall( 'MAC_ADDRESS.*?%s.*?and.*?VLAN_TAG.*?(\d+).*?registered' % (str(self.virtio1_mac)), out) @@ -361,43 +381,9 @@ class TestVhostSample(TestCase, IxiaPacketGenerator): if len(l2) > 0: vlan_id2 = l2[0] print vlan_id2 - - dts.results_table_add_header(self.header_row) - - # Create pcap file and ixia traffic - for frame_size in self.frame_sizes: - info = "Running test %s, and %d frame size.\n" % ( - self.running_case, frame_size) - self.logger.info(info) - - payload_size = frame_size - HEADER_SIZE['eth'] - HEADER_SIZE['ip'] - flow1 = '[Ether(dst="%s")/Dot1Q(vlan=%s)/IP(src="%s",dst="%s")/("X"*%d)]' % ( - self.virtio1_mac, vlan_id1, self.src1, self.dst1, payload_size) - flow2 = '[Ether(dst="%s")/Dot1Q(vlan=%s)/IP(src="%s",dst="%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 - tgenInput = [] - port = self.tester.get_local_port(self.pf) - tgenInput.append((port, port, "flow1.pcap")) - tgenInput.append((port, port, "flow2.pcap")) - - _, pps = self.tester.traffic_generator_throughput( - tgenInput, delay=15) - pps /= 1000000.0 - linerate = self.wirespeed(self.nic, frame_size, 1) - pct = pps * 100 / linerate - scenario = self.running_case - mode = "vhost user" - data_row = [scenario, mode, frame_size, str(pps), str(pct)] - dts.results_table_add_row(data_row) - - dts.results_table_print() + self.send_verify(self.running_case, self.frame_sizes, vlan_id1) # Stop testpmd - print self.vm_dut.send_expect("stop", "testpmd>") + self.vm_dut.send_expect("stop", "testpmd>") time.sleep(1) self.vm_dut.send_expect("quit", "# ") -- 2.1.0