From nobody Sat Apr 20 06:58:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66324+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66324+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1602863385; cv=none; d=zohomail.com; s=zohoarc; b=MbMgGBnuYLixfkUR4SbrVdwKI8W7xhJ8keAbkVkkWhfFW92spZTLPJoQdbn/BZdbpp0rtkLRciPOUtPoGGYr++Nr0TYkmkNtW5Qf/Jl4vTgBG0dHAWN9WH62w4DgGm7/cDs6jpr0CSwme3soMJi8l+iPoBnWt5iNS5aSxJlV0SU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602863385; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=d3HL/uel7UHMLtWrc2fd3n/D3m1v0FpktUZpOESQfmw=; b=dS0/T3dVQozJXhvZQ3m1dAaMeqb3wk6XKcQ8yOpZek/LX7Kpzb6iZ4y22T7Lafqq4eKWvg1fs1MraA8MN8CasNVAf2Dh5C1m7ivj34EhPJKCwxISEL2QcyFdyw0nmP4ImedQdg/7EQqHVLE3gATASqrpPgrkFo/519jaTBInk+M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66324+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 1602863385110339.0823024322418; Fri, 16 Oct 2020 08:49:45 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id cBZPYY1788612x0JeJFT2Xba; Fri, 16 Oct 2020 08:49:44 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.19081.1602863377454404851 for ; Fri, 16 Oct 2020 08:49:37 -0700 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 043581424; Fri, 16 Oct 2020 08:49:37 -0700 (PDT) X-Received: from e123331-lin.nice.arm.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 636DE3F719; Fri, 16 Oct 2020 08:49:35 -0700 (PDT) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Dandan Bi , Liming Gao , Jian J Wang , Hao A Wu , Sami Mujawar , Laszlo Ersek , Leif Lindholm Subject: [edk2-devel] [PATCH 1/3] MdeModulePkg/AcpiTableDxe: use pool allocations when possible Date: Fri, 16 Oct 2020 17:49:21 +0200 Message-Id: <20201016154923.21260-2-ard.biesheuvel@arm.com> In-Reply-To: <20201016154923.21260-1-ard.biesheuvel@arm.com> References: <20201016154923.21260-1-ard.biesheuvel@arm.com> 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,ard.biesheuvel@arm.com X-Gm-Message-State: iFF1tBrreUDats4JW6k8F8lcx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1602863384; bh=Rav/1ON/4dnVMVIWzPAEe3VI3SKdDK1S7xKzxoMAa4I=; h=Cc:Date:From:Reply-To:Subject:To; b=gAVosvUn6RsS0L8ic4Yr8EkgeiIWIqjkmMb4Yk74zrDKN+8knY7WJH4TmyB5s0S72+c FKhMWzvXO63oMFKatzErKiDRUc6lQnUjsScwd1X1x5kJGkaEr8AJ9ltRu62YcIYG26g5s 6HOiXoNkZlCmbP5WBDlTqzv7rKCuLxtq0EM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" On AArch64 systems, page based allocations for memory types that are relevant to the OS are rounded up to 64 KB multiples. This wastes some space in the ACPI table memory allocator, since it uses page based allocations in order to be able to place the ACPI tables low in memory. Since the latter requirement does not exist on AArch64, switch to pool allocations for all ACPI tables except the root tables if the active allocation policy permits them to be anywhere in memory. The root tables will be handled in a subsequent patch. Signed-off-by: Ard Biesheuvel --- MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h | 4 +- MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.c | 4 +- MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c | 75 ++++++++= ++++++------ 3 files changed, 57 insertions(+), 26 deletions(-) diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h b/MdeModu= lePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h index 425a462fd92b..6e600e7acd24 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h @@ -64,9 +64,9 @@ typedef struct { LIST_ENTRY Link; EFI_ACPI_TABLE_VERSION Version; EFI_ACPI_COMMON_HEADER *Table; - EFI_PHYSICAL_ADDRESS PageAddress; - UINTN NumberOfPages; + UINTN TableSize; UINTN Handle; + BOOLEAN PoolAllocation; } EFI_ACPI_TABLE_LIST; =20 // diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.c b/MdeModule= Pkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.c index b1cba20c8ed7..14ced68e645f 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.c +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.c @@ -68,8 +68,8 @@ FindTableByBuffer ( =20 while (CurrentLink !=3D StartLink) { CurrentTableList =3D EFI_ACPI_TABLE_LIST_FROM_LINK (CurrentLink); - if (((UINTN)CurrentTableList->PageAddress <=3D (UINTN)Buffer) && - ((UINTN)CurrentTableList->PageAddress + EFI_PAGES_TO_SIZE(CurrentT= ableList->NumberOfPages) > (UINTN)Buffer)) { + if (((UINTN)CurrentTableList->Table <=3D (UINTN)Buffer) && + ((UINTN)CurrentTableList->Table + CurrentTableList->TableSize > (U= INTN)Buffer)) { // // Good! Found Table. // diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c b= /MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c index ad7baf8205b4..b05e57e6584f 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c @@ -428,6 +428,26 @@ ReallocateAcpiTableBuffer ( return EFI_SUCCESS; } =20 +/** + Free the memory associated with provided the EFI_ACPI_TABLE_LIST instance + + @param TableEntry EFI_ACPI_TABLE_LIST instance pointer + +**/ +STATIC +VOID +FreeTableMemory ( + EFI_ACPI_TABLE_LIST *TableEntry + ) +{ + if (TableEntry->PoolAllocation) { + gBS->FreePool (TableEntry->Table); + } else { + gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)TableEntry->Table, + EFI_SIZE_TO_PAGES (TableEntry->TableSize)); + } +} + /** This function adds an ACPI table to the table list. It will detect FACS= and allocate the correct type of memory and properly align the table. @@ -454,14 +474,15 @@ AddTableToList ( OUT UINTN *Handle ) { - EFI_STATUS Status; - EFI_ACPI_TABLE_LIST *CurrentTableList; - UINT32 CurrentTableSignature; - UINT32 CurrentTableSize; - UINT32 *CurrentRsdtEntry; - VOID *CurrentXsdtEntry; - UINT64 Buffer64; - BOOLEAN AddToRsdt; + EFI_STATUS Status; + EFI_ACPI_TABLE_LIST *CurrentTableList; + UINT32 CurrentTableSignature; + UINT32 CurrentTableSize; + UINT32 *CurrentRsdtEntry; + VOID *CurrentXsdtEntry; + EFI_PHYSICAL_ADDRESS AllocPhysAddress; + UINT64 Buffer64; + BOOLEAN AddToRsdt; =20 // // Check for invalid input parameters @@ -496,8 +517,8 @@ AddTableToList ( // There is no architectural reason these should be below 4GB, it is pur= ely // for convenience of implementation that we force memory below 4GB. // - CurrentTableList->PageAddress =3D 0xFFFFFFFF; - CurrentTableList->NumberOfPages =3D EFI_SIZE_TO_PAGES (CurrentTableSize); + AllocPhysAddress =3D 0xFFFFFFFF; + CurrentTableList->TableSize =3D CurrentTableSize; =20 // // Allocation memory type depends on the type of the table @@ -518,9 +539,22 @@ AddTableToList ( Status =3D gBS->AllocatePages ( AllocateMaxAddress, EfiACPIMemoryNVS, - CurrentTableList->NumberOfPages, - &CurrentTableList->PageAddress + EFI_SIZE_TO_PAGES (CurrentTableList->TableSize), + &AllocPhysAddress ); + CurrentTableList->Table =3D (EFI_ACPI_COMMON_HEADER *)(UINTN)AllocPhys= Address; + } else if (mAcpiTableAllocType =3D=3D AllocateAnyPages) { + // + // If there is no allocation limit, there is also no need to use page + // based allocations for ACPI tables, which may be wasteful on platfor= ms + // such as AArch64 that allocate multiples of 64 KB + // + Status =3D gBS->AllocatePool ( + EfiACPIReclaimMemory, + CurrentTableList->TableSize, + (VOID **)&CurrentTableList->Table + ); + CurrentTableList->PoolAllocation =3D TRUE; } else { // // All other tables are ACPI reclaim memory, no alignment requirements. @@ -528,9 +562,10 @@ AddTableToList ( Status =3D gBS->AllocatePages ( mAcpiTableAllocType, EfiACPIReclaimMemory, - CurrentTableList->NumberOfPages, - &CurrentTableList->PageAddress + EFI_SIZE_TO_PAGES (CurrentTableList->TableSize), + &AllocPhysAddress ); + CurrentTableList->Table =3D (EFI_ACPI_COMMON_HEADER *)(UINTN)AllocPhys= Address; } // // Check return value from memory alloc. @@ -539,10 +574,6 @@ AddTableToList ( gBS->FreePool (CurrentTableList); return EFI_OUT_OF_RESOURCES; } - // - // Update the table pointer with the allocated memory start - // - CurrentTableList->Table =3D (EFI_ACPI_COMMON_HEADER *) (UINTN) CurrentTa= bleList->PageAddress; =20 // // Initialize the table contents @@ -575,7 +606,7 @@ AddTableToList ( if (((Version & EFI_ACPI_TABLE_VERSION_1_0B) !=3D 0 && AcpiTableInstan= ce->Fadt1 !=3D NULL) || ((Version & ACPI_TABLE_VERSION_GTE_2_0) !=3D 0 && AcpiTableInstan= ce->Fadt3 !=3D NULL) ) { - gBS->FreePages (CurrentTableList->PageAddress, CurrentTableList->Num= berOfPages); + FreeTableMemory (CurrentTableList); gBS->FreePool (CurrentTableList); return EFI_ACCESS_DENIED; } @@ -729,7 +760,7 @@ AddTableToList ( if (((Version & EFI_ACPI_TABLE_VERSION_1_0B) !=3D 0 && AcpiTableInstan= ce->Facs1 !=3D NULL) || ((Version & ACPI_TABLE_VERSION_GTE_2_0) !=3D 0 && AcpiTableInstan= ce->Facs3 !=3D NULL) ) { - gBS->FreePages (CurrentTableList->PageAddress, CurrentTableList->Num= berOfPages); + FreeTableMemory (CurrentTableList); gBS->FreePool (CurrentTableList); return EFI_ACCESS_DENIED; } @@ -813,7 +844,7 @@ AddTableToList ( if (((Version & EFI_ACPI_TABLE_VERSION_1_0B) !=3D 0 && AcpiTableInstan= ce->Dsdt1 !=3D NULL) || ((Version & ACPI_TABLE_VERSION_GTE_2_0) !=3D 0 && AcpiTableInstan= ce->Dsdt3 !=3D NULL) ) { - gBS->FreePages (CurrentTableList->PageAddress, CurrentTableList->Num= berOfPages); + FreeTableMemory (CurrentTableList); gBS->FreePool (CurrentTableList); return EFI_ACCESS_DENIED; } @@ -1449,7 +1480,7 @@ DeleteTable ( // // Free the Table // - gBS->FreePages (Table->PageAddress, Table->NumberOfPages); + FreeTableMemory (Table); RemoveEntryList (&(Table->Link)); gBS->FreePool (Table); } --=20 2.17.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 (#66324): https://edk2.groups.io/g/devel/message/66324 Mute This Topic: https://groups.io/mt/77553423/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 Sat Apr 20 06:58:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66325+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66325+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1602863385; cv=none; d=zohomail.com; s=zohoarc; b=MLIDo31JOO70vei5XhBpS+KvsU9vM3O6nAd22GULoWH5yWKuxE8gPZAA4kk6TUQpLXSnHii6gGJAcf52ytEkjFQ/sLC4ySQ1FL71fhGBDW7Fnxm1J9XruDBc4TlvLAKDSoW02BpMkx7bcMYCbqXgxAU7nh6e5JeQT8NTN02+KHY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602863385; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=M3lt6DJgqap1S1MPtVngJ8UnymqMhXfCadRWZXSeTx0=; b=TkpOBXItMbuFPlcl7oT5D8ST8/C5Ls09ZlUISy2sH1gPpWf8S1RBXdAEj8fw97yvNZSrZxIXDZ78afvMO25A8IWN0bJGyas400ScfjXs78tR7v9GO0iTB2fQD0lVQo4ycm/tEIziDimltI070mndiZCri21W3VbHw8Kx6UYfKLI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66325+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 1602863385370117.36859921698374; Fri, 16 Oct 2020 08:49:45 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id OTb9YY1788612xZuTvDOqGBW; Fri, 16 Oct 2020 08:49:44 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.19267.1602863379345516421 for ; Fri, 16 Oct 2020 08:49:39 -0700 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id DE749143D; Fri, 16 Oct 2020 08:49:38 -0700 (PDT) X-Received: from e123331-lin.nice.arm.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4724A3F719; Fri, 16 Oct 2020 08:49:37 -0700 (PDT) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Dandan Bi , Liming Gao , Jian J Wang , Hao A Wu , Sami Mujawar , Laszlo Ersek , Leif Lindholm Subject: [edk2-devel] [PATCH 2/3] MdeModulePkg/AcpiTableDxe: use pool allocation for RSDT/XSDT if possible Date: Fri, 16 Oct 2020 17:49:22 +0200 Message-Id: <20201016154923.21260-3-ard.biesheuvel@arm.com> In-Reply-To: <20201016154923.21260-1-ard.biesheuvel@arm.com> References: <20201016154923.21260-1-ard.biesheuvel@arm.com> 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,ard.biesheuvel@arm.com X-Gm-Message-State: bNMMtLTdEidf3OhJ99fNGBhux1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1602863384; bh=7o/DKR8nTnd5xbVTQRQirb0d0WEKT93ZOQUGi33GGeU=; h=Cc:Date:From:Reply-To:Subject:To; b=ZgpqUtf+JZFo+3qLNIn3TPKJbbn3XqQVtJ9ZrZnqmT1uTQytEHEKQ0cxxQy0sXUMcmP HI107VK00NdvCR+5u3UJrqkfpmJXspmMjOgy6xXpYpC7VO6LqgNnGCHXqcA89JI5nHBxh TbUlKrQy6AUpE/jtZKSwiL+7yoWrpYv9fb8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If no memory allocation limit is in effect for ACPI tables, prefer pool allocations over page allocations, to avoid wasting memory on systems where page based allocations are rounded up to 64 KB, such as AArch64. Signed-off-by: Ard Biesheuvel --- MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c | 111 +++++++= +++++-------- 1 file changed, 65 insertions(+), 46 deletions(-) diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c b= /MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c index b05e57e6584f..22f49a8489e7 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c @@ -355,28 +355,35 @@ ReallocateAcpiTableBuffer ( NewMaxTableNumber * sizeof (UINT32); } =20 - // - // Allocate memory in the lower 32 bit of address range for - // compatibility with ACPI 1.0 OS. - // - // This is done because ACPI 1.0 pointers are 32 bit values. - // ACPI 2.0 OS and all 64 bit OS must use the 64 bit ACPI table addresse= s. - // There is no architectural reason these should be below 4GB, it is pur= ely - // for convenience of implementation that we force memory below 4GB. - // - PageAddress =3D 0xFFFFFFFF; - Status =3D gBS->AllocatePages ( - mAcpiTableAllocType, - EfiACPIReclaimMemory, - EFI_SIZE_TO_PAGES (TotalSize), - &PageAddress - ); + if (mAcpiTableAllocType !=3D AllocateAnyPages) { + // + // Allocate memory in the lower 32 bit of address range for + // compatibility with ACPI 1.0 OS. + // + // This is done because ACPI 1.0 pointers are 32 bit values. + // ACPI 2.0 OS and all 64 bit OS must use the 64 bit ACPI table addres= ses. + // There is no architectural reason these should be below 4GB, it is p= urely + // for convenience of implementation that we force memory below 4GB. + // + PageAddress =3D 0xFFFFFFFF; + Status =3D gBS->AllocatePages ( + mAcpiTableAllocType, + EfiACPIReclaimMemory, + EFI_SIZE_TO_PAGES (TotalSize), + &PageAddress + ); + Pointer =3D (UINT8 *)(UINTN)PageAddress; + } else { + Status =3D gBS->AllocatePool ( + EfiACPIReclaimMemory, + TotalSize, + (VOID **)&Pointer); + } =20 if (EFI_ERROR (Status)) { return EFI_OUT_OF_RESOURCES; } =20 - Pointer =3D (UINT8 *) (UINTN) PageAddress; ZeroMem (Pointer, TotalSize); =20 AcpiTableInstance->Rsdt1 =3D (EFI_ACPI_DESCRIPTION_HEADER *) Pointer; @@ -406,21 +413,26 @@ ReallocateAcpiTableBuffer ( } CopyMem (AcpiTableInstance->Xsdt, TempPrivateData.Xsdt, (sizeof (EFI_ACP= I_DESCRIPTION_HEADER) + mEfiAcpiMaxNumTables * sizeof (UINT64))); =20 - // - // Calculate orignal ACPI table buffer size - // - TotalSize =3D sizeof (EFI_ACPI_DESCRIPTION_HEADER) + // for ACPI= 2.0/3.0 XSDT - mEfiAcpiMaxNumTables * sizeof (UINT64); + if (mAcpiTableAllocType !=3D AllocateAnyPages) { + // + // Calculate orignal ACPI table buffer size + // + TotalSize =3D sizeof (EFI_ACPI_DESCRIPTION_HEADER) + // for AC= PI 2.0/3.0 XSDT + mEfiAcpiMaxNumTables * sizeof (UINT64); =20 - if ((PcdGet32 (PcdAcpiExposedTableVersions) & EFI_ACPI_TABLE_VERSION_1_0= B) !=3D 0) { - TotalSize +=3D sizeof (EFI_ACPI_DESCRIPTION_HEADER) + // for A= CPI 1.0 RSDT - mEfiAcpiMaxNumTables * sizeof (UINT32) + - sizeof (EFI_ACPI_DESCRIPTION_HEADER) + // for ACP= I 2.0/3.0 RSDT - mEfiAcpiMaxNumTables * sizeof (UINT32); + if ((PcdGet32 (PcdAcpiExposedTableVersions) & EFI_ACPI_TABLE_VERSION_1= _0B) !=3D 0) { + TotalSize +=3D sizeof (EFI_ACPI_DESCRIPTION_HEADER) + // for= ACPI 1.0 RSDT + mEfiAcpiMaxNumTables * sizeof (UINT32) + + sizeof (EFI_ACPI_DESCRIPTION_HEADER) + // for A= CPI 2.0/3.0 RSDT + mEfiAcpiMaxNumTables * sizeof (UINT32); + } + + gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)TempPrivateData.Rsdt1, + EFI_SIZE_TO_PAGES (TotalSize)); + } else { + gBS->FreePool (TempPrivateData.Rsdt1); } =20 - gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)TempPrivateData.Rsdt1, EFI_= SIZE_TO_PAGES (TotalSize)); - // // Update the Max ACPI table number // @@ -1759,29 +1771,36 @@ AcpiTableAcpiTableConstructor ( mEfiAcpiMaxNumTables * sizeof (UINT32); } =20 - // - // Allocate memory in the lower 32 bit of address range for - // compatibility with ACPI 1.0 OS. - // - // This is done because ACPI 1.0 pointers are 32 bit values. - // ACPI 2.0 OS and all 64 bit OS must use the 64 bit ACPI table addresse= s. - // There is no architectural reason these should be below 4GB, it is pur= ely - // for convenience of implementation that we force memory below 4GB. - // - PageAddress =3D 0xFFFFFFFF; - Status =3D gBS->AllocatePages ( - mAcpiTableAllocType, - EfiACPIReclaimMemory, - EFI_SIZE_TO_PAGES (TotalSize), - &PageAddress - ); + if (mAcpiTableAllocType !=3D AllocateAnyPages) { + // + // Allocate memory in the lower 32 bit of address range for + // compatibility with ACPI 1.0 OS. + // + // This is done because ACPI 1.0 pointers are 32 bit values. + // ACPI 2.0 OS and all 64 bit OS must use the 64 bit ACPI table addres= ses. + // There is no architectural reason these should be below 4GB, it is p= urely + // for convenience of implementation that we force memory below 4GB. + // + PageAddress =3D 0xFFFFFFFF; + Status =3D gBS->AllocatePages ( + mAcpiTableAllocType, + EfiACPIReclaimMemory, + EFI_SIZE_TO_PAGES (TotalSize), + &PageAddress + ); + Pointer =3D (UINT8 *)(UINTN)PageAddress; + } else { + Status =3D gBS->AllocatePool ( + EfiACPIReclaimMemory, + TotalSize, + (VOID **)&Pointer); + } =20 if (EFI_ERROR (Status)) { gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)AcpiTableInstance->Rsdp1,= EFI_SIZE_TO_PAGES (RsdpTableSize)); return EFI_OUT_OF_RESOURCES; } =20 - Pointer =3D (UINT8 *) (UINTN) PageAddress; ZeroMem (Pointer, TotalSize); =20 AcpiTableInstance->Rsdt1 =3D (EFI_ACPI_DESCRIPTION_HEADER *) Pointer; --=20 2.17.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 (#66325): https://edk2.groups.io/g/devel/message/66325 Mute This Topic: https://groups.io/mt/77553424/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 Sat Apr 20 06:58:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66326+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66326+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1602863385; cv=none; d=zohomail.com; s=zohoarc; b=YmJn9bn9hl0RLI6P4Gdob1yhp1Zs+8kr6rOM2VmT/RtPZ+ciatN33+mOvQ5OxY+U70BGf/7WjOUJweldQFk1qzMp6ss9W6uTVsV17f09MNNC/QcxS/zEFZ1bNRmBssWaLuqWhmIEx3F3fnFt5kNpsP1f508HrdYJyIZSfz45BRk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602863385; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=8BpGWn4A8DIqte4yeV57cdDuMOQMo9aVfukssNhVDUQ=; b=RnUTugosGGMQQRtUhPEfUTFn56d3W+a7ORiL/hi1yV5iRLLCNwt2WptzEYzggGZaNTeEX2+xb58N2h2h/CKewcC6uxV1RqcAOCsS0yGVh1QKpJbzTa8Rpv6Eul0y6qf2NV7KN8CeMqJgD52/xY9H2xE0M7pPmJByFKx9xlcckPI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66326+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 1602863385572709.174848939723; Fri, 16 Oct 2020 08:49:45 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id x2slYY1788612xkvggqYaoOH; Fri, 16 Oct 2020 08:49:45 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.19271.1602863382145638521 for ; Fri, 16 Oct 2020 08:49:42 -0700 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BA9801474; Fri, 16 Oct 2020 08:49:40 -0700 (PDT) X-Received: from e123331-lin.nice.arm.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2DD133F719; Fri, 16 Oct 2020 08:49:39 -0700 (PDT) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Dandan Bi , Liming Gao , Jian J Wang , Hao A Wu , Sami Mujawar , Laszlo Ersek , Leif Lindholm Subject: [edk2-devel] [PATCH 3/3] MdeModulePkg/AcpiTableDxe: use pool allocation for RSDP if possible Date: Fri, 16 Oct 2020 17:49:23 +0200 Message-Id: <20201016154923.21260-4-ard.biesheuvel@arm.com> In-Reply-To: <20201016154923.21260-1-ard.biesheuvel@arm.com> References: <20201016154923.21260-1-ard.biesheuvel@arm.com> 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,ard.biesheuvel@arm.com X-Gm-Message-State: eRiUq9GbheyEri69ng9WajJGx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1602863385; bh=dwPOVLegz4MIej3K6Buruyl5jyhc8S607EEzTNnrXiA=; h=Cc:Date:From:Reply-To:Subject:To; b=fCZ2h5NJoakLs/NnnaMAtnjuHu9mDopkZzPBbidSPIsKmw1yDlS9EK59MCUAFosMBBb /nYet4hIVZKdmdIqfUFqZWXOLA2ce38973s0ziyvtcd3MEBWR+e0dZ1orqA7K628Egdd2 0PGX6q8BUpgjhfxZh0z+oqdm6iQ7PdZocSY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use a pool allocation for the RSDP ACPI root pointer structure if no memory limit is in effect that forces us to use page based allocation, which may be wasteful if they get rounded up to 64 KB as is the case on AArch64. Signed-off-by: Ard Biesheuvel --- MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c | 30 ++++++++= ++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c b= /MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c index 22f49a8489e7..fb939aa00f49 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c @@ -1737,19 +1737,26 @@ AcpiTableAcpiTableConstructor ( RsdpTableSize +=3D sizeof (EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_POINTE= R); } =20 - PageAddress =3D 0xFFFFFFFF; - Status =3D gBS->AllocatePages ( - mAcpiTableAllocType, - EfiACPIReclaimMemory, - EFI_SIZE_TO_PAGES (RsdpTableSize), - &PageAddress - ); + if (mAcpiTableAllocType !=3D AllocateAnyPages) { + PageAddress =3D 0xFFFFFFFF; + Status =3D gBS->AllocatePages ( + mAcpiTableAllocType, + EfiACPIReclaimMemory, + EFI_SIZE_TO_PAGES (RsdpTableSize), + &PageAddress + ); + Pointer =3D (UINT8 *)(UINTN)PageAddress; + } else { + Status =3D gBS->AllocatePool ( + EfiACPIReclaimMemory, + RsdpTableSize, + (VOID **)&Pointer); + } =20 if (EFI_ERROR (Status)) { return EFI_OUT_OF_RESOURCES; } =20 - Pointer =3D (UINT8 *) (UINTN) PageAddress; ZeroMem (Pointer, RsdpTableSize); =20 AcpiTableInstance->Rsdp1 =3D (EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_POINT= ER *) Pointer; @@ -1797,7 +1804,12 @@ AcpiTableAcpiTableConstructor ( } =20 if (EFI_ERROR (Status)) { - gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)AcpiTableInstance->Rsdp1,= EFI_SIZE_TO_PAGES (RsdpTableSize)); + if (mAcpiTableAllocType !=3D AllocateAnyPages) { + gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)AcpiTableInstance->Rsdp= 1, + EFI_SIZE_TO_PAGES (RsdpTableSize)); + } else { + gBS->FreePool (AcpiTableInstance->Rsdp1); + } return EFI_OUT_OF_RESOURCES; } =20 --=20 2.17.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 (#66326): https://edk2.groups.io/g/devel/message/66326 Mute This Topic: https://groups.io/mt/77553426/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-