From patchwork Wed Nov 9 05:57:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 119591 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 B8743A0093; Wed, 9 Nov 2022 07:03:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B418740150; Wed, 9 Nov 2022 07:03:37 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 7331F400D4 for ; Wed, 9 Nov 2022 07:03:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667973815; x=1699509815; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=TAOO/pF1hvBqL82Il7zbDQ+yY5axYdjwI4aPraz35Ns=; b=XWn98kHAccH50Qbuql7hkTK1YMLUiCocG9KOsbpjW5fcam85EnWUx/Qf tl+An8VcusYrjxPBSF2+ZIm4BAK4TO01QDk0Oe6GHzfEulgghnTF/wuv6 trmEKp/1x8zrDcFtvVJfurS/NyMax83z7lVxweZlrv0cUefwumd3d+XE0 uXmiMQdO0hIK22h9MMc/rNr8IMIMtHLfyLwIabljH/mOy17pTLXXu5uzE SOEJzEGUSRFyt5pgPqELCITpOx8A29UdJQEQJ9oKRiUS4SNv03o64XZen pf9u9Xie/5zzvn5dYnz3112k55XVpk0KBNY4MkVuJqJ6azCcin5+u9w2/ A==; X-IronPort-AV: E=McAfee;i="6500,9779,10525"; a="290614730" X-IronPort-AV: E=Sophos;i="5.96,149,1665471600"; d="scan'208,223";a="290614730" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2022 22:03:34 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10525"; a="705580340" X-IronPort-AV: E=Sophos;i="5.96,149,1665471600"; d="scan'208,223";a="705580340" Received: from unknown (HELO localhost.localdomain) ([10.239.252.222]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2022 22:03:33 -0800 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V1 1/2] test_plans/virtio_event_idx_interrupt_cbdma_test_plan: modify the dmas parameter Date: Wed, 9 Nov 2022 13:57:10 +0800 Message-Id: <20221109055710.1207699-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, so modify the dmas parameter in the testplan. Signed-off-by: Wei Ling --- ...io_event_idx_interrupt_cbdma_test_plan.rst | 94 +++++++++---------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/test_plans/virtio_event_idx_interrupt_cbdma_test_plan.rst b/test_plans/virtio_event_idx_interrupt_cbdma_test_plan.rst index 0926e052..1b8f17c6 100644 --- a/test_plans/virtio_event_idx_interrupt_cbdma_test_plan.rst +++ b/test_plans/virtio_event_idx_interrupt_cbdma_test_plan.rst @@ -15,7 +15,6 @@ virtio event idx interrupt with cbdma enable. Also need cover driver reload test ..Note: 1.For packed virtqueue virtio-net test, need qemu version > 4.2.0 and VM kernel version > 5.1, and packed ring multi-queues not support reconnect in qemu yet. 2.For split virtqueue virtio-net with multi-queues server mode test, need qemu version >= 5.2.0, dut to old qemu exist reconnect issue when multi-queues test. -3.DPDK local patch that about vhost pmd is needed when testing Vhost asynchronous data path with testpmd. Prerequisites ============= @@ -55,25 +54,27 @@ Test case Test Case1: Split ring virtio-pci driver reload test with CBDMA enable ---------------------------------------------------------------------- -This case tests split ring event idx interrupt mode workable after reload virtio-pci driver several times when vhost uses the asynchronous operations with CBDMA channels. +This case tests split ring event idx interrupt mode workable after reload +virtio-pci driver several times when vhost uses the asynchronous +operations with CBDMA channels. 1. Bind one nic port and one cbdma channel to vfio-pci, then launch the vhost sample by below commands:: rm -rf vhost-net* ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xF0000000 -n 4 --file-prefix=vhost \ - --vdev 'net_vhost,iface=vhost-net,queues=1,dmas=[txq0;rxq0]' \ - -- -i --nb-cores=1 --txd=1024 --rxd=1024 --lcore-dma=[lcore29@0000:00:04.0] + --vdev 'net_vhost,iface=vhost-net,queues=1,dmas=[txq0@0000:00:04.0;rxq0@0000:00:04.0]' \ + -- -i --nb-cores=1 --txd=1024 --rxd=1024 testpmd> start 2. Launch VM:: - taskset -c 32-33 \ - qemu-system-x86_64 -name us-vhost-vm1 \ + taskset -c 32-33 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=1,sockets=1 -drive file=/home/osimg/ubuntu2004_1.img \ - -monitor unix:/tmp/vm2_monitor.sock,server,nowait -device e1000,netdev=nttsip1 \ - -netdev user,id=nttsip1,hostfwd=tcp:127.0.0.1:6000-:22 \ - -chardev socket,id=char1,path=./vhost-net -netdev type=vhost-user,id=mynet1,chardev=char1,vhostforce \ + -smp cores=1,sockets=1 -drive file=/home/osimg/ubuntu2004.img \ + -monitor unix:/tmp/vm2_monitor.sock,server,nowait \ + -device e1000,netdev=nttsip1 -netdev user,id=nttsip1,hostfwd=tcp:127.0.0.1:6000-:22 \ + -chardev socket,id=char1,path=./vhost-net \ + -netdev type=vhost-user,id=mynet1,chardev=char1,vhostforce \ -device virtio-net-pci,mac=52:54:00:00:00:02,netdev=mynet1,mrg_rxbuf=on,csum=on,gso=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on \ -vnc :11 -daemonize @@ -97,28 +98,27 @@ This case tests split ring event idx interrupt mode workable after reload virtio Test Case2: Split ring 16 queues virtio-net event idx interrupt mode test with cbdma enable ------------------------------------------------------------------------------------------- -This case tests the split ring virtio-net event idx interrupt with 16 queues and when vhost uses the asynchronous operations with CBDMA channels. +This case tests the split ring virtio-net event idx interrupt with 16 queues and when +vhost uses the asynchronous operations with CBDMA channels. -1. Bind one nic port and 16 cbdma channels to vfio-pci, then launch the vhost sample by below commands:: +1. Bind one nic port and 4 cbdma channels to vfio-pci, then launch the vhost sample by below commands:: rm -rf vhost-net* ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-17 -n 4 --file-prefix=vhost \ - --vdev 'net_vhost,iface=vhost-net,queues=16,client=1,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 --txd=1024 --rxd=1024 --rxq=16 --txq=16 \ - --lcore-dma=[lcore2@0000:00:04.0,lcore3@0000:00:04.1,lcore4@0000:00:04.2,lcore5@0000:00:04.3,lcore6@0000:00:04.4,lcore7@0000:00:04.5,lcore8@0000:00:04.6,lcore9@0000:00:04.7,\ - lcore10@0000:80:04.0,lcore11@0000:80:04.1,lcore12@0000:80:04.2,lcore13@0000:80:04.3,lcore14@0000:80:04.4,lcore15@0000:80:04.5,lcore16@0000:80:04.6,lcore17@0000:80:04.7] + --vdev 'net_vhost,iface=vhost-net,queues=16,client=1,dmas=[txq0@0000:00:04.0;txq1@0000:00:04.0;txq2@0000:00:04.0;txq3@0000:00:04.0;txq4@0000:00:04.0;txq5@0000:00:04.0;txq6@0000:00:04.0;txq7@0000:00:04.0;txq8@0000:00:04.1;txq9@0000:00:04.1;txq10@0000:00:04.1;txq11@0000:00:04.1;txq12@0000:00:04.1;txq13@0000:00:04.1;txq14@0000:00:04.1;txq15@0000:00:04.1;rxq0@0000:00:04.2;rxq1@0000:00:04.2;rxq2@0000:00:04.2;rxq3@0000:00:04.2;rxq4@0000:00:04.2;rxq5@0000:00:04.2;rxq6@0000:00:04.2;rxq7@0000:00:04.2;rxq8@0000:00:04.3;rxq9@0000:00:04.3;rxq10@0000:00:04.3;rxq11@0000:00:04.3;rxq12@0000:00:04.3;rxq13@0000:00:04.3;rxq14@0000:00:04.3;rxq15@0000:00:04.3]' \ + -- -i --nb-cores=16 --txd=1024 --rxd=1024 --rxq=16 --txq=16 testpmd> start 2. Launch VM:: - taskset -c 32-33 \ - qemu-system-x86_64 -name us-vhost-vm1 \ + taskset -c 32-33 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=1,sockets=1 -drive file=/home/osimg/ubuntu2004_1.img \ - -monitor unix:/tmp/vm2_monitor.sock,server,nowait -device e1000,netdev=nttsip1 \ - -netdev user,id=nttsip1,hostfwd=tcp:127.0.0.1:6000-:22 \ - -chardev socket,id=char1,path=./vhost-net -netdev type=vhost-user,id=mynet1,chardev=char1,vhostforce \ - -device virtio-net-pci,mac=52:54:00:00:00:02,netdev=mynet1,mrg_rxbuf=on,csum=on,gso=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on \ + -smp cores=1,sockets=1 -drive file=/home/osimg/ubuntu2004.img \ + -monitor unix:/tmp/vm2_monitor.sock,server,nowait \ + -device e1000,netdev=nttsip1 -netdev user,id=nttsip1,hostfwd=tcp:127.0.0.1:6000-:22 \ + -chardev socket,id=char1,path=./vhost-net \ + -netdev type=vhost-user,id=mynet1,chardev=char1,vhostforce \ + -device virtio-net-pci,mac=52:54:00:00:00:02,netdev=mynet1,mrg_rxbuf=on,csum=on,gso=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on \ -vnc :11 -daemonize 3. On VM1, give virtio device IP and enable vitio-net with 16 quques:: @@ -138,26 +138,28 @@ This case tests the split ring virtio-net event idx interrupt with 16 queues and Test Case3: Packed ring virtio-pci driver reload test with CBDMA enable ----------------------------------------------------------------------- -This case tests packed ring event idx interrupt mode workable after reload virtio-pci driver several times when uses the asynchronous operations with CBDMA channels. +This case tests packed ring event idx interrupt mode workable after reload +virtio-pci driver several times when uses the asynchronous operations +with CBDMA channels. 1. Bind one nic port and one cbdma channel to vfio-pci, then launch the vhost sample by below commands:: rm -rf vhost-net* ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xF0000000 -n 4 --file-prefix=vhost \ - --vdev 'net_vhost,iface=vhost-net,queues=1,dmas=[txq0;rxq0]' \ - -- -i --nb-cores=1 --txd=1024 --rxd=1024 --lcore-dma=[lcore29@0000:00:04.0] + --vdev 'net_vhost,iface=vhost-net,queues=1,dmas=[txq0@0000:00:04.0;rxq0@0000:00:04.0]' \ + -- -i --nb-cores=1 --txd=1024 --rxd=1024 testpmd> start 2. Launch VM:: - taskset -c 32-33 \ - qemu-system-x86_64 -name us-vhost-vm1 \ + taskset -c 32-33 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=1,sockets=1 -drive file=/home/osimg/ubuntu2004_1.img \ - -monitor unix:/tmp/vm2_monitor.sock,server,nowait -device e1000,netdev=nttsip1 \ - -netdev user,id=nttsip1,hostfwd=tcp:127.0.0.1:6000-:22 \ - -chardev socket,id=char1,path=./vhost-net -netdev type=vhost-user,id=mynet1,chardev=char1,vhostforce \ - -device virtio-net-pci,mac=52:54:00:00:00:02,netdev=mynet1,mrg_rxbuf=on,csum=on,gso=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on \ + -smp cores=1,sockets=1 -drive file=/home/osimg/ubuntu2004.img \ + -monitor unix:/tmp/vm2_monitor.sock,server,nowait \ + -device e1000,netdev=nttsip1 -netdev user,id=nttsip1,hostfwd=tcp:127.0.0.1:6000-:22 \ + -chardev socket,id=char1,path=./vhost-net \ + -netdev type=vhost-user,id=mynet1,chardev=char1,vhostforce \ + -device virtio-net-pci,mac=52:54:00:00:00:02,netdev=mynet1,mrg_rxbuf=on,csum=on,gso=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on \ -vnc :11 -daemonize 3. On VM1, set virtio device IP, send 10M packets from packet generator to nic then check virtio device can receive packets:: @@ -180,28 +182,27 @@ This case tests packed ring event idx interrupt mode workable after reload virti Test Case4: Packed ring 16 queues virtio-net event idx interrupt mode test with cbdma enable -------------------------------------------------------------------------------------------- -This case tests the packed ring virtio-net event idx interrupt with 16 queues and when vhost uses the asynchronous operations with CBDMA channels. +This case tests the packed ring virtio-net event idx interrupt with 16 queues and when vhost +uses the asynchronous operations with CBDMA channels. -1. Bind one nic port and 16 cbdma channels to vfio-pci, then launch the vhost sample by below commands:: +1. Bind one nic port and 4 cbdma channels to vfio-pci, then launch the vhost sample by below commands:: rm -rf vhost-net* ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-17 -n 4 --file-prefix=vhost \ - --vdev 'net_vhost,iface=vhost-net,queues=16,client=1,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 --txd=1024 --rxd=1024 --rxq=16 --txq=16 \ - --lcore-dma=[lcore2@0000:00:04.0,lcore3@0000:00:04.1,lcore4@0000:00:04.2,lcore5@0000:00:04.3,lcore6@0000:00:04.4,lcore7@0000:00:04.5,lcore8@0000:00:04.6,lcore9@0000:00:04.7,\ - lcore10@0000:80:04.0,lcore11@0000:80:04.1,lcore12@0000:80:04.2,lcore13@0000:80:04.3,lcore14@0000:80:04.4,lcore15@0000:80:04.5,lcore15@0000:80:04.6,lcore15@0000:80:04.7] + --vdev 'net_vhost,iface=vhost-net,queues=16,client=1,dmas=[txq0@0000:00:04.0;txq1@0000:00:04.0;txq2@0000:00:04.0;txq3@0000:00:04.0;txq4@0000:00:04.0;txq5@0000:00:04.0;txq6@0000:00:04.0;txq7@0000:00:04.0;txq8@0000:00:04.1;txq9@0000:00:04.1;txq10@0000:00:04.1;txq11@0000:00:04.1;txq12@0000:00:04.1;txq13@0000:00:04.1;txq14@0000:00:04.1;txq15@0000:00:04.1;rxq0@0000:00:04.2;rxq1@0000:00:04.2;rxq2@0000:00:04.2;rxq3@0000:00:04.2;rxq4@0000:00:04.2;rxq5@0000:00:04.2;rxq6@0000:00:04.2;rxq7@0000:00:04.2;rxq8@0000:00:04.3;rxq9@0000:00:04.3;rxq10@0000:00:04.3;rxq11@0000:00:04.3;rxq12@0000:00:04.3;rxq13@0000:00:04.3;rxq14@0000:00:04.3;rxq15@0000:00:04.3]' \ + -- -i --nb-cores=16 --txd=1024 --rxd=1024 --rxq=16 --txq=16 testpmd> start 2. Launch VM:: - taskset -c 32-33 \ - qemu-system-x86_64 -name us-vhost-vm1 \ + taskset -c 32-33 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=1,sockets=1 -drive file=/home/osimg/ubuntu2004_1.img \ - -monitor unix:/tmp/vm2_monitor.sock,server,nowait -device e1000,netdev=nttsip1 \ - -netdev user,id=nttsip1,hostfwd=tcp:127.0.0.1:6000-:22 \ - -chardev socket,id=char1,path=./vhost-net -netdev type=vhost-user,id=mynet1,chardev=char1,vhostforce \ - -device virtio-net-pci,mac=52:54:00:00:00:02,netdev=mynet1,mrg_rxbuf=on,csum=on,gso=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on \ + -smp cores=1,sockets=1 -drive file=/home/osimg/ubuntu2004.img \ + -monitor unix:/tmp/vm2_monitor.sock,server,nowait \ + -device e1000,netdev=nttsip1 -netdev user,id=nttsip1,hostfwd=tcp:127.0.0.1:6000-:22 \ + -chardev socket,id=char1,path=./vhost-net \ + -netdev type=vhost-user,id=mynet1,chardev=char1,vhostforce \ + -device virtio-net-pci,mac=52:54:00:00:00:02,netdev=mynet1,mrg_rxbuf=on,csum=on,gso=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on \ -vnc :11 -daemonize 3. On VM1, configure virtio device IP and enable vitio-net with 16 quques:: @@ -218,4 +219,3 @@ This case tests the packed ring virtio-net event idx interrupt with 16 queues an testpmd> stop testpmd> start testpmd> stop - From patchwork Wed Nov 9 05:57:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 119592 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 E47A8A0093; Wed, 9 Nov 2022 07:04:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DDE5040151; Wed, 9 Nov 2022 07:04:03 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id 96BD5400D4 for ; Wed, 9 Nov 2022 07:04:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667973842; x=1699509842; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=3wB1zV2uAnlQ98qo2FU2g+/9Xl558qWispVm7SHyAho=; b=buoMylg8WC3EW/KMCBvxv0e1dJNrchMgWyZ/Y7l3eeaBJ93vPzgq87xp u6igzQGgchNrJAs+134EHLDRbgFAr3oMjt3P+a8303s9tG+gU3XY9tEaY MQZT1/lp1a0u+ngYqcgSjdrMZuxJU2pZmf0M9YquEXnZre8U7SyK10nCZ uxhl6oIaT3/mZ5t/6a1rRX6NhhGrcL98vtliJvq59Q1jxQRFpTOTaRN8K 4GSm1Qbh6JW/4fk63iqCS+mZWf8TFZtOX49Hq0TYnlr5jJtCBgl7DXOnb niRn46zbiGO9SqioM1zZKWcxuEEbivnJmc+7NWoZQypfJnyfKU5Q1oS06 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10525"; a="308517495" X-IronPort-AV: E=Sophos;i="5.96,149,1665471600"; d="scan'208,223";a="308517495" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2022 22:03:43 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10525"; a="705580358" X-IronPort-AV: E=Sophos;i="5.96,149,1665471600"; d="scan'208,223";a="705580358" Received: from unknown (HELO localhost.localdomain) ([10.239.252.222]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2022 22:03:42 -0800 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V1 2/2] tests/virtio_event_idx_interrupt_cbdma: modify the dmas parameter Date: Wed, 9 Nov 2022 13:57:20 +0800 Message-Id: <20221109055720.1207759-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, so modify the dmas parameter in the testplan. Signed-off-by: Wei Ling --- ...tSuite_virtio_event_idx_interrupt_cbdma.py | 244 ++++++++++-------- 1 file changed, 140 insertions(+), 104 deletions(-) diff --git a/tests/TestSuite_virtio_event_idx_interrupt_cbdma.py b/tests/TestSuite_virtio_event_idx_interrupt_cbdma.py index c5d7af18..20919131 100644 --- a/tests/TestSuite_virtio_event_idx_interrupt_cbdma.py +++ b/tests/TestSuite_virtio_event_idx_interrupt_cbdma.py @@ -260,9 +260,12 @@ class TestVirtioIdxInterruptCbdma(TestCase): Test Case1: Split ring virtio-pci driver reload test with CBDMA enable """ self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=1) - lcore_dma = "lcore%s@%s" % (self.vhost_core_list[1], self.cbdma_list[0]) - vhost_param = "--nb-cores=1 --txd=1024 --rxd=1024 --lcore-dma=[%s]" % lcore_dma - vhost_eal_param = "--vdev 'net_vhost,iface=vhost-net,queues=1,dmas=[txq0;rxq0]'" + dmas = "txq0@%s;rxq0@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], + ) + vhost_param = "--nb-cores=1 --txd=1024 --rxd=1024" + vhost_eal_param = "--vdev 'net_vhost,iface=vhost-net,queues=1,dmas=[%s]'" % dmas ports = self.cbdma_list ports.append(self.dut.ports_info[0]["pci"]) self.vhost_pmd.start_testpmd( @@ -287,63 +290,78 @@ class TestVirtioIdxInterruptCbdma(TestCase): Test Case2: Split ring 16 queues virtio-net event idx interrupt mode test with 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" + 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.cbdma_list[0], + self.cbdma_list[0], + 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[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[2], + self.cbdma_list[2], + self.cbdma_list[2], + 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], + self.cbdma_list[3], + self.cbdma_list[3], + self.cbdma_list[3], 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 --txd=1024 --rxd=1024 --rxq=16 --txq=16 --lcore-dma=[%s]" - % lcore_dma + vhost_param = "--nb-cores=16 --txd=1024 --rxd=1024 --rxq=16 --txq=16" + vhost_eal_param = ( + "--vdev 'net_vhost,iface=vhost-net,queues=16,client=1,dmas=[%s]'" % dmas ) - vhost_eal_param = "--vdev 'net_vhost,iface=vhost-net,queues=16,client=1,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( @@ -369,9 +387,12 @@ class TestVirtioIdxInterruptCbdma(TestCase): Test Case3: Packed ring virtio-pci driver reload test with CBDMA enable """ self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=1) - lcore_dma = "lcore%s@%s" % (self.vhost_core_list[1], self.cbdma_list[0]) - vhost_param = "--nb-cores=1 --txd=1024 --rxd=1024 --lcore-dma=[%s]" % lcore_dma - vhost_eal_param = "--vdev 'net_vhost,iface=vhost-net,queues=1,dmas=[txq0;rxq0]'" + dmas = "txq0@%s;rxq0@%s" % ( + self.cbdma_list[0], + self.cbdma_list[0], + ) + vhost_param = "--nb-cores=1 --txd=1024 --rxd=1024" + vhost_eal_param = "--vdev 'net_vhost,iface=vhost-net,queues=1,dmas=[%s]'" % dmas ports = self.cbdma_list ports.append(self.dut.ports_info[0]["pci"]) self.vhost_pmd.start_testpmd( @@ -396,63 +417,78 @@ class TestVirtioIdxInterruptCbdma(TestCase): Test Case4: Packed ring 16 queues virtio-net event idx interrupt mode test with cbdma enable """ self.get_cbdma_ports_info_and_bind_to_dpdk(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" + 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.cbdma_list[0], + self.cbdma_list[0], + 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[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[2], + self.cbdma_list[2], + self.cbdma_list[2], + 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], + self.cbdma_list[3], + self.cbdma_list[3], + self.cbdma_list[3], 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 --txd=1024 --rxd=1024 --rxq=16 --txq=16 --lcore-dma=[%s]" - % lcore_dma + vhost_param = "--nb-cores=16 --txd=1024 --rxd=1024 --rxq=16 --txq=16" + vhost_eal_param = ( + "--vdev 'net_vhost,iface=vhost-net,queues=16,client=1,dmas=[%s]'" % dmas ) - vhost_eal_param = "--vdev 'net_vhost,iface=vhost-net,queues=16,client=1,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(