From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web12.46431.1661581332997885650 for ; Fri, 26 Aug 2022 23:22:44 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=VlpjPb4z; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: min.m.xu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661581364; x=1693117364; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XGIY0ayc0M2e0pJqj74ahXa2sCtvAZM1BdIhgMUBFqU=; b=VlpjPb4zSfii7PopaK1M2FlIE7BoPO8bnvlOxGGEpeYcB1J2v0wqmI4E woMj+Qbt/y9R6ppHqDV32inRZ5GwHLSD7Bitfe1qRdb5PzNkJO/WWWCXN TiF6mfFxeUFBAWqZTWwqSI8Sag1QPtUakwnNRLRjdG8DJYk95jHEZ3sJx 8PEjkkwOKslVs2FYicOu3AG0ZyR062QMndH74z/ZSBTzg0TX/0iQzV8yV crdf+o6HmEaCeSRoblv8iFGfWo4pbLABVwLSVTaA0+KDFWSL0jvdgzPUG uXcSDveV18VsuG64SWDMzGERt0UjSOEF5Uyg7dRoLqIACN2gDkceyX6eW w==; X-IronPort-AV: E=McAfee;i="6500,9779,10451"; a="356355997" X-IronPort-AV: E=Sophos;i="5.93,267,1654585200"; d="scan'208";a="356355997" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Aug 2022 23:22:43 -0700 X-IronPort-AV: E=Sophos;i="5.93,267,1654585200"; d="scan'208";a="671738946" Received: from mxu9-mobl1.ccr.corp.intel.com ([10.249.171.119]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Aug 2022 23:22:41 -0700 From: "Min Xu" To: devel@edk2.groups.io Cc: Jiaqi Gao , Jian J Wang , Liming Gao , Dandan Bi , Erdem Aktas , James Bottomley , Jiewen Yao , Tom Lendacky , Gerd Hoffmann , Min Xu Subject: [PATCH V2 14/14] MdeModulePkg: Pool and page functions accept memory when OOM occurs Date: Sat, 27 Aug 2022 14:21:21 +0800 Message-Id: X-Mailer: git-send-email 2.29.2.windows.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jiaqi Gao RFC: https://bugzilla.tianocore.org/show_bug.cgi?id=3937 When CoreAllocatePages() / CoreAllocatePool() meets error of EFI_OUT_OF_RESOURCES, locate the EdkiiMemoryAcceptProtocol and accept extra memory dynamically. Firstly, find the unaccpeted memory region with enough size in GCD entries. Then locate the EdkiiMemoryAcceptProtocol and accept the memory. Finally, update the GCD memory and gMemoryMap entries. After updating the memory infomation, CoreInternalAllocatePages() / CoreInternalAllocatePool() will be recalled to allocate pages / pool. Cc: Jian J Wang Cc: Liming Gao Cc: Dandan Bi Cc: Erdem Aktas Cc: James Bottomley Cc: Jiewen Yao Cc: Tom Lendacky Cc: Gerd Hoffmann Signed-off-by: Jiaqi Gao Signed-off-by: Min Xu --- MdeModulePkg/Core/Dxe/DxeMain.inf | 1 + MdeModulePkg/Core/Dxe/Mem/Imem.h | 16 +++ MdeModulePkg/Core/Dxe/Mem/Page.c | 190 ++++++++++++++++++++++++++++++ MdeModulePkg/Core/Dxe/Mem/Pool.c | 14 +++ 4 files changed, 221 insertions(+) diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf index e4bca895773d..371ba45357be 100644 --- a/MdeModulePkg/Core/Dxe/DxeMain.inf +++ b/MdeModulePkg/Core/Dxe/DxeMain.inf @@ -169,6 +169,7 @@ gEfiVariableArchProtocolGuid ## CONSUMES gEfiCapsuleArchProtocolGuid ## CONSUMES gEfiWatchdogTimerArchProtocolGuid ## CONSUMES + gEdkiiMemoryAcceptProtocolGuid ## CONSUMES [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressBootTimeCodePageNumber ## SOMETIMES_CONSUMES diff --git a/MdeModulePkg/Core/Dxe/Mem/Imem.h b/MdeModulePkg/Core/Dxe/Mem/Imem.h index 2f0bf2bf631f..22e0d0e44030 100644 --- a/MdeModulePkg/Core/Dxe/Mem/Imem.h +++ b/MdeModulePkg/Core/Dxe/Mem/Imem.h @@ -47,6 +47,22 @@ typedef struct { // Internal prototypes // +/** + Internal function. Used by the pool and page functions to accept memory + when OOM occurs. + + @param Type The type of allocation to perform. + @param AcceptSize Size of memory to be accepted. + @param Memory Accept memory address + +**/ +EFI_STATUS +AcceptMemoryResource ( + IN EFI_ALLOCATE_TYPE Type, + IN UINTN AcceptSize, + IN OUT EFI_PHYSICAL_ADDRESS *Memory + ); + /** Internal function. Used by the pool functions to allocate pages to back pool allocation requests. diff --git a/MdeModulePkg/Core/Dxe/Mem/Page.c b/MdeModulePkg/Core/Dxe/Mem/Page.c index 160289c1f9ec..513792a7fe04 100644 --- a/MdeModulePkg/Core/Dxe/Mem/Page.c +++ b/MdeModulePkg/Core/Dxe/Mem/Page.c @@ -10,6 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include "Imem.h" #include "HeapGuard.h" #include +#include // // Entry for tracking the memory regions for each memory type to coalesce similar memory types @@ -379,6 +380,176 @@ CoreFreeMemoryMapStack ( mFreeMapStack -= 1; } +/** + Used to accept memory when OOM occurs. + + @param Type The type of allocation to perform. + @param AcceptSize Size of memory to be accepted. + @param Memory Accept memory address + +**/ +EFI_STATUS +AcceptMemoryResource ( + IN EFI_ALLOCATE_TYPE Type, + IN UINTN AcceptSize, + IN OUT EFI_PHYSICAL_ADDRESS *Memory + ) +{ + #ifdef MDE_CPU_X64 + + LIST_ENTRY *Link; + EFI_GCD_MAP_ENTRY *GcdEntry; + EFI_GCD_MAP_ENTRY UnacceptedEntry; + EDKII_MEMORY_ACCEPT_PROTOCOL *MemoryAcceptProtocol; + UINTN Start; + UINTN End; + EFI_STATUS Status; + + // + // We accept n*32MB at one time to improve the efficiency. + // + AcceptSize = (AcceptSize + SIZE_32MB - 1) & ~(SIZE_32MB - 1); + + if (AcceptSize == 0) { + return EFI_INVALID_PARAMETER; + } + + Status = gBS->LocateProtocol (&gEdkiiMemoryAcceptProtocolGuid, NULL, (VOID **)&MemoryAcceptProtocol); + if (EFI_ERROR (Status)) { + return EFI_UNSUPPORTED; + } + + if (Type == AllocateAddress) { + Start = *Memory; + End = *Memory + AcceptSize; + } + + if (Type == AllocateMaxAddress) { + if (*Memory < EFI_PAGE_MASK) { + return EFI_INVALID_PARAMETER; + } + + if ((*Memory & EFI_PAGE_MASK) != EFI_PAGE_MASK) { + // + // Change MaxAddress to be 1 page lower + // + *Memory -= EFI_PAGE_SIZE; + + // + // Set MaxAddress to a page boundary + // + *Memory &= ~(UINT64)EFI_PAGE_MASK; + + // + // Set MaxAddress to end of the page + // + *Memory |= EFI_PAGE_MASK; + } + } + + // + // Traverse the mGcdMemorySpaceMap to find out the unaccepted + // memory entry with big enough size. + // + Link = mGcdMemorySpaceMap.ForwardLink; + while (Link != &mGcdMemorySpaceMap) { + GcdEntry = CR (Link, EFI_GCD_MAP_ENTRY, Link, EFI_GCD_MAP_SIGNATURE); + if (GcdEntry->GcdMemoryType == EFI_GCD_MEMORY_TYPE_UNACCEPTED) { + if (Type == AllocateMaxAddress) { + if (GcdEntry->BaseAddress + AcceptSize - 1 > *Memory) { + Link = Link->ForwardLink; + continue; + } + } else if (Type == AllocateAddress) { + if ((GcdEntry->BaseAddress > *Memory) || (GcdEntry->EndAddress < *Memory + AcceptSize - 1)) { + Link = Link->ForwardLink; + continue; + } + } + + // + // Is the entry big enough? + // + if (AcceptSize <= GcdEntry->EndAddress - GcdEntry->BaseAddress + 1) { + UnacceptedEntry = *GcdEntry; + if (Type != AllocateAddress) { + Start = UnacceptedEntry.BaseAddress; + End = UnacceptedEntry.BaseAddress + AcceptSize - 1; + } + + break; + } + } + + Link = Link->ForwardLink; + } + + if (Link == &mGcdMemorySpaceMap) { + return EFI_OUT_OF_RESOURCES; + } + + // + // Accept memory using the interface provide by the protocol. + // + Status = MemoryAcceptProtocol->AcceptMemory (MemoryAcceptProtocol, Start, AcceptSize); + if (EFI_ERROR (Status)) { + return EFI_OUT_OF_RESOURCES; + } + + // + // If memory is accepted successfully, remove the target memory space from GCD. + // + CoreRemoveMemorySpace (UnacceptedEntry.BaseAddress, UnacceptedEntry.EndAddress - UnacceptedEntry.BaseAddress + 1); + + // + // Add the remain lower part of unaccepted memory to the + // Gcd memory space and memory map. + // + if (Start > UnacceptedEntry.BaseAddress) { + CoreAddMemorySpace ( + EFI_GCD_MEMORY_TYPE_UNACCEPTED, + UnacceptedEntry.BaseAddress, + Start - UnacceptedEntry.BaseAddress, + UnacceptedEntry.Capabilities + ); + } + + // + // Update accepted part of the memory entry to type of EfiGcdMemoryTypeSystemMemory + // and add the range to the memory map. + // + CoreAddMemorySpace ( + EfiGcdMemoryTypeSystemMemory, + Start, + AcceptSize, + // + // Hardcode memory space attributes. + // + EFI_MEMORY_CPU_CRYPTO | EFI_MEMORY_XP | EFI_MEMORY_RO | EFI_MEMORY_RP + ); + + // + // Add the remain higher part of unaccepted memory to the + // Gcd memory space and memory map. + // + if (UnacceptedEntry.EndAddress > End) { + CoreAddMemorySpace ( + EFI_GCD_MEMORY_TYPE_UNACCEPTED, + End + 1, + UnacceptedEntry.EndAddress - End, + UnacceptedEntry.Capabilities + ); + } + + return EFI_SUCCESS; + + #else + + return EFI_UNSUPPORTED; + + #endif +} + /** Find untested but initialized memory regions in GCD map and convert them to be DXE allocatable. @@ -1486,6 +1657,25 @@ CoreAllocatePages ( Memory, NeedGuard ); + #ifdef MDE_CPU_X64 + + if (Status == EFI_OUT_OF_RESOURCES) { + Status = AcceptMemoryResource (Type, NumberOfPages << EFI_PAGE_SHIFT, Memory); + if (!EFI_ERROR (Status)) { + Status = CoreInternalAllocatePages ( + Type, + MemoryType, + NumberOfPages, + Memory, + NeedGuard + ); + } else { + Status = EFI_OUT_OF_RESOURCES; + } + } + + #endif + if (!EFI_ERROR (Status)) { CoreUpdateProfile ( (EFI_PHYSICAL_ADDRESS)(UINTN)RETURN_ADDRESS (0), diff --git a/MdeModulePkg/Core/Dxe/Mem/Pool.c b/MdeModulePkg/Core/Dxe/Mem/Pool.c index 7aaf501600cf..9e8c8611c1ef 100644 --- a/MdeModulePkg/Core/Dxe/Mem/Pool.c +++ b/MdeModulePkg/Core/Dxe/Mem/Pool.c @@ -273,6 +273,20 @@ CoreAllocatePool ( EFI_STATUS Status; Status = CoreInternalAllocatePool (PoolType, Size, Buffer); + + #ifdef MDE_CPU_X64 + + if (Status == EFI_OUT_OF_RESOURCES) { + Status = AcceptMemoryResource (AllocateAnyPages, Size, NULL); + if (!EFI_ERROR (Status)) { + Status = CoreInternalAllocatePool (PoolType, Size, Buffer); + } else { + Status = EFI_OUT_OF_RESOURCES; + } + } + + #endif + if (!EFI_ERROR (Status)) { CoreUpdateProfile ( (EFI_PHYSICAL_ADDRESS)(UINTN)RETURN_ADDRESS (0), -- 2.29.2.windows.2