Ring3: Renamed Ring3 files as UserSpace.

This commit is contained in:
Mikhail Krichanov 2025-02-03 14:13:49 +03:00
parent 3664e7206d
commit 0ffae89c3e
23 changed files with 45 additions and 45 deletions

View File

@ -476,7 +476,7 @@
DebugLib|ArmVirtPkg/Library/DebugLibFdtPL011Uart/DebugLibFdtPL011UartUser.inf DebugLib|ArmVirtPkg/Library/DebugLibFdtPL011Uart/DebugLibFdtPL011UartUser.inf
!endif !endif
} }
MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf { MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf {
<LibraryClasses> <LibraryClasses>
MemoryPoolLib|MdeModulePkg/Library/MemoryPoolLib/MemoryPoolLib.inf MemoryPoolLib|MdeModulePkg/Library/MemoryPoolLib/MemoryPoolLib.inf
!if $(TARGET) != RELEASE !if $(TARGET) != RELEASE

View File

@ -40,9 +40,9 @@ READ_LOCK_STATUS = TRUE
APRIORI DXE { APRIORI DXE {
INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
# The driver responsible for UserSpace initialization (DxeRing3.inf) # The driver responsible for UserSpace initialization (DxeUserSpace.inf)
# must be the first USER driver in APRIORI list. # must be the first USER driver in APRIORI list.
INF MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf INF MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf
} }
INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Core/Dxe/DxeMain.inf
@ -89,7 +89,7 @@ APRIORI DXE {
INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
INF USER FatPkg/EnhancedFatDxe/Fat.inf INF USER FatPkg/EnhancedFatDxe/Fat.inf
INF USER MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf INF USER MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf
INF USER MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf INF USER MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf

View File

@ -228,10 +228,10 @@
gEfiMdePkgTokenSpaceGuid.PcdDebugRaisePropertyMask ## CONSUMES gEfiMdePkgTokenSpaceGuid.PcdDebugRaisePropertyMask ## CONSUMES
gEfiMdePkgTokenSpaceGuid.PcdImageProtectionPolicy ## CONSUMES gEfiMdePkgTokenSpaceGuid.PcdImageProtectionPolicy ## CONSUMES
[Pcd.IA32, Pcd.X64] [Pcd.IA32, Pcd.X64]
gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable ## SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdUse5LevelPageTable ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdUse5LevelPageTable ## SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask ## CONSUMES
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaBase ## CONSUMES gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaBase ## CONSUMES
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaSize ## CONSUMES gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaSize ## CONSUMES

View File

@ -13,7 +13,7 @@
#include <Library/UefiBootServicesTableLib.h> #include <Library/UefiBootServicesTableLib.h>
#include <Library/UefiRuntimeServicesTableLib.h> #include <Library/UefiRuntimeServicesTableLib.h>
#include "Ring3.h" #include "UserSpace.h"
EFI_BOOT_SERVICES mBootServices = { EFI_BOOT_SERVICES mBootServices = {
{ {

View File

@ -9,7 +9,7 @@
[Defines] [Defines]
INF_VERSION = 0x00010005 INF_VERSION = 0x00010005
BASE_NAME = DxeRing3 BASE_NAME = DxeUserSpace
FILE_GUID = 88EA50C2-0DEA-4F13-B691-B506554E632B FILE_GUID = 88EA50C2-0DEA-4F13-B691-B506554E632B
MODULE_TYPE = DXE_DRIVER MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0 VERSION_STRING = 1.0
@ -22,11 +22,11 @@
# #
[Sources] [Sources]
Ring3.h UserSpace.h
DxeRing3.c DxeUserSpace.c
Ring3UefiBootServices.c UserSpaceUefiBootServices.c
Ring3UefiRuntimeServices.c UserSpaceUefiRuntimeServices.c
Ring3Protocols.c UserSpaceProtocols.c
[Sources.IA32] [Sources.IA32]
IA32/SysCall.nasm IA32/SysCall.nasm

View File

@ -6,7 +6,7 @@
**/ **/
#include "Ring3.h" #include "UserSpace.h"
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI

View File

@ -14,7 +14,7 @@
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
#include <Library/MemoryPoolLib.h> #include <Library/MemoryPoolLib.h>
#include "Ring3.h" #include "UserSpace.h"
BOOLEAN mOnGuarding = FALSE; BOOLEAN mOnGuarding = FALSE;

View File

@ -1,17 +1,17 @@
/** @file /** @file
This driver constructs User space wrappers for the EFI_RUNTIME_SERVICES. This driver constructs User space wrappers for the EFI_RUNTIME_SERVICES.
Copyright (c) 2024 - 2025, Mikhail Krichanov. All rights reserved. Copyright (c) 2024 - 2025, Mikhail Krichanov. All rights reserved.
SPDX-License-Identifier: BSD-3-Clause SPDX-License-Identifier: BSD-3-Clause
**/ **/
#include <Uefi.h> #include <Uefi.h>
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
#include "Ring3.h" #include "UserSpace.h"
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI

View File

@ -1204,8 +1204,8 @@
# @Prompt Defines the page allocation for the MM communication buffer; default is 128 pages (512KB). # @Prompt Defines the page allocation for the MM communication buffer; default is 128 pages (512KB).
gEfiMdeModulePkgTokenSpaceGuid.PcdMmCommBufferPages|128|UINT32|0x30001061 gEfiMdeModulePkgTokenSpaceGuid.PcdMmCommBufferPages|128|UINT32|0x30001061
## Indicates whether DXE drivers marked in .fdf file as USER will be loaded in user memory. ## Indicates whether DXE drivers marked in .fdf file as USER will be loaded in separate User address spaces.
# TRUE - USER DXE drivers will be loaded in user memory.<BR> # TRUE - USER DXE drivers will be loaded in separate User address spaces.<BR>
# FALSE - All DXE drivers will be loaded in supervisor memory.<BR> # FALSE - All DXE drivers will be loaded in supervisor memory.<BR>
# @Prompt Enable User Space. # @Prompt Enable User Space.
gEfiMdeModulePkgTokenSpaceGuid.PcdEnableUserSpace|FALSE|BOOLEAN|0x30001062 gEfiMdeModulePkgTokenSpaceGuid.PcdEnableUserSpace|FALSE|BOOLEAN|0x30001062

View File

@ -305,7 +305,7 @@
MdeModulePkg/Bus/Spi/SpiHc/SpiHcDxe.inf MdeModulePkg/Bus/Spi/SpiHc/SpiHcDxe.inf
MdeModulePkg/Bus/Spi/SpiHc/SpiHcSmm.inf MdeModulePkg/Bus/Spi/SpiHc/SpiHcSmm.inf
MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf { MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf {
<LibraryClasses> <LibraryClasses>
MemoryPoolLib|MdeModulePkg/Library/MemoryPoolLib/MemoryPoolLib.inf MemoryPoolLib|MdeModulePkg/Library/MemoryPoolLib/MemoryPoolLib.inf
} }

View File

@ -830,7 +830,7 @@
MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
FatPkg/EnhancedFatDxe/Fat.inf FatPkg/EnhancedFatDxe/Fat.inf
MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf { MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf {
<LibraryClasses> <LibraryClasses>
MemoryPoolLib|MdeModulePkg/Library/MemoryPoolLib/MemoryPoolLib.inf MemoryPoolLib|MdeModulePkg/Library/MemoryPoolLib/MemoryPoolLib.inf
} }

View File

@ -203,9 +203,9 @@ APRIORI DXE {
!if $(SMM_REQUIRE) == FALSE !if $(SMM_REQUIRE) == FALSE
INF OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf INF OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
!endif !endif
# The driver responsible for UserSpace initialization (DxeRing3.inf) # The driver responsible for UserSpace initialization (DxeUserSpace.inf)
# must be the first USER driver in APRIORI list. # must be the first USER driver in APRIORI list.
INF MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf INF MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf
} }
# #
@ -291,7 +291,7 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
INF USER FatPkg/EnhancedFatDxe/Fat.inf INF USER FatPkg/EnhancedFatDxe/Fat.inf
INF USER MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf INF USER MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf

View File

@ -842,7 +842,7 @@
MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
FatPkg/EnhancedFatDxe/Fat.inf FatPkg/EnhancedFatDxe/Fat.inf
MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf { MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf {
<LibraryClasses> <LibraryClasses>
MemoryPoolLib|MdeModulePkg/Library/MemoryPoolLib/MemoryPoolLib.inf MemoryPoolLib|MdeModulePkg/Library/MemoryPoolLib/MemoryPoolLib.inf
} }

View File

@ -204,9 +204,9 @@ APRIORI DXE {
!if $(SMM_REQUIRE) == FALSE !if $(SMM_REQUIRE) == FALSE
INF OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf INF OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
!endif !endif
# The driver responsible for UserSpace initialization (DxeRing3.inf) # The driver responsible for UserSpace initialization (DxeUserSpace.inf)
# must be the first USER driver in APRIORI list. # must be the first USER driver in APRIORI list.
INF MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf INF MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf
} }
# #
@ -293,7 +293,7 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
INF USER FatPkg/EnhancedFatDxe/Fat.inf INF USER FatPkg/EnhancedFatDxe/Fat.inf
INF USER MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf INF USER MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf

View File

@ -894,7 +894,7 @@
MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
FatPkg/EnhancedFatDxe/Fat.inf FatPkg/EnhancedFatDxe/Fat.inf
MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf { MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf {
<LibraryClasses> <LibraryClasses>
MemoryPoolLib|MdeModulePkg/Library/MemoryPoolLib/MemoryPoolLib.inf MemoryPoolLib|MdeModulePkg/Library/MemoryPoolLib/MemoryPoolLib.inf
} }

View File

@ -235,9 +235,9 @@ APRIORI DXE {
!if $(SMM_REQUIRE) == FALSE !if $(SMM_REQUIRE) == FALSE
INF OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf INF OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
!endif !endif
# The driver responsible for UserSpace initialization (DxeRing3.inf) # The driver responsible for UserSpace initialization (DxeUserSpace.inf)
# must be the first USER driver in APRIORI list. # must be the first USER driver in APRIORI list.
INF MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf INF MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf
} }
# #
@ -325,7 +325,7 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
INF USER FatPkg/EnhancedFatDxe/Fat.inf INF USER FatPkg/EnhancedFatDxe/Fat.inf
INF USER MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf INF USER MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf

View File

@ -846,7 +846,7 @@
MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
FatPkg/EnhancedFatDxe/Fat.inf FatPkg/EnhancedFatDxe/Fat.inf
MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf { MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf {
<LibraryClasses> <LibraryClasses>
MemoryPoolLib|MdeModulePkg/Library/MemoryPoolLib/MemoryPoolLib.inf MemoryPoolLib|MdeModulePkg/Library/MemoryPoolLib/MemoryPoolLib.inf
} }

View File

@ -143,7 +143,7 @@ APRIORI DXE {
INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
INF UefiPayloadPkg/BlSupportDxe/BlSupportDxe.inf INF UefiPayloadPkg/BlSupportDxe/BlSupportDxe.inf
INF MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf INF MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf
} }
# #
@ -286,7 +286,7 @@ INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
!endif !endif
INF FatPkg/EnhancedFatDxe/Fat.inf INF FatPkg/EnhancedFatDxe/Fat.inf
INF MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf INF MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf
# #
# SD/eMMC Support # SD/eMMC Support