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.24; helo=mga09.intel.com; envelope-from=chao.b.zhang@intel.com; receiver=edk2-devel@lists.01.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 8CA2F201B042A for ; Mon, 18 Feb 2019 17:05:36 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Feb 2019 17:05:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,385,1544515200"; d="scan'208";a="300739911" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga005.jf.intel.com with ESMTP; 18 Feb 2019 17:05:35 -0800 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 18 Feb 2019 17:05:35 -0800 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 18 Feb 2019 17:05:34 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.207]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.110]) with mapi id 14.03.0415.000; Tue, 19 Feb 2019 09:05:32 +0800 From: "Zhang, Chao B" To: "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: AQHUx05c0CwhHaMphUa+TgLS0tDHSqXmTzKQ Date: Tue, 19 Feb 2019 01:05:31 +0000 Message-ID: References: <20190218055330.13448-1-chen.a.chen@intel.com> In-Reply-To: <20190218055330.13448-1-chen.a.chen@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMzZkZmEyY2ItNTVmYi00YjAyLThlNjctYTM4NWRiYzU1NDhjIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiaVYrZGNnKzQrZzFNTm1cL05oV1JDcmo3Tzc2NUE4ZzROVkI5aVlPU0dUY25xTEJaaXphVVpQN3ppWGFaUk1zU2cifQ== dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action 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 01:05:36 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Chen Chen: I think you can add uCode format info into comments. Also please highlig= ht in comment Which part is header checksum calculation, which part is for extended heade= r -----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 REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1020 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 MicrocodeHeader, and th= en calculate the CheckSum32 with MicrocodeHeader+MicrocodeBinary. This patch already verified on ICL platform. 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(-) 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->Micr= ocodePatchAddress; + + // + // 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) + MicrocodeEntr= yPoint->DataSize + ); + } + InCompleteCheckSum32 -=3D=20 + 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, 2= 048); - } else { - CheckSum32 =3D CalculateSum32 ( - (UINT32 *) MicrocodeEntryPoint, - MicrocodeEntryPoint->DataSize + sizeof (CPU_MICRO= CODE_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->ExtendedSignatur= eCount; ExtendedTable =3D (CPU_MICROCODE_EXTENDED_TABLE *) (Ext= endedTableHeader + 1); for (Index =3D 0; Index < ExtendedTableCount; Index ++) { - CheckSum32 =3D CalculateSum32 ((UINT32 *) ExtendedTable, s= izeof(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 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel