[edk2-platforms] Platform/Loongson: Pre-allocate 0-4K memory during the Pei phase

[edk2-platforms] Platform/Loongson: Pre-allocate 0-4K memory during the Pei phase

[xianglai]

When 0 address protection is enabled,
0-4k memory needs to be preallocated to
prevent UEFI applications from allocating use,
such as grub.

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Bibo Mao <maobibo@loongson.cn>
Cc: Chao Li <lichao@loongson.cn>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: xianglai li <lixianglai@loongson.cn>
---
 .../LoongArchQemuPkg/PlatformPei/MemDetect.c        | 13 +++++++++++++
 .../LoongArchQemuPkg/PlatformPei/PlatformPei.inf    |  1 +
 2 files changed, 14 insertions(+)

diff --git a/Platform/Loongson/LoongArchQemuPkg/PlatformPei/MemDetect.c b/Platform/Loongson/LoongArchQemuPkg/PlatformPei/MemDetect.c
index fad4cff8d8..7e6a4a3aa9 100644
--- a/Platform/Loongson/LoongArchQemuPkg/PlatformPei/MemDetect.c
+++ b/Platform/Loongson/LoongArchQemuPkg/PlatformPei/MemDetect.c
@@ -101,4 +101,17 @@ InitializeRamRegions (
 
     AddMemoryRangeHob ( pEntry->BaseAddr, pEntry->BaseAddr + pEntry->Length);
   }
+
+  //
+  //When 0 address protection is enabled,
+  //0-4k memory needs to be preallocated to prevent UEFI applications from allocating use,
+  //such as grub
+  //
+  if (PcdGet8 (PcdNullPointerDetectionPropertyMask) & BIT0) {
+    BuildMemoryAllocationHob (
+          0,
+          EFI_PAGE_SIZE,
+          EfiBootServicesData
+          );
+  }
 }
diff --git a/Platform/Loongson/LoongArchQemuPkg/PlatformPei/PlatformPei.inf b/Platform/Loongson/LoongArchQemuPkg/PlatformPei/PlatformPei.inf
index 268efac585..6cc3513b63 100644
--- a/Platform/Loongson/LoongArchQemuPkg/PlatformPei/PlatformPei.inf
+++ b/Platform/Loongson/LoongArchQemuPkg/PlatformPei/PlatformPei.inf
@@ -59,6 +59,7 @@
   gLoongArchQemuPkgTokenSpaceGuid.PcdDeviceTreeBase
   gLoongArchQemuPkgTokenSpaceGuid.PcdDeviceTreePadding
   gLoongArchQemuPkgTokenSpaceGuid.PcdRtcBaseAddress
+  gEfiMdeModulePkgTokenSpaceGuid.PcdNullPointerDetectionPropertyMask
 
 [FixedPcd]
   gLoongArchQemuPkgTokenSpaceGuid.PcdFlashDxeFvBase
-- 
2.39.1

Re: [edk2-devel] [edk2-platforms] Platform/Loongson: Pre-allocate 0-4K memory during the Pei phase

[Chao Li]

[-- Attachment #1: Type: text/plain, Size: 2233 bytes --]

Reviewed-by: Chao Li <lichao@loongson.cn>


Thanks,
Chao
在 2023/6/1 19:19, xianglai 写道:
> When 0 address protection is enabled,
> 0-4k memory needs to be preallocated to
> prevent UEFI applications from allocating use,
> such as grub.
>
> Cc: Ard Biesheuvel<ardb+tianocore@kernel.org>
> Cc: Bibo Mao<maobibo@loongson.cn>
> Cc: Chao Li<lichao@loongson.cn>
> Cc: Leif Lindholm<quic_llindhol@quicinc.com>
> Cc: Liming Gao<gaoliming@byosoft.com.cn>
> Cc: Michael D Kinney<michael.d.kinney@intel.com>
> Signed-off-by: xianglai li<lixianglai@loongson.cn>
> ---
>   .../LoongArchQemuPkg/PlatformPei/MemDetect.c        | 13 +++++++++++++
>   .../LoongArchQemuPkg/PlatformPei/PlatformPei.inf    |  1 +
>   2 files changed, 14 insertions(+)
>
> diff --git a/Platform/Loongson/LoongArchQemuPkg/PlatformPei/MemDetect.c b/Platform/Loongson/LoongArchQemuPkg/PlatformPei/MemDetect.c
> index fad4cff8d8..7e6a4a3aa9 100644
> --- a/Platform/Loongson/LoongArchQemuPkg/PlatformPei/MemDetect.c
> +++ b/Platform/Loongson/LoongArchQemuPkg/PlatformPei/MemDetect.c
> @@ -101,4 +101,17 @@ InitializeRamRegions (
>   
>       AddMemoryRangeHob ( pEntry->BaseAddr, pEntry->BaseAddr + pEntry->Length);
>     }
> +
> +  //
> +  //When 0 address protection is enabled,
> +  //0-4k memory needs to be preallocated to prevent UEFI applications from allocating use,
> +  //such as grub
> +  //
> +  if (PcdGet8 (PcdNullPointerDetectionPropertyMask) & BIT0) {
> +    BuildMemoryAllocationHob (
> +          0,
> +          EFI_PAGE_SIZE,
> +          EfiBootServicesData
> +          );
> +  }
>   }
> diff --git a/Platform/Loongson/LoongArchQemuPkg/PlatformPei/PlatformPei.inf b/Platform/Loongson/LoongArchQemuPkg/PlatformPei/PlatformPei.inf
> index 268efac585..6cc3513b63 100644
> --- a/Platform/Loongson/LoongArchQemuPkg/PlatformPei/PlatformPei.inf
> +++ b/Platform/Loongson/LoongArchQemuPkg/PlatformPei/PlatformPei.inf
> @@ -59,6 +59,7 @@
>     gLoongArchQemuPkgTokenSpaceGuid.PcdDeviceTreeBase
>     gLoongArchQemuPkgTokenSpaceGuid.PcdDeviceTreePadding
>     gLoongArchQemuPkgTokenSpaceGuid.PcdRtcBaseAddress
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdNullPointerDetectionPropertyMask
>   
>   [FixedPcd]
>     gLoongArchQemuPkgTokenSpaceGuid.PcdFlashDxeFvBase

[-- Attachment #2: Type: text/html, Size: 3464 bytes --]