* [PATCH v4 1/6] BaseTools/tools_def CLANGDWARF: Permit text relocations
2023-04-03 14:29 [PATCH v4 0/6] UefiCpuPkg, OvmfPkg: Simplify CpuExceptionHandlerLib Ard Biesheuvel
@ 2023-04-03 14:29 ` Ard Biesheuvel
2023-04-05 17:11 ` Rebecca Cran
2023-04-03 14:29 ` [PATCH v4 2/6] UefiCpuPkg/CpuExceptionHandlerLib: Use single SEC/PEI version Ard Biesheuvel
` (6 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: Ard Biesheuvel @ 2023-04-03 14:29 UTC (permalink / raw)
To: devel
Cc: Ard Biesheuvel, Ni, Ray, Andrew Fish, Kinney, Michael D,
Liu, Zhiguang, Rebecca Cran, Tom Lendacky, Marvin Häuser
We rely on PIE executables to get the codegen that is suitable for
PE/COFF conversion where the resulting executables can be loaded
anywhere in the address space.
However, ELF linkers may default to disallowing text relocations in PIE
executables, as this would require text segments to be updated at
runtime, which is bad for security and increases the copy-on-write
footprint of ELF executables and shared libraries.
However, none of those concerns apply to PE/COFF executables in the
context of EFI, which are copied into memory rather than mmap()'ed, and
fixed up by the loader before launch.
So pass -z notext to the LLD linker to permit runtime relocations in
read-only sections.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
BaseTools/Conf/tools_def.template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index ae43101853870c6d..5a3af55bfb09d753 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -2870,7 +2870,7 @@ DEFINE CLANGDWARF_X64_PREFIX = ENV(CLANG_BIN)
DEFINE CLANGDWARF_IA32_X64_DLINK_COMMON = -nostdlib -Wl,-q,--gc-sections -z max-page-size=0x40
DEFINE CLANGDWARF_DLINK2_FLAGS_COMMON = -Wl,--script=$(EDK_TOOLS_PATH)/Scripts/ClangBase.lds
DEFINE CLANGDWARF_IA32_X64_ASLDLINK_FLAGS = DEF(CLANGDWARF_IA32_X64_DLINK_COMMON) -Wl,--defsym=PECOFF_HEADER_SIZE=0 DEF(CLANGDWARF_DLINK2_FLAGS_COMMON) -Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable
-DEFINE CLANGDWARF_IA32_X64_DLINK_FLAGS = DEF(CLANGDWARF_IA32_X64_DLINK_COMMON) -Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map,--whole-archive
+DEFINE CLANGDWARF_IA32_X64_DLINK_FLAGS = DEF(CLANGDWARF_IA32_X64_DLINK_COMMON) -Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map,--whole-archive -Wl,-z,notext
DEFINE CLANGDWARF_IA32_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x220 DEF(CLANGDWARF_DLINK2_FLAGS_COMMON)
DEFINE CLANGDWARF_X64_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 DEF(CLANGDWARF_DLINK2_FLAGS_COMMON)
--
2.39.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH v4 1/6] BaseTools/tools_def CLANGDWARF: Permit text relocations
2023-04-03 14:29 ` [PATCH v4 1/6] BaseTools/tools_def CLANGDWARF: Permit text relocations Ard Biesheuvel
@ 2023-04-05 17:11 ` Rebecca Cran
0 siblings, 0 replies; 15+ messages in thread
From: Rebecca Cran @ 2023-04-05 17:11 UTC (permalink / raw)
To: Ard Biesheuvel, devel
Cc: Ni, Ray, Andrew Fish, Kinney, Michael D, Liu, Zhiguang,
Tom Lendacky, Marvin Häuser
Reviewed-by: Rebecca Cran <rebecca@bsdio.com>
--
Rebecca Cran
On 4/3/23 8:29 AM, Ard Biesheuvel wrote:
> We rely on PIE executables to get the codegen that is suitable for
> PE/COFF conversion where the resulting executables can be loaded
> anywhere in the address space.
>
> However, ELF linkers may default to disallowing text relocations in PIE
> executables, as this would require text segments to be updated at
> runtime, which is bad for security and increases the copy-on-write
> footprint of ELF executables and shared libraries.
>
> However, none of those concerns apply to PE/COFF executables in the
> context of EFI, which are copied into memory rather than mmap()'ed, and
> fixed up by the loader before launch.
>
> So pass -z notext to the LLD linker to permit runtime relocations in
> read-only sections.
>
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> ---
> BaseTools/Conf/tools_def.template | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
> index ae43101853870c6d..5a3af55bfb09d753 100755
> --- a/BaseTools/Conf/tools_def.template
> +++ b/BaseTools/Conf/tools_def.template
> @@ -2870,7 +2870,7 @@ DEFINE CLANGDWARF_X64_PREFIX = ENV(CLANG_BIN)
> DEFINE CLANGDWARF_IA32_X64_DLINK_COMMON = -nostdlib -Wl,-q,--gc-sections -z max-page-size=0x40
> DEFINE CLANGDWARF_DLINK2_FLAGS_COMMON = -Wl,--script=$(EDK_TOOLS_PATH)/Scripts/ClangBase.lds
> DEFINE CLANGDWARF_IA32_X64_ASLDLINK_FLAGS = DEF(CLANGDWARF_IA32_X64_DLINK_COMMON) -Wl,--defsym=PECOFF_HEADER_SIZE=0 DEF(CLANGDWARF_DLINK2_FLAGS_COMMON) -Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable
> -DEFINE CLANGDWARF_IA32_X64_DLINK_FLAGS = DEF(CLANGDWARF_IA32_X64_DLINK_COMMON) -Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map,--whole-archive
> +DEFINE CLANGDWARF_IA32_X64_DLINK_FLAGS = DEF(CLANGDWARF_IA32_X64_DLINK_COMMON) -Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map,--whole-archive -Wl,-z,notext
> DEFINE CLANGDWARF_IA32_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x220 DEF(CLANGDWARF_DLINK2_FLAGS_COMMON)
> DEFINE CLANGDWARF_X64_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 DEF(CLANGDWARF_DLINK2_FLAGS_COMMON)
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v4 2/6] UefiCpuPkg/CpuExceptionHandlerLib: Use single SEC/PEI version
2023-04-03 14:29 [PATCH v4 0/6] UefiCpuPkg, OvmfPkg: Simplify CpuExceptionHandlerLib Ard Biesheuvel
2023-04-03 14:29 ` [PATCH v4 1/6] BaseTools/tools_def CLANGDWARF: Permit text relocations Ard Biesheuvel
@ 2023-04-03 14:29 ` Ard Biesheuvel
2023-04-06 5:54 ` Ni, Ray
2023-04-03 14:29 ` [PATCH v4 3/6] UefiCpuPkg/PeiCpuExceptionHandlerLib: Use SEC/PEI specific asm component Ard Biesheuvel
` (5 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: Ard Biesheuvel @ 2023-04-03 14:29 UTC (permalink / raw)
To: devel
Cc: Ard Biesheuvel, Ni, Ray, Andrew Fish, Kinney, Michael D,
Liu, Zhiguang, Rebecca Cran, Tom Lendacky, Marvin Häuser
Currently, we use the non-Xcode5 version of ExceptionHandlerAsm.nasm
only for the SEC and PEI phases, and this version was not compatible
with the XCODE or LLD linkers, which do not permit absolute relocations
in read-only sections.
Given that SEC and PEI code typically executes in place from flash and
does not use page alignment for sections, we can simply emit the code
carrying the absolute symbol references into the .data segment instead.
This works around the linker's objections, and the resulting image will
be mapped executable in its entirety anyway. Since this is only needed
for XCODE, let's make this change conditionally using a preprocessor
macro.
Let's rename the .nasm file to reflect the fact that is used for the
SecPei flavor of this library only, and while at it, remove some
unnecessary absolute references.
Also update the Xcode specific version of this library, and use this
source file instead. This is necesessary, as the Xcode specific version
modifies its own code at runtime, which is not permitted in SEC or PEI.
Note that this also removes CET support from the Xcode5 specific build
of the SEC/PEI version of this library, but this is not needed this
early in any case, and this aligns it with other toolchains, which use
this version of the library, which does not have CET support either.
1. Change for non-XCODE SecPeiCpuExceptionHandlerLib:
. Use SecPeiExceptionHandlerAsm.nasm (renamed from
ExceptionHandlerAsm.nasm)
. Removed some unnecessary absolute references
(32 IDT stubs are still in .text.)
2. Change for XCODE SecPeiCpuExceptionHandlerLib:
. Use SecPeiExceptionHandlerAsm.nasm instead of
Xcode5ExceptionHandlerAsm.nasm
. CET logic is not in SecPeiExceptionHandlerAsm.nasm (but aligns to
non-XCODE lib instance)
. Fixed a bug that does runtime fixup in TEXT section in SPI flash.
. Emitted the code carrying the absolute symbol references into the
.data which XCODE or LLD linkers allow.
. Then fixup can be done by other build tools such as GenFv if the code
runs in SPI flash, or by PE coff loader if the code is loaded to
memory.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf | 4 +++-
UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/{ExceptionHandlerAsm.nasm => SecPeiExceptionHandlerAsm.nasm} | 12 ++++++++----
UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf | 4 +++-
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
index df44371fe018e06d..e7b1144f694183b7 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
@@ -28,7 +28,7 @@ [Sources.Ia32]
Ia32/ArchInterruptDefs.h
[Sources.X64]
- X64/ExceptionHandlerAsm.nasm
+ X64/SecPeiExceptionHandlerAsm.nasm
X64/ArchExceptionHandler.c
X64/ArchInterruptDefs.h
@@ -58,3 +58,5 @@ [Pcd]
[FeaturePcd]
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackGuard ## CONSUMES
+[BuildOptions]
+ XCODE:*_*_X64_NASM_FLAGS = -D NO_ABSOLUTE_RELOCS_IN_TEXT
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/SecPeiExceptionHandlerAsm.nasm
similarity index 94%
rename from UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm
rename to UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/SecPeiExceptionHandlerAsm.nasm
index aaf8d622e6f3b8f1..5c7a59c99d3210f1 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/SecPeiExceptionHandlerAsm.nasm
@@ -27,7 +27,9 @@ extern ASM_PFX(CommonExceptionHandler)
SECTION .data
DEFAULT REL
+%ifndef NO_ABSOLUTE_RELOCS_IN_TEXT
SECTION .text
+%endif
ALIGN 8
@@ -51,6 +53,9 @@ HookAfterStubHeaderBegin:
push rax
mov rax, HookAfterStubHeaderEnd
jmp rax
+
+SECTION .text
+
HookAfterStubHeaderEnd:
mov rax, rsp
and sp, 0xfff0 ; make sure 16-byte aligned for exception context
@@ -276,8 +281,7 @@ DrFinish:
; and make sure RSP is 16-byte aligned
;
sub rsp, 4 * 8 + 8
- mov rax, ASM_PFX(CommonExceptionHandler)
- call rax
+ call ASM_PFX(CommonExceptionHandler)
add rsp, 4 * 8 + 8
cli
@@ -384,10 +388,10 @@ DoIret:
; comments here for definition of address map
global ASM_PFX(AsmGetTemplateAddressMap)
ASM_PFX(AsmGetTemplateAddressMap):
- mov rax, AsmIdtVectorBegin
+ lea rax, [AsmIdtVectorBegin]
mov qword [rcx], rax
mov qword [rcx + 0x8], (AsmIdtVectorEnd - AsmIdtVectorBegin) / 32
- mov rax, HookAfterStubHeaderBegin
+ lea rax, [HookAfterStubHeaderBegin]
mov qword [rcx + 0x10], rax
ret
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf
index 619b39d7f1de9ae3..accc081a95f53453 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf
@@ -33,7 +33,7 @@ [Sources.Ia32]
Ia32/ArchInterruptDefs.h
[Sources.X64]
- X64/Xcode5ExceptionHandlerAsm.nasm
+ X64/SecPeiExceptionHandlerAsm.nasm
X64/ArchExceptionHandler.c
X64/ArchInterruptDefs.h
@@ -63,3 +63,5 @@ [Pcd]
[FeaturePcd]
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackGuard ## CONSUMES
+[BuildOptions]
+ XCODE:*_*_X64_NASM_FLAGS = -D NO_ABSOLUTE_RELOCS_IN_TEXT
--
2.39.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH v4 2/6] UefiCpuPkg/CpuExceptionHandlerLib: Use single SEC/PEI version
2023-04-03 14:29 ` [PATCH v4 2/6] UefiCpuPkg/CpuExceptionHandlerLib: Use single SEC/PEI version Ard Biesheuvel
@ 2023-04-06 5:54 ` Ni, Ray
0 siblings, 0 replies; 15+ messages in thread
From: Ni, Ray @ 2023-04-06 5:54 UTC (permalink / raw)
To: Ard Biesheuvel, devel@edk2.groups.io
Cc: Andrew Fish, Kinney, Michael D, Liu, Zhiguang, Rebecca Cran,
Tom Lendacky, Marvin Häuser
Reviewed-by: Ray Ni <ray.ni@intel.com>
> -----Original Message-----
> From: Ard Biesheuvel <ardb@kernel.org>
> Sent: Monday, April 3, 2023 10:29 PM
> To: devel@edk2.groups.io
> Cc: Ard Biesheuvel <ardb@kernel.org>; Ni, Ray <ray.ni@intel.com>; Andrew
> Fish <afish@apple.com>; Kinney, Michael D <michael.d.kinney@intel.com>;
> Liu, Zhiguang <zhiguang.liu@intel.com>; Rebecca Cran
> <rebecca@bsdio.com>; Tom Lendacky <thomas.lendacky@amd.com>;
> Marvin Häuser <mhaeuser@posteo.de>
> Subject: [PATCH v4 2/6] UefiCpuPkg/CpuExceptionHandlerLib: Use single
> SEC/PEI version
>
> Currently, we use the non-Xcode5 version of ExceptionHandlerAsm.nasm
> only for the SEC and PEI phases, and this version was not compatible
> with the XCODE or LLD linkers, which do not permit absolute relocations
> in read-only sections.
>
> Given that SEC and PEI code typically executes in place from flash and
> does not use page alignment for sections, we can simply emit the code
> carrying the absolute symbol references into the .data segment instead.
> This works around the linker's objections, and the resulting image will
> be mapped executable in its entirety anyway. Since this is only needed
> for XCODE, let's make this change conditionally using a preprocessor
> macro.
>
> Let's rename the .nasm file to reflect the fact that is used for the
> SecPei flavor of this library only, and while at it, remove some
> unnecessary absolute references.
>
> Also update the Xcode specific version of this library, and use this
> source file instead. This is necesessary, as the Xcode specific version
> modifies its own code at runtime, which is not permitted in SEC or PEI.
> Note that this also removes CET support from the Xcode5 specific build
> of the SEC/PEI version of this library, but this is not needed this
> early in any case, and this aligns it with other toolchains, which use
> this version of the library, which does not have CET support either.
>
> 1. Change for non-XCODE SecPeiCpuExceptionHandlerLib:
> . Use SecPeiExceptionHandlerAsm.nasm (renamed from
> ExceptionHandlerAsm.nasm)
> . Removed some unnecessary absolute references
> (32 IDT stubs are still in .text.)
>
> 2. Change for XCODE SecPeiCpuExceptionHandlerLib:
> . Use SecPeiExceptionHandlerAsm.nasm instead of
> Xcode5ExceptionHandlerAsm.nasm
> . CET logic is not in SecPeiExceptionHandlerAsm.nasm (but aligns to
> non-XCODE lib instance)
> . Fixed a bug that does runtime fixup in TEXT section in SPI flash.
> . Emitted the code carrying the absolute symbol references into the
> .data which XCODE or LLD linkers allow.
> . Then fixup can be done by other build tools such as GenFv if the code
> runs in SPI flash, or by PE coff loader if the code is loaded to
> memory.
>
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> ---
>
> UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib
> .inf | 4 +++-
>
> UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/{ExceptionHandlerAsm.na
> sm => SecPeiExceptionHandlerAsm.nasm} | 12 ++++++++----
>
> UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHa
> ndlerLib.inf | 4 +++-
> 3 files changed, 14 insertions(+), 6 deletions(-)
>
> diff --git
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandler
> Lib.inf
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandler
> Lib.inf
> index df44371fe018e06d..e7b1144f694183b7 100644
> ---
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandler
> Lib.inf
> +++
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandler
> Lib.inf
> @@ -28,7 +28,7 @@ [Sources.Ia32]
> Ia32/ArchInterruptDefs.h
>
>
>
> [Sources.X64]
>
> - X64/ExceptionHandlerAsm.nasm
>
> + X64/SecPeiExceptionHandlerAsm.nasm
>
> X64/ArchExceptionHandler.c
>
> X64/ArchInterruptDefs.h
>
>
>
> @@ -58,3 +58,5 @@ [Pcd]
> [FeaturePcd]
>
> gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackGuard ##
> CONSUMES
>
>
>
> +[BuildOptions]
>
> + XCODE:*_*_X64_NASM_FLAGS = -D NO_ABSOLUTE_RELOCS_IN_TEXT
>
> diff --git
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.n
> asm
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/SecPeiExceptionHandler
> Asm.nasm
> similarity index 94%
> rename from
> UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nas
> m
> rename to
> UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/SecPeiExceptionHandlerA
> sm.nasm
> index aaf8d622e6f3b8f1..5c7a59c99d3210f1 100644
> ---
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.n
> asm
> +++
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/SecPeiExceptionHandler
> Asm.nasm
> @@ -27,7 +27,9 @@ extern ASM_PFX(CommonExceptionHandler)
> SECTION .data
>
>
>
> DEFAULT REL
>
> +%ifndef NO_ABSOLUTE_RELOCS_IN_TEXT
>
> SECTION .text
>
> +%endif
>
>
>
> ALIGN 8
>
>
>
> @@ -51,6 +53,9 @@ HookAfterStubHeaderBegin:
> push rax
>
> mov rax, HookAfterStubHeaderEnd
>
> jmp rax
>
> +
>
> +SECTION .text
>
> +
>
> HookAfterStubHeaderEnd:
>
> mov rax, rsp
>
> and sp, 0xfff0 ; make sure 16-byte aligned for exception context
>
> @@ -276,8 +281,7 @@ DrFinish:
> ; and make sure RSP is 16-byte aligned
>
> ;
>
> sub rsp, 4 * 8 + 8
>
> - mov rax, ASM_PFX(CommonExceptionHandler)
>
> - call rax
>
> + call ASM_PFX(CommonExceptionHandler)
>
> add rsp, 4 * 8 + 8
>
>
>
> cli
>
> @@ -384,10 +388,10 @@ DoIret:
> ; comments here for definition of address map
>
> global ASM_PFX(AsmGetTemplateAddressMap)
>
> ASM_PFX(AsmGetTemplateAddressMap):
>
> - mov rax, AsmIdtVectorBegin
>
> + lea rax, [AsmIdtVectorBegin]
>
> mov qword [rcx], rax
>
> mov qword [rcx + 0x8], (AsmIdtVectorEnd - AsmIdtVectorBegin) / 32
>
> - mov rax, HookAfterStubHeaderBegin
>
> + lea rax, [HookAfterStubHeaderBegin]
>
> mov qword [rcx + 0x10], rax
>
> ret
>
>
>
> diff --git
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuException
> HandlerLib.inf
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuException
> HandlerLib.inf
> index 619b39d7f1de9ae3..accc081a95f53453 100644
> ---
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuException
> HandlerLib.inf
> +++
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuException
> HandlerLib.inf
> @@ -33,7 +33,7 @@ [Sources.Ia32]
> Ia32/ArchInterruptDefs.h
>
>
>
> [Sources.X64]
>
> - X64/Xcode5ExceptionHandlerAsm.nasm
>
> + X64/SecPeiExceptionHandlerAsm.nasm
>
> X64/ArchExceptionHandler.c
>
> X64/ArchInterruptDefs.h
>
>
>
> @@ -63,3 +63,5 @@ [Pcd]
> [FeaturePcd]
>
> gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackGuard ##
> CONSUMES
>
>
>
> +[BuildOptions]
>
> + XCODE:*_*_X64_NASM_FLAGS = -D NO_ABSOLUTE_RELOCS_IN_TEXT
>
> --
> 2.39.2
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v4 3/6] UefiCpuPkg/PeiCpuExceptionHandlerLib: Use SEC/PEI specific asm component
2023-04-03 14:29 [PATCH v4 0/6] UefiCpuPkg, OvmfPkg: Simplify CpuExceptionHandlerLib Ard Biesheuvel
2023-04-03 14:29 ` [PATCH v4 1/6] BaseTools/tools_def CLANGDWARF: Permit text relocations Ard Biesheuvel
2023-04-03 14:29 ` [PATCH v4 2/6] UefiCpuPkg/CpuExceptionHandlerLib: Use single SEC/PEI version Ard Biesheuvel
@ 2023-04-03 14:29 ` Ard Biesheuvel
2023-04-06 6:00 ` Ni, Ray
2023-04-03 14:29 ` [PATCH v4 4/6] UefiCpuPkg/CpuExceptionHandlerLib: Make runtime fixups XCODE-only Ard Biesheuvel
` (4 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: Ard Biesheuvel @ 2023-04-03 14:29 UTC (permalink / raw)
To: devel
Cc: Ard Biesheuvel, Ni, Ray, Andrew Fish, Kinney, Michael D,
Liu, Zhiguang, Rebecca Cran, Tom Lendacky, Marvin Häuser
The PEI flavor of CpuExceptionHandlerLib never populates more than 32
IDT vectors, and there is no CET shadow stack support in the PEI phase.
So there is no need to use the generic ExceptionHandler NASM source,
which carries a 256-entry template and CET support, and writes to its
own .text section when built using XCODE, which is not permitted in the
PEI phase. So let's switch to the reduced SEC/PEI version of this
component, which is sufficient for PEI and doesn't suffer from the same
issue.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf
index 5339f8e604045801..3bcaff5c5fe4633a 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf
@@ -28,7 +28,7 @@ [Sources.Ia32]
Ia32/ArchInterruptDefs.h
[Sources.X64]
- X64/Xcode5ExceptionHandlerAsm.nasm
+ X64/SecPeiExceptionHandlerAsm.nasm
X64/ArchExceptionHandler.c
X64/ArchInterruptDefs.h
@@ -62,3 +62,5 @@ [Pcd]
[FeaturePcd]
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackGuard ## CONSUMES
+[BuildOptions]
+ XCODE:*_*_X64_NASM_FLAGS = -D NO_ABSOLUTE_RELOCS_IN_TEXT
--
2.39.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH v4 3/6] UefiCpuPkg/PeiCpuExceptionHandlerLib: Use SEC/PEI specific asm component
2023-04-03 14:29 ` [PATCH v4 3/6] UefiCpuPkg/PeiCpuExceptionHandlerLib: Use SEC/PEI specific asm component Ard Biesheuvel
@ 2023-04-06 6:00 ` Ni, Ray
0 siblings, 0 replies; 15+ messages in thread
From: Ni, Ray @ 2023-04-06 6:00 UTC (permalink / raw)
To: Ard Biesheuvel, devel@edk2.groups.io
Cc: Andrew Fish, Kinney, Michael D, Liu, Zhiguang, Rebecca Cran,
Tom Lendacky, Marvin Häuser
Reviewed-by: Ray Ni <ray.ni@intel.com>
> -----Original Message-----
> From: Ard Biesheuvel <ardb@kernel.org>
> Sent: Monday, April 3, 2023 10:29 PM
> To: devel@edk2.groups.io
> Cc: Ard Biesheuvel <ardb@kernel.org>; Ni, Ray <ray.ni@intel.com>; Andrew
> Fish <afish@apple.com>; Kinney, Michael D <michael.d.kinney@intel.com>;
> Liu, Zhiguang <zhiguang.liu@intel.com>; Rebecca Cran
> <rebecca@bsdio.com>; Tom Lendacky <thomas.lendacky@amd.com>;
> Marvin Häuser <mhaeuser@posteo.de>
> Subject: [PATCH v4 3/6] UefiCpuPkg/PeiCpuExceptionHandlerLib: Use
> SEC/PEI specific asm component
>
> The PEI flavor of CpuExceptionHandlerLib never populates more than 32
> IDT vectors, and there is no CET shadow stack support in the PEI phase.
> So there is no need to use the generic ExceptionHandler NASM source,
> which carries a 256-entry template and CET support, and writes to its
> own .text section when built using XCODE, which is not permitted in the
> PEI phase. So let's switch to the reduced SEC/PEI version of this
> component, which is sufficient for PEI and doesn't suffer from the same
> issue.
>
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> ---
>
> UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf
> | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.i
> nf
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.i
> nf
> index 5339f8e604045801..3bcaff5c5fe4633a 100644
> ---
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.i
> nf
> +++
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.i
> nf
> @@ -28,7 +28,7 @@ [Sources.Ia32]
> Ia32/ArchInterruptDefs.h
>
>
>
> [Sources.X64]
>
> - X64/Xcode5ExceptionHandlerAsm.nasm
>
> + X64/SecPeiExceptionHandlerAsm.nasm
>
> X64/ArchExceptionHandler.c
>
> X64/ArchInterruptDefs.h
>
>
>
> @@ -62,3 +62,5 @@ [Pcd]
> [FeaturePcd]
>
> gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackGuard ##
> CONSUMES
>
>
>
> +[BuildOptions]
>
> + XCODE:*_*_X64_NASM_FLAGS = -D NO_ABSOLUTE_RELOCS_IN_TEXT
>
> --
> 2.39.2
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v4 4/6] UefiCpuPkg/CpuExceptionHandlerLib: Make runtime fixups XCODE-only
2023-04-03 14:29 [PATCH v4 0/6] UefiCpuPkg, OvmfPkg: Simplify CpuExceptionHandlerLib Ard Biesheuvel
` (2 preceding siblings ...)
2023-04-03 14:29 ` [PATCH v4 3/6] UefiCpuPkg/PeiCpuExceptionHandlerLib: Use SEC/PEI specific asm component Ard Biesheuvel
@ 2023-04-03 14:29 ` Ard Biesheuvel
2023-04-03 14:29 ` [PATCH v4 5/6] OvmfPkg: Drop special Xcode5 version of exception handler library Ard Biesheuvel
` (3 subsequent siblings)
7 siblings, 0 replies; 15+ messages in thread
From: Ard Biesheuvel @ 2023-04-03 14:29 UTC (permalink / raw)
To: devel
Cc: Ard Biesheuvel, Ni, Ray, Andrew Fish, Kinney, Michael D,
Liu, Zhiguang, Rebecca Cran, Tom Lendacky, Marvin Häuser
The CPU exception handler library code was rewritten at some point to
populate the vector code templates with absolute references at runtime,
given that the XCODE linker does not permit absolute references in
executable code when creating PIE executables.
This is rather unfortunate, as this prevents us from using strict
permissions on the memory mappings, given that the .text section needs
to be writable at runtime for this arrangement to work.
So let's make this hack XCODE-only, by setting a preprocessor #define
from the command line when using the XCODE toolchain, and only including
the runtime fixup code when the macro is defined.
While at it, rename the Xcode5ExceptionHandlerAsm.nasm source file and
drop the Xcode5 prefix: this code is used by other toolchains too.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Ray Ni <ray.ni@intel.com>
---
UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf | 5 ++++-
UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf | 4 +++-
UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/{Xcode5ExceptionHandlerAsm.nasm => ExceptionHandlerAsm.nasm} | 10 ++++++++++
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
index d0f82095cf926e99..fdbebadab93df756 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
@@ -28,7 +28,7 @@ [Sources.Ia32]
Ia32/ArchInterruptDefs.h
[Sources.X64]
- X64/Xcode5ExceptionHandlerAsm.nasm
+ X64/ExceptionHandlerAsm.nasm
X64/ArchExceptionHandler.c
X64/ArchInterruptDefs.h
@@ -61,3 +61,6 @@ [LibraryClasses]
MemoryAllocationLib
DebugLib
CcExitLib
+
+[BuildOptions]
+ XCODE:*_*_X64_NASM_FLAGS = -D NO_ABSOLUTE_RELOCS_IN_TEXT
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
index 8f8a5dab79303f87..27f0b96fa9e97705 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
@@ -28,7 +28,7 @@ [Sources.Ia32]
Ia32/ArchInterruptDefs.h
[Sources.X64]
- X64/Xcode5ExceptionHandlerAsm.nasm
+ X64/ExceptionHandlerAsm.nasm
X64/ArchExceptionHandler.c
X64/ArchInterruptDefs.h
@@ -61,3 +61,5 @@ [Pcd]
[FeaturePcd]
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackGuard ## CONSUMES
+[BuildOptions]
+ XCODE:*_*_X64_NASM_FLAGS = -D NO_ABSOLUTE_RELOCS_IN_TEXT
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/Xcode5ExceptionHandlerAsm.nasm b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm
similarity index 95%
rename from UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/Xcode5ExceptionHandlerAsm.nasm
rename to UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm
index 957478574253e619..3d64ac908010562f 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/Xcode5ExceptionHandlerAsm.nasm
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm
@@ -59,7 +59,11 @@ AsmIdtVectorBegin:
%rep 256
push strict dword %[Vector] ; This instruction pushes sign-extended 8-byte value on stack
push rax
+%ifdef NO_ABSOLUTE_RELOCS_IN_TEXT
mov rax, strict qword 0 ; mov rax, ASM_PFX(CommonInterruptEntry)
+%else
+ mov rax, ASM_PFX(CommonInterruptEntry)
+%endif
jmp rax
%assign Vector Vector+1
%endrep
@@ -69,8 +73,12 @@ HookAfterStubHeaderBegin:
push strict dword 0 ; 0 will be fixed
VectorNum:
push rax
+%ifdef NO_ABSOLUTE_RELOCS_IN_TEXT
mov rax, strict qword 0 ; mov rax, HookAfterStubHeaderEnd
JmpAbsoluteAddress:
+%else
+ mov rax, HookAfterStubHeaderEnd
+%endif
jmp rax
HookAfterStubHeaderEnd:
mov rax, rsp
@@ -457,6 +465,7 @@ ASM_PFX(AsmGetTemplateAddressMap):
lea rax, [HookAfterStubHeaderBegin]
mov qword [rcx + 0x10], rax
+%ifdef NO_ABSOLUTE_RELOCS_IN_TEXT
; Fix up CommonInterruptEntry address
lea rax, [ASM_PFX(CommonInterruptEntry)]
lea rcx, [AsmIdtVectorBegin]
@@ -468,6 +477,7 @@ ASM_PFX(AsmGetTemplateAddressMap):
lea rax, [HookAfterStubHeaderEnd]
lea rcx, [JmpAbsoluteAddress]
mov qword [rcx - 8], rax
+%endif
ret
--
2.39.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v4 5/6] OvmfPkg: Drop special Xcode5 version of exception handler library
2023-04-03 14:29 [PATCH v4 0/6] UefiCpuPkg, OvmfPkg: Simplify CpuExceptionHandlerLib Ard Biesheuvel
` (3 preceding siblings ...)
2023-04-03 14:29 ` [PATCH v4 4/6] UefiCpuPkg/CpuExceptionHandlerLib: Make runtime fixups XCODE-only Ard Biesheuvel
@ 2023-04-03 14:29 ` Ard Biesheuvel
2023-04-03 14:29 ` [PATCH v4 6/6] UefiCpuPkg/CpuExceptionHandlerLib: Drop special XCODE5 version Ard Biesheuvel
` (2 subsequent siblings)
7 siblings, 0 replies; 15+ messages in thread
From: Ard Biesheuvel @ 2023-04-03 14:29 UTC (permalink / raw)
To: devel
Cc: Ard Biesheuvel, Ni, Ray, Andrew Fish, Kinney, Michael D,
Liu, Zhiguang, Rebecca Cran, Tom Lendacky, Marvin Häuser,
Jiewen Yao
The generic and XCODE5 versions of this library are now identical, so
drop the special case. The library will be removed entirely in a
subsequent patch.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Jiewen Yao <jiewen.yao@intel.com>
---
OvmfPkg/AmdSev/AmdSevX64.dsc | 4 ----
OvmfPkg/CloudHv/CloudHvX64.dsc | 4 ----
OvmfPkg/IntelTdx/IntelTdxX64.dsc | 4 ----
OvmfPkg/Microvm/MicrovmX64.dsc | 4 ----
OvmfPkg/OvmfPkgIa32.dsc | 4 ----
OvmfPkg/OvmfPkgIa32X64.dsc | 4 ----
OvmfPkg/OvmfPkgX64.dsc | 4 ----
OvmfPkg/OvmfXen.dsc | 4 ----
8 files changed, 32 deletions(-)
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
index c005e474dd826759..943c4eed9831a1c5 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
@@ -224,11 +224,7 @@ [LibraryClasses.common.SEC]
PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
-!if $(TOOL_CHAIN_TAG) == "XCODE5"
- CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf
-!else
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
-!endif
CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf
MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf
diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc
index b9820cc14bee0693..cc2dd925bc940ea8 100644
--- a/OvmfPkg/CloudHv/CloudHvX64.dsc
+++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
@@ -270,11 +270,7 @@ [LibraryClasses.common.SEC]
PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
-!if $(TOOL_CHAIN_TAG) == "XCODE5"
- CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf
-!else
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
-!endif
CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf
MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf
diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
index 5c56858d063b96bf..f734409055400859 100644
--- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc
+++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
@@ -238,11 +238,7 @@ [LibraryClasses.common.SEC]
ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf
PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/PrePiMemoryAllocationLib.inf
-!if $(TOOL_CHAIN_TAG) == "XCODE5"
- CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf
-!else
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
-!endif
CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf
MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf
PrePiHobListPointerLib|OvmfPkg/IntelTdx/PrePiHobListPointerLibTdx/PrePiHobListPointerLibTdx.inf
diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc
index 384b0b7afc74e90f..e9aab515592ffcec 100644
--- a/OvmfPkg/Microvm/MicrovmX64.dsc
+++ b/OvmfPkg/Microvm/MicrovmX64.dsc
@@ -272,11 +272,7 @@ [LibraryClasses.common.SEC]
PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
-!if $(TOOL_CHAIN_TAG) == "XCODE5"
- CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf
-!else
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
-!endif
CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf
MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index a6db902f54ece86f..86177bb948999435 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -275,11 +275,7 @@ [LibraryClasses.common.SEC]
PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
-!if $(TOOL_CHAIN_TAG) == "XCODE5"
- CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf
-!else
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
-!endif
MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf
[LibraryClasses.common.PEI_CORE]
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 076fc0353de02aaa..065b5445064712d9 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -280,11 +280,7 @@ [LibraryClasses.common.SEC]
PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
-!if $(TOOL_CHAIN_TAG) == "XCODE5"
- CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf
-!else
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
-!endif
MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf
[LibraryClasses.common.PEI_CORE]
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index b2f3d14cd94d5fff..3d405cd4ade07900 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -297,11 +297,7 @@ [LibraryClasses.common.SEC]
PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
-!if $(TOOL_CHAIN_TAG) == "XCODE5" || $(TOOL_CHAIN_TAG) == "CLANGDWARF"
- CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf
-!else
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
-!endif
CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf
MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf
CcProbeLib|OvmfPkg/Library/CcProbeLib/SecPeiCcProbeLib.inf
diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc
index 990225d2dd05d3a8..8bfc16c2d3d6aabe 100644
--- a/OvmfPkg/OvmfXen.dsc
+++ b/OvmfPkg/OvmfXen.dsc
@@ -247,11 +247,7 @@ [LibraryClasses.common.SEC]
PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
-!if $(TOOL_CHAIN_TAG) == "XCODE5"
- CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf
-!else
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
-!endif
MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf
[LibraryClasses.common.PEI_CORE]
--
2.39.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v4 6/6] UefiCpuPkg/CpuExceptionHandlerLib: Drop special XCODE5 version
2023-04-03 14:29 [PATCH v4 0/6] UefiCpuPkg, OvmfPkg: Simplify CpuExceptionHandlerLib Ard Biesheuvel
` (4 preceding siblings ...)
2023-04-03 14:29 ` [PATCH v4 5/6] OvmfPkg: Drop special Xcode5 version of exception handler library Ard Biesheuvel
@ 2023-04-03 14:29 ` Ard Biesheuvel
2023-04-03 22:18 ` [edk2-devel] [PATCH v4 0/6] UefiCpuPkg, OvmfPkg: Simplify CpuExceptionHandlerLib Lendacky, Thomas
2023-04-04 7:57 ` Marvin Häuser
7 siblings, 0 replies; 15+ messages in thread
From: Ard Biesheuvel @ 2023-04-03 14:29 UTC (permalink / raw)
To: devel
Cc: Ard Biesheuvel, Ni, Ray, Andrew Fish, Kinney, Michael D,
Liu, Zhiguang, Rebecca Cran, Tom Lendacky, Marvin Häuser
This library is no longer used or needed, so let's remove it.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Ray Ni <ray.ni@intel.com>
---
UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf | 67 --------------------
UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.uni | 18 ------
UefiCpuPkg/UefiCpuPkg.dsc | 7 --
3 files changed, 92 deletions(-)
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf
deleted file mode 100644
index accc081a95f53453..0000000000000000
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf
+++ /dev/null
@@ -1,67 +0,0 @@
-## @file
-# CPU Exception Handler library instance for SEC/PEI modules.
-#
-# Copyright (C) 2020, Advanced Micro Devices, Inc. All rights reserved.<BR>
-# Copyright (c) 2012 - 2022, Intel Corporation. All rights reserved.<BR>
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-#
-# This is the XCODE5 variant of the SEC/PEI CpuExceptionHandlerLib. This
-# variant performs binary patching to fix up addresses that allow the
-# XCODE5 toolchain to be used.
-#
-##
-
-[Defines]
- INF_VERSION = 0x00010005
- BASE_NAME = Xcode5SecPeiCpuExceptionHandlerLib
- MODULE_UNI_FILE = Xcode5SecPeiCpuExceptionHandlerLib.uni
- FILE_GUID = 49C481AF-1621-42F3-8FA1-27C64143E304
- MODULE_TYPE = PEIM
- VERSION_STRING = 1.1
- LIBRARY_CLASS = CpuExceptionHandlerLib|SEC PEI_CORE PEIM
-
-#
-# The following information is for reference only and not required by the build tools.
-#
-# VALID_ARCHITECTURES = IA32 X64
-#
-
-[Sources.Ia32]
- Ia32/ExceptionHandlerAsm.nasm
- Ia32/ExceptionTssEntryAsm.nasm
- Ia32/ArchExceptionHandler.c
- Ia32/ArchInterruptDefs.h
-
-[Sources.X64]
- X64/SecPeiExceptionHandlerAsm.nasm
- X64/ArchExceptionHandler.c
- X64/ArchInterruptDefs.h
-
-[Sources.common]
- CpuExceptionCommon.h
- CpuExceptionCommon.c
- SecPeiCpuException.c
-
-[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
- UefiCpuPkg/UefiCpuPkg.dec
-
-[LibraryClasses]
- BaseLib
- SerialPortLib
- PrintLib
- LocalApicLib
- PeCoffGetEntryPointLib
- CcExitLib
-
-[Pcd]
- gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard
- gUefiCpuPkgTokenSpaceGuid.PcdCpuStackSwitchExceptionList
- gUefiCpuPkgTokenSpaceGuid.PcdCpuKnownGoodStackSize
-
-[FeaturePcd]
- gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackGuard ## CONSUMES
-
-[BuildOptions]
- XCODE:*_*_X64_NASM_FLAGS = -D NO_ABSOLUTE_RELOCS_IN_TEXT
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.uni b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.uni
deleted file mode 100644
index a63b25f39d992775..0000000000000000
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.uni
+++ /dev/null
@@ -1,18 +0,0 @@
-// /** @file
-// XCODE5 CPU Exception Handler library instance for SEC/PEI modules.
-//
-// CPU Exception Handler library instance for SEC/PEI modules when built
-// using the XCODE5 toolchain.
-//
-// Copyright (C) 2020, Advanced Micro Devices, Inc. All rights reserved.<BR>
-// Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.<BR>
-//
-// SPDX-License-Identifier: BSD-2-Clause-Patent
-//
-// **/
-
-
-#string STR_MODULE_ABSTRACT #language en-US "CPU Exception Handler library instance for SEC/PEI modules with the XCODE5 toolchain."
-
-#string STR_MODULE_DESCRIPTION #language en-US "CPU Exception Handler library instance for SEC/PEI modules with the XCODE5 toolchain."
-
diff --git a/UefiCpuPkg/UefiCpuPkg.dsc b/UefiCpuPkg/UefiCpuPkg.dsc
index a7318d3fe9db0ec4..d85d56916f2cdbce 100644
--- a/UefiCpuPkg/UefiCpuPkg.dsc
+++ b/UefiCpuPkg/UefiCpuPkg.dsc
@@ -69,11 +69,7 @@ [LibraryClasses]
[LibraryClasses.common.SEC]
PlatformSecLib|UefiCpuPkg/Library/PlatformSecLibNull/PlatformSecLibNull.inf
-!if $(TOOL_CHAIN_TAG) == "XCODE5"
- CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf
-!else
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
-!endif
HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
@@ -145,12 +141,9 @@ [Components.IA32, Components.X64]
UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.inf
UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
-!if $(TOOL_CHAIN_TAG) != "XCODE5"
UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
-!endif
UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf
- UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf
UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf
UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.inf
--
2.39.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [edk2-devel] [PATCH v4 0/6] UefiCpuPkg, OvmfPkg: Simplify CpuExceptionHandlerLib
2023-04-03 14:29 [PATCH v4 0/6] UefiCpuPkg, OvmfPkg: Simplify CpuExceptionHandlerLib Ard Biesheuvel
` (5 preceding siblings ...)
2023-04-03 14:29 ` [PATCH v4 6/6] UefiCpuPkg/CpuExceptionHandlerLib: Drop special XCODE5 version Ard Biesheuvel
@ 2023-04-03 22:18 ` Lendacky, Thomas
2023-04-04 7:57 ` Marvin Häuser
7 siblings, 0 replies; 15+ messages in thread
From: Lendacky, Thomas @ 2023-04-03 22:18 UTC (permalink / raw)
To: devel, ardb
Cc: Ni, Ray, Andrew Fish, Kinney, Michael D, Liu, Zhiguang,
Rebecca Cran, Marvin Häuser
On 4/3/23 09:29, Ard Biesheuvel via groups.io wrote:
> We have a special version of CpuExceptionHandlerLib for XCODE5, whose
> linker (LLD) does not permit absolute symbol references in read-only
> sections.
>
> Instead of fixing this up at runtime for all toolchains (which is done
> by writing the fixed up values to the .text section, which we'd prefer
> to avoid), tweak the SEC/PEI version so it does not need this, and
> update the remaining versions to only incorporate this logic when using
> the XCODE toolchain.
>
> Changes since v3:
> - Add another patch to move PeiCpuExceptionHandlerLib to SEC/PEI version
> of the NASM source file
> - Improve commit logs
>
> Changes since v2:
> - As Marvin points out, using '-read_only_relocs suppress' with the X64
> XCODE linker is a terrible idea, as it corrupts the resulting PE
> binaries, so instead, let's do the following:
> . tweak the SEC/PEI version of the library so the relocs are emitted
> into .data when using XCODE;
> . tweak the other versions so the runtime fixups are only done when
> using XCODE
> - add acks from Jiewen and Ray
>
> Changes since v1:
> - pass linker switches to permit absolute relocations in read-only
> regions, and keep all code in .text
>
> Cc: "Ni, Ray" <ray.ni@intel.com>
> Cc: Andrew Fish <afish@apple.com>
> Cc: "Kinney, Michael D" <michael.d.kinney@intel.com>
> Cc: "Liu, Zhiguang" <zhiguang.liu@intel.com>
> Cc: Rebecca Cran <rebecca@bsdio.com>
> Cc: Tom Lendacky <thomas.lendacky@amd.com>
> Cc: Marvin Häuser <mhaeuser@posteo.de>
Validated against SEV-ES (which was part of the original reason for the
split out) and SEV-SNP guests. Both guest types boot successfully.
Tested-by: Tom Lendacky <thomas.lendacky@amd.com>
>
> Ard Biesheuvel (6):
> BaseTools/tools_def CLANGDWARF: Permit text relocations
> UefiCpuPkg/CpuExceptionHandlerLib: Use single SEC/PEI version
> UefiCpuPkg/PeiCpuExceptionHandlerLib: Use SEC/PEI specific asm
> component
> UefiCpuPkg/CpuExceptionHandlerLib: Make runtime fixups XCODE-only
> OvmfPkg: Drop special Xcode5 version of exception handler library
> UefiCpuPkg/CpuExceptionHandlerLib: Drop special XCODE5 version
>
> BaseTools/Conf/tools_def.template | 2 +-
> OvmfPkg/AmdSev/AmdSevX64.dsc | 4 -
> OvmfPkg/CloudHv/CloudHvX64.dsc | 4 -
> OvmfPkg/IntelTdx/IntelTdxX64.dsc | 4 -
> OvmfPkg/Microvm/MicrovmX64.dsc | 4 -
> OvmfPkg/OvmfPkgIa32.dsc | 4 -
> OvmfPkg/OvmfPkgIa32X64.dsc | 4 -
> OvmfPkg/OvmfPkgX64.dsc | 4 -
> OvmfPkg/OvmfXen.dsc | 4 -
> UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf | 5 +-
> UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf | 4 +-
> UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf | 4 +-
> UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf | 4 +-
> UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm | 116 +++++++++++++++++---
> UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/{Xcode5ExceptionHandlerAsm.nasm => SecPeiExceptionHandlerAsm.nasm} | 108 +++---------------
> UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf | 65 -----------
> UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.uni | 18 ---
> UefiCpuPkg/UefiCpuPkg.dsc | 7 --
> 18 files changed, 133 insertions(+), 232 deletions(-)
> rename UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/{Xcode5ExceptionHandlerAsm.nasm => SecPeiExceptionHandlerAsm.nasm} (70%)
> delete mode 100644 UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf
> delete mode 100644 UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.uni
>
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH v4 0/6] UefiCpuPkg, OvmfPkg: Simplify CpuExceptionHandlerLib
2023-04-03 14:29 [PATCH v4 0/6] UefiCpuPkg, OvmfPkg: Simplify CpuExceptionHandlerLib Ard Biesheuvel
` (6 preceding siblings ...)
2023-04-03 22:18 ` [edk2-devel] [PATCH v4 0/6] UefiCpuPkg, OvmfPkg: Simplify CpuExceptionHandlerLib Lendacky, Thomas
@ 2023-04-04 7:57 ` Marvin Häuser
2023-04-04 9:46 ` [edk2-devel] " Ard Biesheuvel
7 siblings, 1 reply; 15+ messages in thread
From: Marvin Häuser @ 2023-04-04 7:57 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: devel, Ni, Ray, Andrew Fish, Kinney, Michael D, Liu, Zhiguang,
Rebecca Cran, Tom Lendacky
FWIW, Reviewed-by: Marvin Häuser <mhaeuser@posteo.de>
> On 3. Apr 2023, at 16:29, Ard Biesheuvel <ardb@kernel.org> wrote:
>
> We have a special version of CpuExceptionHandlerLib for XCODE5, whose
> linker (LLD) does not permit absolute symbol references in read-only
> sections.
>
> Instead of fixing this up at runtime for all toolchains (which is done
> by writing the fixed up values to the .text section, which we'd prefer
> to avoid), tweak the SEC/PEI version so it does not need this, and
> update the remaining versions to only incorporate this logic when using
> the XCODE toolchain.
>
> Changes since v3:
> - Add another patch to move PeiCpuExceptionHandlerLib to SEC/PEI version
> of the NASM source file
> - Improve commit logs
>
> Changes since v2:
> - As Marvin points out, using '-read_only_relocs suppress' with the X64
> XCODE linker is a terrible idea, as it corrupts the resulting PE
> binaries, so instead, let's do the following:
> . tweak the SEC/PEI version of the library so the relocs are emitted
> into .data when using XCODE;
> . tweak the other versions so the runtime fixups are only done when
> using XCODE
> - add acks from Jiewen and Ray
>
> Changes since v1:
> - pass linker switches to permit absolute relocations in read-only
> regions, and keep all code in .text
>
> Cc: "Ni, Ray" <ray.ni@intel.com>
> Cc: Andrew Fish <afish@apple.com>
> Cc: "Kinney, Michael D" <michael.d.kinney@intel.com>
> Cc: "Liu, Zhiguang" <zhiguang.liu@intel.com>
> Cc: Rebecca Cran <rebecca@bsdio.com>
> Cc: Tom Lendacky <thomas.lendacky@amd.com>
> Cc: Marvin Häuser <mhaeuser@posteo.de>
>
> Ard Biesheuvel (6):
> BaseTools/tools_def CLANGDWARF: Permit text relocations
> UefiCpuPkg/CpuExceptionHandlerLib: Use single SEC/PEI version
> UefiCpuPkg/PeiCpuExceptionHandlerLib: Use SEC/PEI specific asm
> component
> UefiCpuPkg/CpuExceptionHandlerLib: Make runtime fixups XCODE-only
> OvmfPkg: Drop special Xcode5 version of exception handler library
> UefiCpuPkg/CpuExceptionHandlerLib: Drop special XCODE5 version
>
> BaseTools/Conf/tools_def.template | 2 +-
> OvmfPkg/AmdSev/AmdSevX64.dsc | 4 -
> OvmfPkg/CloudHv/CloudHvX64.dsc | 4 -
> OvmfPkg/IntelTdx/IntelTdxX64.dsc | 4 -
> OvmfPkg/Microvm/MicrovmX64.dsc | 4 -
> OvmfPkg/OvmfPkgIa32.dsc | 4 -
> OvmfPkg/OvmfPkgIa32X64.dsc | 4 -
> OvmfPkg/OvmfPkgX64.dsc | 4 -
> OvmfPkg/OvmfXen.dsc | 4 -
> UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf | 5 +-
> UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf | 4 +-
> UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf | 4 +-
> UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf | 4 +-
> UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm | 116 +++++++++++++++++---
> UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/{Xcode5ExceptionHandlerAsm.nasm => SecPeiExceptionHandlerAsm.nasm} | 108 +++---------------
> UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf | 65 -----------
> UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.uni | 18 ---
> UefiCpuPkg/UefiCpuPkg.dsc | 7 --
> 18 files changed, 133 insertions(+), 232 deletions(-)
> rename UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/{Xcode5ExceptionHandlerAsm.nasm => SecPeiExceptionHandlerAsm.nasm} (70%)
> delete mode 100644 UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf
> delete mode 100644 UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.uni
>
> --
> 2.39.2
>
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [edk2-devel] [PATCH v4 0/6] UefiCpuPkg, OvmfPkg: Simplify CpuExceptionHandlerLib
2023-04-04 7:57 ` Marvin Häuser
@ 2023-04-04 9:46 ` Ard Biesheuvel
2023-04-05 17:11 ` Rebecca Cran
2023-04-06 6:55 ` Ni, Ray
0 siblings, 2 replies; 15+ messages in thread
From: Ard Biesheuvel @ 2023-04-04 9:46 UTC (permalink / raw)
To: devel, mhaeuser, Ni, Ray
Cc: Andrew Fish, Kinney, Michael D, Liu, Zhiguang, Rebecca Cran,
Tom Lendacky, Liming Gao (Byosoft address)
Thanks all
Ray, any comments on this version? Thanks.
Liming, Rebecca, any comments on the BaseTools changes?
On Tue, 4 Apr 2023 at 09:57, Marvin Häuser <mhaeuser@posteo.de> wrote:
>
> FWIW, Reviewed-by: Marvin Häuser <mhaeuser@posteo.de>
>
> > On 3. Apr 2023, at 16:29, Ard Biesheuvel <ardb@kernel.org> wrote:
> >
> > We have a special version of CpuExceptionHandlerLib for XCODE5, whose
> > linker (LLD) does not permit absolute symbol references in read-only
> > sections.
> >
> > Instead of fixing this up at runtime for all toolchains (which is done
> > by writing the fixed up values to the .text section, which we'd prefer
> > to avoid), tweak the SEC/PEI version so it does not need this, and
> > update the remaining versions to only incorporate this logic when using
> > the XCODE toolchain.
> >
> > Changes since v3:
> > - Add another patch to move PeiCpuExceptionHandlerLib to SEC/PEI version
> > of the NASM source file
> > - Improve commit logs
> >
> > Changes since v2:
> > - As Marvin points out, using '-read_only_relocs suppress' with the X64
> > XCODE linker is a terrible idea, as it corrupts the resulting PE
> > binaries, so instead, let's do the following:
> > . tweak the SEC/PEI version of the library so the relocs are emitted
> > into .data when using XCODE;
> > . tweak the other versions so the runtime fixups are only done when
> > using XCODE
> > - add acks from Jiewen and Ray
> >
> > Changes since v1:
> > - pass linker switches to permit absolute relocations in read-only
> > regions, and keep all code in .text
> >
> > Cc: "Ni, Ray" <ray.ni@intel.com>
> > Cc: Andrew Fish <afish@apple.com>
> > Cc: "Kinney, Michael D" <michael.d.kinney@intel.com>
> > Cc: "Liu, Zhiguang" <zhiguang.liu@intel.com>
> > Cc: Rebecca Cran <rebecca@bsdio.com>
> > Cc: Tom Lendacky <thomas.lendacky@amd.com>
> > Cc: Marvin Häuser <mhaeuser@posteo.de>
> >
> > Ard Biesheuvel (6):
> > BaseTools/tools_def CLANGDWARF: Permit text relocations
> > UefiCpuPkg/CpuExceptionHandlerLib: Use single SEC/PEI version
> > UefiCpuPkg/PeiCpuExceptionHandlerLib: Use SEC/PEI specific asm
> > component
> > UefiCpuPkg/CpuExceptionHandlerLib: Make runtime fixups XCODE-only
> > OvmfPkg: Drop special Xcode5 version of exception handler library
> > UefiCpuPkg/CpuExceptionHandlerLib: Drop special XCODE5 version
> >
> > BaseTools/Conf/tools_def.template | 2 +-
> > OvmfPkg/AmdSev/AmdSevX64.dsc | 4 -
> > OvmfPkg/CloudHv/CloudHvX64.dsc | 4 -
> > OvmfPkg/IntelTdx/IntelTdxX64.dsc | 4 -
> > OvmfPkg/Microvm/MicrovmX64.dsc | 4 -
> > OvmfPkg/OvmfPkgIa32.dsc | 4 -
> > OvmfPkg/OvmfPkgIa32X64.dsc | 4 -
> > OvmfPkg/OvmfPkgX64.dsc | 4 -
> > OvmfPkg/OvmfXen.dsc | 4 -
> > UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf | 5 +-
> > UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf | 4 +-
> > UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf | 4 +-
> > UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf | 4 +-
> > UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm | 116 +++++++++++++++++---
> > UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/{Xcode5ExceptionHandlerAsm.nasm => SecPeiExceptionHandlerAsm.nasm} | 108 +++---------------
> > UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf | 65 -----------
> > UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.uni | 18 ---
> > UefiCpuPkg/UefiCpuPkg.dsc | 7 --
> > 18 files changed, 133 insertions(+), 232 deletions(-)
> > rename UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/{Xcode5ExceptionHandlerAsm.nasm => SecPeiExceptionHandlerAsm.nasm} (70%)
> > delete mode 100644 UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf
> > delete mode 100644 UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.uni
> >
> > --
> > 2.39.2
> >
>
>
>
>
>
>
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [edk2-devel] [PATCH v4 0/6] UefiCpuPkg, OvmfPkg: Simplify CpuExceptionHandlerLib
2023-04-04 9:46 ` [edk2-devel] " Ard Biesheuvel
@ 2023-04-05 17:11 ` Rebecca Cran
2023-04-06 6:55 ` Ni, Ray
1 sibling, 0 replies; 15+ messages in thread
From: Rebecca Cran @ 2023-04-05 17:11 UTC (permalink / raw)
To: Ard Biesheuvel, devel, mhaeuser, Ni, Ray
Cc: Andrew Fish, Kinney, Michael D, Liu, Zhiguang, Tom Lendacky,
Liming Gao (Byosoft address)
Sorry for the delay. I've just sent my reviewed-by.
On 4/4/23 3:46 AM, Ard Biesheuvel wrote:
> Thanks all
>
> Ray, any comments on this version? Thanks.
>
> Liming, Rebecca, any comments on the BaseTools changes?
>
>
>
> On Tue, 4 Apr 2023 at 09:57, Marvin Häuser <mhaeuser@posteo.de> wrote:
>> FWIW, Reviewed-by: Marvin Häuser <mhaeuser@posteo.de>
>>
>>> On 3. Apr 2023, at 16:29, Ard Biesheuvel <ardb@kernel.org> wrote:
>>>
>>> We have a special version of CpuExceptionHandlerLib for XCODE5, whose
>>> linker (LLD) does not permit absolute symbol references in read-only
>>> sections.
>>>
>>> Instead of fixing this up at runtime for all toolchains (which is done
>>> by writing the fixed up values to the .text section, which we'd prefer
>>> to avoid), tweak the SEC/PEI version so it does not need this, and
>>> update the remaining versions to only incorporate this logic when using
>>> the XCODE toolchain.
>>>
>>> Changes since v3:
>>> - Add another patch to move PeiCpuExceptionHandlerLib to SEC/PEI version
>>> of the NASM source file
>>> - Improve commit logs
>>>
>>> Changes since v2:
>>> - As Marvin points out, using '-read_only_relocs suppress' with the X64
>>> XCODE linker is a terrible idea, as it corrupts the resulting PE
>>> binaries, so instead, let's do the following:
>>> . tweak the SEC/PEI version of the library so the relocs are emitted
>>> into .data when using XCODE;
>>> . tweak the other versions so the runtime fixups are only done when
>>> using XCODE
>>> - add acks from Jiewen and Ray
>>>
>>> Changes since v1:
>>> - pass linker switches to permit absolute relocations in read-only
>>> regions, and keep all code in .text
>>>
>>> Cc: "Ni, Ray" <ray.ni@intel.com>
>>> Cc: Andrew Fish <afish@apple.com>
>>> Cc: "Kinney, Michael D" <michael.d.kinney@intel.com>
>>> Cc: "Liu, Zhiguang" <zhiguang.liu@intel.com>
>>> Cc: Rebecca Cran <rebecca@bsdio.com>
>>> Cc: Tom Lendacky <thomas.lendacky@amd.com>
>>> Cc: Marvin Häuser <mhaeuser@posteo.de>
>>>
>>> Ard Biesheuvel (6):
>>> BaseTools/tools_def CLANGDWARF: Permit text relocations
>>> UefiCpuPkg/CpuExceptionHandlerLib: Use single SEC/PEI version
>>> UefiCpuPkg/PeiCpuExceptionHandlerLib: Use SEC/PEI specific asm
>>> component
>>> UefiCpuPkg/CpuExceptionHandlerLib: Make runtime fixups XCODE-only
>>> OvmfPkg: Drop special Xcode5 version of exception handler library
>>> UefiCpuPkg/CpuExceptionHandlerLib: Drop special XCODE5 version
>>>
>>> BaseTools/Conf/tools_def.template | 2 +-
>>> OvmfPkg/AmdSev/AmdSevX64.dsc | 4 -
>>> OvmfPkg/CloudHv/CloudHvX64.dsc | 4 -
>>> OvmfPkg/IntelTdx/IntelTdxX64.dsc | 4 -
>>> OvmfPkg/Microvm/MicrovmX64.dsc | 4 -
>>> OvmfPkg/OvmfPkgIa32.dsc | 4 -
>>> OvmfPkg/OvmfPkgIa32X64.dsc | 4 -
>>> OvmfPkg/OvmfPkgX64.dsc | 4 -
>>> OvmfPkg/OvmfXen.dsc | 4 -
>>> UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf | 5 +-
>>> UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf | 4 +-
>>> UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf | 4 +-
>>> UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf | 4 +-
>>> UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm | 116 +++++++++++++++++---
>>> UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/{Xcode5ExceptionHandlerAsm.nasm => SecPeiExceptionHandlerAsm.nasm} | 108 +++---------------
>>> UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf | 65 -----------
>>> UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.uni | 18 ---
>>> UefiCpuPkg/UefiCpuPkg.dsc | 7 --
>>> 18 files changed, 133 insertions(+), 232 deletions(-)
>>> rename UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/{Xcode5ExceptionHandlerAsm.nasm => SecPeiExceptionHandlerAsm.nasm} (70%)
>>> delete mode 100644 UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf
>>> delete mode 100644 UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.uni
>>>
>>> --
>>> 2.39.2
>>>
>>
>>
>>
>>
>>
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [edk2-devel] [PATCH v4 0/6] UefiCpuPkg, OvmfPkg: Simplify CpuExceptionHandlerLib
2023-04-04 9:46 ` [edk2-devel] " Ard Biesheuvel
2023-04-05 17:11 ` Rebecca Cran
@ 2023-04-06 6:55 ` Ni, Ray
1 sibling, 0 replies; 15+ messages in thread
From: Ni, Ray @ 2023-04-06 6:55 UTC (permalink / raw)
To: devel@edk2.groups.io, ardb@kernel.org, mhaeuser@posteo.de
Cc: Andrew Fish, Kinney, Michael D, Liu, Zhiguang, Rebecca Cran,
Tom Lendacky, Gao, Liming
Reviewed. Merged.
Thank you Ard!
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Ard
> Biesheuvel
> Sent: Tuesday, April 4, 2023 5:46 PM
> To: devel@edk2.groups.io; mhaeuser@posteo.de; Ni, Ray <ray.ni@intel.com>
> Cc: Andrew Fish <afish@apple.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Liu, Zhiguang <zhiguang.liu@intel.com>;
> Rebecca Cran <rebecca@bsdio.com>; Tom Lendacky
> <thomas.lendacky@amd.com>; Gao, Liming <gaoliming@byosoft.com.cn>
> Subject: Re: [edk2-devel] [PATCH v4 0/6] UefiCpuPkg, OvmfPkg: Simplify
> CpuExceptionHandlerLib
>
> Thanks all
>
> Ray, any comments on this version? Thanks.
>
> Liming, Rebecca, any comments on the BaseTools changes?
>
>
>
> On Tue, 4 Apr 2023 at 09:57, Marvin Häuser <mhaeuser@posteo.de> wrote:
> >
> > FWIW, Reviewed-by: Marvin Häuser <mhaeuser@posteo.de>
> >
> > > On 3. Apr 2023, at 16:29, Ard Biesheuvel <ardb@kernel.org> wrote:
> > >
> > > We have a special version of CpuExceptionHandlerLib for XCODE5, whose
> > > linker (LLD) does not permit absolute symbol references in read-only
> > > sections.
> > >
> > > Instead of fixing this up at runtime for all toolchains (which is done
> > > by writing the fixed up values to the .text section, which we'd prefer
> > > to avoid), tweak the SEC/PEI version so it does not need this, and
> > > update the remaining versions to only incorporate this logic when using
> > > the XCODE toolchain.
> > >
> > > Changes since v3:
> > > - Add another patch to move PeiCpuExceptionHandlerLib to SEC/PEI
> version
> > > of the NASM source file
> > > - Improve commit logs
> > >
> > > Changes since v2:
> > > - As Marvin points out, using '-read_only_relocs suppress' with the X64
> > > XCODE linker is a terrible idea, as it corrupts the resulting PE
> > > binaries, so instead, let's do the following:
> > > . tweak the SEC/PEI version of the library so the relocs are emitted
> > > into .data when using XCODE;
> > > . tweak the other versions so the runtime fixups are only done when
> > > using XCODE
> > > - add acks from Jiewen and Ray
> > >
> > > Changes since v1:
> > > - pass linker switches to permit absolute relocations in read-only
> > > regions, and keep all code in .text
> > >
> > > Cc: "Ni, Ray" <ray.ni@intel.com>
> > > Cc: Andrew Fish <afish@apple.com>
> > > Cc: "Kinney, Michael D" <michael.d.kinney@intel.com>
> > > Cc: "Liu, Zhiguang" <zhiguang.liu@intel.com>
> > > Cc: Rebecca Cran <rebecca@bsdio.com>
> > > Cc: Tom Lendacky <thomas.lendacky@amd.com>
> > > Cc: Marvin Häuser <mhaeuser@posteo.de>
> > >
> > > Ard Biesheuvel (6):
> > > BaseTools/tools_def CLANGDWARF: Permit text relocations
> > > UefiCpuPkg/CpuExceptionHandlerLib: Use single SEC/PEI version
> > > UefiCpuPkg/PeiCpuExceptionHandlerLib: Use SEC/PEI specific asm
> > > component
> > > UefiCpuPkg/CpuExceptionHandlerLib: Make runtime fixups XCODE-only
> > > OvmfPkg: Drop special Xcode5 version of exception handler library
> > > UefiCpuPkg/CpuExceptionHandlerLib: Drop special XCODE5 version
> > >
> > > BaseTools/Conf/tools_def.template
> | 2 +-
> > > OvmfPkg/AmdSev/AmdSevX64.dsc
> | 4 -
> > > OvmfPkg/CloudHv/CloudHvX64.dsc
> | 4 -
> > > OvmfPkg/IntelTdx/IntelTdxX64.dsc
> | 4 -
> > > OvmfPkg/Microvm/MicrovmX64.dsc
> | 4 -
> > > OvmfPkg/OvmfPkgIa32.dsc |
> 4 -
> > > OvmfPkg/OvmfPkgIa32X64.dsc
> | 4 -
> > > OvmfPkg/OvmfPkgX64.dsc |
> 4 -
> > > OvmfPkg/OvmfXen.dsc |
> 4 -
> > >
> UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.in
> f | 5 +-
> > >
> UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf
> | 4 +-
> > >
> UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib
> .inf | 4 +-
> > >
> UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.i
> nf | 4 +-
> > >
> UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nas
> m | 116 +++++++++++++++++---
> > >
> UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/{Xcode5ExceptionHandler
> Asm.nasm => SecPeiExceptionHandlerAsm.nasm} | 108 +++---------------
> > >
> UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHa
> ndlerLib.inf | 65 -----------
> > >
> UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHa
> ndlerLib.uni | 18 ---
> > > UefiCpuPkg/UefiCpuPkg.dsc |
> 7 --
> > > 18 files changed, 133 insertions(+), 232 deletions(-)
> > > rename
> UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/{Xcode5ExceptionHandler
> Asm.nasm => SecPeiExceptionHandlerAsm.nasm} (70%)
> > > delete mode 100644
> UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHa
> ndlerLib.inf
> > > delete mode 100644
> UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHa
> ndlerLib.uni
> > >
> > > --
> > > 2.39.2
> > >
> >
> >
> >
> >
> >
> >
>
>
>
>
^ permalink raw reply [flat|nested] 15+ messages in thread