From patchwork Tue Nov 22 06:24:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 120031 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 3B8FCA057D; Tue, 22 Nov 2022 07:30:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3703442D48; Tue, 22 Nov 2022 07:30:37 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id A8514427EB for ; Tue, 22 Nov 2022 07:30:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669098634; x=1700634634; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=1H3e8o09yHMjtQnsvEnznZLNllTbUw2qE3Dd3AmvN3c=; b=Q2WhVgqQkJvtEF1ZXJ8FjVJZWKkMn73ViOD0BEBp+AsrSPQP1YvkXkaf DaDndaJ2ZFOb52iLSv6XlEGT+pVtD5gzfVDRSTeXIexX070rS+mCABTvx L1sviLAnPiqqchnbq+gFAcILvUmcs5X2gIhL20gnY24l2F++SJhblVjH2 GbjVHpnAnFRKEiI2mlgit7ia2mn7MM2zi2GLjOP8re3C5riz2XHLnmZ34 zJ0Md5HDDurG7sVuBxRMTV2AqFb9hS+k1n6BHo0zZuR5oSrqr5GflfNmf ZzCp4g2AdT7HboUbiV3Hrv5VyNTDOMUbJkqwvApKhnDZ6+rSQqqiKnlDJ g==; X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="301293628" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208,223";a="301293628" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 22:30:33 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="886410398" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208,223";a="886410398" Received: from unknown (HELO localhost.localdomain) ([10.239.252.222]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 22:30:32 -0800 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V3 2/2] tests/vhost_virtio_pmd_interrupt_cbdma: modify the dmas parameter by DPDK changed Date: Tue, 22 Nov 2022 14:24:46 +0800 Message-Id: <20221122062446.2892509-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 testsuite. Signed-off-by: Wei Ling --- ...tSuite_vhost_virtio_pmd_interrupt_cbdma.py | 239 ++++++++++-------- 1 file changed, 134 insertions(+), 105 deletions(-) diff --git a/tests/TestSuite_vhost_virtio_pmd_interrupt_cbdma.py b/tests/TestSuite_vhost_virtio_pmd_interrupt_cbdma.py index 2d51dbf0..4c22cf49 100644 --- a/tests/TestSuite_vhost_virtio_pmd_interrupt_cbdma.py +++ b/tests/TestSuite_vhost_virtio_pmd_interrupt_cbdma.py @@ -252,7 +252,7 @@ class TestVhostVirtioPmdInterruptCbdma(TestCase): pci_info = re.search("\s*(0000:\S*:\d*.\d*)", device) if pci_info is not None: dev_info = pci_info.group(1) - # the numa id of ioat dev, only add the device which on same socket with nic dev + # the numa id of DMA dev, only add the device which on same socket with NIC dev bus = int(dev_info[5:7], base=16) if bus >= 128: cur_socket = 1 @@ -293,7 +293,6 @@ class TestVhostVirtioPmdInterruptCbdma(TestCase): if self.vm_dut is not None: vm_dut2 = self.vm_dut.create_session(name="vm_dut2") vm_dut2.send_expect("killall %s" % self.l3fwdpower_name, "# ", 10) - # self.vm_dut.send_expect("killall l3fwd-power", "# ", 60, alt_session=True) self.vm_dut.send_expect("cp /tmp/main.c ./examples/l3fwd-power/", "#", 15) out = self.vm_dut.build_dpdk_apps("examples/l3fwd-power") self.vm.stop() @@ -305,65 +304,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 +398,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 +445,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(