Core/Dxe: Refactored DisableSMAP(), EnableSMAP() names.

acidanthera · Sep 2, 2024 · d8b5a6d · d8b5a6d
1 parent c820082
commit d8b5a6d
Show file tree

Hide file tree

Showing 8 changed files with 132 additions and 135 deletions.
diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -2743,13 +2743,13 @@ CallRing3 (
 
 VOID
 EFIAPI
-DisableSMAP (
+AllowSupervisorAccessToUserMemory (
   VOID
   );
 
 VOID
 EFIAPI
-EnableSMAP (
+ForbidSupervisorAccessToUserMemory (
   VOID
   );
 

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -762,14 +762,14 @@ CoreExitBootServices (
   // Free resources allocated for Ring3.
   //
   if (gRing3Data != NULL) {
-    DisableSMAP ();
+    AllowSupervisorAccessToUserMemory ();
     if (gRing3Data->SystemTable.ConfigurationTable != NULL) {
       CoreFreePages (
         (EFI_PHYSICAL_ADDRESS)(UINTN)gRing3Data->SystemTable.ConfigurationTable,
         EFI_SIZE_TO_PAGES (gRing3Data->SystemTable.NumberOfTableEntries * sizeof (EFI_CONFIGURATION_TABLE))
       );
     }
-    EnableSMAP ();
+    ForbidSupervisorAccessToUserMemory ();
 
     CoreFreePages (
       (EFI_PHYSICAL_ADDRESS)(UINTN)gRing3Data,

diff --git a/MdeModulePkg/Core/Dxe/SysCall/AARCH64/InitializeMsr.c b/MdeModulePkg/Core/Dxe/SysCall/AARCH64/InitializeMsr.c
@@ -70,15 +70,15 @@ SysCallBootService (
     return Status;
   }
 
-  DisableSMAP ();
+  AllowSupervisorAccessToUserMemory ();
   CopyMem ((VOID *)((UINTN)Physical + sizeof (UINTN)), (VOID *)UserRsp, 8 * sizeof (UINTN));
 
   SetUefiImageMemoryAttributes (
     gUartBaseAddress,
     EFI_PAGE_SIZE,
     EFI_MEMORY_XP
     );
-  EnableSMAP ();
+  ForbidSupervisorAccessToUserMemory ();
 
   Status = CallBootService (
              Type,
@@ -180,7 +180,7 @@ InitializeMsr (
 
 VOID
 EFIAPI
-DisableSMAP (
+AllowSupervisorAccessToUserMemory (
   VOID
   )
 {
@@ -191,7 +191,7 @@ DisableSMAP (
 
 VOID
 EFIAPI
-EnableSMAP (
+ForbidSupervisorAccessToUserMemory (
   VOID
   )
 {

diff --git a/MdeModulePkg/Core/Dxe/SysCall/ARM/InitializeMsr.c b/MdeModulePkg/Core/Dxe/SysCall/ARM/InitializeMsr.c
@@ -67,7 +67,7 @@ SysCallBootService (
     return Status;
   }
 
-  DisableSMAP ();
+  AllowSupervisorAccessToUserMemory ();
   //
   // First 3 arguments are passed through R1-R3 and copied to SysCall Stack.
   //
@@ -76,7 +76,7 @@ SysCallBootService (
   // All remaining arguments are on User Stack.
   //
   CopyMem ((VOID *)((UINTN)Physical + 5 * sizeof (UINTN)), (VOID *)UserRsp, 4 * sizeof (UINTN));
-  EnableSMAP ();
+  ForbidSupervisorAccessToUserMemory ();
 
   Status = CallBootService (
              Type,
@@ -110,12 +110,9 @@ InitializeMsr (
   InitializeSysCallHandler (SysCallBootService);
 }
 
-//
-// TODO: Refactoring.
-//
 VOID
 EFIAPI
-DisableSMAP (
+AllowSupervisorAccessToUserMemory (
   VOID
   )
 {
@@ -126,7 +123,7 @@ DisableSMAP (
 
 VOID
 EFIAPI
-EnableSMAP (
+ForbidSupervisorAccessToUserMemory (
   VOID
   )
 {