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 427B9A0C43; Thu, 29 Jul 2021 07:06:59 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1E3524014D; Thu, 29 Jul 2021 07:06:59 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id 4000F40040 for ; Thu, 29 Jul 2021 07:06:57 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10059"; a="298389166" X-IronPort-AV: E=Sophos;i="5.84,278,1620716400"; d="scan'208";a="298389166" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jul 2021 22:06:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,278,1620716400"; d="scan'208";a="499609031" Received: from fmsmsx604.amr.corp.intel.com ([10.18.126.84]) by fmsmga004.fm.intel.com with ESMTP; 28 Jul 2021 22:06:51 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx604.amr.corp.intel.com (10.18.126.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Wed, 28 Jul 2021 22:06:51 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10 via Frontend Transport; Wed, 28 Jul 2021 22:06:51 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.100) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.10; Wed, 28 Jul 2021 22:06:23 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d9Nb2IPnRHKDmBC/YkrLIrqXnpnnGxzJGIJKU5d99JrOrxgr/RzapZBClADFw/0+Xy8KjbpbqwvpwTqxY2aKbQo7D6FxnDfWpHvBxwbKz+o+W5zrsVextKT3qDMYnucq1FvXa5b0x47atPzb3xUuY3ZipwkCHegFfQgt174yOBEeuSQWnyd5n3rF3aqKwpxD7AkkTHpZoKsB+GiaBQkcOz2sjBsBI8Fhr6RmznmuE0I1HX4iHzHEK0FHCgD3E86GM1Bj0UVOJavPk2MkFpyBrMst5Pc1xERIMbwUEzf9pS6BwVQjoowSsNdMGlESTwe3yPX2aiBWVQHRwklZRmmmKg== 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-SenderADCheck; bh=durhcM4Bp9XgVO5QJEU4CpiTwC4hhggAxM/y+cWfF2E=; b=Is/78Sndx16IuSezL7qFyN2RMFcLh4jYOHtdWBKRboI65c5b/oiER+QUe58OxUElIJjR9D663ZckCZKJMUM/BcbtJKMYpClh3X6VELSuWvzHECnH4EVl3SthQU+SAOcPfhQ2kGeM8l5wQzW4MNdhNuH6A7ByNyhdlBDZdr08kWnTg4OLsiabjrwQleTY3daIb34FFUM5UIO0C1ltITbSLkV1ILMAcBQjNnP6f+6uIIvBnFZ7GOsaWY5YxSV9GWPO0wSebtMMNntsNQeRYUQB+Y081AwXsEKBDdgHGEz300ek/Ub4kLdKMWZwVPNiGCTR226D7GhqxZ1WyZnFatwYbQ== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=durhcM4Bp9XgVO5QJEU4CpiTwC4hhggAxM/y+cWfF2E=; b=w4y3B7qhJA6hcmnQuU4y8jG9o6XMwswQOgcOAmwng2n2w/x1S9GSZaMA9/KjuyQaZHbf1VDBTy0+oSPLcTp2UcBAmWjt3/j31EZ53MLaVjBbdzXoTNNe0PtNswE09YJqtJIpBxaCS8kLUChl68GmxTz4yKyA3C+qNNceqmTXol4= Received: from BYAPR11MB2648.namprd11.prod.outlook.com (2603:10b6:a02:c7::10) by BYAPR11MB2872.namprd11.prod.outlook.com (2603:10b6:a02:c9::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.26; Thu, 29 Jul 2021 05:06:22 +0000 Received: from BYAPR11MB2648.namprd11.prod.outlook.com ([fe80::f8e4:c512:756d:b265]) by BYAPR11MB2648.namprd11.prod.outlook.com ([fe80::f8e4:c512:756d:b265%7]) with mapi id 15.20.4373.021; Thu, 29 Jul 2021 05:06:22 +0000 From: "Wang, Yinan" To: "Chen, LingliX" , "dts@dpdk.org" CC: "Chen, LingliX" Thread-Topic: [dts] [PATCH V2] tests/vm2vm_virtio_pmd: fix script issues Thread-Index: AQHXhCE5oGir6+urDEel7MoGaRxF/6tZZptw Date: Thu, 29 Jul 2021 05:06:21 +0000 Message-ID: References: <20210729102738.87558-1-linglix.chen@intel.com> In-Reply-To: <20210729102738.87558-1-linglix.chen@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.5.1.3 dlp-product: dlpe-windows authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: c91866b2-d4f6-44ed-879d-08d9524e9b9a x-ms-traffictypediagnostic: BYAPR11MB2872: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:101; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: aggn9Qk62cvOIyqkqLJe6NVF/yVZSvGoBV519rulOPJOh92mEG2XHMEnTBC1UsX2Gh5Uk54ZD+FZ7hVTXkEBV0HekdiXc89jAd0OYw4xT9ghMC4QJTUL6L0N1hUOsS9DCVw9D8F8roFjR4vFe83X3Jd7dCNWiJtLTqLBK7SFQtFrRJSQnvvIQFCb9cVYx77iwj5UsW/RgGEYGcYDfu7aBRMpRTecH/Xb0avG1oV/neOZyIfzySmaAjEpKZwtPpt6UvEl6vSy7EbLQxlWyMQqORIfxuy7GBJf04Nkdhl7AyU6cSJHztN9rZxxEGBjlPmf/n2/3puDa6dR50Yn9q10hT/Me1bEEbkSU6m8VCt9MCsWuMaMzyJ83BljYy1ckjzPpMWFmnfyRK98BKILxDD/HRN5d0jJX53hOEyg7/G8tYoQyRwaEOQwRQml+LBotV1mdd3MP5z0xf4oZEdjULVEh0K3B6ARmIF9nI1x5r6Wpy3kc0FeXTMkMRZN3ZDQSKHtNvWODlhNUu0VgVJYyv/7XXr1hdH/Zpko1AMJA7WfoJXYenlehRhw5iQNDUubij179pYgCvzNrpI5HwORUm99LjdLnrA0bF/wQp2sZz9Xl2mHSHmvMOY1UVy+ID+bbLUyp9cJpF2F9Pc6SgiH8jutSOf3CP9y1H2JppcPZ7uWOaz8gXtW/ix4r/IFRWx4b9Q2v8Y97DA5HjwM2YfzQ+meFQ== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR11MB2648.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(30864003)(110136005)(186003)(55016002)(508600001)(26005)(4326008)(86362001)(19627235002)(83380400001)(107886003)(52536014)(71200400001)(5660300002)(316002)(76116006)(2906002)(33656002)(66946007)(66476007)(66556008)(64756008)(66446008)(53546011)(122000001)(38100700002)(7696005)(8676002)(9686003)(8936002)(6506007)(38070700005); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?Windows-1252?Q?lig3VXCcg1aPwtvTVgzlMtY2vr1xXJYZDKv8a0fL45EVcdq5H6/I/+tr?= =?Windows-1252?Q?5HtBGZSWuFYcLgbK5RFW8/pooJfVF6cFVZq0YfPU1mBhGz84Ne/5J/bI?= =?Windows-1252?Q?FORIdOi/SlHJrBcNQuDA+Tqx+mkJYqj16g8pLFJPusVmI2EQ/FJ+1Jhh?= =?Windows-1252?Q?3X6A9lQ/GI8CXTSjRnw4Pd2ocTq2oV0vAJCvVdRUaYjwdi35lnMXddp6?= =?Windows-1252?Q?eCRQHWJIQva2USxr+bDIWkQF3RyEk8+LPWZVYli02RIRGA5rAAhful/m?= =?Windows-1252?Q?zE7zCUgHKc1TLjSggHxLyxrqmNo3Zv4JnpBqKSJ5uxGoKdS6CcpCn4y1?= =?Windows-1252?Q?UqKNgX0zCzdhYPJn+oYayyK51dDYxa23XeOPw9CXSvfU/0tZZ0866dtx?= =?Windows-1252?Q?NO/a7A8yMKMNT3hTEmE0AWYOWPaPAbPvpkA0zs3mc0wToA6SocYnLTA5?= =?Windows-1252?Q?5c6Q9KByQnZP69TGWs3LpKG4sceKm3t3LnPeN961z1x+43M6L0ulFc5Q?= =?Windows-1252?Q?YgP+5bLVAKJmFw1lr3GkUJrEreC77FYssPEXkSm3fXffWhbrJkJhZeNX?= =?Windows-1252?Q?GnRRcy9XO3tMJMGgt6kkMBgsVgVWqgxamBnvxIj3+b6j4SYSzJ8Hbqas?= =?Windows-1252?Q?39/Pb2N9BJQZO6nrxhRKN1HJaKCeZwfzqolGtIWfyLRUfzqmutF1bvRv?= =?Windows-1252?Q?BXQuCdg337I8Yo5JpYM4/al0UAVLX4Gd/pvdjUP81OSc0SnE5zuJYKpT?= =?Windows-1252?Q?rE7T+VnFag0nLpBD75G+k9zIn1uMYXeIpnClb+udY1eHUfyEVLHA/E8z?= =?Windows-1252?Q?c5YJd5jyapAx33uUg8WPL8nn/oTwh2NaypXBUEKeMtCmMVbd9ofwZWZc?= =?Windows-1252?Q?yzAH7B2CHNutxRzd/epagJQznRdv2Y61UZLLHC1fGHhEdDisR9lC1U5S?= =?Windows-1252?Q?zJKO90IQKVR+Rwrp7HKpngg2JqOOedrbyxaEup/QkgtXdudC4cqtUzst?= =?Windows-1252?Q?q3eTqJawABfeoCDCA4c5zP9x8e1OxdBoZL2BUCwJLxzqUHm65HUhl14G?= =?Windows-1252?Q?WVsYnRcVCAypttvzSR2EsdJQWW6h+q+W870zLuJyeskHXuEayeU77niW?= =?Windows-1252?Q?1TsgVl1wd2/F3L26lsDjSMh/cH0TpN/9bFw095pV6ZoKoH08JqNWKww+?= =?Windows-1252?Q?4+c0/nZPcfksx25bvYFWJbPR2BUhZ8/fJz7e84vlRP6TwiFkWIN/xCNG?= =?Windows-1252?Q?GvHJAF5FiwaxO9pUvc9rm0h8bBAYBV/WfZ+1Tkwyb5MOyuFAesEX9sm1?= =?Windows-1252?Q?jBNN8j4/w/JdjaTKpjDj3V/qiZdtz2iH4Qs2Wj72Yq7AAd+ED5+T7sK9?= =?Windows-1252?Q?3dbJGy7w109q/hyFdmjL4GSABc2Lh2grUA301tglP46vQW9stry8AwOg?= Content-Type: text/plain; charset="Windows-1252" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB2648.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c91866b2-d4f6-44ed-879d-08d9524e9b9a X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jul 2021 05:06:21.9499 (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: 2m+YLPEjYEtyK3d9FmS0WNYyA/jWT3/F4NYkIea6+++6a3fQxgFliHTTSsp7LBp99J9OPQBjcq8DpdVU4tDpfQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2872 X-OriginatorOrg: intel.com Subject: Re: [dts] [PATCH V2] tests/vm2vm_virtio_pmd: fix script issues 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 Sender: "dts" Acked-by: Yinan Wang > -----Original Message----- > From: dts On Behalf Of Lingli Chen > Sent: 2021?7?29? 18:28 > To: dts@dpdk.org > Cc: Chen, LingliX > Subject: [dts] [PATCH V2] tests/vm2vm_virtio_pmd: fix script issues >=20 > 1.Launch virtio-pmd on VM with_mergeable_path add > --rx-offloads=3D0x00002000, according to dpdk commit > 4e8169eb0d2d("net/virtio: fix Rx scatter offload"). > 2.start_vms() use qemu_path instead mode and mergeable parameters. > 3.fix script issues:influence between cases. >=20 > Signed-off-by: Lingli Chen > --- > V2:modifie comment use git commit description style. > V1:modifie script. >=20 > tests/TestSuite_vm2vm_virtio_pmd.py | 97 ++++++++++++++--------------- > 1 file changed, 48 insertions(+), 49 deletions(-) >=20 > diff --git a/tests/TestSuite_vm2vm_virtio_pmd.py > b/tests/TestSuite_vm2vm_virtio_pmd.py > index 44f17a36..99a4602b 100644 > --- a/tests/TestSuite_vm2vm_virtio_pmd.py > +++ b/tests/TestSuite_vm2vm_virtio_pmd.py > @@ -66,6 +66,7 @@ class TestVM2VMVirtioPMD(TestCase): > self.pmd_vhost =3D PmdOutput(self.dut, self.vhost_user) > self.cbdma_dev_infos =3D [] > self.vm_config =3D 'vhost_sample' > + self.device_str =3D ' ' >=20 > def set_up(self): > """ > @@ -155,20 +156,20 @@ class TestVM2VMVirtioPMD(TestCase): > w_pci_str =3D ' '.join(w_pci_list) > if path_mode =3D=3D "mergeable": > command =3D self.app_testpmd_path + " -c 0x3 -n 4 " + \ > - "--file-prefix=3Dvirtio -- -i --tx-offloads=3D0x= 00 " + \ > - "--enable-hw-vlan-strip " + "--txq=3D{0} --rxq= =3D{0} ".format(queues) > if queues else "" > + "--file-prefix=3Dvirtio -- -i --tx-offloads=3D0x= 00 --rx- > offloads=3D0x00002000 " + \ > + "--enable-hw-vlan-strip " + ("--txq=3D{0} --rxq= =3D{0} > ".format(queues) if queues else "") >=20 > command =3D command + "--txd=3D1024 --rxd=3D1024 %s" > vm_client.send_expect(command % extern_param, "testpmd> ", 2= 0) > elif path_mode =3D=3D "normal": > command =3D self.app_testpmd_path + " -c 0x3 -n 4 " + \ > "--file-prefix=3Dvirtio -- -i --tx-offloads=3D0x= 00 " + \ > - "--enable-hw-vlan-strip " + "--txq=3D{0} --rxq= =3D{0} ".format(queues) > if queues else "" > + "--enable-hw-vlan-strip " + ("--txq=3D{0} --rxq= =3D{0} > ".format(queues) if queues else "") > command =3D command + "--txd=3D1024 --rxd=3D1024 %s" > vm_client.send_expect(command % extern_param, "testpmd> ", 2= 0) > elif path_mode =3D=3D "vector_rx": > command =3D self.app_testpmd_path + " -c 0x3 -n 4 " + \ > - "--file-prefix=3Dvirtio %s -- -i" + "--txq=3D{0}= --rxq=3D{0} > ".format(queues) if queues else "" > + "--file-prefix=3Dvirtio %s -- -i " + ("--txq=3D{= 0} --rxq=3D{0} > ".format(queues) if queues else "") > command =3D command + "--txd=3D1024 --rxd=3D1024 %s" > vm_client.send_expect(command % (w_pci_str, extern_param), > "testpmd> ", 20) >=20 > @@ -188,29 +189,16 @@ class TestVM2VMVirtioPMD(TestCase): > "--pdump '%s,queue=3D*,rx-dev=3D%s,mbuf-size=3D8000= '" > self.pdump_session.send_expect(command_line % > (self.dut.prefix_subfix, dump_port, self.dump_pcap), 'Port') >=20 > - def start_vms(self, mode=3D0, mergeable=3DTrue, server_mode=3DFalse, > opt_queue=3DNone, vm_config=3D''): > + def start_vms(self, qemu_path=3D'', server_mode=3DFalse, opt_queue= =3DNone, > vm_config=3D'vhost_sample'): > """ > start two VM, each VM has one virtio device > """ > # for virtio 0.95, start vm with "disable-modern=3Dtrue" > # for virito 1.0, start vm with "disable-modern=3Dfalse" > - if mode =3D=3D 0: > - setting_args =3D "disable-modern=3Dtrue" > - elif mode =3D=3D 1: > - setting_args =3D "disable-modern=3Dfalse" > - elif mode =3D=3D 2: > - setting_args =3D "disable-modern=3Dfalse,packed=3Don" > - if mergeable is True: > - setting_args +=3D "," + "mrg_rxbuf=3Don" > - else: > - setting_args +=3D "," + "mrg_rxbuf=3Doff" > vm_params =3D {} > - if opt_queue > 1: > - setting_args +=3D > ",csum=3Don,guest_csum=3Don,host_tso4=3Don,guest_tso4=3Don,guest_ecn=3Don= ,guest > _ufo=3Don,host_ufo=3Don" > + > + if opt_queue is not None: > vm_params['opt_queue'] =3D opt_queue > - setting_args =3D setting_args + ",mq=3Don,vectors=3D40" > - else: > - setting_args +=3D > ",csum=3Don,gso=3Don,guest_csum=3Don,host_tso4=3Don,guest_tso4=3Don,guest= _ecn=3Do > n" >=20 > for i in range(self.vm_num): > vm_dut =3D None > @@ -222,7 +210,7 @@ class TestVM2VMVirtioPMD(TestCase): > else: > vm_params['opt_path'] =3D self.base_dir + '/vhost-net%d'= % i + > ',server' > vm_params['opt_mac'] =3D "52:54:00:00:00:0%d" % (i+1) > - vm_params['opt_settings'] =3D setting_args > + vm_params['opt_settings'] =3D qemu_path > vm_info.set_vm_device(**vm_params) > time.sleep(3) > try: > @@ -304,62 +292,67 @@ class TestVM2VMVirtioPMD(TestCase): >=20 > def test_vhost_vm2vm_virtio_pmd_with_normal_path(self): > """ > - vhost-user + virtio-pmd with normal path > + Test Case 2: vhost-user + virtio-pmd with normal path > """ > + qemu_path =3D "disable- > modern=3Dtrue,mrg_rxbuf=3Doff,csum=3Don,guest_csum=3Don,host_tso4=3Don,gu= est_ts > o4=3Don,guest_ecn=3Don" > path_mode =3D "normal" > self.get_core_list(2) > self.start_vhost_testpmd() > - self.start_vms(mode=3D0, mergeable=3DFalse) > + self.start_vms(qemu_path=3Dqemu_path) > self.start_vm_testpmd(self.vm_dut[0], path_mode) > self.start_vm_testpmd(self.vm_dut[1], path_mode) > self.send_and_verify(mode=3D"virtio 0.95 normal path", path=3Dpa= th_mode) >=20 > def test_vhost_vm2vm_virito_10_pmd_with_normal_path(self): > """ > - vhost-user + virtio1.0-pmd with normal path > + Test Case 4: vhost-user + virtio1.0-pmd with normal path > """ > path_mode =3D "normal" > + qemu_path =3D "disable- > modern=3Dfalse,mrg_rxbuf=3Doff,csum=3Don,guest_csum=3Don,host_tso4=3Don,g= uest_t > so4=3Don,guest_ecn=3Don" > self.get_core_list(2) > self.start_vhost_testpmd() > - self.start_vms(mode=3D1, mergeable=3DFalse) > + self.start_vms(qemu_path=3Dqemu_path) > self.start_vm_testpmd(self.vm_dut[0], path_mode) > self.start_vm_testpmd(self.vm_dut[1], path_mode) > self.send_and_verify(mode=3D"virtio 1.0 normal path", path=3Dpat= h_mode) >=20 > def test_vhost_vm2vm_virtio_pmd_with_vector_rx_path(self): > """ > - vhost-user + virtio-pmd with vector_rx path > + Test Case 1: vhost-user + virtio-pmd with vector_rx path > """ > path_mode =3D "vector_rx" > + qemu_path =3D "disable- > modern=3Dtrue,mrg_rxbuf=3Doff,csum=3Don,guest_csum=3Don,host_tso4=3Don,gu= est_ts > o4=3Don,guest_ecn=3Don" > self.get_core_list(2) > self.start_vhost_testpmd() > - self.start_vms(mode=3D0, mergeable=3DFalse) > + self.start_vms(qemu_path=3Dqemu_path) > self.start_vm_testpmd(self.vm_dut[0], path_mode, virtio_net_pci = =3D > self.vm_dut[0].ports_info[0]['pci']) > self.start_vm_testpmd(self.vm_dut[1], path_mode, virtio_net_pci = =3D > self.vm_dut[1].ports_info[0]['pci']) > self.send_and_verify(mode=3D"virtio 0.95 vector_rx", path=3Dpath= _mode) >=20 > def test_vhost_vm2vm_virtio_10_pmd_with_vector_rx_path(self): > """ > - vhost-user + virtio1.0-pmd with vector_rx path > + Test Case 3: vhost-user + virtio1.0-pmd with vector_rx path > """ > path_mode =3D "vector_rx" > + qemu_path =3D "disable- > modern=3Dfalse,mrg_rxbuf=3Doff,csum=3Don,guest_csum=3Don,host_tso4=3Don,g= uest_t > so4=3Don,guest_ecn=3Don" > self.get_core_list(2) > self.start_vhost_testpmd() > - self.start_vms(mode=3D1, mergeable=3DFalse) > + self.start_vms(qemu_path=3Dqemu_path) > self.start_vm_testpmd(self.vm_dut[0], path_mode, virtio_net_pci = =3D > self.vm_dut[0].ports_info[0]['pci']) > self.start_vm_testpmd(self.vm_dut[1], path_mode, virtio_net_pci = =3D > self.vm_dut[1].ports_info[0]['pci']) > self.send_and_verify(mode=3D"virtio 1.0 vector_rx", path=3Dpath_= mode) >=20 > def test_vhost_vm2vm_virito_pmd_with_mergeable_path(self): > """ > - vhost-user + virtio-pmd with mergeable path test with payload ch= eck > + Test Case 5: vhost-user + virtio-pmd with mergeable path test wi= th > payload check > """ > path_mode =3D "mergeable" > + qemu_path =3D "disable- > modern=3Dtrue,mrg_rxbuf=3Don,csum=3Don,guest_csum=3Don,host_tso4=3Don,gue= st_ts > o4=3Don,guest_ecn=3Don" > extern_param =3D '--max-pkt-len=3D9600' > dump_port =3D 'port=3D0' > self.get_core_list(2) > self.start_vhost_testpmd() > - self.start_vms(mode=3D0, mergeable=3DTrue) > + self.start_vms(qemu_path=3Dqemu_path) > # git the vm enough huge to run pdump > self.vm_dut[0].set_huge_pages(2048) > # start testpmd and pdump in VM0 > @@ -377,14 +370,15 @@ class TestVM2VMVirtioPMD(TestCase): >=20 > def test_vhost_vm2vm_virito_10_pmd_with_mergeable_path(self): > """ > - vhost-user + virtio1.0-pmd with mergeable path test with payload= check > + Test Case 6: vhost-user + virtio1.0-pmd with mergeable path test= with > payload check > """ > path_mode =3D "mergeable" > + qemu_path =3D "disable- > modern=3Dfalse,mrg_rxbuf=3Don,csum=3Don,guest_csum=3Don,host_tso4=3Don,gu= est_ts > o4=3Don,guest_ecn=3Don" > extern_param =3D '--max-pkt-len=3D9600' > dump_port =3D 'port=3D0' > self.get_core_list(2) > self.start_vhost_testpmd() > - self.start_vms(mode=3D1, mergeable=3DTrue) > + self.start_vms(qemu_path=3Dqemu_path) > # git the vm enough huge to run pdump > self.vm_dut[0].set_huge_pages(2048) > # start testpmd and pdump in VM0 > @@ -402,26 +396,28 @@ class TestVM2VMVirtioPMD(TestCase): >=20 > def test_vhost_vm2vm_virito_11_pmd_with_normal_path(self): > """ > - vhost-user + virtio1.0-pmd with normal path > + Test Case 8: vhost-user + virtio1.0-pmd with normal path > """ > path_mode =3D "normal" > + qemu_path =3D "disable- > modern=3Dfalse,mrg_rxbuf=3Doff,csum=3Don,guest_csum=3Don,host_tso4=3Don,g= uest_t > so4=3Don,guest_ecn=3Don,packed=3Don" > self.get_core_list(2) > self.start_vhost_testpmd() > - self.start_vms(mode=3D2, mergeable=3DFalse) > + self.start_vms(qemu_path=3Dqemu_path) > self.start_vm_testpmd(self.vm_dut[0], path_mode) > self.start_vm_testpmd(self.vm_dut[1], path_mode) > self.send_and_verify(mode=3D"virtio 1.0 normal path", path=3Dpat= h_mode) >=20 > def test_vhost_vm2vm_virito_11_pmd_with_mergeable_path(self): > """ > - vhost-user + virtio1.0-pmd with mergeable path test with payload= check > + Test Case 7: vhost-user + virtio1.0-pmd with mergeable path test= with > payload check > """ > path_mode =3D "mergeable" > + qemu_path =3D "disable- > modern=3Dfalse,mrg_rxbuf=3Don,csum=3Don,guest_csum=3Don,host_tso4=3Don,gu= est_ts > o4=3Don,guest_ecn=3Don,packed=3Don" > extern_param =3D '--max-pkt-len=3D9600' > dump_port =3D 'port=3D0' > self.get_core_list(2) > self.start_vhost_testpmd() > - self.start_vms(mode=3D2, mergeable=3DTrue) > + self.start_vms(qemu_path=3Dqemu_path) > # git the vm enough huge to run pdump > self.vm_dut[0].set_huge_pages(2048) > # start testpmd and pdump in VM0 > @@ -437,7 +433,7 @@ class TestVM2VMVirtioPMD(TestCase): > # check the packet in vm0 > self.check_packet_payload_valid(self.vm_dut[0]) >=20 > - def > test_vhost_vm2vm_virtio_split_ring_with_mergeable_path_cbdma_enabled( > self): > + def > test_vhost_vm2vm_virtio_split_ring_with_mergeable_path_cbdma_enable(s > elf): > """ > Test Case 9: VM2VM virtio-pmd split ring mergeable path 8 queues > CBDMA enable with server mode stable test > """ > @@ -445,8 +441,9 @@ class TestVM2VMVirtioPMD(TestCase): > self.get_core_list(self.nb_cores + 1) > self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=3D16, > queue_num=3D8, allow_diff_socket=3DTrue) > self.logger.info("Launch vhost-testpmd with CBDMA and used 8 que= ue") > - self.prepare_test_env(cbdma=3DTrue, no_pci=3DFalse, client_mode= =3DTrue, > enable_queues=3D8, nb_cores=3D4, > - server_mode=3DTrue, opt_queue=3D8, combine= d=3DTrue, > rxq_txq=3D8) > + qemu_path =3D "disable- > modern=3Dfalse,mrg_rxbuf=3Don,mq=3Don,vectors=3D40,csum=3Don,guest_csum= =3Don,ho > st_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= =3DTrue, > enable_queues=3D8, nb_cores=3D4, qemu_path=3Dqemu_path, > + server_mode=3DTrue, opt_queue=3D8, rxq_txq= =3D8) > self.logger.info("Launch testpmd in VM1") > self.start_vm_testpmd(self.vm_dut[0], "mergeable", extern_param= =3D"-- > max-pkt-len=3D9600", queues=3D"8") > self.vm_dut[0].send_expect('set fwd mac', 'testpmd> ', 30) > @@ -469,7 +466,7 @@ class TestVM2VMVirtioPMD(TestCase): > self.check_port_stats_result(self.vm_dut[0], queue_num=3D8) > self.check_port_stats_result(self.vm_dut[1], queue_num=3D8) >=20 > - def > test_vhost_vm2vm_split_ring_with_mergeable_path_and_server_mode_cbd > ma_enabled(self): > + def > test_vhost_vm2vm_split_ring_with_mergeable_path_and_server_mode_cbd > ma_enable(self): > """ > Test Case 10: VM2VM virtio-pmd split ring mergeable path dynamic > queue size CBDMA enable with server mode test > """ > @@ -477,8 +474,9 @@ class TestVM2VMVirtioPMD(TestCase): > self.get_core_list(self.nb_cores + 1) > self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=3D16, > queue_num=3D8, allow_diff_socket=3DTrue) > self.logger.info("Launch vhost-testpmd with CBDMA and used 8 que= ue") > - self.prepare_test_env(cbdma=3DTrue, no_pci=3DFalse, client_mode= =3DTrue, > enable_queues=3D8, nb_cores=3D4, > - server_mode=3DTrue, opt_queue=3D8, combine= d=3DTrue, > rxq_txq=3D8) > + qemu_path =3D "disable- > modern=3Dfalse,mrg_rxbuf=3Don,mq=3Don,vectors=3D40,csum=3Don,guest_csum= =3Don,ho > st_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= =3DTrue, > enable_queues=3D8, nb_cores=3D4, qemu_path=3Dqemu_path, > + server_mode=3DTrue, opt_queue=3D8, rxq_txq= =3D8) > self.logger.info("Launch testpmd in VM1") > self.start_vm_testpmd(self.vm_dut[0], "mergeable", extern_param= =3D"-- > max-pkt-len=3D9600", queues=3D"8") > self.vm_dut[0].send_expect('set fwd mac', 'testpmd> ', 30) > @@ -500,15 +498,16 @@ class TestVM2VMVirtioPMD(TestCase): > self.check_port_stats_result(self.vm_dut[0], queue_num=3D8) > self.check_port_stats_result(self.vm_dut[1], queue_num=3D8) >=20 > - def > test_vhost_vm2vm_packed_ring_with_mergeable_path_and_8queues_cbdm > a_enabled(self): > + def > test_vhost_vm2vm_packed_ring_with_mergeable_path_and_8queues_cbdm > a_enable(self): > """ > Test Case 11: VM2VM virtio-pmd packed ring mergeable path 8 queu= es > CBDMA enable test > """ > self.nb_cores =3D 4 > self.get_core_list(self.nb_cores + 1) > self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=3D16, > queue_num=3D8, allow_diff_socket=3DTrue) > - self.prepare_test_env(cbdma=3DTrue, no_pci=3DFalse, client_mode= =3DFalse, > enable_queues=3D8, nb_cores=3D4, > - server_mode=3DFalse, opt_queue=3D8, combin= ed=3DTrue, > rxq_txq=3D8, mode=3D2) > + qemu_path =3D "disable- > modern=3Dfalse,mrg_rxbuf=3Don,mq=3Don,vectors=3D40,csum=3Don,guest_csum= =3Don,ho > st_tso4=3Don,guest_tso4=3Don,guest_ecn=3Don,guest_ufo=3Don,host_ufo=3Don,= packed > =3Don" > + self.prepare_test_env(cbdma=3DTrue, no_pci=3DFalse, client_mode= =3DFalse, > enable_queues=3D8, nb_cores=3D4, qemu_path=3Dqemu_path, > + server_mode=3DFalse, opt_queue=3D8, rxq_tx= q=3D8) > self.logger.info("Launch testpmd in VM1") > self.start_vm_testpmd(self.vm_dut[0], "mergeable", extern_param= =3D"-- > max-pkt-len=3D9600", queues=3D"8") > self.logger.info("Launch testpmd in VM2 and send imix pkts") > @@ -616,14 +615,14 @@ class TestVM2VMVirtioPMD(TestCase): > vm_dut.send_expect("clear port stats all", "testpmd> ", 30) > vm_dut.send_expect("start", "testpmd> ", 30) >=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, iova_mode=3DFalse, vm_config=3D'vhost_sample', mode=3D1): > + def prepare_test_env(self, cbdma=3DFalse, no_pci=3DTrue, client_mode= =3DFalse, > enable_queues=3D1, nb_cores=3D2, qemu_path=3D'', > + server_mode=3DFalse, opt_queue=3DNone, rxq_txq= =3DNone, > iova_mode=3DFalse, vm_config=3D'vhost_sample'): > """ > start vhost testpmd and qemu, and config the vm env > """ > self.start_vhost_testpmd_cbdma(cbdma=3Dcbdma, no_pci=3Dno_pci, > client_mode=3Dclient_mode, enable_queues=3Denable_queues, > nb_cores=3Dnb_cores, rxq_txq=3Drxq_txq, > iova_mode=3Diova_mode) > - self.start_vms(server_mode=3Dserver_mode, opt_queue=3Dopt_queue, > mode=3Dmode, vm_config=3Dvm_config) > + self.start_vms(qemu_path=3Dqemu_path, server_mode=3Dserver_mode, > opt_queue=3Dopt_queue, vm_config=3Dvm_config) >=20 > def start_vhost_testpmd_cbdma(self, cbdma=3DFalse, no_pci=3DTrue, > client_mode=3DFalse, enable_queues=3D1, nb_cores=3D2, rxq_txq=3DNone, > iova_mode=3DFalse): > """ > -- > 2.32.0