From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.31; helo=mga06.intel.com; envelope-from=ray.ni@intel.com; receiver=edk2-devel@lists.01.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A5BBD208AE9B6 for ; Mon, 18 Feb 2019 18:37:41 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Feb 2019 18:37:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,385,1544515200"; d="scan'208";a="117223128" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga006.jf.intel.com with ESMTP; 18 Feb 2019 18:37:40 -0800 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 18 Feb 2019 18:37:40 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.102]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.194]) with mapi id 14.03.0415.000; Tue, 19 Feb 2019 10:37:38 +0800 From: "Ni, Ray" To: "Zhang, Chao B" , "Chen, Chen A" , "edk2-devel@lists.01.org" CC: "Dong, Eric" Thread-Topic: [edk2] [PATCH] UefiCpuPkg/Microcode: Fix incorrect checksum issue for extended table Thread-Index: AQHUx05VQR+TVPp2rk+6xE9HfQwkEaXlybKAgACgLRA= Date: Tue, 19 Feb 2019 02:37:37 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5C023691@SHSMSX104.ccr.corp.intel.com> References: <20190218055330.13448-1-chen.a.chen@intel.com> In-Reply-To: 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 Subject: Re: [PATCH] UefiCpuPkg/Microcode: Fix incorrect checksum issue for extended table X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Feb 2019 02:37:41 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable I agree with Chao's comments. Please add more code comments to: 1. describe the uCode format 2. explain all the 3 code blocks that checks the checksum. > -----Original Message----- > From: edk2-devel On Behalf Of Zhang, > Chao B > Sent: Tuesday, February 19, 2019 9:06 AM > To: Chen, Chen A ; edk2-devel@lists.01.org > Cc: Dong, Eric > Subject: Re: [edk2] [PATCH] UefiCpuPkg/Microcode: Fix incorrect checksum > issue for extended table >=20 > Chen Chen: > I think you can add uCode format info into comments. Also please highl= ight > in comment Which part is header checksum calculation, which part is for > extended header >=20 > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of > Chen A Chen > Sent: Monday, February 18, 2019 1:54 PM > To: edk2-devel@lists.01.org > Cc: Dong, Eric > Subject: [edk2] [PATCH] UefiCpuPkg/Microcode: Fix incorrect checksum > issue for extended table >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1020 >=20 > The following Microcode payload format is define in SDM spec. > Payload: > |MicrocodeHeader|MicrocodeBinary|ExtendedHeader|ExtendedTable|. > When we verify the CheckSum32 with ExtendedTable, we should use the > fields of ExtendedTable to replace corresponding fields in MicrocodeHeade= r, > and then calculate the CheckSum32 with MicrocodeHeader+MicrocodeBinary. > This patch already verified on ICL platform. >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Chen A Chen > Cc: Ray Ni > Cc: Eric Dong > --- > UefiCpuPkg/Library/MpInitLib/Microcode.c | 38 > ++++++++++++++++++++++++-------- > 1 file changed, 29 insertions(+), 9 deletions(-) >=20 > diff --git a/UefiCpuPkg/Library/MpInitLib/Microcode.c > b/UefiCpuPkg/Library/MpInitLib/Microcode.c > index d84344c6f5..38880cdbec 100644 > --- a/UefiCpuPkg/Library/MpInitLib/Microcode.c > +++ b/UefiCpuPkg/Library/MpInitLib/Microcode.c > @@ -57,6 +57,7 @@ MicrocodeDetect ( > UINT32 LatestRevision; > UINTN TotalSize; > UINT32 CheckSum32; > + UINT32 InCompleteCheckSum32; > BOOLEAN CorrectMicrocode; > VOID *MicrocodeData; > MSR_IA32_PLATFORM_ID_REGISTER PlatformIdMsr; > @@ -121,6 +122,26 @@ MicrocodeDetect ( > MicrocodeData =3D NULL; > MicrocodeEnd =3D (UINTN) (CpuMpData->MicrocodePatchAddress + > CpuMpData->MicrocodePatchRegionSize); > MicrocodeEntryPoint =3D (CPU_MICROCODE_HEADER *) (UINTN) > CpuMpData->MicrocodePatchAddress; > + > + // > + // To avoid double calculate checksum32 value. > + // Save the CheckSum32 of the common parts in advance. > + // > + if (MicrocodeEntryPoint->DataSize =3D=3D 0) { > + InCompleteCheckSum32 =3D CalculateSum32 ( > + (UINT32 *) MicrocodeEntryPoint, > + sizeof (CPU_MICROCODE_HEADER) + 2000 > + ); > + } else { > + InCompleteCheckSum32 =3D CalculateSum32 ( > + (UINT32 *) MicrocodeEntryPoint, > + sizeof (CPU_MICROCODE_HEADER) + MicrocodeEn= tryPoint- > >DataSize > + ); > + } > + InCompleteCheckSum32 -=3D > + MicrocodeEntryPoint->ProcessorSignature.Uint32; > + InCompleteCheckSum32 -=3D MicrocodeEntryPoint->ProcessorFlags; > + InCompleteCheckSum32 -=3D MicrocodeEntryPoint->Checksum; > + > do { > // > // Check if the microcode is for the Cpu and the version is newer @@= - > 137,14 +158,10 @@ MicrocodeDetect ( > MicrocodeEntryPoint->UpdateRevision > LatestRevision && > (MicrocodeEntryPoint->ProcessorFlags & (1 << PlatformId)) > ) { > - if (MicrocodeEntryPoint->DataSize =3D=3D 0) { > - CheckSum32 =3D CalculateSum32 ((UINT32 *) MicrocodeEntryPoint,= 2048); > - } else { > - CheckSum32 =3D CalculateSum32 ( > - (UINT32 *) MicrocodeEntryPoint, > - MicrocodeEntryPoint->DataSize + sizeof > (CPU_MICROCODE_HEADER) > - ); > - } > + CheckSum32 =3D InCompleteCheckSum32; > + CheckSum32 +=3D MicrocodeEntryPoint->ProcessorSignature.Uint32; > + CheckSum32 +=3D MicrocodeEntryPoint->ProcessorFlags; > + CheckSum32 +=3D MicrocodeEntryPoint->Checksum; > if (CheckSum32 =3D=3D 0) { > CorrectMicrocode =3D TRUE; > ProcessorFlags =3D MicrocodeEntryPoint->ProcessorFlags; > @@ -171,7 +188,10 @@ MicrocodeDetect ( > ExtendedTableCount =3D ExtendedTableHeader- > >ExtendedSignatureCount; > ExtendedTable =3D (CPU_MICROCODE_EXTENDED_TABLE *) > (ExtendedTableHeader + 1); > for (Index =3D 0; Index < ExtendedTableCount; Index ++) { > - CheckSum32 =3D CalculateSum32 ((UINT32 *) ExtendedTable, > sizeof(CPU_MICROCODE_EXTENDED_TABLE)); > + CheckSum32 =3D InCompleteCheckSum32; > + CheckSum32 +=3D ExtendedTable->ProcessorSignature.Uint32= ; > + CheckSum32 +=3D ExtendedTable->ProcessorFlag; > + CheckSum32 +=3D ExtendedTable->Checksum; > if (CheckSum32 =3D=3D 0) { > // > // Verify Header > -- > 2.16.2.windows.1 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel