From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: ray.ni@intel.com) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by groups.io with SMTP; Thu, 25 Jul 2019 01:59:15 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Jul 2019 01:59:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,306,1559545200"; d="scan'208";a="345370292" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga005.jf.intel.com with ESMTP; 25 Jul 2019 01:59:14 -0700 Received: from fmsmsx158.amr.corp.intel.com (10.18.116.75) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 25 Jul 2019 01:59:14 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx158.amr.corp.intel.com (10.18.116.75) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 25 Jul 2019 01:59:14 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.110]) by shsmsx102.ccr.corp.intel.com ([169.254.2.19]) with mapi id 14.03.0439.000; Thu, 25 Jul 2019 16:59:12 +0800 From: "Ni, Ray" To: "Dong, Eric" , "devel@edk2.groups.io" CC: Laszlo Ersek , "Kumar, Chandana C" , "Zeng, Star" Subject: Re: [Patch v3 6/6] UefiCpuPkg/RegisterCpuFeaturesLib: Start all processors simultaneously. Thread-Topic: [Patch v3 6/6] UefiCpuPkg/RegisterCpuFeaturesLib: Start all processors simultaneously. Thread-Index: AQHVQe6Em9gKEz5bt0Kvh/2YsSJfPabbCgjw Date: Thu, 25 Jul 2019 08:59:12 +0000 Deferred-Delivery: Thu, 25 Jul 2019 08:58:00 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5C244F29@SHSMSX104.ccr.corp.intel.com> References: <20190724070727.14976-1-eric.dong@intel.com> <20190724070727.14976-7-eric.dong@intel.com> In-Reply-To: <20190724070727.14976-7-eric.dong@intel.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: ray.ni@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ray Ni > -----Original Message----- > From: Dong, Eric > Sent: Wednesday, July 24, 2019 3:07 PM > To: devel@edk2.groups.io > Cc: Ni, Ray ; Laszlo Ersek ; Kumar, > Chandana C ; Zeng, Star > > Subject: [Patch v3 6/6] UefiCpuPkg/RegisterCpuFeaturesLib: Start all > processors simultaneously. >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1973 >=20 > For semaphore type register, it required all processors to do the task at= the > same time. > Current logic begins BSP's task after all APs have finished their tasks. > This will caused set semaphore task hang if semaphore has package level > type. > This patch use new EDKII_PEI_MP_SERVICES2_PPI to start all processors at > the same time to fix the potential hang issue. >=20 > Cc: Ray Ni > Cc: Laszlo Ersek > Cc: Chandana Kumar > Cc: Star Zeng > Signed-off-by: Eric Dong > --- > .../CpuFeaturesInitialize.c | 2 +- > .../DxeRegisterCpuFeaturesLib.c | 6 +- > .../PeiRegisterCpuFeaturesLib.c | 66 ++++++++++++++----- > .../PeiRegisterCpuFeaturesLib.inf | 1 + > .../RegisterCpuFeatures.h | 2 +- > 5 files changed, 54 insertions(+), 23 deletions(-) >=20 > diff --git > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c > index 33752c1a9f..4e97e863c7 100644 > --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c > +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c > @@ -1074,7 +1074,7 @@ CpuFeaturesDetect ( > // > // Wakeup all APs for data collection. > // > - StartupAPsWorker (CollectProcessorData, NULL); > + StartupAllAPsWorker (CollectProcessorData, NULL); > } >=20 > // > diff --git > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLib.c > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLib.c > index f87b2892aa..e2e06e88e0 100644 > --- > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLib.c > +++ > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLi > +++ b.c > @@ -1,7 +1,7 @@ > /** @file > CPU Register Table Library functions. >=20 > - Copyright (c) 2017, Intel Corporation. All rights reserved.
> + Copyright (c) 2017 - 2019, Intel Corporation. All rights > + reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ > @@ -116,7 +116,7 @@ GetProcessorInformation ( > to check whether procedure has don= e. > **/ > VOID > -StartupAPsWorker ( > +StartupAllAPsWorker ( > IN EFI_AP_PROCEDURE Procedure, > IN EFI_EVENT MpEvent > ) > @@ -248,7 +248,7 @@ CpuFeaturesInitialize ( > // > // Wakeup all APs for programming. > // > - StartupAPsWorker (SetProcessorRegister, MpEvent); > + StartupAllAPsWorker (SetProcessorRegister, MpEvent); > } >=20 > // > diff --git > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.c > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.c > index 8ad5a40e5a..52b849ce13 100644 > --- > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.c > +++ > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLi > +++ b.c > @@ -1,7 +1,7 @@ > /** @file > CPU Register Table Library functions. >=20 > - Copyright (c) 2016, Intel Corporation. All rights reserved.
> + Copyright (c) 2016 - 2019, Intel Corporation. All rights > + reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ > @@ -12,6 +12,8 @@ > #include > #include > #include > +#include > + > #include "RegisterCpuFeatures.h" >=20 > #define REGISTER_CPU_FEATURES_GUID \ > @@ -154,7 +156,7 @@ GetProcessorInformation ( >=20 > **/ > VOID > -StartupAPsWorker ( > +StartupAllAPsWorker ( > IN EFI_AP_PROCEDURE Procedure, > IN EFI_EVENT MpEvent > ) > @@ -180,6 +182,48 @@ StartupAPsWorker ( > ASSERT_EFI_ERROR (Status); > } >=20 > +/** > + Worker function to execute a caller provided function on all enabled A= Ps. > + > + @param[in] Procedure A pointer to the function to be ru= n on > + enabled APs of the system. > + @param[in] MpEvent The Event used to sync the result. > + > +**/ > +VOID > +StartupAllCPUsWorker ( > + IN EFI_AP_PROCEDURE Procedure > + ) > +{ > + EFI_STATUS Status; > + EDKII_PEI_MP_SERVICES2_PPI *CpuMp2Ppi; > + CPU_FEATURES_DATA *CpuFeaturesData; > + > + CpuFeaturesData =3D GetCpuFeaturesData (); > + > + // > + // Get MP Services2 Ppi > + // > + Status =3D PeiServicesLocatePpi ( > + &gEdkiiPeiMpServices2PpiGuid, > + 0, > + NULL, > + (VOID **)&CpuMp2Ppi > + ); > + ASSERT_EFI_ERROR (Status); > + > + // > + // Wakeup all APs for data collection. > + // > + Status =3D CpuMp2Ppi->StartupAllCPUs ( > + CpuMp2Ppi, > + Procedure, > + 0, > + CpuFeaturesData > + ); > + ASSERT_EFI_ERROR (Status); > +} > + > /** > Worker function to switch the requested AP to be the BSP from that poi= nt > onward. >=20 > @@ -267,23 +311,9 @@ CpuFeaturesInitialize ( > CpuFeaturesData->BspNumber =3D OldBspNumber; >=20 > // > - // Known limitation: In PEI phase, CpuFeatures driver not > - // support async mode execute tasks. So semaphore type > - // register can't been used for this instance, must use > - // DXE type instance. > - // > - > - if (CpuFeaturesData->NumberOfCpus > 1) { > - // > - // Wakeup all APs for programming. > - // > - StartupAPsWorker (SetProcessorRegister, NULL); > - } > - > - // > - // Programming BSP > + // Start to program register for all CPUs. > // > - SetProcessorRegister (CpuFeaturesData); > + StartupAllCPUsWorker (SetProcessorRegister); >=20 > // > // Switch to new BSP if required > diff --git > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.in > f > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.in > f > index 63091dfeb8..61f922bf63 100644 > --- > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.in > f > +++ > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLi > +++ b.inf > @@ -46,6 +46,7 @@ >=20 > [Ppis] > gEfiPeiMpServicesPpiGuid #= # CONSUMES > + gEdkiiPeiMpServices2PpiGuid #= # CONSUMES >=20 > [Pcd] > gUefiCpuPkgTokenSpaceGuid.PcdCpuS3DataAddress #= # > CONSUMES > diff --git > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h > index a18f926641..a25dd69292 100644 > --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h > +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h > @@ -145,7 +145,7 @@ GetProcessorInformation ( > to check whether procedure has don= e. > **/ > VOID > -StartupAPsWorker ( > +StartupAllAPsWorker ( > IN EFI_AP_PROCEDURE Procedure, > IN EFI_EVENT MpEvent > ); > -- > 2.21.0.windows.1