From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 26534A034F; Mon, 17 Jan 2022 08:58:26 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E559141165; Mon, 17 Jan 2022 08:58:25 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id BDBE24067B for ; Mon, 17 Jan 2022 08:58:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642406303; x=1673942303; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=XhyEN21WjuWpObiKjtpC5a9qZVclh8dyI4mxwTpOHgA=; b=HLYQo6Gc67gFJY8SC02ssYrteAfti8jMFU+UDP+CzQG64aKcemcMXB9p zXbaTQuyuRMreISzz61pM++RRnkD+i2rt3rCUqDsRvwwQlfhtlQncILGb O79CD8cDaMU0JbBQtQBLqgG3V+b7kKA86SQQ8Csx4VAkUOzbKbJQakmf8 BelfulOGZOF1mVa0JWq5INkH/zgQM8JME1ayLZKY55yMTbT+MLUTEbSBk H21ur9xaKx4bHXzlCjj8FPzIKKErRIUi0sO6zAOLMt4V7FwiZYLN38k1W S1Jb3AVMP3ecFjhJ+9n/U1/djZQhPrpg1kK2Zt1c5aZWifNxQMre6WETd Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10229"; a="244531452" X-IronPort-AV: E=Sophos;i="5.88,295,1635231600"; d="scan'208";a="244531452" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jan 2022 23:58:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,295,1635231600"; d="scan'208";a="764247413" Received: from orsmsx606.amr.corp.intel.com ([10.22.229.19]) by fmsmga006.fm.intel.com with ESMTP; 16 Jan 2022 23:58:21 -0800 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX606.amr.corp.intel.com (10.22.229.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Sun, 16 Jan 2022 23:58:20 -0800 Received: from orsmsx604.amr.corp.intel.com (10.22.229.17) by ORSMSX607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Sun, 16 Jan 2022 23:58:20 -0800 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx604.amr.corp.intel.com (10.22.229.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20 via Frontend Transport; Sun, 16 Jan 2022 23:58:20 -0800 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.40) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.20; Sun, 16 Jan 2022 23:58:20 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oH1fIxv+uBpYz6VA5ix1RrxUWijIXdBW5zPglUHwi97FKuzeo/srIrUYnm4Fb4NY2luTXKZ73VYjL+NGY3bWJZXjkcBzr8pKSXU52uhMS2jeZO2QpdqCa3jOAi8m4mMmAj2/xfv5ZsdOITK77lvBlGExUPyVPkrXEpd8KqmUL4cW/WaELPy4g7lmjl+hArTkTyGTtI6R0hUGuwZAbqbbAlKrMx0fAby4FN6P58ELAbl2Z1xr14CXdNAvSG6UCfC1gnmGxmFP6N1D+74fvxM0tvm8x2xsvJo92VZPWnvuNsUQtcr+h/kiWhC/7m2d9tmsDAEqgo6wiBTFr2uHfojVfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=somOCD2TVzRrLJxRoBhjy2RdYcAcXWsCIAYmb7SNRz4=; b=lyVo5YyEPshPdscGpGLSkwR7USBZyhWZ4fVwF8ljS3NCh7jeKJ/U5oMhV+RYZTgMh/VuZfgqnMMrCuusUJyU/BtaimV1JndoBqm5K5mVIOeNi4tC3x25B25G++YwuqF/iVRWlp18klx6dGGA3VCK2TZiZVQmIwyRdk9kflYYJSSgKDhsHcAc9VoOQzBVy4KnDGhmBfRnbRGR0a5iRFiVcgdDBvR8f7hfBJkBbWUCAK3aswoY0UpxXFem66/2Osxge9mymMdxXhpwywjbzwVf25mByerEjMEVxNgjENSDR5X4QYI1kV2wPZyLsIKP35S7RASMqRw9yJSO45b/05qVKA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from MW3PR11MB4553.namprd11.prod.outlook.com (2603:10b6:303:2c::9) by DM6PR11MB3371.namprd11.prod.outlook.com (2603:10b6:5:e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Mon, 17 Jan 2022 07:58:17 +0000 Received: from MW3PR11MB4553.namprd11.prod.outlook.com ([fe80::e807:ad3d:2ae4:e3cb]) by MW3PR11MB4553.namprd11.prod.outlook.com ([fe80::e807:ad3d:2ae4:e3cb%7]) with mapi id 15.20.4888.013; Mon, 17 Jan 2022 07:58:17 +0000 From: "He, Xingguang" To: "Ling, WeiX" , "dts@dpdk.org" CC: "Ling, WeiX" Subject: RE: [dts][PATCH V2 2/2] tests/vm2vm_virtio_net_perf:modify and add test case sync with test plan Thread-Topic: [dts][PATCH V2 2/2] tests/vm2vm_virtio_net_perf:modify and add test case sync with test plan Thread-Index: AQHYC3MtKFULVdjajEy4uNuyZJVtqqxm10sQ Date: Mon, 17 Jan 2022 07:58:16 +0000 Message-ID: References: <20220117063057.1369495-1-weix.ling@intel.com> In-Reply-To: <20220117063057.1369495-1-weix.ling@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.6.200.16 dlp-reaction: no-action authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 63387bc1-4288-49ce-51dc-08d9d98f1ed8 x-ms-traffictypediagnostic: DM6PR11MB3371:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:170; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: oxVQTPPdlgGauwuwS3AgERFCJiYV/o8C6a0f+WSs9NGs/i8jByVEnVVmwhttTARQVnIKauIS0gcGYw5EpEjQ4VmApA0fRvw38NOWX/ww73+kiIXCIs4T0smL76f97w1q0njZFUcLkKw/kPOVTVPax5xhEaiwO5Fvnt+DkuUrCaLSrKFt0jkbf+3vkqV6/o5qJz+wp2VGhsfdpglZFOqQQdkR8KgPrXZc50GQ7hmo/hHn7U38RSZOQZvtjwnNCbNdCr8OISgUEEx/UWH83zA/IYnW70MA/9BsfqOc+oBdlL9PnT9vqeRjzMOzwoARRSiqDdDAUU9KrGuJkj7kejasJgZVS9/+4S9WGP7Id7SJKQ6g4BAcrDBERI5lTIMULU1r94eui7wrdDJ6/CVWaDvG2xLfEtBWiSLeyYa+d24/Cx4vTdR0smo/8Iv8tmdSBWmZrN0RyMWuBY5qeyVp+f/MNnGojq3wlpYpl0KvsUBZ7SE7UkTel9sIuVeBTvoLkCxFCxVkTAR/a1oo3ZXlvmjzKS1JsgamH9mpxvwdGH32zgGPhrnkMcdgZEvkZTwwBYDuaqCdP1vh2dqu1RU/xt6UNJ197EQSPuSWPH1bamYj2p77fel6bNpyP/hmLmdmAo6F5ylCycEB9bD0avpoLTdpBxOn8BXzYunTx4gkTe2VPphgPf/ZyVUhaeG6hGR4od5T/zHX09/TVoFgR5uvyZJ67Q== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MW3PR11MB4553.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(508600001)(122000001)(83380400001)(52536014)(5660300002)(30864003)(4326008)(107886003)(316002)(76116006)(38100700002)(82960400001)(26005)(33656002)(66946007)(66476007)(66446008)(64756008)(9686003)(186003)(110136005)(8676002)(53546011)(6506007)(71200400001)(8936002)(66556008)(55016003)(19627235002)(86362001)(7696005)(2906002)(38070700005); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?zbGmN3ld13VrlLUq2q1YH1CKjPkfJDEQw2t1eLZZ8IWiuA58W5npm0xy8kGk?= =?us-ascii?Q?402BYYCsPlgWhG7ON2A8pNpGSIzjjE9g+Q2sTkjWQqzo/IV3Ahsqog3ZDB7X?= =?us-ascii?Q?6zX415KCmUk4mrl85zPn02+mBaJa+eOguXczJOCBtq4Bx42B0Rp0EddkoXFu?= =?us-ascii?Q?sZdJJHekdDdTtf3VUZlqELvLnNZLvBR4UZw0AYhd2LyncsCl/M1co3SxHQjH?= =?us-ascii?Q?u1a+75UYJu4O2HGDJddbQHDVSDpKiBLe8atWWtumCVUAPky5rGhDWM8iLr20?= =?us-ascii?Q?Asy3pQwzirO7Aajxy6mqgYDiKuDgk0Ol4DzU1LnTPuvwPKydYwQujiHiVeL7?= =?us-ascii?Q?vzN1AkljWBIjB1ILN/JNiDtJbuYB7HDL245mcoIsh1gf17xlkMdCDGJonXSi?= =?us-ascii?Q?KIC3R9aBxqIDDY4xkOOZC80pQpzd9sg+csD6OPFz+AuTJKoaXduhCkN/djF/?= =?us-ascii?Q?+r00hwWnxdXxyjWsSspiH+YnVYIxznCiqeiP+f97kRnRScg0N/Q1spVCuFi9?= =?us-ascii?Q?LFanOV+Q4GtG143U2dda2nXxBIamP0HC/oAQ+D74sALjTdF0dmSo1GvQ7DPf?= =?us-ascii?Q?2AFphE0KafNssmo5lP+5fmnNeR96BbwrDVeg1f2LQra0gBEe+9unIucMXfsG?= =?us-ascii?Q?sQbo9E8/5WdaG8XEtSfLYl49a6+0KnCYEY/4+IJDx7VVbNDHZXJVDvp3sHZP?= =?us-ascii?Q?YDtjGgnUBAK4iGvJ2z5VWr4eq9+5RPajxgP0OR9LDictFf/05Fl8/XlPGkX3?= =?us-ascii?Q?Zm5k2Mj9IHzhkGIWO1MrnkvY95bT4R3sSjLjfE/moJ3syU2SnTmgR/A+VmBq?= =?us-ascii?Q?U/1p0696Zwk6IfvCAzs7qcerodAOsdTt3ZQTSOi/L1TnafQC8Yb+5ai1iVHx?= =?us-ascii?Q?0LqRvmmjBuBkpNvuFotwMEwT0/ncjZlzWD0bGdy1beyxBBzHs/Qs5wOc9ipQ?= =?us-ascii?Q?9uGtsi62GJ6NU0bHXFtMQC+zFtRlq24qmm/k1yUtM+7BSqlfGQdcr5NqEwZ6?= =?us-ascii?Q?SRxiFOoYOi0+R++4OHebAqLS1iy9x5w9wSKtHX1MB73U4foYiMv4iQ2z9wC7?= =?us-ascii?Q?MmniMuJ2Herg12fUIGhlXtxXU2SRtgVhEvk2pQBwvMKPz4u2fRb0H/pU0113?= =?us-ascii?Q?IQL1cFTjAlCaifXDw8aIXxOhM1DbKiNViPKYqsp2kCOVk+LqZuxZDgmh7YW5?= =?us-ascii?Q?+TDjIUnwSVKfm2q4kvrUUoNNb77eiqpIs+xXM/zc994iNorePbpyYqV6D7Vg?= =?us-ascii?Q?MEJNdr1ffCC/oYj+sKuNDuqfawldEW4nn2ZHo4oA3qgnQBD24bPkvGEFSqYw?= =?us-ascii?Q?sgQci2XTqFkMXX9cw1I6zjYcbcpWPy22vAGXX5IGFC3WMAoMGx8qA6vPASfP?= =?us-ascii?Q?7Ip58t30XobayWgzXKr63tP5kel/6qYJEqyO2aMPR22vpmicLoeD/ydlbfLY?= =?us-ascii?Q?Otd7WSXrk2ySN3ZljknOGPrLWc4R+y5lpHpwi1LclGhdUplHsIuKnijboca6?= =?us-ascii?Q?W/a6nZSlWXB7Ml5P5a7iCnGwbn3IAdCigqFcUpfEho4nazMPXtieeLzosHdr?= =?us-ascii?Q?oK2poouBc3HAkB9z+Ck6Xrvj2SY1d1Ou3QMQU6F45xRiTsddhkB1pjQF6MbK?= =?us-ascii?Q?dw=3D=3D?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW3PR11MB4553.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63387bc1-4288-49ce-51dc-08d9d98f1ed8 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jan 2022 07:58:17.0211 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: auK0UPTaRaU/jChuuRze01S+LIaMNF4wsC5JvyJXxK1n7pa84AUTIA4en29etseBADp+FFp3Oz7s8NX9kweCTw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3371 X-OriginatorOrg: intel.com 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 Acked-by: Xingguang He -----Original Message----- From: Wei Ling =20 Sent: Monday, January 17, 2022 2:31 PM To: dts@dpdk.org Cc: Ling, WeiX Subject: [dts][PATCH V2 2/2] tests/vm2vm_virtio_net_perf:modify and add tes= t case sync with test plan 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 --- 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_vm2= vm_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' % sel= f.device_str, '# ', 30) self.dut.send_expect('./usertools/dpdk-devbind.py --force --bi= nd=3Dioatdma %s' % self.device_str, '# ', 60) =20 - def start_vhost_testpmd(self, cbdma=3DFalse, no_pci=3DTrue, client_mod= e=3DFalse, enable_queues=3D1, nb_cores=3D2, rxq_txq=3DNone): + @property + def check_2m_env(self): + out =3D self.dut.send_expect("cat /proc/meminfo |grep Hugepagesize= |awk '{print($2)}'", "# ") + return True if out =3D=3D '2048' else False + + def start_vhost_testpmd(self, cbdma=3DFalse, no_pci=3DTrue, client_mod= e=3DFalse, enable_queues=3D1, nb_cores=3D2, rxq_txq=3DNone, exchange_cbdma= =3DFalse, iova_mode=3D''): """ launch the testpmd with different parameters """ @@ -150,12 +155,20 @@ class TestVM2VMVirtioNetPerf(TestCase): else: vdev1 =3D "--vdev 'net_vhost0,iface=3D%s/vhost-net0,client=3D1= ,queues=3D%d%s' " % (self.base_dir, enable_queues, cbdma_arg_0) vdev2 =3D "--vdev 'net_vhost1,iface=3D%s/vhost-net1,client=3D1= ,queues=3D%d%s' " % (self.base_dir, enable_queues, cbdma_arg_1) + if exchange_cbdma: + vdev1 =3D "--vdev 'net_vhost0,iface=3D%s/vhost-net0,client=3D1= ,queues=3D%d%s' " % (self.base_dir, enable_queues, cbdma_arg_1) + vdev2 =3D "--vdev=20 + 'net_vhost1,iface=3D%s/vhost-net1,client=3D1,queues=3D%d%s' " %=20 + (self.base_dir, enable_queues, cbdma_arg_0) + eal_params =3D self.dut.create_eal_parameters(cores=3Dself.cores_l= ist, prefix=3D'vhost', no_pci=3Dno_pci) if rxq_txq is None: params =3D " -- -i --nb-cores=3D%d --txd=3D1024 --rxd=3D1024" = % nb_cores else: params =3D " -- -i --nb-cores=3D%d --txd=3D1024 --rxd=3D1024 -= -rxq=3D%d --txq=3D%d" % (nb_cores, rxq_txq, rxq_txq) - self.command_line =3D testcmd + eal_params + vdev1 + vdev2 + param= s + if iova_mode: + iova_parm =3D " --iova=3D" + iova_mode + else: + iova_parm =3D "" + self.command_line =3D testcmd + eal_params + vdev1 + vdev2 +=20 + iova_parm + params self.pmd_vhost.execute_cmd(self.command_line, timeout=3D30) self.pmd_vhost.execute_cmd('vhost enable tx all', timeout=3D30) self.pmd_vhost.execute_cmd('start', timeout=3D30) @@ -204,13 +217,= 13 @@ class TestVM2VMVirtioNetPerf(TestCase): self.vm_dut[1].send_expect("arp -s %s %s" % (self.virtio_ip1, self= .virtio_mac1), "#", 10) =20 def prepare_test_env(self, cbdma=3DFalse, no_pci=3DTrue, client_mode= =3DFalse, enable_queues=3D1, nb_cores=3D2, - server_mode=3DFalse, opt_queue=3DNone, combined= =3DFalse, rxq_txq=3DNone, vm_config=3D'vhost_sample'): + server_mode=3DFalse, opt_queue=3DNone, combined= =3DFalse, rxq_txq=3DNone, iova_mode=3D''): """ start vhost testpmd and qemu, and config the vm env """ self.start_vhost_testpmd(cbdma=3Dcbdma, no_pci=3Dno_pci, client_mo= de=3Dclient_mode, enable_queues=3Denable_queues, - nb_cores=3Dnb_cores, rxq_txq=3Drxq_txq) - self.start_vms(server_mode=3Dserver_mode, opt_queue=3Dopt_queue, v= m_config=3Dvm_config) + nb_cores=3Dnb_cores, rxq_txq=3Drxq_txq, i= ova_mode=3Diova_mode) + self.start_vms(server_mode=3Dserver_mode, opt_queue=3Dopt_queue) self.config_vm_env(combined=3Dcombined, rxq_txq=3Drxq_txq) =20 def start_iperf(self, iperf_mode=3D'tso'): @@ -314,11 +327,11 @@ class TestVM2VMVirtioNetPerf(TestCase): self.verify(tcp6_info is not None and tcp6_info.group(1) =3D=3D "o= n", "tx-tcp6-segmentation in vm not right") =20 - def check_scp_file_valid_between_vms(self, file_size=3D1): + def check_scp_file_valid_between_vms(self, file_size=3D1024): """ scp file form VM1 to VM2, check the data is valid """ - # default file_size=3D1K + # default file_size=3D1024K data =3D '' for char in range(file_size * 1024): data +=3D random.choice(self.random_string) @@ -353,7 +366,7 @= @ class TestVM2VMVirtioNetPerf(TestCase): self.prepare_test_env(cbdma=3DTrue, no_pci=3DFalse, client_mode=3D= False, enable_queues=3D1, nb_cores=3D2, server_mode=3DFalse, opt_queue=3D1, combined= =3DFalse, rxq_txq=3DNone) cbdma_value =3D self.start_iperf_and_verify_vhost_xstats_info(iper= f_mode=3D'tso') - expect_value =3D self.get_suite_cfg()['expected_throughput'][self.= running_case] + expect_value =3D=20 + self.get_suite_cfg()['expected_throughput']['test_vm2vm_split_ring_ipe + rf_with_tso'] self.verify(cbdma_value > expect_value, "CBDMA enable performance:= %s is lower than CBDMA disable: %s." %(cbdma_value, expect_value)) =20 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 =3D [] self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=3D16, allow_d= iff_socket=3DTrue) =20 - self.logger.info("Launch vhost-testpmd with CBDMA and used 8 queue= ") + self.logger.info("Launch vhost with CBDMA and with 8 queue with=20 + VA mode") self.vm_args =3D "disable-modern=3Dfalse,mrg_rxbuf=3Don,mq=3Don,ve= ctors=3D40,csum=3Don,guest_csum=3Don,host_tso4=3Don,guest_tso4=3Don,guest_e= cn=3Don,guest_ufo=3Don,host_ufo=3Don" self.prepare_test_env(cbdma=3DTrue, no_pci=3DFalse, client_mode=3D= True, enable_queues=3D8, nb_cores=3D4, - server_mode=3DTrue, opt_queue=3D8, combined= =3DTrue, rxq_txq=3D8, vm_config=3D'vm') + server_mode=3DTrue, opt_queue=3D8,=20 + combined=3DTrue, rxq_txq=3D8, iova_mode=3D'va') self.check_scp_file_valid_between_vms() iperf_data_cbdma_enable_8_queue =3D self.start_iperf_and_verify_vh= ost_xstats_info(iperf_mode=3D'tso') - ipef_result.append(['Enable', 'mergeable path', 8, iperf_data_cbdm= a_enable_8_queue]) + ipef_result.append(['Enable', 'mergeable path with VA mode', 8,=20 + iperf_data_cbdma_enable_8_queue]) =20 - self.logger.info("Re-launch without CBDMA and used 8 queue") + self.logger.info("Re-launch and exchange CBDMA and with 8 queue=20 + with VA mode") self.vhost.send_expect("quit", "# ", 30) - self.start_vhost_testpmd(cbdma=3DFalse, no_pci=3DFalse, client_mod= e=3DTrue, enable_queues=3D8, nb_cores=3D4, rxq_txq=3D8) + self.start_vhost_testpmd(cbdma=3DTrue, no_pci=3DFalse,=20 + client_mode=3DTrue, enable_queues=3D8, nb_cores=3D4, rxq_txq=3D8,=20 + exchange_cbdma=3DTrue, iova_mode=3D'va') self.check_scp_file_valid_between_vms() - iperf_data_cbdma_disable_8_queue =3D self.start_iperf_and_verify_v= host_xstats_info(iperf_mode=3D'tso') - ipef_result.append(['Disable','mergeable path', 8, iperf_data_cbdm= a_disable_8_queue]) + iperf_data_cbdma_enable_8_queue_exchange =3D self.start_iperf_and_= verify_vhost_xstats_info(iperf_mode=3D'tso') + ipef_result.append(['Disable','mergeable path exchange CBDMA=20 + 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 queu= e with PA mode") + self.vhost.send_expect("quit", "# ", 30) + self.start_vhost_testpmd(cbdma=3DTrue, no_pci=3DFalse, client_= mode=3DTrue, enable_queues=3D8, nb_cores=3D4, rxq_txq=3D8, exchange_cbdma= =3DTrue, iova_mode=3D'pa') + self.check_scp_file_valid_between_vms() + iperf_data_cbdma_enable_8_queue_exchange_pa =3D self.start_ipe= rf_and_verify_vhost_xstats_info(iperf_mode=3D'tso') + ipef_result.append(['Disable', 'mergeable path exchange=20 + CBDMA with PA mode', 8, iperf_data_cbdma_enable_8_queue_exchange_pa]) =20 - 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=3DFalse, no_pci=3DFalse, client_mod= e=3DTrue, enable_queues=3D8, nb_cores=3D4, rxq_txq=3D1) + self.start_vhost_testpmd(cbdma=3DFalse, no_pci=3DFalse, client_mod= e=3DTrue, enable_queues=3D4, nb_cores=3D4, rxq_txq=3D4) + self.config_vm_env(combined=3DTrue, rxq_txq=3D4) + self.check_scp_file_valid_between_vms() + iperf_data_cbdma_disable_4_queue =3D self.start_iperf_and_verify_v= host_xstats_info(iperf_mode=3D'tso') + ipef_result.append(['Disable', 'mergeable path without CBDMA=20 + 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=3DFalse, no_pci=3DFalse,=20 + client_mode=3DTrue, enable_queues=3D4, nb_cores=3D4, rxq_txq=3D1) self.config_vm_env(combined=3DTrue, rxq_txq=3D1) self.check_scp_file_valid_between_vms() iperf_data_cbdma_disable_1_queue =3D self.start_iperf_and_verify_v= host_xstats_info(iperf_mode=3D'tso') - ipef_result.append(['Disable', 'mergeable path', 1, iperf_data_cbd= ma_disable_1_queue]) + ipef_result.append(['Disable', 'mergeable path without CBDMA=20 + with 1 queue', 1, iperf_data_cbdma_disable_1_queue]) =20 self.table_header =3D ['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_dis= able_8_queue, \ + self.verify(iperf_data_cbdma_enable_8_queue >=20 + 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,=20 + iperf_data_cbdma_disable_4_queue)) =20 def test_vm2vm_split_ring_with_no_mergeable_path_check_large_packet_an= d_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 =3D [] self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=3D16, allow_d= iff_socket=3DTrue) =20 self.logger.info("Launch vhost-testpmd with CBDMA and used 8 queue= ") self.vm_args =3D "disable-modern=3Dfalse,mrg_rxbuf=3Doff,mq=3Don,v= ectors=3D40,csum=3Don,guest_csum=3Don,host_tso4=3Don,guest_tso4=3Don,guest_= ecn=3Don,guest_ufo=3Don,host_ufo=3Don" self.prepare_test_env(cbdma=3DTrue, no_pci=3DFalse, client_mode=3D= True, enable_queues=3D8, nb_cores=3D4, - server_mode=3DTrue, opt_queue=3D8, combined= =3DTrue, rxq_txq=3D8, vm_config=3D'vm') + server_mode=3DTrue, opt_queue=3D8,=20 + combined=3DTrue, rxq_txq=3D8) self.check_scp_file_valid_between_vms() iperf_data_cbdma_enable_8_queue =3D self.start_iperf_and_verify_vh= ost_xstats_info(iperf_mode=3D'tso') ipef_result.append(['Enable', 'no-mergeable path', 8, iperf_data_c= bdma_enable_8_queue]) @@ -497,7 +525,6 @@ class TestVM2VMVirtioNetPerf(Test= Case): """ Test Case 11: VM2VM virtio-net packed ring mergeable 8 queues CBDM= A enable test with large packet payload valid check """ - # This test case need to use QEMU 3.0 to test ipef_result =3D [] self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=3D16, allow_d= iff_socket=3DTrue) =20 @@ -509,8 +536,6 @@ class TestVM2VMVirtioNetPerf(TestCase): self.check_scp_file_valid_between_vms() iperf_data_cbdma_enable_8_queue =3D self.start_iperf_and_verif= y_vhost_xstats_info(iperf_mode=3D'tso') ipef_result.append(['Enable_%d' % i, 'mergeable path', 8, iper= f_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 =3D ['CBDMA Enable/Disable', 'Mode', 'rxq/tx= q', '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 =3D [] self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=3D16, allow_d= iff_socket=3DTrue) =20 @@ -533,8 +557,42 @@ class TestVM2VMVirtioNetPerf(TestCase): self.check_scp_file_valid_between_vms() iperf_data_cbdma_enable_8_queue =3D self.start_iperf_and_verif= y_vhost_xstats_info(iperf_mode=3D'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 =3D ['CBDMA Enable/Disable', 'Mode', 'rxq/tx= q', '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=3Dpa + """ + # This test case need to test on 1G guest hugepage ENV. + self.vm_args =3D "disable-modern=3Dfalse,mrg_rxbuf=3Don,csum=3Don,= guest_csum=3Don,host_tso4=3Don,guest_tso4=3Don,guest_ecn=3Don,packed=3Don" + self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=3D2) + self.prepare_test_env(cbdma=3DTrue, no_pci=3DFalse, client_mode=3D= False, enable_queues=3D1, nb_cores=3D2, + server_mode=3DFalse, opt_queue=3D1, combined= =3DFalse, rxq_txq=3DNone, iova_mode=3D'pa') + self.check_scp_file_valid_between_vms() + cbdma_value =3D self.start_iperf_and_verify_vhost_xstats_info(iper= f_mode=3D'tso') + expect_value =3D self.get_suite_cfg()['expected_throughput']['test= _vm2vm_split_ring_iperf_with_tso'] + self.verify(cbdma_value > expect_value, "CBDMA enable=20 + performance: %s is lower than CBDMA disable: %s." %(cbdma_value,=20 + 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 CBDM= A enable and PA mode test with large packet payload valid check + """ + # This test case need to test on 1G guest hugepage ENV. + ipef_result =3D [] + self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=3D16,=20 + allow_diff_socket=3DTrue) + + self.logger.info("Launch vhost-testpmd with CBDMA and used 8 queue= ") + self.vm_args =3D "disable-modern=3Dfalse,mrg_rxbuf=3Don,mq=3Don,ve= ctors=3D40,csum=3Don,guest_csum=3Don,host_tso4=3Don,guest_tso4=3Don,guest_e= cn=3Don,guest_ufo=3Don,host_ufo=3Don,packed=3Don" + self.prepare_test_env(cbdma=3DTrue, no_pci=3DFalse, client_mode=3D= False, enable_queues=3D8, nb_cores=3D4, + server_mode=3DFalse, opt_queue=3D8, combined= =3DTrue, rxq_txq=3D8, iova_mode=3D'pa') + for i in range(0,5): + self.check_scp_file_valid_between_vms() + iperf_data_cbdma_enable_8_queue =3D self.start_iperf_and_verif= y_vhost_xstats_info(iperf_mode=3D'tso') + ipef_result.append(['Enable_%d' % i, 'mergeable path', 8,=20 + iperf_data_cbdma_enable_8_queue]) self.table_header =3D ['CBDMA Enable/Disable', 'Mode', 'rxq/tx= q', 'Gbits/sec'] self.result_table_create(self.table_header) for table_row in ipef_result: -- 2.25.1