Re: [edk2-devel] [PATCH 1/1] Increase ACPI Reclaim memory size

Re: [edk2-devel] [PATCH 1/1] Increase ACPI Reclaim memory size

[annie li]

Oops! This patch title misses the module name, I'll post a V2 version to
include it.

Thanks
Annie

On 4/15/2022 1:11 PM, annie li wrote:
> The current ACPI Reclaim memory size is set as 0x10(64k). The
> ACPI table size will be increased if the memory slots' number of
> the guest gets increased. In the guest with more memory slots,
> the ACPI Reclaim memory size may not be sufficient for hibernation.
> This may cause resume failure of the hibernated guest that was
> booted up with a fresh copied writable OVMF_VARS file. However,
> the failure doesn't happen in following hibernation/resume
> cycles.
>
> The ACPI_MAX_RAM_SLOTS is set as 256 in the current QEMU. With
> ACPI_MAX_RAM_SLOTS, 18 pages are required to be allocated in ACPI
> Reclaim memory. However, due to the 0x10(16 pages) setting, 2 extra
> pages will be allocated in other space. This may break the
> hibernation/resume in the above scenario.
>
> This patch increases the ACPI Reclaim memory size to 0x12, i.e.
> PcdMemoryTypeEfiACPIReclaimMemory is set as 0x12(18 pages).
>
> Signed-off-by: Annie Li <annie.li@oracle.com>
> ---
>   OvmfPkg/OvmfPkgIa32.dsc    | 2 +-
>   OvmfPkg/OvmfPkgIa32X64.dsc | 2 +-
>   OvmfPkg/OvmfPkgX64.dsc     | 2 +-
>   3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
> index 29eea82571..fb158f98c9 100644
> --- a/OvmfPkg/OvmfPkgIa32.dsc
> +++ b/OvmfPkg/OvmfPkgIa32.dsc
> @@ -547,7 +547,7 @@
>     # unknown) workloads / boot paths.
>
>     #
>
>     gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0x80
>
> -  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0x10
>
> +  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0x12
>
>     gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType|0x80
>
>     gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|0x100
>
>     gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|0x100
>
> diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
> index 56d3c49ab2..30d47ca28a 100644
> --- a/OvmfPkg/OvmfPkgIa32X64.dsc
> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
> @@ -552,7 +552,7 @@
>     # unknown) workloads / boot paths.
>
>     #
>
>     gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0x80
>
> -  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0x10
>
> +  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0x12
>
>     gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType|0x80
>
>     gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|0x100
>
>     gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|0x100
>
> diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
> index f0924c0f9d..6c10ceedd7 100644
> --- a/OvmfPkg/OvmfPkgX64.dsc
> +++ b/OvmfPkg/OvmfPkgX64.dsc
> @@ -552,7 +552,7 @@
>     # unknown) workloads / boot paths.
>
>     #
>
>     gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0x80
>
> -  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0x10
>
> +  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0x12
>
>     gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType|0x80
>
>     gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|0x100
>
>     gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|0x100
>