From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: redhat.com, ip: 209.132.183.28, mailfrom: lersek@redhat.com) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Wed, 31 Jul 2019 08:08:24 -0700 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ADF422D1CE; Wed, 31 Jul 2019 15:08:23 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-110.ams2.redhat.com [10.36.116.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id B15CD6061E; Wed, 31 Jul 2019 15:08:22 +0000 (UTC) Subject: Re: [Patch] UefiCpuPkg/MpInitLib: Avoid copy twice. To: Eric Dong , devel@edk2.groups.io Cc: Ray Ni References: <20190731080102.7292-1-eric.dong@intel.com> From: "Laszlo Ersek" Message-ID: <7572eb62-0ba3-904c-8fc8-d3c074472c75@redhat.com> Date: Wed, 31 Jul 2019 17:08:21 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190731080102.7292-1-eric.dong@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 31 Jul 2019 15:08:23 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 07/31/19 10:01, Eric Dong wrote: > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1982 > > MpInitLibInitialize in MpLib.c will be invoked on both PEI and DXE > CPU code, MicrocodeDetect would be performed twice and copy > Microcode from flash to memory twice as well, which consider as > duplicate work to lead longer boot time. > This patch just use microcode memory copied in PEI phase if exist. > > Signed-off-by: Eric Dong > Cc: Ray Ni > Cc: Laszlo Ersek > --- > UefiCpuPkg/Library/MpInitLib/MpLib.c | 62 +++++++++++++++------------- > 1 file changed, 33 insertions(+), 29 deletions(-) > > diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c > index 572495ec36..a1ad665564 100644 > --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c > +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c > @@ -1607,38 +1607,42 @@ MpInitLibInitialize ( > CpuMpData->SwitchBspFlag = FALSE; > CpuMpData->CpuData = (CPU_AP_DATA *) (CpuMpData + 1); > CpuMpData->CpuInfoInHob = (UINT64) (UINTN) (CpuMpData->CpuData + MaxLogicalProcessorNumber); > - CpuMpData->MicrocodePatchRegionSize = PcdGet64 (PcdCpuMicrocodePatchRegionSize); > - // > - // If platform has more than one CPU, relocate microcode to memory to reduce > - // loading microcode time. > - // > - MicrocodePatchInRam = NULL; > - if (MaxLogicalProcessorNumber > 1) { > - MicrocodePatchInRam = AllocatePages ( > - EFI_SIZE_TO_PAGES ( > - (UINTN)CpuMpData->MicrocodePatchRegionSize > - ) > - ); > - } > - if (MicrocodePatchInRam == NULL) { > - // > - // there is only one processor, or no microcode patch is available, or > - // memory allocation failed > - // > - CpuMpData->MicrocodePatchAddress = PcdGet64 (PcdCpuMicrocodePatchAddress); > - } else { > + if (OldCpuMpData == NULL) { > + CpuMpData->MicrocodePatchRegionSize = PcdGet64 (PcdCpuMicrocodePatchRegionSize); > // > - // there are multiple processors, and a microcode patch is available, and > - // memory allocation succeeded > + // If platform has more than one CPU, relocate microcode to memory to reduce > + // loading microcode time. > // > - CopyMem ( > - MicrocodePatchInRam, > - (VOID *)(UINTN)PcdGet64 (PcdCpuMicrocodePatchAddress), > - (UINTN)CpuMpData->MicrocodePatchRegionSize > - ); > - CpuMpData->MicrocodePatchAddress = (UINTN)MicrocodePatchInRam; > + MicrocodePatchInRam = NULL; > + if (MaxLogicalProcessorNumber > 1) { > + MicrocodePatchInRam = AllocatePages ( > + EFI_SIZE_TO_PAGES ( > + (UINTN)CpuMpData->MicrocodePatchRegionSize > + ) > + ); > + } > + if (MicrocodePatchInRam == NULL) { > + // > + // there is only one processor, or no microcode patch is available, or > + // memory allocation failed > + // > + CpuMpData->MicrocodePatchAddress = PcdGet64 (PcdCpuMicrocodePatchAddress); > + } else { > + // > + // there are multiple processors, and a microcode patch is available, and > + // memory allocation succeeded > + // > + CopyMem ( > + MicrocodePatchInRam, > + (VOID *)(UINTN)PcdGet64 (PcdCpuMicrocodePatchAddress), > + (UINTN)CpuMpData->MicrocodePatchRegionSize > + ); > + CpuMpData->MicrocodePatchAddress = (UINTN)MicrocodePatchInRam; > + } > + }else { > + CpuMpData->MicrocodePatchRegionSize = OldCpuMpData->MicrocodePatchRegionSize; > + CpuMpData->MicrocodePatchAddress = OldCpuMpData->MicrocodePatchAddress; > } > - > InitializeSpinLock(&CpuMpData->MpLock); > > // > I applied this patch locally and reviewed it with: git show -b -W The change looks reasonable to me. (1) Please clarify the subject line a bit. My suggestion is: UefiCpuPkg/MpInitLib: don't shadow the microcode patch twice (this is 58 characters). Feel free to tweak this further if you wish; the point is that "copy" is too generic in itself. With (1) fixed: Reviewed-by: Laszlo Ersek Thanks Laszlo