1. Patchew
  2. EDK2
  3. [edk2] [PATCH 0/6] Fix issues caused by NX memory protection
  4. View patch

[edk2] [PATCH 2/6] UefiCpuPkg/CpuExceptionHandlerLib: alloc code memory for exception handlers

Jian J Wang posted 6 patches 6 years, 11 months ago
[edk2] [PATCH 2/6] UefiCpuPkg/CpuExceptionHandlerLib: alloc code memory for exception handlers
Posted by Jian J Wang 6 years, 11 months ago 
If PcdDxeNxMemoryProtectionPolicy is set to enable protection for memory
of EfiBootServicesData, EfiConventionalMemory, the BIOS will reset after
timer initialized and started.

The root cause is that the memory used to hold the exception and interrupt
handler is allocated with type of EfiBootServicesData and marked as
non-executable due to NX feature enabled. This patch fixes it by allocating
EfiBootServicesCode type of memory for those handlers instead.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jian J Wang <jian.j.wang@intel.com>
---
 .../Library/CpuExceptionHandlerLib/DxeException.c      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c
index 9a72b37e77..6d1b54d31d 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c
@@ -16,6 +16,7 @@
 #include "CpuExceptionCommon.h"
 #include <Library/DebugLib.h>
 #include <Library/MemoryAllocationLib.h>
+#include <Library/UefiBootServicesTableLib.h>
 
 CONST UINTN    mDoFarReturnFlag  = 0;
 
@@ -106,8 +107,12 @@ InitializeCpuInterruptHandlers (
   RESERVED_VECTORS_DATA              *ReservedVectors;
   EFI_CPU_INTERRUPT_HANDLER          *ExternalInterruptHandler;
 
-  ReservedVectors = AllocatePool (sizeof (RESERVED_VECTORS_DATA) * CPU_INTERRUPT_NUM);
-  ASSERT (ReservedVectors != NULL);
+  Status = gBS->AllocatePool (
+                  EfiBootServicesCode,
+                  sizeof (RESERVED_VECTORS_DATA) * CPU_INTERRUPT_NUM,
+                  (VOID **)&ReservedVectors
+                  );
+  ASSERT (!EFI_ERROR (Status) && ReservedVectors != NULL);
   SetMem ((VOID *) ReservedVectors, sizeof (RESERVED_VECTORS_DATA) * CPU_INTERRUPT_NUM, 0xff);
   if (VectorInfo != NULL) {
     Status = ReadAndVerifyVectorInfo (VectorInfo, ReservedVectors, CPU_INTERRUPT_NUM);
@@ -137,8 +142,13 @@ InitializeCpuInterruptHandlers (
 
   AsmGetTemplateAddressMap (&TemplateMap);
   ASSERT (TemplateMap.ExceptionStubHeaderSize <= HOOKAFTER_STUB_SIZE);
-  InterruptEntryCode = AllocatePool (TemplateMap.ExceptionStubHeaderSize * CPU_INTERRUPT_NUM);
-  ASSERT (InterruptEntryCode != NULL);
+
+  Status = gBS->AllocatePool (
+                  EfiBootServicesCode,
+                  TemplateMap.ExceptionStubHeaderSize * CPU_INTERRUPT_NUM,
+                  (VOID **)&InterruptEntryCode
+                  );
+  ASSERT (!EFI_ERROR (Status) && InterruptEntryCode != NULL);
 
   InterruptEntry = (UINTN) InterruptEntryCode;
   for (Index = 0; Index < CPU_INTERRUPT_NUM; Index ++) {
-- 
2.15.1.windows.2

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH 2/6] UefiCpuPkg/CpuExceptionHandlerLib: alloc code memory for exception handlers
Posted by Dong, Eric 6 years, 11 months ago 
Reviewed-by: Eric Dong <eric.dong@intel.com>

> -----Original Message-----
> From: Wang, Jian J
> Sent: Monday, January 15, 2018 4:54 PM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Ni, Ruiyu <ruiyu.ni@intel.com>;
> Dong, Eric <eric.dong@intel.com>; Laszlo Ersek <lersek@redhat.com>
> Subject: [PATCH 2/6] UefiCpuPkg/CpuExceptionHandlerLib: alloc code
> memory for exception handlers
> 
> If PcdDxeNxMemoryProtectionPolicy is set to enable protection for memory
> of EfiBootServicesData, EfiConventionalMemory, the BIOS will reset after
> timer initialized and started.
> 
> The root cause is that the memory used to hold the exception and interrupt
> handler is allocated with type of EfiBootServicesData and marked as non-
> executable due to NX feature enabled. This patch fixes it by allocating
> EfiBootServicesCode type of memory for those handlers instead.
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Jian J Wang <jian.j.wang@intel.com>
> ---
>  .../Library/CpuExceptionHandlerLib/DxeException.c      | 18
> ++++++++++++++----
>  1 file changed, 14 insertions(+), 4 deletions(-)
> 
> diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c
> index 9a72b37e77..6d1b54d31d 100644
> --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c
> +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c
> @@ -16,6 +16,7 @@
>  #include "CpuExceptionCommon.h"
>  #include <Library/DebugLib.h>
>  #include <Library/MemoryAllocationLib.h>
> +#include <Library/UefiBootServicesTableLib.h>
> 
>  CONST UINTN    mDoFarReturnFlag  = 0;
> 
> @@ -106,8 +107,12 @@ InitializeCpuInterruptHandlers (
>    RESERVED_VECTORS_DATA              *ReservedVectors;
>    EFI_CPU_INTERRUPT_HANDLER          *ExternalInterruptHandler;
> 
> -  ReservedVectors = AllocatePool (sizeof (RESERVED_VECTORS_DATA) *
> CPU_INTERRUPT_NUM);
> -  ASSERT (ReservedVectors != NULL);
> +  Status = gBS->AllocatePool (
> +                  EfiBootServicesCode,
> +                  sizeof (RESERVED_VECTORS_DATA) * CPU_INTERRUPT_NUM,
> +                  (VOID **)&ReservedVectors
> +                  );
> +  ASSERT (!EFI_ERROR (Status) && ReservedVectors != NULL);
>    SetMem ((VOID *) ReservedVectors, sizeof (RESERVED_VECTORS_DATA) *
> CPU_INTERRUPT_NUM, 0xff);
>    if (VectorInfo != NULL) {
>      Status = ReadAndVerifyVectorInfo (VectorInfo, ReservedVectors,
> CPU_INTERRUPT_NUM); @@ -137,8 +142,13 @@
> InitializeCpuInterruptHandlers (
> 
>    AsmGetTemplateAddressMap (&TemplateMap);
>    ASSERT (TemplateMap.ExceptionStubHeaderSize <=
> HOOKAFTER_STUB_SIZE);
> -  InterruptEntryCode = AllocatePool
> (TemplateMap.ExceptionStubHeaderSize * CPU_INTERRUPT_NUM);
> -  ASSERT (InterruptEntryCode != NULL);
> +
> +  Status = gBS->AllocatePool (
> +                  EfiBootServicesCode,
> +                  TemplateMap.ExceptionStubHeaderSize * CPU_INTERRUPT_NUM,
> +                  (VOID **)&InterruptEntryCode
> +                  );
> +  ASSERT (!EFI_ERROR (Status) && InterruptEntryCode != NULL);
> 
>    InterruptEntry = (UINTN) InterruptEntryCode;
>    for (Index = 0; Index < CPU_INTERRUPT_NUM; Index ++) {
> --
> 2.15.1.windows.2

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-8c64711

© 2016 - 2024 Red Hat, Inc.