From patchwork Fri Nov 11 06:08:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 119751 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 B9EF7A0542; Fri, 11 Nov 2022 07:15:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B424C40150; Fri, 11 Nov 2022 07:15:08 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id A0A214014F for ; Fri, 11 Nov 2022 07:15:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668147306; x=1699683306; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=rvVk8m4qJUJXsTyDmIj7bvK5gzECet/tY92pQxY1j/Q=; b=a0d+ZkSTa412RazF5LFAzIpil78MOKgjMlSPkZpcoKVIEzBd+xlqR5VC EaSlzKf/5exNDvs7IW3vSWaGwIL9JM74JZwHtJtTuhugw7dac2fqOe4zT 3IpltyndkqEMbOqCTwNZkQeUhg91caN+eq3fWTBMfeXZm/qbDiaEKN9ik fSeTSq8+yrNATJeLUwosaQlfv8B2eCatd3snGpVAD228X0WBnF+vb+Ark QWUDrkiJM0zJUjkZ2Da0cy5QcPqWcEChXbhUFUCDgZ9vv01eIQUc4evKj LXn2gDSi2m560s+ZiWHtyXjGO7pirDUj8MUtmuKgyaeOp5TMblU1Gy/6Q w==; X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="311538005" X-IronPort-AV: E=Sophos;i="5.96,156,1665471600"; d="scan'208,223";a="311538005" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 22:15:05 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="639906600" X-IronPort-AV: E=Sophos;i="5.96,156,1665471600"; d="scan'208,223";a="639906600" Received: from unknown (HELO localhost.localdomain) ([10.239.252.222]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 22:15:04 -0800 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V2 1/2] test_plans/vhost_virtio_pmd_interrupt_cbdma_test_plan: modify the dmas parameter Date: Fri, 11 Nov 2022 14:08:25 +0800 Message-Id: <20221111060825.2421660-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 From DPDK-22.11, the dmas parameter have changed from `lcore-dma=[lcore1@0000:00:04.0]` to `dmas=[txq0@0000:00:04.0]` by DPDK local patch,so modify the dmas parameter. Signed-off-by: Wei Ling --- ...t_virtio_pmd_interrupt_cbdma_test_plan.rst | 107 ++++++------------ 1 file changed, 37 insertions(+), 70 deletions(-) diff --git a/test_plans/vhost_virtio_pmd_interrupt_cbdma_test_plan.rst b/test_plans/vhost_virtio_pmd_interrupt_cbdma_test_plan.rst index b9c0640d..ab37a4ab 100644 --- a/test_plans/vhost_virtio_pmd_interrupt_cbdma_test_plan.rst +++ b/test_plans/vhost_virtio_pmd_interrupt_cbdma_test_plan.rst @@ -1,35 +1,6 @@ .. SPDX-License-Identifier: BSD-3-Clause Copyright(c) 2022 Intel Corporation - 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. - ==================================================== vhost/virtio-pmd interrupt mode with cbdma test plan ==================================================== @@ -47,8 +18,7 @@ cover virtio 0.95, virtio 1.0 and virtio 1.1. 2.For split virtqueue virtio-net with multi-queues server mode test, better to use qemu version >= 5.2.0, dut to qemu(v4.2.0~v5.1.0) exist split ring multi-queues reconnection issue. 3.Kernel version > 4.8.0, mostly linux distribution don't support vfio-noiommu mode by default, so testing this case need rebuild kernel to enable vfio-noiommu. -4.When DMA devices are bound to vfio driver, VA mode is the default and recommended. For PA mode, page by page mapping may -exceed IOMMU's max capability, better to use 1G guest hugepage. +4.When DMA devices are bound to vfio driver, VA mode is the default and recommended. For PA mode, page by page mapping may exceed IOMMU's max capability, better to use 1G guest hugepage. 5.DPDK local patch that about vhost pmd is needed when testing Vhost asynchronous data path with testpmd. Prerequisites @@ -87,26 +57,26 @@ General set up Test case ========= -Test Case1: Basic virtio0.95 interrupt test with 16 queues and cbdma enable ---------------------------------------------------------------------------- +Test Case 1: Basic virtio0.95 interrupt test with 16 queues and cbdma enable +---------------------------------------------------------------------------- This case tests virtio0.95 pmd interrupt with l3fwd-power sample when vhost uses the asynchronous operations with CBDMA channels. 1. Bind 16 cbdma channels and one NIC port to vfio-pci, then launch testpmd by below command:: ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0x1ffff -n 4 \ - --vdev 'eth_vhost0,iface=vhost-net,queues=16,dmas=[txq0;txq1;txq2;txq3;txq4;txq5;txq6;txq7;txq8;txq9;txq10;txq11;txq12;txq13;txq14;txq15;rxq0;rxq1;rxq2;rxq3;rxq4;rxq5;rxq6;rxq7;rxq8;rxq9;rxq10;rxq11;rxq12;rxq13;rxq14;rxq15]' \ - -- -i --nb-cores=16 --rxq=16 --txq=16 --rss-ip --lcore-dma=[lcore1@0000:00:04.0,lcore2@0000:00:04.0,lcore3@0000:00:04.1,lcore3@0000:00:04.2,lcore4@0000:00:04.3,lcore5@0000:00:04.4,lcore6@0000:00:04.5,lcore7@0000:00:04.6,lcore8@0000:00:04.7,\ - lcore9@0000:80:04.0,lcore10@0000:80:04.1,lcore11@0000:80:04.2,lcore12@0000:80:04.3,lcore13@0000:80:04.4,lcore14@0000:80:04.5,lcore15@0000:80:04.6,lcore16@0000:80:04.7] + --vdev 'eth_vhost0,iface=vhost-net,queues=16,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;txq8@0000:00:04.0;txq9@0000:00:04.1;txq10@0000:00:04.2;txq11@0000:00:04.3;txq12@0000:00:04.4;txq13@0000:00:04.5;txq14@0000:00:04.6;txq15@0000:00:04.7;rxq0@0000:80:04.0;rxq1@0000:80:04.1;rxq2@0000:80:04.2;rxq3@0000:80:04.3;rxq4@0000:80:04.4;rxq5@0000:80:04.5;rxq6@0000:80:04.6;rxq7@0000:80:04.7;rxq8@0000:00:04.0;rxq9@0000:00:04.1;rxq10@0000:00:04.2;rxq11@0000:00:04.3;rxq12@0000:00:04.4;rxq13@0000:00:04.5;rxq14@0000:00:04.6;rxq15@0000:00:04.7]' \ + -- -i --nb-cores=16 --rxq=16 --txq=16 --rss-ip 2. Launch VM1, set queues=16, vectors>=2xqueues+2, mq=on:: - taskset -c 34-35 qemu-system-x86_64 -name us-vhost-vm2 \ + taskset -c 34-35 qemu-system-x86_64 -name vm1 \ -cpu host -enable-kvm -m 2048 -object memory-backend-file,id=mem,size=2048M,mem-path=/mnt/huge,share=on -numa node,memdev=mem -mem-prealloc \ - -smp cores=16,sockets=1 -drive file=/home/osimg/ubuntu1910.img \ - -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=char1,path=./vhost-net -netdev type=vhost-user,id=mynet2,chardev=char1,vhostforce,queues=16 \ - -device virtio-net-pci,mac=52:54:00:00:00:02,netdev=mynet2,disable-modern=ture,mrg_rxbuf=on,csum=on,mq=on,vectors=40 \ + -smp cores=16,sockets=1 -drive file=/home/osimg/ubuntu20-04.img \ + -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=char1,path=./vhost-net \ + -netdev type=vhost-user,id=mynet2,chardev=char1,vhostforce,queues=16 \ + -device virtio-net-pci,mac=52:54:00:00:00:02,netdev=mynet2,disable-modern=true,mrg_rxbuf=on,csum=on,mq=on,vectors=40 \ -vnc :11 -daemonize 3. Bind virtio port to vfio-pci:: @@ -118,8 +88,8 @@ This case tests virtio0.95 pmd interrupt with l3fwd-power sample when vhost uses 4. In VM, launch l3fwd-power sample:: ./x86_64-native-linuxapp-gcc/examples/dpdk-l3fwd-power -c 0x0ffff -n 4 --log-level='user1,7' \ - -- -p 1 -P --config '(0,0,0),(0,1,1),(0,2,2),(0,3,3)(0,4,4),(0,5,5),(0,6,6),(0,7,7)(0,8,8),(0,9,9),(0,10,10),(0,11,11)(0,12,12),(0,13,13),(0,14,14),(0,15,15)' \ - --no-numa --parse-ptype + -- -p 1 -P --config '(0,0,0),(0,1,1),(0,2,2),(0,3,3)(0,4,4),(0,5,5),(0,6,6),(0,7,7)(0,8,8),(0,9,9),(0,10,10),(0,11,11)(0,12,12),(0,13,13),(0,14,14),(0,15,15)' \ + --no-numa --parse-ptype 5. Send random dest IP packets to host NIC with packet generator, packets will distribute to all queues, check l3fwd-power log that all related cores are waked up. @@ -127,27 +97,26 @@ This case tests virtio0.95 pmd interrupt with l3fwd-power sample when vhost uses 7. Stop the date transmitter, check all related core will be back to sleep status. -Test Case2: Basic virtio-1.0 interrupt test with 4 queues and cbdma enable --------------------------------------------------------------------------- +Test Case 2: Basic virtio-1.0 interrupt test with 4 queues and cbdma enable +--------------------------------------------------------------------------- This case tests virtio1.0 pmd interrupt with l3fwd-power sample when vhost uses the asynchronous operations with CBDMA channels. -1. Bind four cbdma channels and one NIC port to vfio-pci, then launch testpmd by below command:: +1. Bind 2 cbdma channels and one NIC port to vfio-pci, then launch testpmd by below command:: ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0x7c -n 4 \ - --vdev 'net_vhost0,iface=vhost-net,queues=4,dmas=[txq0;txq1;txq2;txq3;rxq0;rxq1;rxq2;rxq3]' \ + --vdev 'net_vhost0,iface=vhost-net,queues=4,dmas=[txq0@0000:80:04.0;txq1@0000:80:04.0;txq2@0000:80:04.0;txq3@0000:80:04.0;rxq0@0000:80:04.1;rxq1@0000:80:04.1;rxq2@0000:80:04.1;rxq3@0000:80:04.1]' \ -- -i --nb-cores=4 --rxq=4 --txq=4 --rss-ip --lcore-dma=[lcore3@0000:00:04.0,lcore4@0000:00:04.0,lcore5@0000:00:04.0,lcore5@0000:00:04.1,lcore6@0000:00:04.1] 2. Launch VM1, set queues=4, vectors>=2xqueues+2, mq=on:: - taskset -c 34-35 \ - qemu-system-x86_64 -name us-vhost-vm2 \ + taskset -c 34-35 qemu-system-x86_64 -name vm1 \ -cpu host -enable-kvm -m 2048 -object memory-backend-file,id=mem,size=2048M,mem-path=/mnt/huge,share=on -numa node,memdev=mem -mem-prealloc \ - -smp cores=4,sockets=1 -drive file=/home/osimg/ubuntu1910.img \ - -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=char1,path=./vhost-net -netdev type=vhost-user,id=mynet2,chardev=char1,vhostforce,queues=4 \ - -device virtio-net-pci,mac=52:54:00:00:00:02,netdev=mynet2,disable-modern=false,mrg_rxbuf=on,csum=on,mq=on,vectors=15 \ - -vnc :11 -daemonize + -smp cores=4,sockets=1 -drive file=/home/osimg/ubuntu20-04.img \ + -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=char1,path=./vhost-net \ + -netdev type=vhost-user,id=mynet2,chardev=char1,vhostforce,queues=4 \ + -device virtio-net-pci,mac=52:54:00:00:00:02,netdev=mynet2,disable-modern=false,mrg_rxbuf=on,csum=on,mq=on,vectors=15 -vnc :11 -daemonize 3. Bind virtio port to vfio-pci:: @@ -165,28 +134,26 @@ This case tests virtio1.0 pmd interrupt with l3fwd-power sample when vhost uses 7. Stop the date transmitter, check all related core will be back to sleep status. -Test Case3: Basic virtio-1.1 interrupt test with 16 queues and cbdma enable ------------------------------------------------------------------------------ +Test Case 3: Basic virtio-1.1 interrupt test with 16 queues and cbdma enable +---------------------------------------------------------------------------- This case tests packed ring virtio-pmd interrupt with l3fwd-power sample when vhost uses the asynchronous operations with CBDMA channels. -1. Bind 16 cbdma channels ports and one NIC port to vfio-pci, then launch testpmd by below command:: +1. Bind 4 cbdma channels ports and one NIC port to vfio-pci, then launch testpmd by below command:: ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0x1ffff -n 4 \ - --vdev 'eth_vhost0,iface=vhost-net,queues=16,dmas=[txq0;txq1;txq2;txq3;txq4;txq5;txq6;txq7;txq8;txq9;txq10;txq11;txq12;txq13;txq14;txq15;rxq0;rxq1;rxq2;rxq3;rxq4;rxq5;rxq6;rxq7;rxq8;rxq9;rxq10;rxq11;rxq12;rxq13;rxq14;rxq15]' \ - -- -i --nb-cores=16 --rxq=16 --txq=16 --rss-ip --lcore-dma=[lcore1@0000:00:04.0,lcore2@0000:00:04.0,lcore3@0000:00:04.1,lcore3@0000:00:04.2,lcore4@0000:00:04.3,lcore5@0000:00:04.4,lcore6@0000:00:04.5,lcore7@0000:00:04.6,lcore8@0000:00:04.7,\ - lcore9@0000:80:04.0,lcore10@0000:80:04.1,lcore11@0000:80:04.2,lcore12@0000:80:04.3,lcore13@0000:80:04.4,lcore14@0000:80:04.5,lcore15@0000:80:04.6,lcore16@0000:80:04.7] + --vdev 'eth_vhost0,iface=vhost-net,queues=16,dmas=[txq0@0000:80:04.0;txq1@0000:80:04.0;txq2@0000:80:04.0;txq3@0000:80:04.0;txq4@0000:80:04.1;txq5@0000:80:04.1;txq6@0000:80:04.1;txq7@0000:80:04.1;txq8@0000:80:04.2;txq9@0000:80:04.2;txq10@0000:80:04.2;txq11@0000:80:04.2;txq12@0000:80:04.3;txq13@0000:80:04.3;txq14@0000:80:04.3;txq15@0000:80:04.3;rxq0@0000:80:04.0;rxq1@0000:80:04.0;rxq2@0000:80:04.0;rxq3@0000:80:04.0;rxq4@0000:80:04.1;rxq5@0000:80:04.1;rxq6@0000:80:04.1;rxq7@0000:80:04.1;rxq8@0000:80:04.2;rxq9@0000:80:04.2;rxq10@0000:80:04.2;rxq11@0000:80:04.2;rxq12@0000:80:04.3;rxq13@0000:80:04.3;rxq14@0000:80:04.3;rxq15@0000:80:04.3]' \ + -- -i --nb-cores=16 --rxq=16 --txq=16 --rss-ip 2. Launch VM1, set queues=16, vectors>=2xqueues+2, mq=on:: - taskset -c 34-35 \ - qemu-system-x86_64 -name us-vhost-vm2 \ + taskset -c 34-35 qemu-system-x86_64 -name us-vhost-vm1 \ -cpu host -enable-kvm -m 2048 -object memory-backend-file,id=mem,size=2048M,mem-path=/mnt/huge,share=on -numa node,memdev=mem -mem-prealloc \ - -smp cores=16,sockets=1 -drive file=/home/osimg/ubuntu1910.img \ - -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=char1,path=./vhost-net -netdev type=vhost-user,id=mynet2,chardev=char1,vhostforce,queues=16 \ - -device virtio-net-pci,mac=52:54:00:00:00:02,netdev=mynet2,disable-modern=false,mrg_rxbuf=on,csum=on,mq=on,vectors=40,packed=on \ - -vnc :11 -daemonize + -smp cores=16,sockets=1 -drive file=/home/osimg/ubuntu20-04.img \ + -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=char1,path=./vhost-net \ + -netdev type=vhost-user,id=mynet2,chardev=char1,vhostforce,queues=16 \ + -device virtio-net-pci,mac=52:54:00:00:00:02,netdev=mynet2,mrg_rxbuf=on,csum=on,mq=on,vectors=40,packed=on -vnc :11 -daemonize 3. Bind virtio port to vfio-pci:: From patchwork Fri Nov 11 06:08:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 119752 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 DC30DA0542; Fri, 11 Nov 2022 07:15:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D66C440F16; Fri, 11 Nov 2022 07:15:17 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id CAAFA4014F for ; Fri, 11 Nov 2022 07:15:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668147317; x=1699683317; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=aUA+p+AQarPLupIAKE9vL97ZoXBk3KJ1YOl6urLJDrs=; b=iavs4Byuy89oS6Rn+tKCRWtJfHFiNgvsW36n9b/LzG92uDojXOjSsV6m EYcOjM/3vG5iR4I7Lku1UTC7U4kxmjDe/Oiz9VCClV37cuj14nZKPjVbB G8Xok+yCJX2kAS76+7YQA/EnoHbMrn+LdTkzZgSyyeInXkcRxHuRx9T91 hhka1eEH/yof+opqgALbub7ReE/WII8X19VuXZSNAIIE47nEQBayCIGWb GMINgoKjxjJqr4B3hs13RkjzWkhCaREYdMh48z/9+SZpkd0+L4+VyzrGP rC2ETdfCqUNWHczcbyYJZVZ0Ma/LAmcfNV3tau1b1SbGPqKvzJj1vQxDZ w==; X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="312679343" X-IronPort-AV: E=Sophos;i="5.96,156,1665471600"; d="scan'208,223";a="312679343" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 22:15:15 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="639906772" X-IronPort-AV: E=Sophos;i="5.96,156,1665471600"; d="scan'208,223";a="639906772" Received: from unknown (HELO localhost.localdomain) ([10.239.252.222]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 22:15:13 -0800 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V2 2/2] tests/vhost_virtio_pmd_interrupt_cbdma: modify the dmas parameter Date: Fri, 11 Nov 2022 14:08:34 +0800 Message-Id: <20221111060834.2421720-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 From DPDK-22.11, the dmas parameter have changed from `lcore-dma=[lcore1@0000:00:04.0]` to `dmas=[txq0@0000:00:04.0]` by DPDK local patch,so modify the dmas parameter. Signed-off-by: Wei Ling --- ...tSuite_vhost_virtio_pmd_interrupt_cbdma.py | 236 ++++++++++-------- 1 file changed, 133 insertions(+), 103 deletions(-) diff --git a/tests/TestSuite_vhost_virtio_pmd_interrupt_cbdma.py b/tests/TestSuite_vhost_virtio_pmd_interrupt_cbdma.py index 2d51dbf0..f50aeaae 100644 --- a/tests/TestSuite_vhost_virtio_pmd_interrupt_cbdma.py +++ b/tests/TestSuite_vhost_virtio_pmd_interrupt_cbdma.py @@ -305,65 +305,78 @@ class TestVhostVirtioPmdInterruptCbdma(TestCase): Test Case1: Basic virtio0.95 interrupt test with 16 queues and cbdma enable """ self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True) - lcore_dma = ( - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s" + dmas = ( + "txq0@%s;" + "txq1@%s;" + "txq2@%s;" + "txq3@%s;" + "txq4@%s;" + "txq5@%s;" + "txq6@%s;" + "txq7@%s;" + "txq8@%s;" + "txq9@%s;" + "txq10@%s;" + "txq11@%s;" + "txq12@%s;" + "txq13@%s;" + "txq14@%s;" + "txq15@%s;" + "rxq0@%s;" + "rxq1@%s;" + "rxq2@%s;" + "rxq3@%s;" + "rxq4@%s;" + "rxq5@%s;" + "rxq6@%s;" + "rxq7@%s;" + "rxq8@%s;" + "rxq9@%s;" + "rxq10@%s;" + "rxq11@%s;" + "rxq12@%s;" + "rxq13@%s;" + "rxq14@%s;" + "rxq15@%s" % ( - self.vhost_core_list[1], self.cbdma_list[0], - self.vhost_core_list[2], + self.cbdma_list[1], + self.cbdma_list[2], + self.cbdma_list[3], + self.cbdma_list[4], + self.cbdma_list[5], + self.cbdma_list[6], + self.cbdma_list[7], + self.cbdma_list[8], + self.cbdma_list[9], + self.cbdma_list[10], + self.cbdma_list[11], + self.cbdma_list[12], + self.cbdma_list[13], + self.cbdma_list[14], + self.cbdma_list[15], self.cbdma_list[0], - self.vhost_core_list[3], self.cbdma_list[1], - self.vhost_core_list[3], self.cbdma_list[2], - self.vhost_core_list[4], self.cbdma_list[3], - self.vhost_core_list[5], self.cbdma_list[4], - self.vhost_core_list[6], self.cbdma_list[5], - self.vhost_core_list[7], self.cbdma_list[6], - self.vhost_core_list[8], self.cbdma_list[7], - self.vhost_core_list[9], self.cbdma_list[8], - self.vhost_core_list[10], self.cbdma_list[9], - self.vhost_core_list[11], self.cbdma_list[10], - self.vhost_core_list[12], self.cbdma_list[11], - self.vhost_core_list[13], self.cbdma_list[12], - self.vhost_core_list[14], self.cbdma_list[13], - self.vhost_core_list[15], self.cbdma_list[14], - self.vhost_core_list[16], self.cbdma_list[15], ) ) - vhost_param = ( - "--nb-cores=16 --rxq=16 --txq=16 --rss-ip --lcore-dma=[%s]" % lcore_dma + vhost_param = "--nb-cores=16 --rxq=16 --txq=16 --rss-ip" + vhost_eal_param = ( + "--vdev 'eth_vhost0,iface=vhost-net,queues=16,dmas=[%s]'" % dmas ) - vhost_eal_param = "--vdev 'eth_vhost0,iface=vhost-net,queues=16,dmas=[txq0;txq1;txq2;txq3;txq4;txq5;txq6;txq7;txq8;txq9;txq10;txq11;txq12;txq13;txq14;txq15;rxq0;rxq1;rxq2;rxq3;rxq4;rxq5;rxq6;rxq7;rxq8;rxq9;rxq10;rxq11;rxq12;rxq13;rxq14;rxq15]'" ports = self.cbdma_list ports.append(self.dut.ports_info[0]["pci"]) self.vhost_pmd.start_testpmd( @@ -386,26 +399,30 @@ class TestVhostVirtioPmdInterruptCbdma(TestCase): Test Case2: Basic virtio-1.0 interrupt test with 4 queues and cbdma enable """ self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=4) - lcore_dma = ( - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," + dmas = ( + "txq0@%s;" + "txq1@%s;" + "txq2@%s;" + "txq3@%s;" + "rxq0@%s;" + "rxq1@%s;" + "rxq2@%s;" + "rxq3@%s" % ( - self.vhost_core_list[1], self.cbdma_list[0], - self.vhost_core_list[2], + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[1], + self.cbdma_list[1], self.cbdma_list[1], - self.vhost_core_list[3], - self.cbdma_list[2], - self.vhost_core_list[4], - self.cbdma_list[3], ) ) - vhost_param = ( - "--nb-cores=4 --rxq=4 --txq=4 --rss-ip --lcore-dma=[%s]" % lcore_dma + vhost_param = "--nb-cores=4 --rxq=4 --txq=4 --rss-ip" + vhost_eal_param = ( + "--vdev 'net_vhost0,iface=vhost-net,queues=4,dmas=[%s]'" % dmas ) - vhost_eal_param = "--vdev 'net_vhost0,iface=vhost-net,queues=4,dmas=[txq0;txq1;txq2;txq3;rxq0;rxq1;rxq2;rxq3]'" ports = self.cbdma_list ports.append(self.dut.ports_info[0]["pci"]) self.vhost_pmd.start_testpmd( @@ -429,66 +446,79 @@ class TestVhostVirtioPmdInterruptCbdma(TestCase): """ Test Case3: Packed ring virtio interrupt test with 16 queues and cbdma enable """ - self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=16, allow_diff_socket=True) - lcore_dma = ( - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s," - "lcore%s@%s" + self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=4, allow_diff_socket=True) + dmas = ( + "txq0@%s;" + "txq1@%s;" + "txq2@%s;" + "txq3@%s;" + "txq4@%s;" + "txq5@%s;" + "txq6@%s;" + "txq7@%s;" + "txq8@%s;" + "txq9@%s;" + "txq10@%s;" + "txq11@%s;" + "txq12@%s;" + "txq13@%s;" + "txq14@%s;" + "txq15@%s;" + "rxq0@%s;" + "rxq1@%s;" + "rxq2@%s;" + "rxq3@%s;" + "rxq4@%s;" + "rxq5@%s;" + "rxq6@%s;" + "rxq7@%s;" + "rxq8@%s;" + "rxq9@%s;" + "rxq10@%s;" + "rxq11@%s;" + "rxq12@%s;" + "rxq13@%s;" + "rxq14@%s;" + "rxq15@%s" % ( - self.vhost_core_list[1], self.cbdma_list[0], - self.vhost_core_list[2], self.cbdma_list[0], - self.vhost_core_list[3], + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[1], self.cbdma_list[1], - self.vhost_core_list[3], + self.cbdma_list[1], + self.cbdma_list[2], + self.cbdma_list[2], + self.cbdma_list[2], self.cbdma_list[2], - self.vhost_core_list[4], self.cbdma_list[3], - self.vhost_core_list[5], - self.cbdma_list[4], - self.vhost_core_list[6], - self.cbdma_list[5], - self.vhost_core_list[7], - self.cbdma_list[6], - self.vhost_core_list[8], - self.cbdma_list[7], - self.vhost_core_list[9], - self.cbdma_list[8], - self.vhost_core_list[10], - self.cbdma_list[9], - self.vhost_core_list[11], - self.cbdma_list[10], - self.vhost_core_list[12], - self.cbdma_list[11], - self.vhost_core_list[13], - self.cbdma_list[12], - self.vhost_core_list[14], - self.cbdma_list[13], - self.vhost_core_list[15], - self.cbdma_list[14], - self.vhost_core_list[16], - self.cbdma_list[15], + self.cbdma_list[3], + self.cbdma_list[3], + self.cbdma_list[3], + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[0], + self.cbdma_list[1], + self.cbdma_list[1], + self.cbdma_list[1], + self.cbdma_list[1], + self.cbdma_list[2], + self.cbdma_list[2], + self.cbdma_list[2], + self.cbdma_list[2], + self.cbdma_list[3], + self.cbdma_list[3], + self.cbdma_list[3], + self.cbdma_list[3], ) ) - vhost_param = ( - "--nb-cores=16 --rxq=16 --txq=16 --rss-ip --lcore-dma=[%s]" % lcore_dma + vhost_param = "--nb-cores=16 --rxq=16 --txq=16 --rss-ip" + vhost_eal_param = ( + "--vdev 'eth_vhost0,iface=vhost-net,queues=16,dmas=[%s]'" % dmas ) - vhost_eal_param = "--vdev 'eth_vhost0,iface=vhost-net,queues=16,dmas=[txq0;txq1;txq2;txq3;txq4;txq5;txq6;txq7;txq8;txq9;txq10;txq11;txq12;txq13;txq14;txq15;rxq0;rxq1;rxq2;rxq3;rxq4;rxq5;rxq6;rxq7;rxq8;rxq9;rxq10;rxq11;rxq12;rxq13;rxq14;rxq15]'" ports = self.cbdma_list ports.append(self.dut.ports_info[0]["pci"]) self.vhost_pmd.start_testpmd(