From nobody Sun Apr 28 11:23:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+41903+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+41903+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1559697356; cv=none; d=zoho.com; s=zohoarc; b=ISQoEMFO+3XIfQlbV8KU8WxbOLc0pf4zpZk37Uab+UzLXK1mGy1JL9TIfjJ1wPtEl0ZfuFhtypuJnDB/GTvi0xNz95vfLqY/Nlm1vFvPUAoTjsq60ONXurijAQsRVdRX2FJxmC3571EflseFoQhqVEvXZDSEmyson2fzh6rN+Kc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559697356; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=b6ZRRQGVw9VohBLkep7+JeKs7atpZicxdqpXrX2Orog=; b=jpxle2w0PEp+W8pDaynbSITSAYlRDSh1O6UxG7mWRjIk1ydUrSMcXylHqU1fJRjk14/epCXrdkiamG874cGH8ZssKdC59iIXfpITU3zq/t28g+2XhcFIo4ZSaJCjlwv27yjlIv6EoB2zs7rrzOdHZvKbMPblIrCxFsXj4vo659o= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+41903+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1559697356629387.08192660710074; Tue, 4 Jun 2019 18:15:56 -0700 (PDT) Return-Path: X-Received: from mga09.intel.com (mga09.intel.com []) by groups.io with SMTP; Tue, 04 Jun 2019 18:15:55 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Jun 2019 18:15:55 -0700 X-ExtLoop1: 1 X-Received: from fieedk001.ccr.corp.intel.com ([10.239.33.119]) by orsmga006.jf.intel.com with ESMTP; 04 Jun 2019 18:15:52 -0700 From: "Gao, Zhichao" To: devel@edk2.groups.io Cc: Bret Barkelew , Jian J Wang , Hao A Wu , Ray Ni , Star Zeng , Liming Gao , Sean Brogan , Michael Turner , Leif Lindholm , Zhichao gao Subject: [edk2-devel] [PATCH v4 1/2] MdeModulePkg/CapsulePei: Optimize the CapsulePei Date: Wed, 5 Jun 2019 09:15:44 +0800 Message-Id: <20190605011545.18724-2-zhichao.gao@intel.com> In-Reply-To: <20190605011545.18724-1-zhichao.gao@intel.com> References: <20190605011545.18724-1-zhichao.gao@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,zhichao.gao@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1559697355; bh=9aPZP0qFus9SYW6GKAEwHJiy0pvW/J1viig5QUCTtdE=; h=Cc:Date:From:Reply-To:Subject:To; b=uHd8UKCxmjnj/7macFJv1PT012IUPDrHFTuDh0fwBXGzQDUbF+pP9n+xStWjkJjx4PH j4eG8t0dYQhaFtzlrB1jo8rKYefyYiiaA0dBzLxT6KwpXD2aOnbCjsczA3KsDJbryG997 jYjnubNBumBZezQnYq8sA5wBKYCc386qfts= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Bret Barkelew REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1853 Code change form Mu project: https://github.com/microsoft/mu_basecore/blob/release/201903/ MdeModulePkg/Universal/CapsulePei/UefiCapsule.c#L801 Separate the capsule check function from GetCapsuleDescriptors to AreCapsulesStaged. The original one is unclear. Avoid querying the capsule variable twice. Use a fixed array to cache the SG list during count the number of SG list. Then allocate memory buffer to save the SG list from array. Using MemoryAllocationLib instead of memory function in Pei services. Cc: Jian J Wang Cc: Hao A Wu Cc: Ray Ni Cc: Star Zeng Cc: Liming Gao Cc: Sean Brogan Cc: Michael Turner Cc: Bret Barkelew Cc: Leif Lindholm Signed-off-by: Zhichao gao --- MdeModulePkg/Universal/CapsulePei/Capsule.h | 1 + .../Universal/CapsulePei/CapsulePei.inf | 1 + .../Universal/CapsulePei/UefiCapsule.c | 325 +++++++++--------- 3 files changed, 172 insertions(+), 155 deletions(-) diff --git a/MdeModulePkg/Universal/CapsulePei/Capsule.h b/MdeModulePkg/Uni= versal/CapsulePei/Capsule.h index baf40423af..3d9cab02c4 100644 --- a/MdeModulePkg/Universal/CapsulePei/Capsule.h +++ b/MdeModulePkg/Universal/CapsulePei/Capsule.h @@ -30,6 +30,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include #include +#include #include #include "Common/CommonHeader.h" =20 diff --git a/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf b/MdeModulePk= g/Universal/CapsulePei/CapsulePei.inf index 5d43df3075..786c411633 100644 --- a/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf +++ b/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf @@ -43,6 +43,7 @@ BaseLib HobLib BaseMemoryLib + MemoryAllocationLib PeiServicesLib PeimEntryPoint DebugLib diff --git a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c b/MdeModulePkg= /Universal/CapsulePei/UefiCapsule.c index e967599e96..7c8c7a0f45 100644 --- a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c +++ b/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c @@ -791,18 +791,84 @@ BuildMemoryResourceDescriptor ( } =20 /** - Checks for the presence of capsule descriptors. - Get capsule descriptors from variable CapsuleUpdateData, CapsuleUpdateDa= ta1, CapsuleUpdateData2... - and save to DescriptorBuffer. + Check if the capsules are staged. =20 - @param DescriptorBuffer Pointer to the capsule descriptors + @param UpdateCapsules A pointer to return the check result. + + @retval EFI_INVALID_PARAMETER The parameter is null. + @retval EFI_SUCCESS The Capsules are staged. =20 - @retval EFI_SUCCESS a valid capsule is present - @retval EFI_NOT_FOUND if a valid capsule is not present **/ EFI_STATUS -GetCapsuleDescriptors ( - IN EFI_PHYSICAL_ADDRESS *DescriptorBuffer +EFIAPI +AreCapsulesStaged( + OUT BOOLEAN *UpdateCapsules + ) +{ + EFI_STATUS Status; + UINTN Size; + EFI_PEI_READ_ONLY_VARIABLE2_PPI *PPIVariableServices; + EFI_PHYSICAL_ADDRESS CapsuleDataPtr64 =3D 0; + + if (UpdateCapsules =3D=3D NULL) { + DEBUG ((DEBUG_ERROR, "%a Invalid parameters. Inputs can't be NULL\n",= __FUNCTION__)); + ASSERT (UpdateCapsules !=3D NULL); + return EFI_INVALID_PARAMETER; + } + + *UpdateCapsules =3D FALSE; + + Status =3D PeiServicesLocatePpi( + &gEfiPeiReadOnlyVariable2PpiGuid, + 0, + NULL, + (VOID **)&PPIVariableServices + ); + + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "Failed to find ReadOnlyVariable2PPI\n")); + return Status; + } + + // + // Check for Update capsule + // + Size =3D sizeof (CapsuleDataPtr64); + Status =3D PPIVariableServices->GetVariable ( + PPIVariableServices, + EFI_CAPSULE_VARIABLE_NAME, + &gEfiCapsuleVendorGuid, + NULL, + &Size, + (VOID *)&CapsuleDataPtr64 + ); + + if (!EFI_ERROR (Status)) { + *UpdateCapsules =3D TRUE; + } + + return EFI_SUCCESS; +} + +#define MAX_SG_LIST_HEADS (20) + +/** + Check all the variables for SG list heads and get the count and addresse= s. + + @param ListLength A pointer would return the SG list lengt= h. + @param HeadList A ponter to the capsule SG list. + + @retval EFI_SUCCESS a valid capsule is present + @retval EFI_NOT_FOUND if a valid capsule is not present + @retval EFI_INVALID_PARAMETER the input parameter is invalid + @retval EFI_OUT_OF_RESOURCES fail to allocate memory + +**/ +EFI_STATUS +EFIAPI +GetScatterGatherHeadEntries( + OUT UINTN *ListLength, + OUT EFI_PHYSICAL_ADDRESS **HeadList ) { EFI_STATUS Status; @@ -815,6 +881,7 @@ GetCapsuleDescriptors ( CHAR16 *TempVarName; EFI_PHYSICAL_ADDRESS CapsuleDataPtr64; EFI_PEI_READ_ONLY_VARIABLE2_PPI *PPIVariableServices; + EFI_PHYSICAL_ADDRESS TempList[MAX_SG_LIST_HEADS]; =20 Index =3D 0; TempVarName =3D NULL; @@ -822,87 +889,96 @@ GetCapsuleDescriptors ( ValidIndex =3D 0; CapsuleDataPtr64 =3D 0; =20 + if ((ListLength =3D=3D NULL) || (HeadList =3D=3D NULL)) { + DEBUG ((DEBUG_ERROR, "%a Invalid parameters. Inputs can't be NULL\n",= __FUNCTION__)); + ASSERT (ListLength !=3D NULL); + ASSERT (HeadList !=3D NULL); + return EFI_INVALID_PARAMETER; + } + + *ListLength =3D 0; + *HeadList =3D NULL; + Status =3D PeiServicesLocatePpi ( &gEfiPeiReadOnlyVariable2PpiGuid, 0, NULL, - (VOID **) &PPIVariableServices + (VOID **)&PPIVariableServices ); - if (Status =3D=3D EFI_SUCCESS) { - StrCpyS (CapsuleVarName, sizeof(CapsuleVarName)/sizeof(CHAR16), EFI_CA= PSULE_VARIABLE_NAME); - TempVarName =3D CapsuleVarName + StrLen (CapsuleVarName); + + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "Failed to find ReadOnlyVariable2PPI\n")); + return Status; + } + + // + // setup var name buffer for update capsules + // + StrCpyS (CapsuleVarName, sizeof (CapsuleVarName) / sizeof (CHAR16), EFI_= CAPSULE_VARIABLE_NAME); + TempVarName =3D CapsuleVarName + StrLen (CapsuleVarName); + while (ValidIndex < MAX_SG_LIST_HEADS) { + if (Index !=3D 0) { + UnicodeValueToStringS ( + TempVarName, + (sizeof (CapsuleVarName) - ((StrLen (CapsuleVarName) + 1) * sizeof= (CHAR16))), + 0, + Index, + 0 + ); + } Size =3D sizeof (CapsuleDataPtr64); - while (1) { - if (Index =3D=3D 0) { - // - // For the first Capsule Image - // - Status =3D PPIVariableServices->GetVariable ( - PPIVariableServices, - CapsuleVarName, - &gEfiCapsuleVendorGuid, - NULL, - &Size, - (VOID *) &CapsuleDataPtr64 - ); - if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_INFO, "Capsule -- capsule variable not set\n")); - return EFI_NOT_FOUND; - } - // - // We have a chicken/egg situation where the memory init code need= s to - // know the boot mode prior to initializing memory. For this case,= our - // validate function will fail. We can detect if this is the case = if blocklist - // pointer is null. In that case, return success since we know tha= t the - // variable is set. - // - if (DescriptorBuffer =3D=3D NULL) { - return EFI_SUCCESS; - } - } else { - UnicodeValueToStringS ( - TempVarName, - sizeof (CapsuleVarName) - ((UINTN)TempVarName - (UINTN)CapsuleVa= rName), - 0, - Index, - 0 - ); - Status =3D PPIVariableServices->GetVariable ( - PPIVariableServices, - CapsuleVarName, - &gEfiCapsuleVendorGuid, - NULL, - &Size, - (VOID *) &CapsuleDataPtr64 - ); - if (EFI_ERROR (Status)) { - break; - } + Status =3D PPIVariableServices->GetVariable ( + PPIVariableServices, + CapsuleVarName, + &gEfiCapsuleVendorGuid, + NULL, + &Size, + (VOID *)&CapsuleDataPtr64 + ); =20 - // - // If this BlockList has been linked before, skip this variable - // - Flag =3D FALSE; - for (TempIndex =3D 0; TempIndex < ValidIndex; TempIndex++) { - if (DescriptorBuffer[TempIndex] =3D=3D CapsuleDataPtr64) { - Flag =3D TRUE; - break; - } - } - if (Flag) { - Index ++; - continue; - } + if (EFI_ERROR (Status)) { + if (Status !=3D EFI_NOT_FOUND) { + DEBUG ((DEBUG_ERROR, "Unexpected error getting Capsule Update vari= able. Status =3D %r\n")); } + break; + } =20 - // - // Cache BlockList which has been processed - // - DescriptorBuffer[ValidIndex++] =3D CapsuleDataPtr64; - Index ++; + // + // If this BlockList has been linked before, skip this variable + // + Flag =3D FALSE; + for (TempIndex =3D 0; TempIndex < ValidIndex; TempIndex++) { + if (TempList[TempIndex] =3D=3D CapsuleDataPtr64) { + Flag =3D TRUE; + break; + } } + if (Flag) { + Index++; + continue; + } + + // + // add it to the cached list + // + TempList[ValidIndex++] =3D CapsuleDataPtr64; + Index++; + } + + if (ValidIndex =3D=3D 0) { + DEBUG ((DEBUG_ERROR, "%a didn't find any SG lists in variables\n", __F= UNCTION__)); + return EFI_NOT_FOUND; } =20 + *HeadList =3D AllocateZeroPool ((ValidIndex + 1) * sizeof (EFI_PHYSICAL_= ADDRESS)); + if (*HeadList =3D=3D NULL) { + DEBUG ((DEBUG_ERROR, "Failed to allocate memory\n")); + return EFI_OUT_OF_RESOURCES; + } + + CopyMem (*HeadList, TempList, (ValidIndex) * sizeof (EFI_PHYSICAL_ADDRES= S)); + *ListLength =3D ValidIndex; + return EFI_SUCCESS; } =20 @@ -937,15 +1013,9 @@ CapsuleCoalesce ( IN OUT UINTN *MemorySize ) { - UINTN Index; - UINTN Size; - UINTN VariableCount; - CHAR16 CapsuleVarName[30]; - CHAR16 *TempVarName; - EFI_PHYSICAL_ADDRESS CapsuleDataPtr64; EFI_STATUS Status; EFI_BOOT_MODE BootMode; - EFI_PEI_READ_ONLY_VARIABLE2_PPI *PPIVariableServices; + UINTN ListLength; EFI_PHYSICAL_ADDRESS *VariableArrayAddress; MEMORY_RESOURCE_DESCRIPTOR *MemoryResource; #ifdef MDE_CPU_IA32 @@ -955,10 +1025,8 @@ CapsuleCoalesce ( EFI_CAPSULE_LONG_MODE_BUFFER LongModeBuffer; #endif =20 - Index =3D 0; - VariableCount =3D 0; - CapsuleVarName[0] =3D 0; - CapsuleDataPtr64 =3D 0; + ListLength =3D 0; + VariableArrayAddress =3D NULL; =20 // // Someone should have already ascertained the boot mode. If it's not @@ -972,74 +1040,11 @@ CapsuleCoalesce ( } =20 // - // User may set the same ScatterGatherList with several different variab= les, - // so cache all ScatterGatherList for check later. + // Get SG list entries // - Status =3D PeiServicesLocatePpi ( - &gEfiPeiReadOnlyVariable2PpiGuid, - 0, - NULL, - (VOID **) &PPIVariableServices - ); + Status =3D GetScatterGatherHeadEntries (&ListLength, &VariableArrayAddre= ss); if (EFI_ERROR (Status)) { - goto Done; - } - Size =3D sizeof (CapsuleDataPtr64); - StrCpyS (CapsuleVarName, sizeof(CapsuleVarName)/sizeof(CHAR16), EFI_CAPS= ULE_VARIABLE_NAME); - TempVarName =3D CapsuleVarName + StrLen (CapsuleVarName); - while (TRUE) { - if (Index > 0) { - UnicodeValueToStringS ( - TempVarName, - sizeof (CapsuleVarName) - ((UINTN)TempVarName - (UINTN)CapsuleVarN= ame), - 0, - Index, - 0 - ); - } - Status =3D PPIVariableServices->GetVariable ( - PPIVariableServices, - CapsuleVarName, - &gEfiCapsuleVendorGuid, - NULL, - &Size, - (VOID *) &CapsuleDataPtr64 - ); - if (EFI_ERROR (Status)) { - // - // There is no capsule variables, quit - // - DEBUG ((DEBUG_INFO,"Capsule variable Index =3D %d\n", Index)); - break; - } - VariableCount++; - Index++; - } - - DEBUG ((DEBUG_INFO,"Capsule variable count =3D %d\n", VariableCount)); - - // - // The last entry is the end flag. - // - Status =3D PeiServicesAllocatePool ( - (VariableCount + 1) * sizeof (EFI_PHYSICAL_ADDRESS), - (VOID **)&VariableArrayAddress - ); - - if (Status !=3D EFI_SUCCESS) { - DEBUG ((DEBUG_ERROR, "AllocatePages Failed!, Status =3D %x\n", Status)= ); - goto Done; - } - - ZeroMem (VariableArrayAddress, (VariableCount + 1) * sizeof (EFI_PHYSICA= L_ADDRESS)); - - // - // Find out if we actually have a capsule. - // GetCapsuleDescriptors depends on variable PPI, so it should run in 32= -bit environment. - // - Status =3D GetCapsuleDescriptors (VariableArrayAddress); - if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "Fail to find capsule variables.\n")); + DEBUG ((DEBUG_ERROR, "%a failed to get Scatter Gather List Head Entrie= s. Status =3D %r\n", __FUNCTION__, Status)); goto Done; } =20 @@ -1118,7 +1123,17 @@ CheckCapsuleUpdate ( ) { EFI_STATUS Status; - Status =3D GetCapsuleDescriptors (NULL); + BOOLEAN Update; + + Status =3D AreCapsulesStaged (&Update); + + if (!EFI_ERROR (Status)) { + if (Update) { + Status =3D EFI_SUCCESS; + } else { + Status =3D EFI_NOT_FOUND; + } + } return Status; } /** --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#41903): https://edk2.groups.io/g/devel/message/41903 Mute This Topic: https://groups.io/mt/31932896/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun Apr 28 11:23:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+41904+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+41904+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1559697358; cv=none; d=zoho.com; s=zohoarc; b=MVKbfhoazO+M2cALbGKGGkM6pI2Penyj+16FSVWOCuMPa5RRGCfFRxM7U1jTzQxzF1CsbfGS37vHgEFbBh2WHy2VIkwZsaiZJqdXFZrX5Y31g1WX84zXafHxWCE0tfOqEM6OQAUewDxlL2Sd2TSeS6rRv8apMu16rZVWetNOQz4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559697358; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=FgtRHiy7ZN70FV9eM+8Tt605W+IeTkEpJpeWTIrybCU=; b=a1Z0kdTYwUtc2nabFTa2VQzwBc2Hh0vhg3RMQmQ3Quy/W2hTV1KbV6ajiy3gSuQ1JOUB8Df4K4HlXYufeb1nD/07eXZpI5MJSpZ4GuHliI1IvucujUpSDaUZvvru6w+vQonaCDbOVz6xDddi5mdWX8tiRw3pVG5Tu6762Dtd6kE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+41904+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1559697358299423.2982399861703; Tue, 4 Jun 2019 18:15:58 -0700 (PDT) Return-Path: X-Received: from mga09.intel.com (mga09.intel.com []) by groups.io with SMTP; Tue, 04 Jun 2019 18:15:57 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Jun 2019 18:15:57 -0700 X-ExtLoop1: 1 X-Received: from fieedk001.ccr.corp.intel.com ([10.239.33.119]) by orsmga006.jf.intel.com with ESMTP; 04 Jun 2019 18:15:55 -0700 From: "Gao, Zhichao" To: devel@edk2.groups.io Cc: Jian J Wang , Hao A Wu , Ray Ni , Star Zeng , Liming Gao , Sean Brogan , Michael Turner , Bret Barkelew , Leif Lindholm , Zhichao gao Subject: [edk2-devel] [PATCH v4 2/2] MdeMoudlePkg/CapsulePei: Substantial change on UefiCapsule.c Date: Wed, 5 Jun 2019 09:15:45 +0800 Message-Id: <20190605011545.18724-3-zhichao.gao@intel.com> In-Reply-To: <20190605011545.18724-1-zhichao.gao@intel.com> References: <20190605011545.18724-1-zhichao.gao@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,zhichao.gao@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1559697357; bh=nnGbudqewuv13Eb5Oaqjg4ELNzTSNgNrtHG9TNIYaMA=; h=Cc:Date:From:Reply-To:Subject:To; b=Ee85QIK94wvL3pMq4LbX/Q4djxjGjotw2U1I0KIzjmmR+MCtsWPhkF+FZHwqdwy9Vu5 MjgdED2m+BayyKD0TA2CxMfFxYRVTVIFJUXl96S+Iq+g19EqLjvSBjSV8CV5X9O8/rJn2 /U5jkufgA9EcklpgMF7FY8AIwSWKl+UL0d8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1853 AreCapsulesStaged do not need to return the status, only boolean result is useful. So directly return a boolean value. Cannot initialize the variable at its definition. GetScatterGatherHeadEntries: use allocated buffer instead of fixed array to handle the condition which the SG list is larger then the array size. Remove API specifier AreCapsulesStaged and GetScatterGatherHeadEntries because they are internal used. Fix some coding style issues. Cc: Jian J Wang Cc: Hao A Wu Cc: Ray Ni Cc: Star Zeng Cc: Liming Gao Cc: Sean Brogan Cc: Michael Turner Cc: Bret Barkelew Cc: Leif Lindholm Signed-off-by: Zhichao gao --- .../Universal/CapsulePei/UefiCapsule.c | 103 +++++++++--------- 1 file changed, 54 insertions(+), 49 deletions(-) diff --git a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c b/MdeModulePkg= /Universal/CapsulePei/UefiCapsule.c index 7c8c7a0f45..fabf30926c 100644 --- a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c +++ b/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c @@ -1,7 +1,7 @@ /** @file Capsule update PEIM for UEFI2.0 =20 -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
Copyright (c) 2017, AMD Incorporated. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent @@ -10,6 +10,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 #include "Capsule.h" =20 +#define DEFAULT_SG_LIST_HEADS (20) + #ifdef MDE_CPU_IA32 // // Global Descriptor Table (GDT) @@ -793,30 +795,21 @@ BuildMemoryResourceDescriptor ( /** Check if the capsules are staged. =20 - @param UpdateCapsules A pointer to return the check result. - - @retval EFI_INVALID_PARAMETER The parameter is null. - @retval EFI_SUCCESS The Capsules are staged. + @retval TRUE The capsules are staged. + @retval FALSE The capsules are not staged. =20 **/ -EFI_STATUS -EFIAPI -AreCapsulesStaged( - OUT BOOLEAN *UpdateCapsules +BOOLEAN +AreCapsulesStaged ( + VOID ) { EFI_STATUS Status; UINTN Size; EFI_PEI_READ_ONLY_VARIABLE2_PPI *PPIVariableServices; - EFI_PHYSICAL_ADDRESS CapsuleDataPtr64 =3D 0; - - if (UpdateCapsules =3D=3D NULL) { - DEBUG ((DEBUG_ERROR, "%a Invalid parameters. Inputs can't be NULL\n",= __FUNCTION__)); - ASSERT (UpdateCapsules !=3D NULL); - return EFI_INVALID_PARAMETER; - } + EFI_PHYSICAL_ADDRESS CapsuleDataPtr64; =20 - *UpdateCapsules =3D FALSE; + CapsuleDataPtr64 =3D 0; =20 Status =3D PeiServicesLocatePpi( &gEfiPeiReadOnlyVariable2PpiGuid, @@ -827,7 +820,7 @@ AreCapsulesStaged( =20 if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "Failed to find ReadOnlyVariable2PPI\n")); - return Status; + return FALSE; } =20 // @@ -844,14 +837,12 @@ AreCapsulesStaged( ); =20 if (!EFI_ERROR (Status)) { - *UpdateCapsules =3D TRUE; + return TRUE; } =20 - return EFI_SUCCESS; + return FALSE; } =20 -#define MAX_SG_LIST_HEADS (20) - /** Check all the variables for SG list heads and get the count and addresse= s. =20 @@ -865,23 +856,24 @@ AreCapsulesStaged( =20 **/ EFI_STATUS -EFIAPI -GetScatterGatherHeadEntries( +GetScatterGatherHeadEntries ( OUT UINTN *ListLength, OUT EFI_PHYSICAL_ADDRESS **HeadList ) { - EFI_STATUS Status; - UINTN Size; - UINTN Index; - UINTN TempIndex; - UINTN ValidIndex; - BOOLEAN Flag; - CHAR16 CapsuleVarName[30]; - CHAR16 *TempVarName; - EFI_PHYSICAL_ADDRESS CapsuleDataPtr64; - EFI_PEI_READ_ONLY_VARIABLE2_PPI *PPIVariableServices; - EFI_PHYSICAL_ADDRESS TempList[MAX_SG_LIST_HEADS]; + EFI_STATUS Status; + UINTN Size; + UINTN Index; + UINTN TempIndex; + UINTN ValidIndex; + BOOLEAN Flag; + CHAR16 CapsuleVarName[30]; + CHAR16 *TempVarName; + EFI_PHYSICAL_ADDRESS CapsuleDataPtr64; + EFI_PEI_READ_ONLY_VARIABLE2_PPI *PPIVariableServices; + EFI_PHYSICAL_ADDRESS *TempList; + EFI_PHYSICAL_ADDRESS *EnlargedTempList; + UINTN TempListLength; =20 Index =3D 0; TempVarName =3D NULL; @@ -911,16 +903,26 @@ GetScatterGatherHeadEntries( return Status; } =20 + // + // Allocate memory for sg list head + // + TempListLength =3D DEFAULT_SG_LIST_HEADS * sizeof (EFI_PHYSICAL_ADDRESS); + TempList =3D AllocateZeroPool (TempListLength); + if (TempList =3D=3D NULL) { + DEBUG((DEBUG_ERROR, "Failed to allocate memory\n")); + return EFI_OUT_OF_RESOURCES; + } + // // setup var name buffer for update capsules // StrCpyS (CapsuleVarName, sizeof (CapsuleVarName) / sizeof (CHAR16), EFI_= CAPSULE_VARIABLE_NAME); TempVarName =3D CapsuleVarName + StrLen (CapsuleVarName); - while (ValidIndex < MAX_SG_LIST_HEADS) { + while (TRUE) { if (Index !=3D 0) { UnicodeValueToStringS ( TempVarName, - (sizeof (CapsuleVarName) - ((StrLen (CapsuleVarName) + 1) * sizeof= (CHAR16))), + (sizeof(CapsuleVarName) - ((UINTN)TempVarName - (UINTN)CapsuleVarN= ame)), 0, Index, 0 @@ -958,6 +960,17 @@ GetScatterGatherHeadEntries( continue; } =20 + // + // The TempList is full, enlarge it + // + if ((ValidIndex + 1) >=3D TempListLength) { + EnlargedTempList =3D AllocateZeroPool (TempListLength * 2); + CopyMem (EnlargedTempList, TempList, TempListLength); + FreePool (TempList); + TempList =3D EnlargedTempList; + TempListLength *=3D 2; + } + // // add it to the cached list // @@ -1122,19 +1135,11 @@ CheckCapsuleUpdate ( IN EFI_PEI_SERVICES **PeiServices ) { - EFI_STATUS Status; - BOOLEAN Update; - - Status =3D AreCapsulesStaged (&Update); - - if (!EFI_ERROR (Status)) { - if (Update) { - Status =3D EFI_SUCCESS; - } else { - Status =3D EFI_NOT_FOUND; - } + if (AreCapsulesStaged ()) { + return EFI_SUCCESS; + } else { + return EFI_NOT_FOUND; } - return Status; } /** This function will look at a capsule and determine if it's a test patter= n. --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#41904): https://edk2.groups.io/g/devel/message/41904 Mute This Topic: https://groups.io/mt/31932897/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-