From patchwork Mon Jan 17 06:30:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 105898 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CB145A034F; Mon, 17 Jan 2022 07:30:45 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BF16D410FD; Mon, 17 Jan 2022 07:30:45 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 16F5B4067B for ; Mon, 17 Jan 2022 07:30:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642401044; x=1673937044; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=itOVAfRtmgXgSm0w9ULFnCcLHpzrnhVJXLnokCAS8as=; b=moR97lMkxAMPyUcs8E8ypYMEHz786dzRJ4bf1s27VgwN/XNpDo+mO07X t0nSE/Ab3hY5Su1cBBoJu9smO+F1Q/p+Fv6sk2roNJ5ByXUrixrCAZodT p5l8IaVW26zgK4/ePPUIwyGiQHPfC2QyEgC5oeGUTJmSriTd3n61s41pN u5+MOnoYsouoYXcYSD80789TNCT+JMEj2dOkzH6gySuQYj3zuaw1kdRVi nzbBy1agWhRMHPI13MhYJbk9dUWSrV/GvbP6fwJmi5tiBsyKqkxjSzs9u DjP3tSwUr8L2BtTHXODiS0eUNdn9MYNZulMN0XIcyRUR9yf8WNVVLaMsS A==; X-IronPort-AV: E=McAfee;i="6200,9189,10229"; a="305294957" X-IronPort-AV: E=Sophos;i="5.88,294,1635231600"; d="scan'208";a="305294957" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jan 2022 22:30:43 -0800 X-IronPort-AV: E=Sophos;i="5.88,294,1635231600"; d="scan'208";a="671463782" Received: from unknown (HELO localhost.localdomain) ([10.239.251.222]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jan 2022 22:30:41 -0800 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V2 1/2] test_plans/vm2vm_virtio_net_perf_test_plan:modify test plan to coverage more test point Date: Mon, 17 Jan 2022 14:30:37 +0800 Message-Id: <20220117063037.1369217-1-weix.ling@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org v1: case 5: Add test step to test exchange CBDMA channel and PA mode. case 13&14: Add new test case to cover the packed ring and PA mode. v2: Fix test plan format issue due to make html failed. Signed-off-by: Wei Ling --- .../vm2vm_virtio_net_perf_test_plan.rst | 399 +++++++++++++----- 1 file changed, 298 insertions(+), 101 deletions(-) diff --git a/test_plans/vm2vm_virtio_net_perf_test_plan.rst b/test_plans/vm2vm_virtio_net_perf_test_plan.rst index d7194477..6e679b5b 100644 --- a/test_plans/vm2vm_virtio_net_perf_test_plan.rst +++ b/test_plans/vm2vm_virtio_net_perf_test_plan.rst @@ -38,14 +38,17 @@ Description =========== This test plan test several features in VM2VM topo: -1. Check Vhost tx offload (TSO and UFO) function by verifing the TSO/cksum in the TCP/IP stack and UFO/cksum +1. Check Vhost tx offload (TSO and UFO) function by verifying the TSO/cksum in the TCP/IP stack and UFO/cksum in the UDP/IP stack with vm2vm split ring and packed ring vhost-user/virtio-net mergeable path. 2. Check the payload of large packet (larger than 1MB) is valid after forwarding packets with vm2vm split ring and packed ring vhost-user/virtio-net mergeable and non-mergeable path. -3. Multi-queues number dynamic change in vm2vm vhost-user/virtio-net with split ring and packed ring when vhost enqueue operation with multi-CBDMA channels. +3. Check Vhost tx offload function by verifying the TSO/cksum in the TCP/IP stack with vm2vm split ring and +packed ring vhost-user/virtio-net mergeable path with CBDMA channel. +4. Multi-queues number dynamic change in vm2vm vhost-user/virtio-net with split ring and packed ring when vhost enqueue operation with multi-CBDMA channels. Note: 1.For packed virtqueue virtio-net test, need qemu version > 4.2.0 and VM kernel version > v5.1. 2.For split virtqueue virtio-net with multi-queues server mode test, need qemu version > LTS 4.2.1, dut to old qemu exist reconnect issue when multi-queues test. +3.For PA mode, page by page mapping may exceed IOMMU's max capability, better to use 1G guest hugepage. Test flow ========= @@ -58,8 +61,10 @@ Test Case 1: VM2VM split ring vhost-user/virtio-net test with tcp traffic 1. Launch the Vhost sample on socket 0 by below commands:: rm -rf vhost-net* - ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 2-4 -n 4 --no-pci --file-prefix=vhost --vdev 'net_vhost0,iface=vhost-net0,queues=1' \ - --vdev 'net_vhost1,iface=vhost-net1,queues=1' -- -i --nb-cores=2 --txd=1024 --rxd=1024 + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 2-4 -n 4 --no-pci --file-prefix=vhost \ + --vdev 'net_vhost0,iface=vhost-net0,queues=1' \ + --vdev 'net_vhost1,iface=vhost-net1,queues=1' \ + -- -i --nb-cores=2 --txd=1024 --rxd=1024 testpmd>start 2. Launch VM1 and VM2 on socket 1:: @@ -75,7 +80,7 @@ Test Case 1: VM2VM split ring vhost-user/virtio-net test with tcp traffic -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce \ -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:01,disable-modern=false,mrg_rxbuf=off,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on -vnc :10 - taskset -c 33 qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 1 -m 4096 \ + taskset -c 33 qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 1 -m 4096 \ -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ -numa node,memdev=mem -mem-prealloc -drive file=/home/osimg/ubuntu20-04-2.img \ -chardev socket,path=/tmp/vm2_qga0.sock,server,nowait,id=vm2_qga0 -device virtio-serial \ @@ -86,12 +91,12 @@ Test Case 1: VM2VM split ring vhost-user/virtio-net test with tcp traffic -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce \ -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:02,disable-modern=false,mrg_rxbuf=off,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on -vnc :12 -3. On VM1, set virtio device IP and run arp protocal:: +3. On VM1, set virtio device IP and run arp protocol:: ifconfig ens5 1.1.1.2 arp -s 1.1.1.8 52:54:00:00:00:02 -4. On VM2, set virtio device IP and run arp protocal:: +4. On VM2, set virtio device IP and run arp protocol:: ifconfig ens5 1.1.1.8 arp -s 1.1.1.2 52:54:00:00:00:01 @@ -110,14 +115,17 @@ Test Case 1: VM2VM split ring vhost-user/virtio-net test with tcp traffic Test Case 2: VM2VM split ring vhost-user/virtio-net CBDMA enable test with tcp traffic ====================================================================================== -1. Launch the Vhost sample by below commands:: +1. Bind 2 CBDMA channels to vfio-pci, then launch vhost by below command:: rm -rf vhost-net* - ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 2-4 -n 4 --file-prefix=vhost --vdev 'net_vhost0,iface=vhost-net0,queues=1,dmas=[txq0@00:04.0]' \ - --vdev 'net_vhost1,iface=vhost-net1,queues=1,dmas=[txq0@00:04.1]' -- -i --nb-cores=2 --txd=1024 --rxd=1024 + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 2-4 -n 4 --file-prefix=vhost \ + --vdev 'net_vhost0,iface=vhost-net0,queues=1,dmas=[txq0@0000:80:04.0]' \ + --vdev 'net_vhost1,iface=vhost-net1,queues=1,dmas=[txq0@0000:80:04.1]' \ + --iova=va -- -i --nb-cores=2 --txd=1024 --rxd=1024 + testpmd>vhost enable tx all testpmd>start -2. Launch VM1 and VM2 on socket 1:: +2. Launch VM1 and VM2:: taskset -c 32 qemu-system-x86_64 -name vm1 -enable-kvm -cpu host -smp 1 -m 4096 \ -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ @@ -130,7 +138,7 @@ Test Case 2: VM2VM split ring vhost-user/virtio-net CBDMA enable test with tcp t -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce \ -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:01,disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on -vnc :10 - taskset -c 33 qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 1 -m 4096 \ + taskset -c 33 qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 1 -m 4096 \ -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ -numa node,memdev=mem -mem-prealloc -drive file=/home/osimg/ubuntu20-04-2.img \ -chardev socket,path=/tmp/vm2_qga0.sock,server,nowait,id=vm2_qga0 -device virtio-serial \ @@ -141,12 +149,12 @@ Test Case 2: VM2VM split ring vhost-user/virtio-net CBDMA enable test with tcp t -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce \ -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:02,disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on -vnc :12 -3. On VM1, set virtio device IP and run arp protocal:: +3. On VM1, set virtio device IP and run arp protocol:: ifconfig ens5 1.1.1.2 arp -s 1.1.1.8 52:54:00:00:00:02 -4. On VM2, set virtio device IP and run arp protocal:: +4. On VM2, set virtio device IP and run arp protocol:: ifconfig ens5 1.1.1.8 arp -s 1.1.1.2 52:54:00:00:00:01 @@ -170,8 +178,10 @@ Test Case 3: VM2VM split ring vhost-user/virtio-net test with udp traffic 1. Launch the Vhost sample by below commands:: rm -rf vhost-net* - ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xF0000000 -n 4 --no-pci --file-prefix=vhost --vdev 'net_vhost0,iface=vhost-net0,queues=1' \ - --vdev 'net_vhost1,iface=vhost-net1,queues=1' -- -i --nb-cores=1 --txd=1024 --rxd=1024 + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xF0000000 -n 4 --no-pci --file-prefix=vhost \ + --vdev 'net_vhost0,iface=vhost-net0,queues=1' \ + --vdev 'net_vhost1,iface=vhost-net1,queues=1' \ + -- -i --nb-cores=1 --txd=1024 --rxd=1024 testpmd>start 2. Launch VM1 and VM2:: @@ -198,12 +208,12 @@ Test Case 3: VM2VM split ring vhost-user/virtio-net test with udp traffic -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce \ -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:02,disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on -vnc :12 -3. On VM1, set virtio device IP and run arp protocal:: +3. On VM1, set virtio device IP and run arp protocol:: ifconfig ens3 1.1.1.2 arp -s 1.1.1.8 52:54:00:00:00:02 -4. On VM2, set virtio device IP and run arp protocal:: +4. On VM2, set virtio device IP and run arp protocol:: ifconfig ens3 1.1.1.8 arp -s 1.1.1.2 52:54:00:00:00:01 @@ -225,8 +235,10 @@ Test Case 4: Check split ring virtio-net device capability 1. Launch the Vhost sample by below commands:: rm -rf vhost-net* - ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xF0000000 -n 4 --no-pci --file-prefix=vhost --vdev 'net_vhost0,iface=vhost-net0,queues=1' \ - --vdev 'net_vhost1,iface=vhost-net1,queues=1' -- -i --nb-cores=2 --txd=1024 --rxd=1024 + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xF0000000 -n 4 --no-pci --file-prefix=vhost \ + --vdev 'net_vhost0,iface=vhost-net0,queues=1' \ + --vdev 'net_vhost1,iface=vhost-net1,queues=1' \ + -- -i --nb-cores=2 --txd=1024 --rxd=1024 testpmd>start 2. Launch VM1 and VM2,set TSO and UFO on in qemu command:: @@ -242,7 +254,7 @@ Test Case 4: Check split ring virtio-net device capability -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce \ -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:01,disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on -vnc :10 - qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 1 -m 4096 \ + qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 1 -m 4096 \ -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ -numa node,memdev=mem -mem-prealloc -drive file=/home/osimg/ubuntu20-04-2.img \ -chardev socket,path=/tmp/vm2_qga0.sock,server,nowait,id=vm2_qga0 -device virtio-serial \ @@ -267,17 +279,20 @@ Test Case 4: Check split ring virtio-net device capability tx-tcp-ecn-segmentation: on tx-tcp6-segmentation: on -Test Case 5: VM2VM virtio-net split ring mergeable 8 queues CBDMA enable test with large packet payload valid check -==================================================================================================================== +Test Case 5: VM2VM split ring vhost-user/virtio-net mergeable 8 queues CBDMA enable test with large packet payload valid check +============================================================================================================================== -1. Launch the Vhost sample by below commands:: +1. Bind 16 CBDMA channels to vfio-pci, then launch vhost by below command:: rm -rf vhost-net* - ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --file-prefix=vhost --vdev 'net_vhost0,iface=vhost-net0,client=1,queues=8,dmas=[txq0@00:04.0;txq1@00:04.1;txq2@00:04.2;txq3@00:04.3;txq4@00:04.4;txq5@00:04.5;txq6@00:04.6;txq7@00:04.7]' \ - --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8,dmas=[txq0@80:04.0;txq1@80:04.1;txq2@80:04.2;txq3@80:04.3;txq4@80:04.4;txq5@80:04.5;txq6@80:04.6;txq7@80:04.7]' -- -i --nb-cores=4 --txd=1024 --rxd=1024 --rxq=8 --txq=8 + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --file-prefix=vhost \ + --vdev 'net_vhost0,iface=vhost-net0,client=1,queues=8,dmas=[txq0@0000:00:04.0;txq1@0000:00:04.1;txq2@0000:00:04.2;txq3@0000:00:04.3;txq4@0000:00:04.4;txq5@0000:00:04.5;txq6@0000:00:04.6;txq7@0000:00:04.7]' \ + --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8,dmas=[txq0@0000:80:04.0;txq1@0000:80:04.1;txq2@0000:80:04.2;txq3@0000:80:04.3;txq4@0000:80:04.4;txq5@0000:80:04.5;txq6@0000:80:04.6;txq7@0000:80:04.7]' \ + --iova=va -- -i --nb-cores=4 --txd=1024 --rxd=1024 --rxq=8 --txq=8 + testpmd>vhost enable tx all testpmd>start -2. Launch VM1 and VM2 using qemu 5.2.0:: +2. Launch VM1 and VM2 using qemu:: taskset -c 32 qemu-system-x86_64 -name vm1 -enable-kvm -cpu host -smp 8 -m 4096 \ -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ @@ -290,7 +305,7 @@ Test Case 5: VM2VM virtio-net split ring mergeable 8 queues CBDMA enable test wi -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce,queues=8 \ -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:01,disable-modern=false,mrg_rxbuf=on,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on -vnc :10 - taskset -c 40 qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 8 -m 4096 \ + taskset -c 40 qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 8 -m 4096 \ -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ -numa node,memdev=mem -mem-prealloc -drive file=/home/osimg/ubuntu20-04-2.img \ -chardev socket,path=/tmp/vm2_qga0.sock,server,nowait,id=vm2_qga0 -device virtio-serial \ @@ -301,13 +316,13 @@ Test Case 5: VM2VM virtio-net split ring mergeable 8 queues CBDMA enable test wi -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce,queues=8 \ -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:02,disable-modern=false,mrg_rxbuf=on,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on -vnc :12 -3. On VM1, set virtio device IP and run arp protocal:: +3. On VM1, set virtio device IP and run arp protocol:: ethtool -L ens5 combined 8 ifconfig ens5 1.1.1.2 arp -s 1.1.1.8 52:54:00:00:00:02 -4. On VM2, set virtio device IP and run arp protocal:: +4. On VM2, set virtio device IP and run arp protocol:: ethtool -L ens5 combined 8 ifconfig ens5 1.1.1.8 @@ -322,55 +337,94 @@ Test Case 5: VM2VM virtio-net split ring mergeable 8 queues CBDMA enable test wi Under VM1, run: `iperf -s -i 1` Under VM2, run: `iperf -c 1.1.1.2 -i 1 -t 60` -7. Quit vhost ports and relaunch vhost ports w/o CBDMA channels:: +7. Quit and relaunch vhost w/ diff CBDMA channels:: - ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --file-prefix=vhost --vdev 'net_vhost0,iface=vhost-net0,client=1,queues=8' \ - --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8' -- -i --nb-cores=4 --txd=1024 --rxd=1024 --rxq=8 --txq=8 - testpmd>start + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --file-prefix=vhost \ + --vdev 'net_vhost0,iface=vhost-net0,client=1,queues=8,dmas=[txq0@0000:80:04.0;txq1@0000:80:04.1;txq2@0000:80:04.2;txq3@0000:80:04.3;txq4@0000:80:04.4;txq5@0000:80:04.5;txq6@0000:80:04.6;txq7@0000:80:04.7]' \ + --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8,dmas=[txq0@0000:00:04.0;txq1@0000:00:04.1;txq2@0000:00:04.2;txq3@0000:00:04.3;txq4@0000:00:04.4;txq5@0000:00:04.5;txq6@0000:00:04.6;txq7@0000:00:04.7]' \ + --iova=va -- -i --nb-cores=4 --txd=1024 --rxd=1024 --rxq=8 --txq=8 + testpmd>vhost enable tx all + testpmd>start -8. Scp 1MB file form VM1 to VM2:: +8. Rerun step 5-6. - Under VM1, run: `scp [xxx] root@1.1.1.8:/` [xxx] is the file name +9. Quit and relaunch vhost w/ iova=pa:: -9. Check the iperf performance and compare with CBDMA enable performance, ensure CMDMA enable performance is higher:: + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --file-prefix=vhost \ + --vdev 'net_vhost0,iface=vhost-net0,client=1,queues=8,dmas=[txq0@0000:80:04.0;txq1@0000:80:04.1;txq2@0000:80:04.2;txq3@0000:80:04.3;txq4@0000:80:04.4;txq5@0000:80:04.5;txq6@0000:80:04.6;txq7@0000:80:04.7]' \ + --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8,dmas=[txq0@0000:00:04.0;txq1@0000:00:04.1;txq2@0000:00:04.2;txq3@0000:00:04.3;txq4@0000:00:04.4;txq5@0000:00:04.5;txq6@0000:00:04.6;txq7@0000:00:04.7]' \ + --iova=pa -- -i --nb-cores=4 --txd=1024 --rxd=1024 --rxq=8 --txq=8 + testpmd>vhost enable tx all + testpmd>start - Under VM1, run: `iperf -s -i 1` - Under VM2, run: `iperf -c 1.1.1.2 -i 1 -t 60` +10. Rerun step 5-6. -10. Quit vhost ports and relaunch vhost ports with 1 queues:: +11. Quit and relaunch vhost w/o CBDMA channels:: - ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --file-prefix=vhost --vdev 'net_vhost0,iface=vhost-net0,client=1,queues=8' \ - --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8' -- -i --nb-cores=4 --txd=1024 --rxd=1024 --rxq=1 --txq=1 + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --file-prefix=vhost \ + --vdev 'net_vhost0,iface=vhost-net0,client=1,queues=4' \ + --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=4' \ + -- -i --nb-cores=4 --txd=1024 --rxd=1024 --rxq=4 --txq=4 + testpmd>vhost enable tx all testpmd>start -11. On VM1, set virtio device:: +12. On VM1, set virtio device:: + + ethtool -L ens5 combined 4 + +13. On VM2, set virtio device:: + + ethtool -L ens5 combined 4 + +14. Scp 1MB file form VM1 to VM2:: + + Under VM1, run: `scp [xxx] root@1.1.1.8:/` [xxx] is the file name + +15. Check the iperf performance and compare with CBDMA enable performance, ensure CMDMA enable performance is higher:: + + Under VM1, run: `iperf -s -i 1` + Under VM2, run: `iperf -c 1.1.1.2 -i 1 -t 60` + +16. Quit and relaunch vhost with 1 queues:: + + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --file-prefix=vhost \ + --vdev 'net_vhost0,iface=vhost-net0,client=1,queues=4' \ + --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=4' \ + -- -i --nb-cores=4 --txd=1024 --rxd=1024 --rxq=1 --txq=1 + testpmd>vhost enable tx all + testpmd>start + +17. On VM1, set virtio device:: ethtool -L ens5 combined 1 -12. On VM2, set virtio device:: +18. On VM2, set virtio device:: ethtool -L ens5 combined 1 -13. Scp 1MB file form VM1 to VM2M, check packets can be forwarding success by scp:: +19. Scp 1MB file form VM1 to VM2M, check packets can be forwarding success by scp:: - Under VM1, run: `scp [xxx] root@1.1.1.8:/` [xxx] is the file name + Under VM1, run: `scp [xxx] root@1.1.1.8:/` [xxx] is the file name -14. Check the iperf performance, ensure queue0 can work from vhost side:: +20. Check the iperf performance, ensure queue0 can work from vhost side:: - Under VM1, run: `iperf -s -i 1` - Under VM2, run: `iperf -c 1.1.1.2 -i 1 -t 60` + Under VM1, run: `iperf -s -i 1` + Under VM2, run: `iperf -c 1.1.1.2 -i 1 -t 60` -Test Case 6: VM2VM virtio-net split ring non-mergeable 8 queues CBDMA enable test with large packet payload valid check -======================================================================================================================== +Test Case 6: VM2VM split ring vhost-user/virtio-net non-mergeable 8 queues CBDMA enable test with large packet payload valid check +================================================================================================================================== -1. Launch the Vhost sample by below commands:: +1. Bind 16 CBDMA channels to vfio-pci, then launch vhost by below command:: rm -rf vhost-net* - ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --file-prefix=vhost --vdev 'net_vhost0,iface=vhost-net0,client=1,queues=8,dmas=[txq0@00:04.0;txq1@00:04.1;txq2@00:04.2;txq3@00:04.3;txq4@00:04.4;txq5@00:04.5;txq6@00:04.6;txq7@00:04.7]' \ - --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8,dmas=[txq0@80:04.0;txq1@80:04.1;txq2@80:04.2;txq3@80:04.3;txq4@80:04.4;txq5@80:04.5;txq6@80:04.6;txq7@80:04.7]' -- -i --nb-cores=4 --txd=1024 --rxd=1024 --rxq=8 --txq=8 + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --file-prefix=vhost \ + --vdev 'net_vhost0,iface=vhost-net0,client=1,queues=8,dmas=[txq0@0000:00:04.0;txq1@0000:00:04.1;txq2@0000:00:04.2;txq3@0000:00:04.3;txq4@0000:00:04.4;txq5@0000:00:04.5;txq6@0000:00:04.6;txq7@0000:00:04.7]' \ + --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8,dmas=[txq0@0000:80:04.0;txq1@0000:80:04.1;txq2@0000:80:04.2;txq3@0000:80:04.3;txq4@0000:80:04.4;txq5@0000:80:04.5;txq6@0000:80:04.6;txq7@0000:80:04.7]' \ + -- -i --nb-cores=4 --txd=1024 --rxd=1024 --rxq=8 --txq=8 + testpmd>vhost enable tx all testpmd>start -2. Launch VM1 and VM2 using qemu 5.2.0:: +2. Launch VM1 and VM2 using qemu:: taskset -c 32 qemu-system-x86_64 -name vm1 -enable-kvm -cpu host -smp 8 -m 4096 \ -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ @@ -383,7 +437,7 @@ Test Case 6: VM2VM virtio-net split ring non-mergeable 8 queues CBDMA enable tes -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce,queues=8 \ -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:01,disable-modern=false,mrg_rxbuf=off,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on -vnc :10 - taskset -c 40 qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 8 -m 4096 \ + taskset -c 40 qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 8 -m 4096 \ -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ -numa node,memdev=mem -mem-prealloc -drive file=/home/osimg/ubuntu20-04-2.img \ -chardev socket,path=/tmp/vm2_qga0.sock,server,nowait,id=vm2_qga0 -device virtio-serial \ @@ -394,13 +448,13 @@ Test Case 6: VM2VM virtio-net split ring non-mergeable 8 queues CBDMA enable tes -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce,queues=8 \ -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:02,disable-modern=false,mrg_rxbuf=off,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on -vnc :12 -3. On VM1, set virtio device IP and run arp protocal:: +3. On VM1, set virtio device IP and run arp protocol:: ethtool -L ens5 combined 8 ifconfig ens5 1.1.1.2 arp -s 1.1.1.8 52:54:00:00:00:02 -4. On VM2, set virtio device IP and run arp protocal:: +4. On VM2, set virtio device IP and run arp protocol:: ethtool -L ens5 combined 8 ifconfig ens5 1.1.1.8 @@ -415,10 +469,13 @@ Test Case 6: VM2VM virtio-net split ring non-mergeable 8 queues CBDMA enable tes Under VM1, run: `iperf -s -i 1` Under VM2, run: `iperf -c 1.1.1.2 -i 1 -t 60` -7. Quit vhost ports and relaunch vhost ports w/o CBDMA channels:: +7. Quit and relaunch vhost ports w/o CBDMA channels:: - ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --file-prefix=vhost --vdev 'net_vhost0,iface=vhost-net0,client=1,queues=8' \ - --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8' -- -i --nb-cores=4 --txd=1024 --rxd=1024 --rxq=8 --txq=8 + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --file-prefix=vhost \ + --vdev 'net_vhost0,iface=vhost-net0,client=1,queues=8' \ + --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8' \ + -- -i --nb-cores=4 --txd=1024 --rxd=1024 --rxq=8 --txq=8 + testpmd>vhost enable tx all testpmd>start 8. Scp 1MB file form VM1 to VM2:: @@ -430,10 +487,13 @@ Test Case 6: VM2VM virtio-net split ring non-mergeable 8 queues CBDMA enable tes Under VM1, run: `iperf -s -i 1` Under VM2, run: `iperf -c 1.1.1.2 -i 1 -t 60` -10. Quit vhost ports and relaunch vhost ports with 1 queues:: +10. Quit and relaunch vhost ports with 1 queues:: - ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --file-prefix=vhost --vdev 'net_vhost0,iface=vhost-net0,client=1,queues=8' \ - --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8' -- -i --nb-cores=4 --txd=1024 --rxd=1024 --rxq=1 --txq=1 + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --file-prefix=vhost \ + --vdev 'net_vhost0,iface=vhost-net0,client=1,queues=8' \ + --vdev 'net_vhost1,iface=vhost-net1,client=1,queues=8' \ + -- -i --nb-cores=4 --txd=1024 --rxd=1024 --rxq=1 --txq=1 + testpmd>vhost enable tx all testpmd>start 11. On VM1, set virtio device:: @@ -456,14 +516,16 @@ Test Case 6: VM2VM virtio-net split ring non-mergeable 8 queues CBDMA enable tes Test Case 7: VM2VM packed ring vhost-user/virtio-net test with tcp traffic ========================================================================== -1. Launch the Vhost sample by below commands::,packed=on +1. Launch the Vhost sample by below commands:: rm -rf vhost-net* - ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 2-4 -n 4 --no-pci --file-prefix=vhost --vdev 'net_vhost0,iface=vhost-net0,queues=1' \ - --vdev 'net_vhost1,iface=vhost-net1,queues=1' -- -i --nb-cores=2 --txd=1024 --rxd=1024 + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 2-4 -n 4 --no-pci --file-prefix=vhost \ + --vdev 'net_vhost0,iface=vhost-net0,queues=1' \ + --vdev 'net_vhost1,iface=vhost-net1,queues=1' \ + -- -i --nb-cores=2 --txd=1024 --rxd=1024 testpmd>start -2. Launch VM1 and VM2 with qemu 5.2.0:: +2. Launch VM1 and VM2 with qemu:: qemu-system-x86_64 -name vm1 -enable-kvm -cpu host -smp 1 -m 4096 \ -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ @@ -476,7 +538,7 @@ Test Case 7: VM2VM packed ring vhost-user/virtio-net test with tcp traffic -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce \ -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:01,disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on -vnc :10 - qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 1 -m 4096 \ + qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 1 -m 4096 \ -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ -numa node,memdev=mem -mem-prealloc -drive file=/home/osimg/ubuntu20-04-2.img \ -chardev socket,path=/tmp/vm2_qga0.sock,server,nowait,id=vm2_qga0 -device virtio-serial \ @@ -487,12 +549,12 @@ Test Case 7: VM2VM packed ring vhost-user/virtio-net test with tcp traffic -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce \ -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:02,disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on -vnc :12 -3. On VM1, set virtio device IP and run arp protocal:: +3. On VM1, set virtio device IP and run arp protocol:: ifconfig ens5 1.1.1.2 arp -s 1.1.1.8 52:54:00:00:00:02 -4. On VM2, set virtio device IP and run arp protocal:: +4. On VM2, set virtio device IP and run arp protocol:: ifconfig ens5 1.1.1.8 arp -s 1.1.1.2 52:54:00:00:00:01 @@ -511,14 +573,17 @@ Test Case 7: VM2VM packed ring vhost-user/virtio-net test with tcp traffic Test Case 8: VM2VM packed ring vhost-user/virtio-net CBDMA enable test with tcp traffic ======================================================================================= -1. Launch the Vhost sample by below commands:: +1. Bind 2 CBDMA channels to vfio-pci, then launch vhost by below command:: rm -rf vhost-net* - ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 2-4 -n 4 --file-prefix=vhost --vdev 'net_vhost0,iface=vhost-net0,queues=1,dmas=[txq0@00:04.0]' \ - --vdev 'net_vhost1,iface=vhost-net1,queues=1,dmas=[txq0@00:04.1]' -- -i --nb-cores=2 --txd=1024 --rxd=1024 + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 2-4 -n 4 --file-prefix=vhost \ + --vdev 'net_vhost0,iface=vhost-net0,queues=1,dmas=[txq0@0000:00:04.0]' \ + --vdev 'net_vhost1,iface=vhost-net1,queues=1,dmas=[txq0@0000:00:04.1]' \ + --iova=va -- -i --nb-cores=2 --txd=1024 --rxd=1024 + testpmd>vhost enable tx all testpmd>start -2. Launch VM1 and VM2 on socket 1 with qemu 5.2.0:: +2. Launch VM1 and VM2 on socket 1 with qemu:: taskset -c 32 qemu-system-x86_64 -name vm1 -enable-kvm -cpu host -smp 1 -m 4096 \ -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ @@ -531,7 +596,7 @@ Test Case 8: VM2VM packed ring vhost-user/virtio-net CBDMA enable test with tcp -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce \ -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:01,disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on -vnc :10 - taskset -c 33 qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 1 -m 4096 \ + taskset -c 33 qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 1 -m 4096 \ -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ -numa node,memdev=mem -mem-prealloc -drive file=/home/osimg/ubuntu20-04-2.img \ -chardev socket,path=/tmp/vm2_qga0.sock,server,nowait,id=vm2_qga0 -device virtio-serial \ @@ -542,12 +607,12 @@ Test Case 8: VM2VM packed ring vhost-user/virtio-net CBDMA enable test with tcp -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce \ -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:02,disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on -vnc :12 -3. On VM1, set virtio device IP and run arp protocal:: +3. On VM1, set virtio device IP and run arp protocol:: ifconfig ens5 1.1.1.2 arp -s 1.1.1.8 52:54:00:00:00:02 -4. On VM2, set virtio device IP and run arp protocal:: +4. On VM2, set virtio device IP and run arp protocol:: ifconfig ens5 1.1.1.8 arp -s 1.1.1.2 52:54:00:00:00:01 @@ -571,11 +636,13 @@ Test Case 9: VM2VM packed ring vhost-user/virtio-net test with udp traffic 1. Launch the Vhost sample by below commands:: rm -rf vhost-net* - ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xF0000000 -n 4 --no-pci --file-prefix=vhost --vdev 'net_vhost0,iface=vhost-net0,queues=1' \ - --vdev 'net_vhost1,iface=vhost-net1,queues=1' -- -i --nb-cores=2 --txd=1024 --rxd=1024 + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xF0000000 -n 4 --no-pci --file-prefix=vhost \ + --vdev 'net_vhost0,iface=vhost-net0,queues=1' \ + --vdev 'net_vhost1,iface=vhost-net1,queues=1' \ + -- -i --nb-cores=2 --txd=1024 --rxd=1024 testpmd>start -2. Launch VM1 and VM2 with qemu 5.2.0:: +2. Launch VM1 and VM2 with qemu:: qemu-system-x86_64 -name vm1 -enable-kvm -cpu host -smp 40 -m 4096 \ -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ @@ -588,7 +655,7 @@ Test Case 9: VM2VM packed ring vhost-user/virtio-net test with udp traffic -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce \ -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:01,disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on -vnc :10 - qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 1 -m 4096 \ + qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 1 -m 4096 \ -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ -numa node,memdev=mem -mem-prealloc -drive file=/home/osimg/ubuntu20-04-2.img \ -chardev socket,path=/tmp/vm2_qga0.sock,server,nowait,id=vm2_qga0 -device virtio-serial \ @@ -599,12 +666,12 @@ Test Case 9: VM2VM packed ring vhost-user/virtio-net test with udp traffic -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce \ -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:02,disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on -vnc :12 -3. On VM1, set virtio device IP and run arp protocal:: +3. On VM1, set virtio device IP and run arp protocol:: ifconfig ens3 1.1.1.2 arp -s 1.1.1.8 52:54:00:00:00:02 -4. On VM2, set virtio device IP and run arp protocal:: +4. On VM2, set virtio device IP and run arp protocol:: ifconfig ens3 1.1.1.8 arp -s 1.1.1.2 52:54:00:00:00:01 @@ -626,11 +693,13 @@ Test Case 10: Check packed ring virtio-net device capability 1. Launch the Vhost sample by below commands:: rm -rf vhost-net* - ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xF0000000 -n 4 --no-pci --file-prefix=vhost --vdev 'net_vhost0,iface=vhost-net0,queues=1' \ - --vdev 'net_vhost1,iface=vhost-net1,queues=1' -- -i --nb-cores=2 --txd=1024 --rxd=1024 + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xF0000000 -n 4 --no-pci --file-prefix=vhost \ + --vdev 'net_vhost0,iface=vhost-net0,queues=1' \ + --vdev 'net_vhost1,iface=vhost-net1,queues=1' \ + -- -i --nb-cores=2 --txd=1024 --rxd=1024 testpmd>start -2. Launch VM1 and VM2 with qemu 5.2.0,set TSO and UFO on in qemu command:: +2. Launch VM1 and VM2 with qemu,set TSO and UFO on in qemu command:: qemu-system-x86_64 -name vm1 -enable-kvm -cpu host -smp 1 -m 4096 \ -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ @@ -643,7 +712,7 @@ Test Case 10: Check packed ring virtio-net device capability -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce \ -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:01,disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on -vnc :10 - qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 1 -m 4096 \ + qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 1 -m 4096 \ -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ -numa node,memdev=mem -mem-prealloc -drive file=/home/osimg/ubuntu20-04-2.img \ -chardev socket,path=/tmp/vm2_qga0.sock,server,nowait,id=vm2_qga0 -device virtio-serial \ @@ -671,14 +740,17 @@ Test Case 10: Check packed ring virtio-net device capability Test Case 11: VM2VM virtio-net packed ring mergeable 8 queues CBDMA enable test with large packet payload valid check ===================================================================================================================== -1. Launch the Vhost sample by below commands:: +1. Bind 16 CBDMA channels to vfio-pci, then launch vhost by below command:: rm -rf vhost-net* - ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --file-prefix=vhost --vdev 'net_vhost0,iface=vhost-net0,queues=8,dmas=[txq0@00:04.0;txq1@00:04.1;txq2@00:04.2;txq3@00:04.3;txq4@00:04.4;txq5@00:04.5;txq6@00:04.6;txq7@00:04.7]' \ - --vdev 'net_vhost1,iface=vhost-net1,queues=8,dmas=[txq0@80:04.0;txq1@80:04.1;txq2@80:04.2;txq3@80:04.3;txq4@80:04.4;txq5@80:04.5;txq6@80:04.6;txq7@80:04.7]' -- -i --nb-cores=4 --txd=1024 --rxd=1024 --rxq=8 --txq=8 + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --file-prefix=vhost \ + --vdev 'net_vhost0,iface=vhost-net0,queues=8,dmas=[txq0@0000:00:04.0;txq1@0000:00:04.1;txq2@0000:00:04.2;txq3@0000:00:04.3;txq4@0000:00:04.4;txq5@0000:00:04.5;txq6@0000:00:04.6;txq7@0000:00:04.7]' \ + --vdev 'net_vhost1,iface=vhost-net1,queues=8,dmas=[txq0@0000:80:04.0;txq1@0000:80:04.1;txq2@0000:80:04.2;txq3@0000:80:04.3;txq4@0000:80:04.4;txq5@0000:80:04.5;txq6@0000:80:04.6;txq7@0000:80:04.7]' \ + --iova=va -- -i --nb-cores=4 --txd=1024 --rxd=1024 --rxq=8 --txq=8 + testpmd>vhost enable tx all testpmd>start -2. Launch VM1 and VM2 with qemu 5.2.0:: +2. Launch VM1 and VM2 with qemu:: taskset -c 32 qemu-system-x86_64 -name vm1 -enable-kvm -cpu host -smp 8 -m 4096 \ -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ @@ -691,7 +763,7 @@ Test Case 11: VM2VM virtio-net packed ring mergeable 8 queues CBDMA enable test -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce,queues=8 \ -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:01,disable-modern=false,mrg_rxbuf=on,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on,packed=on -vnc :10 - taskset -c 40 qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 8 -m 4096 \ + taskset -c 40 qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 8 -m 4096 \ -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ -numa node,memdev=mem -mem-prealloc -drive file=/home/osimg/ubuntu20-04-2.img \ -chardev socket,path=/tmp/vm2_qga0.sock,server,nowait,id=vm2_qga0 -device virtio-serial \ @@ -702,13 +774,13 @@ Test Case 11: VM2VM virtio-net packed ring mergeable 8 queues CBDMA enable test -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce,queues=8 \ -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:02,disable-modern=false,mrg_rxbuf=on,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on,packed=on -vnc :12 -3. On VM1, set virtio device IP and run arp protocal:: +3. On VM1, set virtio device IP and run arp protocol:: ethtool -L ens5 combined 8 ifconfig ens5 1.1.1.2 arp -s 1.1.1.8 52:54:00:00:00:02 -4. On VM2, set virtio device IP and run arp protocal:: +4. On VM2, set virtio device IP and run arp protocol:: ethtool -L ens5 combined 8 ifconfig ens5 1.1.1.8 @@ -728,11 +800,14 @@ Test Case 11: VM2VM virtio-net packed ring mergeable 8 queues CBDMA enable test Test Case 12: VM2VM virtio-net packed ring non-mergeable 8 queues CBDMA enable test with large packet payload valid check ========================================================================================================================= -1. Launch the Vhost sample by below commands:: +1. Bind 16 CBDMA channels to vfio-pci, then launch vhost by below command:: rm -rf vhost-net* - ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --file-prefix=vhost --vdev 'net_vhost0,iface=vhost-net0,queues=8,dmas=[txq0@00:04.0;txq1@00:04.1;txq2@00:04.2;txq3@00:04.3;txq4@00:04.4;txq5@00:04.5;txq6@00:04.6;txq7@00:04.7]' \ - --vdev 'net_vhost1,iface=vhost-net1,queues=8,dmas=[txq0@80:04.0;txq1@80:04.1;txq2@80:04.2;txq3@80:04.3;txq4@80:04.4;txq5@80:04.5;txq6@80:04.6;txq7@80:04.7]' -- -i --nb-cores=4 --txd=1024 --rxd=1024 --rxq=8 --txq=8 + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --file-prefix=vhost \ + --vdev 'net_vhost0,iface=vhost-net0,queues=8,dmas=[txq0@0000:00:04.0;txq1@0000:00:04.1;txq2@0000:00:04.2;txq3@0000:00:04.3;txq4@0000:00:04.4;txq5@0000:00:04.5;txq6@0000:00:04.6;txq7@0000:00:04.7]' \ + --vdev 'net_vhost1,iface=vhost-net1,queues=8,dmas=[txq0@0000:80:04.0;txq1@0000:80:04.1;txq2@0000:80:04.2;txq3@0000:80:04.3;txq4@0000:80:04.4;txq5@0000:80:04.5;txq6@0000:80:04.6;txq7@0000:80:04.7]' \ + --iova=va -- -i --nb-cores=4 --txd=1024 --rxd=1024 --rxq=8 --txq=8 + testpmd>vhost enable tx all testpmd>start 2. Launch VM1 and VM2:: @@ -748,7 +823,7 @@ Test Case 12: VM2VM virtio-net packed ring non-mergeable 8 queues CBDMA enable t -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce,queues=8 \ -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:01,disable-modern=false,mrg_rxbuf=off,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on,packed=on -vnc :10 - taskset -c 40 qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 8 -m 4096 \ + taskset -c 40 qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 8 -m 4096 \ -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ -numa node,memdev=mem -mem-prealloc -drive file=/home/osimg/ubuntu20-04-2.img \ -chardev socket,path=/tmp/vm2_qga0.sock,server,nowait,id=vm2_qga0 -device virtio-serial \ @@ -759,13 +834,135 @@ Test Case 12: VM2VM virtio-net packed ring non-mergeable 8 queues CBDMA enable t -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce,queues=8 \ -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:02,disable-modern=false,mrg_rxbuf=off,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on,packed=on -vnc :12 -3. On VM1, set virtio device IP and run arp protocal:: +3. On VM1, set virtio device IP and run arp protocol:: + + ethtool -L ens5 combined 8 + ifconfig ens5 1.1.1.2 + arp -s 1.1.1.8 52:54:00:00:00:02 + +4. On VM2, set virtio device IP and run arp protocol:: + + ethtool -L ens5 combined 8 + ifconfig ens5 1.1.1.8 + arp -s 1.1.1.2 52:54:00:00:00:01 + +5. Scp 1MB file form VM1 to VM2:: + + Under VM1, run: `scp [xxx] root@1.1.1.8:/` [xxx] is the file name + +6. Check the iperf performance between two VMs by below commands:: + + Under VM1, run: `iperf -s -i 1` + Under VM2, run: `iperf -c 1.1.1.2 -i 1 -t 60` + +7. Rerun step 5-6 five times. + +Test Case 13: VM2VM packed ring vhost-user/virtio-net CBDMA enable test with tcp traffic when set iova=pa +========================================================================================================= + +1. Bind 2 CBDMA channels to vfio-pci, then launch vhost by below command:: + + rm -rf vhost-net* + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 2-4 -n 4 --file-prefix=vhost \ + --vdev 'net_vhost0,iface=vhost-net0,queues=1,dmas=[txq0@0000:00:04.0]' \ + --vdev 'net_vhost1,iface=vhost-net1,queues=1,dmas=[txq0@0000:00:04.1]' \ + --iova=pa -- -i --nb-cores=2 --txd=1024 --rxd=1024 + testpmd>vhost enable tx all + testpmd>start + +2. Launch VM1 and VM2 on socket 1 with qemu:: + + taskset -c 32 qemu-system-x86_64 -name vm1 -enable-kvm -cpu host -smp 1 -m 4096 \ + -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ + -numa node,memdev=mem -mem-prealloc -drive file=/home/osimg/ubuntu20-04.img \ + -chardev socket,path=/tmp/vm2_qga0.sock,server,nowait,id=vm2_qga0 -device virtio-serial \ + -device virtserialport,chardev=vm2_qga0,name=org.qemu.guest_agent.2 -daemonize \ + -monitor unix:/tmp/vm2_monitor.sock,server,nowait -device e1000,netdev=nttsip1 \ + -netdev user,id=nttsip1,hostfwd=tcp:127.0.0.1:6002-:22 \ + -chardev socket,id=char0,path=./vhost-net0 \ + -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce \ + -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:01,disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on -vnc :10 + + taskset -c 33 qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 1 -m 4096 \ + -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ + -numa node,memdev=mem -mem-prealloc -drive file=/home/osimg/ubuntu20-04-2.img \ + -chardev socket,path=/tmp/vm2_qga0.sock,server,nowait,id=vm2_qga0 -device virtio-serial \ + -device virtserialport,chardev=vm2_qga0,name=org.qemu.guest_agent.2 -daemonize \ + -monitor unix:/tmp/vm2_monitor.sock,server,nowait -device e1000,netdev=nttsip1 \ + -netdev user,id=nttsip1,hostfwd=tcp:127.0.0.1:6003-:22 \ + -chardev socket,id=char0,path=./vhost-net1 \ + -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce \ + -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:02,disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on -vnc :12 + +3. On VM1, set virtio device IP and run arp protocol:: + + ifconfig ens5 1.1.1.2 + arp -s 1.1.1.8 52:54:00:00:00:02 + +4. On VM2, set virtio device IP and run arp protocol:: + + ifconfig ens5 1.1.1.8 + arp -s 1.1.1.2 52:54:00:00:00:01 + +5. Scp 1MB file form VM1 to VM2:: + + Under VM1, run: `scp [xxx] root@1.1.1.8:/` [xxx] is the file name + +6. Check the iperf performance between two VMs by below commands:: + + Under VM1, run: `iperf -s -i 1` + Under VM2, run: `iperf -c 1.1.1.2 -i 1 -t 60` + +7. Check 2VMs can receive and send big packets to each other:: + + testpmd>show port xstats all + Port 0 should have tx packets above 1522 + Port 1 should have rx packets above 1522 + +Test Case 14: VM2VM virtio-net packed ring mergeable 8 queues CBDMA enable and PA mode test with large packet payload valid check +================================================================================================================================= + +1. Bind 16 CBDMA channels to vfio-pci, then launch vhost by below command:: + + rm -rf vhost-net* + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4 --file-prefix=vhost \ + --vdev 'net_vhost0,iface=vhost-net0,queues=8,dmas=[txq0@0000:00:04.0;txq1@0000:00:04.1;txq2@0000:00:04.2;txq3@0000:00:04.3;txq4@0000:00:04.4;txq5@0000:00:04.5;txq6@0000:00:04.6;txq7@0000:00:04.7]' \ + --vdev 'net_vhost1,iface=vhost-net1,queues=8,dmas=[txq0@0000:80:04.0;txq1@0000:80:04.1;txq2@0000:80:04.2;txq3@0000:80:04.3;txq4@0000:80:04.4;txq5@0000:80:04.5;txq6@0000:80:04.6;txq7@0000:80:04.7]' \ + --iova=pa -- -i --nb-cores=4 --txd=1024 --rxd=1024 --rxq=8 --txq=8 + testpmd>vhost enable tx all + testpmd>start + +2. Launch VM1 and VM2 with qemu:: + + taskset -c 32 qemu-system-x86_64 -name vm1 -enable-kvm -cpu host -smp 8 -m 4096 \ + -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ + -numa node,memdev=mem -mem-prealloc -drive file=/home/osimg/ubuntu20-04.img \ + -chardev socket,path=/tmp/vm2_qga0.sock,server,nowait,id=vm2_qga0 -device virtio-serial \ + -device virtserialport,chardev=vm2_qga0,name=org.qemu.guest_agent.2 -daemonize \ + -monitor unix:/tmp/vm2_monitor.sock,server,nowait -device e1000,netdev=nttsip1 \ + -netdev user,id=nttsip1,hostfwd=tcp:127.0.0.1:6002-:22 \ + -chardev socket,id=char0,path=./vhost-net0 \ + -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce,queues=8 \ + -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:01,disable-modern=false,mrg_rxbuf=on,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on,packed=on -vnc :10 + + taskset -c 40 qemu-system-x86_64 -name vm2 -enable-kvm -cpu host -smp 8 -m 4096 \ + -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \ + -numa node,memdev=mem -mem-prealloc -drive file=/home/osimg/ubuntu20-04-2.img \ + -chardev socket,path=/tmp/vm2_qga0.sock,server,nowait,id=vm2_qga0 -device virtio-serial \ + -device virtserialport,chardev=vm2_qga0,name=org.qemu.guest_agent.2 -daemonize \ + -monitor unix:/tmp/vm2_monitor.sock,server,nowait -device e1000,netdev=nttsip1 \ + -netdev user,id=nttsip1,hostfwd=tcp:127.0.0.1:6003-:22 \ + -chardev socket,id=char0,path=./vhost-net1 \ + -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce,queues=8 \ + -device virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:02,disable-modern=false,mrg_rxbuf=on,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on,packed=on -vnc :12 + +3. On VM1, set virtio device IP and run arp protocol:: ethtool -L ens5 combined 8 ifconfig ens5 1.1.1.2 arp -s 1.1.1.8 52:54:00:00:00:02 -4. On VM2, set virtio device IP and run arp protocal:: +4. On VM2, set virtio device IP and run arp protocol:: ethtool -L ens5 combined 8 ifconfig ens5 1.1.1.8 From patchwork Mon Jan 17 06:30:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 105899 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 03B39A034F; Mon, 17 Jan 2022 07:31:06 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EC5DD41165; Mon, 17 Jan 2022 07:31:05 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id 01C824067B for ; Mon, 17 Jan 2022 07:31:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642401064; x=1673937064; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=6ByrUxT94ohbdDyNt2XOxYlwMMkIuZCiGP7EmBHUiuA=; b=SjKa/amq2yakylq4pXQjsy8Qa+lVt3NUz8g5PlAeYGYzIyzLK9rTxONR eIYlgI8wzWS4Bz3oxmXOMZEumGhNmt3wYK8PXcF0isNJw0/lTp/ezpEI4 aDanUQg1Kb6DvDVRXEj0w/LcwCjogR+KJWpu59Ld3nydsJ08zAncsofvN xhxOu+eD5c50A0HAUpU/rqy+Q62qVIXBN5hLhSqJ2edXgBF0XW97VbBn1 ofvmJ/ZULX8IgMxDLknvb3XJJXpJAg9UmadS4jm5CJE6d2UIZbuvgr9cn XD7wKzlbYPQXyUZSgehD/Ob3LGzxT+XJWGKoFCZB1OJzxnIvfE0KGaRvv A==; X-IronPort-AV: E=McAfee;i="6200,9189,10229"; a="244758881" X-IronPort-AV: E=Sophos;i="5.88,294,1635231600"; d="scan'208";a="244758881" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jan 2022 22:31:03 -0800 X-IronPort-AV: E=Sophos;i="5.88,294,1635231600"; d="scan'208";a="671463873" Received: from unknown (HELO localhost.localdomain) ([10.239.251.222]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jan 2022 22:31:01 -0800 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V2 2/2] tests/vm2vm_virtio_net_perf:modify and add test case sync with test plan Date: Mon, 17 Jan 2022 14:30:57 +0800 Message-Id: <20220117063057.1369495-1-weix.ling@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org v1: case 5: Add test step to test exchange CBDMA channel and PA mode. case 13&14: Add new test case to cover the packed ring and PA mode. v2: Fix test plan format issue due to make html failed. Signed-off-by: Wei Ling Tested-by: Wei Ling Acked-by: Xingguang He Signed-off-by: Wei Ling --- tests/TestSuite_vm2vm_virtio_net_perf.py | 116 +++++++++++++++++------ 1 file changed, 87 insertions(+), 29 deletions(-) diff --git a/tests/TestSuite_vm2vm_virtio_net_perf.py b/tests/TestSuite_vm2vm_virtio_net_perf.py index dc8eaed5..1cb9a324 100644 --- a/tests/TestSuite_vm2vm_virtio_net_perf.py +++ b/tests/TestSuite_vm2vm_virtio_net_perf.py @@ -125,7 +125,12 @@ class TestVM2VMVirtioNetPerf(TestCase): self.dut.send_expect('./usertools/dpdk-devbind.py -u %s' % self.device_str, '# ', 30) self.dut.send_expect('./usertools/dpdk-devbind.py --force --bind=ioatdma %s' % self.device_str, '# ', 60) - def start_vhost_testpmd(self, cbdma=False, no_pci=True, client_mode=False, enable_queues=1, nb_cores=2, rxq_txq=None): + @property + def check_2m_env(self): + out = self.dut.send_expect("cat /proc/meminfo |grep Hugepagesize|awk '{print($2)}'", "# ") + return True if out == '2048' else False + + def start_vhost_testpmd(self, cbdma=False, no_pci=True, client_mode=False, enable_queues=1, nb_cores=2, rxq_txq=None, exchange_cbdma=False, iova_mode=''): """ launch the testpmd with different parameters """ @@ -150,12 +155,20 @@ class TestVM2VMVirtioNetPerf(TestCase): else: vdev1 = "--vdev 'net_vhost0,iface=%s/vhost-net0,client=1,queues=%d%s' " % (self.base_dir, enable_queues, cbdma_arg_0) vdev2 = "--vdev 'net_vhost1,iface=%s/vhost-net1,client=1,queues=%d%s' " % (self.base_dir, enable_queues, cbdma_arg_1) + if exchange_cbdma: + vdev1 = "--vdev 'net_vhost0,iface=%s/vhost-net0,client=1,queues=%d%s' " % (self.base_dir, enable_queues, cbdma_arg_1) + vdev2 = "--vdev 'net_vhost1,iface=%s/vhost-net1,client=1,queues=%d%s' " % (self.base_dir, enable_queues, cbdma_arg_0) + eal_params = self.dut.create_eal_parameters(cores=self.cores_list, prefix='vhost', no_pci=no_pci) if rxq_txq is None: params = " -- -i --nb-cores=%d --txd=1024 --rxd=1024" % nb_cores else: params = " -- -i --nb-cores=%d --txd=1024 --rxd=1024 --rxq=%d --txq=%d" % (nb_cores, rxq_txq, rxq_txq) - self.command_line = testcmd + eal_params + vdev1 + vdev2 + params + if iova_mode: + iova_parm = " --iova=" + iova_mode + else: + iova_parm = "" + self.command_line = testcmd + eal_params + vdev1 + vdev2 + iova_parm + params self.pmd_vhost.execute_cmd(self.command_line, timeout=30) self.pmd_vhost.execute_cmd('vhost enable tx all', timeout=30) self.pmd_vhost.execute_cmd('start', timeout=30) @@ -204,13 +217,13 @@ class TestVM2VMVirtioNetPerf(TestCase): self.vm_dut[1].send_expect("arp -s %s %s" % (self.virtio_ip1, self.virtio_mac1), "#", 10) def prepare_test_env(self, cbdma=False, no_pci=True, client_mode=False, enable_queues=1, nb_cores=2, - server_mode=False, opt_queue=None, combined=False, rxq_txq=None, vm_config='vhost_sample'): + server_mode=False, opt_queue=None, combined=False, rxq_txq=None, iova_mode=''): """ start vhost testpmd and qemu, and config the vm env """ self.start_vhost_testpmd(cbdma=cbdma, no_pci=no_pci, client_mode=client_mode, enable_queues=enable_queues, - nb_cores=nb_cores, rxq_txq=rxq_txq) - self.start_vms(server_mode=server_mode, opt_queue=opt_queue, vm_config=vm_config) + nb_cores=nb_cores, rxq_txq=rxq_txq, iova_mode=iova_mode) + self.start_vms(server_mode=server_mode, opt_queue=opt_queue) self.config_vm_env(combined=combined, rxq_txq=rxq_txq) def start_iperf(self, iperf_mode='tso'): @@ -314,11 +327,11 @@ class TestVM2VMVirtioNetPerf(TestCase): self.verify(tcp6_info is not None and tcp6_info.group(1) == "on", "tx-tcp6-segmentation in vm not right") - def check_scp_file_valid_between_vms(self, file_size=1): + def check_scp_file_valid_between_vms(self, file_size=1024): """ scp file form VM1 to VM2, check the data is valid """ - # default file_size=1K + # default file_size=1024K data = '' for char in range(file_size * 1024): data += random.choice(self.random_string) @@ -353,7 +366,7 @@ class TestVM2VMVirtioNetPerf(TestCase): self.prepare_test_env(cbdma=True, no_pci=False, client_mode=False, enable_queues=1, nb_cores=2, server_mode=False, opt_queue=1, combined=False, rxq_txq=None) cbdma_value = self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='tso') - expect_value = self.get_suite_cfg()['expected_throughput'][self.running_case] + expect_value = self.get_suite_cfg()['expected_throughput']['test_vm2vm_split_ring_iperf_with_tso'] self.verify(cbdma_value > expect_value, "CBDMA enable performance: %s is lower than CBDMA disable: %s." %(cbdma_value, expect_value)) def test_vm2vm_split_ring_iperf_with_ufo(self): @@ -379,54 +392,69 @@ class TestVM2VMVirtioNetPerf(TestCase): """ TestCase5: VM2VM virtio-net split ring mergeable CBDMA enable test with large packet payload valid check """ - # This test case need to use QEMU 3.0 to test ipef_result = [] self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True) - self.logger.info("Launch vhost-testpmd with CBDMA and used 8 queue") + self.logger.info("Launch vhost with CBDMA and with 8 queue with VA mode") self.vm_args = "disable-modern=false,mrg_rxbuf=on,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on" self.prepare_test_env(cbdma=True, no_pci=False, client_mode=True, enable_queues=8, nb_cores=4, - server_mode=True, opt_queue=8, combined=True, rxq_txq=8, vm_config='vm') + server_mode=True, opt_queue=8, combined=True, rxq_txq=8, iova_mode='va') self.check_scp_file_valid_between_vms() iperf_data_cbdma_enable_8_queue = self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='tso') - ipef_result.append(['Enable', 'mergeable path', 8, iperf_data_cbdma_enable_8_queue]) + ipef_result.append(['Enable', 'mergeable path with VA mode', 8, iperf_data_cbdma_enable_8_queue]) - self.logger.info("Re-launch without CBDMA and used 8 queue") + self.logger.info("Re-launch and exchange CBDMA and with 8 queue with VA mode") self.vhost.send_expect("quit", "# ", 30) - self.start_vhost_testpmd(cbdma=False, no_pci=False, client_mode=True, enable_queues=8, nb_cores=4, rxq_txq=8) + self.start_vhost_testpmd(cbdma=True, no_pci=False, client_mode=True, enable_queues=8, nb_cores=4, rxq_txq=8, exchange_cbdma=True, iova_mode='va') self.check_scp_file_valid_between_vms() - iperf_data_cbdma_disable_8_queue = self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='tso') - ipef_result.append(['Disable','mergeable path', 8, iperf_data_cbdma_disable_8_queue]) + iperf_data_cbdma_enable_8_queue_exchange = self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='tso') + ipef_result.append(['Disable','mergeable path exchange CBDMA with VA mode', 8, iperf_data_cbdma_enable_8_queue_exchange]) + + # This test step need to test on 1G guest hugepage ENV. + if not self.check_2m_env: + self.logger.info("Re-launch and exchange CBDMA and with 8 queue with PA mode") + self.vhost.send_expect("quit", "# ", 30) + self.start_vhost_testpmd(cbdma=True, no_pci=False, client_mode=True, enable_queues=8, nb_cores=4, rxq_txq=8, exchange_cbdma=True, iova_mode='pa') + self.check_scp_file_valid_between_vms() + iperf_data_cbdma_enable_8_queue_exchange_pa = self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='tso') + ipef_result.append(['Disable', 'mergeable path exchange CBDMA with PA mode', 8, iperf_data_cbdma_enable_8_queue_exchange_pa]) - self.logger.info("Re-launch without CBDMA and used 1 queue") + self.logger.info("Re-launch without CBDMA and with 4 queue") self.vhost.send_expect("quit", "# ", 30) - self.start_vhost_testpmd(cbdma=False, no_pci=False, client_mode=True, enable_queues=8, nb_cores=4, rxq_txq=1) + self.start_vhost_testpmd(cbdma=False, no_pci=False, client_mode=True, enable_queues=4, nb_cores=4, rxq_txq=4) + self.config_vm_env(combined=True, rxq_txq=4) + self.check_scp_file_valid_between_vms() + iperf_data_cbdma_disable_4_queue = self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='tso') + ipef_result.append(['Disable', 'mergeable path without CBDMA with 4 queue', 4, iperf_data_cbdma_disable_4_queue]) + + self.logger.info("Re-launch without CBDMA and with 1 queue") + self.vhost.send_expect("quit", "# ", 30) + self.start_vhost_testpmd(cbdma=False, no_pci=False, client_mode=True, enable_queues=4, nb_cores=4, rxq_txq=1) self.config_vm_env(combined=True, rxq_txq=1) self.check_scp_file_valid_between_vms() iperf_data_cbdma_disable_1_queue = self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='tso') - ipef_result.append(['Disable', 'mergeable path', 1, iperf_data_cbdma_disable_1_queue]) + ipef_result.append(['Disable', 'mergeable path without CBDMA with 1 queue', 1, iperf_data_cbdma_disable_1_queue]) self.table_header = ['CBDMA Enable/Disable', 'Mode', 'rxq/txq', 'Gbits/sec'] self.result_table_create(self.table_header) for table_row in ipef_result: self.result_table_add(table_row) self.result_table_print() - self.verify(iperf_data_cbdma_enable_8_queue > iperf_data_cbdma_disable_8_queue, \ + self.verify(iperf_data_cbdma_enable_8_queue > iperf_data_cbdma_disable_4_queue, \ "CMDMA enable: %s is lower than CBDMA disable: %s" % ( - iperf_data_cbdma_enable_8_queue, iperf_data_cbdma_disable_8_queue)) + iperf_data_cbdma_enable_8_queue, iperf_data_cbdma_disable_4_queue)) def test_vm2vm_split_ring_with_no_mergeable_path_check_large_packet_and_cbdma_enable_8queue(self): """ TestCase6: VM2VM virtio-net split ring non-mergeable CBDMA enable test with large packet payload valid check """ - # This test case need to use QEMU 3.0 to test ipef_result = [] self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True) self.logger.info("Launch vhost-testpmd with CBDMA and used 8 queue") self.vm_args = "disable-modern=false,mrg_rxbuf=off,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on" self.prepare_test_env(cbdma=True, no_pci=False, client_mode=True, enable_queues=8, nb_cores=4, - server_mode=True, opt_queue=8, combined=True, rxq_txq=8, vm_config='vm') + server_mode=True, opt_queue=8, combined=True, rxq_txq=8) self.check_scp_file_valid_between_vms() iperf_data_cbdma_enable_8_queue = self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='tso') ipef_result.append(['Enable', 'no-mergeable path', 8, iperf_data_cbdma_enable_8_queue]) @@ -497,7 +525,6 @@ class TestVM2VMVirtioNetPerf(TestCase): """ Test Case 11: VM2VM virtio-net packed ring mergeable 8 queues CBDMA enable test with large packet payload valid check """ - # This test case need to use QEMU 3.0 to test ipef_result = [] self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True) @@ -509,8 +536,6 @@ class TestVM2VMVirtioNetPerf(TestCase): self.check_scp_file_valid_between_vms() iperf_data_cbdma_enable_8_queue = self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='tso') ipef_result.append(['Enable_%d' % i, 'mergeable path', 8, iperf_data_cbdma_enable_8_queue]) - if i > 0: - self.verify(abs(ipef_result[0][3]-ipef_result[i][3])/ipef_result[0][3] < 0.2 ,"Performance fluctuates too much") self.table_header = ['CBDMA Enable/Disable', 'Mode', 'rxq/txq', 'Gbits/sec'] self.result_table_create(self.table_header) for table_row in ipef_result: @@ -521,7 +546,6 @@ class TestVM2VMVirtioNetPerf(TestCase): """ Test Case 12: VM2VM virtio-net packed ring non-mergeable 8 queues CBDMA enable test with large packet payload valid check """ - # This test case need to use QEMU 3.0 to test ipef_result = [] self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True) @@ -533,8 +557,42 @@ class TestVM2VMVirtioNetPerf(TestCase): self.check_scp_file_valid_between_vms() iperf_data_cbdma_enable_8_queue = self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='tso') ipef_result.append(['Enable', 'mergeable path', 8, iperf_data_cbdma_enable_8_queue]) - if i > 0: - self.verify(abs(ipef_result[0][3]-ipef_result[i][3])/ipef_result[0][3] < 0.2 ,"Performance fluctuates too much") + self.table_header = ['CBDMA Enable/Disable', 'Mode', 'rxq/txq', 'Gbits/sec'] + self.result_table_create(self.table_header) + for table_row in ipef_result: + self.result_table_add(table_row) + self.result_table_print() + + def test_vm2vm_packed_ring_with_tso_and_cbdma_enable_iova_pa(self): + """ + Test Case 13: VM2VM packed ring vhost-user/virtio-net CBDMA enable test with tcp traffic when set iova=pa + """ + # This test case need to test on 1G guest hugepage ENV. + self.vm_args = "disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on" + self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=2) + self.prepare_test_env(cbdma=True, no_pci=False, client_mode=False, enable_queues=1, nb_cores=2, + server_mode=False, opt_queue=1, combined=False, rxq_txq=None, iova_mode='pa') + self.check_scp_file_valid_between_vms() + cbdma_value = self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='tso') + expect_value = self.get_suite_cfg()['expected_throughput']['test_vm2vm_split_ring_iperf_with_tso'] + self.verify(cbdma_value > expect_value, "CBDMA enable performance: %s is lower than CBDMA disable: %s." %(cbdma_value, expect_value)) + + def test_vm2vm_packed_ring_with_mergeable_path_check_large_packet_and_cbdma_enable_8queue_iova_pa(self): + """ + Test Case 14: VM2VM virtio-net packed ring mergeable 8 queues CBDMA enable and PA mode test with large packet payload valid check + """ + # This test case need to test on 1G guest hugepage ENV. + ipef_result = [] + self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True) + + self.logger.info("Launch vhost-testpmd with CBDMA and used 8 queue") + self.vm_args = "disable-modern=false,mrg_rxbuf=on,mq=on,vectors=40,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,guest_ufo=on,host_ufo=on,packed=on" + self.prepare_test_env(cbdma=True, no_pci=False, client_mode=False, enable_queues=8, nb_cores=4, + server_mode=False, opt_queue=8, combined=True, rxq_txq=8, iova_mode='pa') + for i in range(0,5): + self.check_scp_file_valid_between_vms() + iperf_data_cbdma_enable_8_queue = self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='tso') + ipef_result.append(['Enable_%d' % i, 'mergeable path', 8, iperf_data_cbdma_enable_8_queue]) self.table_header = ['CBDMA Enable/Disable', 'Mode', 'rxq/txq', 'Gbits/sec'] self.result_table_create(self.table_header) for table_row in ipef_result: