tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UefiCpuPkg/PiSmmCpuDxeSmm: patch "gSmmCr4" with PatchInstructionX86() 

Unlike "gSmmCr3" in the previous patch, "gSmmCr4" is not only used for
machine code patching, but also as a means to communicate the initial CR4
value from SmmRelocateBases() to InitSmmS3ResumeState(). In other words,
the last four bytes of the "mov eax, Cr4Value" instruction's binary
representation are utilized as normal data too.

In order to get rid of the DB for "mov eax, Cr4Value", we have to split
both roles, patching and data flow. Introduce the "mSmmCr4" global (SMRAM)
variable for the data flow purpose. Rename the "gSmmCr4" variable to
"gPatchSmmCr4" so that its association with PatchInstructionX86() is clear
from the declaration, change its type to X86_ASSEMBLY_PATCH_LABEL, and
patch it with PatchInstructionX86(), to the value now contained in
"mSmmCr4".

This lets us remove the binary (DB) encoding of "mov eax, Cr4Value" in
"SmmInit.nasm".

Cc: Eric Dong <eric.dong@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=866
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Laszlo Ersek 2018-02-02 02:10:05 +01:00
parent 6b0841c166
commit 351b49c1a7
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
View File

@ -746,7 +746,7 @@ InitSmmS3ResumeState (
SmmS3ResumeState->SmmS3Cr0 = gSmmCr0; SmmS3ResumeState->SmmS3Cr0 = gSmmCr0;
SmmS3ResumeState->SmmS3Cr3 = Cr3; SmmS3ResumeState->SmmS3Cr3 = Cr3;
SmmS3ResumeState->SmmS3Cr4 = gSmmCr4; SmmS3ResumeState->SmmS3Cr4 = mSmmCr4;
if (sizeof (UINTN) == sizeof (UINT64)) { if (sizeof (UINTN) == sizeof (UINT64)) {
SmmS3ResumeState->Signature = SMM_S3_RESUME_SMM_64; SmmS3ResumeState->Signature = SMM_S3_RESUME_SMM_64;

6
UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm
View File

@ -23,7 +23,7 @@ extern ASM_PFX(mRebasedFlag)
extern ASM_PFX(mSmmRelocationOriginalAddress) extern ASM_PFX(mSmmRelocationOriginalAddress)
global ASM_PFX(gPatchSmmCr3) global ASM_PFX(gPatchSmmCr3)
global ASM_PFX(gSmmCr4) global ASM_PFX(gPatchSmmCr4)
global ASM_PFX(gSmmCr0) global ASM_PFX(gSmmCr0)
global ASM_PFX(gSmmJmpAddr) global ASM_PFX(gSmmJmpAddr)
global ASM_PFX(gSmmInitStack) global ASM_PFX(gSmmInitStack)
@ -53,8 +53,8 @@ ASM_PFX(SmmStartup):
ASM_PFX(gPatchSmmCr3): ASM_PFX(gPatchSmmCr3):
mov cr3, eax mov cr3, eax
o32 lgdt [cs:ebp + (ASM_PFX(gcSmiInitGdtr) - ASM_PFX(SmmStartup))] o32 lgdt [cs:ebp + (ASM_PFX(gcSmiInitGdtr) - ASM_PFX(SmmStartup))]
DB 0x66, 0xb8 ; mov eax, imm32 mov eax, strict dword 0 ; source operand will be patched
ASM_PFX(gSmmCr4): DD 0 ASM_PFX(gPatchSmmCr4):
mov cr4, eax mov cr4, eax
mov ecx, 0xc0000080 ; IA32_EFER MSR mov ecx, 0xc0000080 ; IA32_EFER MSR
rdmsr rdmsr

8
UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
View File

@ -125,6 +125,11 @@ UINTN mSmmCpuSmramRangeCount;
UINT8 mPhysicalAddressBits; UINT8 mPhysicalAddressBits;
//
// Control register contents saved for SMM S3 resume state initialization.
//
UINT32 mSmmCr4;
/** /**
Initialize IDT to setup exception handlers for SMM. Initialize IDT to setup exception handlers for SMM.
@ -407,7 +412,8 @@ SmmRelocateBases (
// //
gSmmCr0 = (UINT32)AsmReadCr0 (); gSmmCr0 = (UINT32)AsmReadCr0 ();
PatchInstructionX86 (gPatchSmmCr3, AsmReadCr3 (), 4); PatchInstructionX86 (gPatchSmmCr3, AsmReadCr3 (), 4);
gSmmCr4 = (UINT32)AsmReadCr4 (); mSmmCr4 = (UINT32)AsmReadCr4 ();
PatchInstructionX86 (gPatchSmmCr4, mSmmCr4, 4);
// //
// Patch GDTR for SMM base relocation // Patch GDTR for SMM base relocation

3
UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
View File

@ -310,7 +310,8 @@ extern CONST UINT8 gcSmmInitTemplate[];
extern CONST UINT16 gcSmmInitSize; extern CONST UINT16 gcSmmInitSize;
extern UINT32 gSmmCr0; extern UINT32 gSmmCr0;
X86_ASSEMBLY_PATCH_LABEL gPatchSmmCr3; X86_ASSEMBLY_PATCH_LABEL gPatchSmmCr3;
extern UINT32 gSmmCr4; extern UINT32 mSmmCr4;
X86_ASSEMBLY_PATCH_LABEL gPatchSmmCr4;
extern UINTN gSmmInitStack; extern UINTN gSmmInitStack;
/** /**

6
UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.nasm
View File

@ -23,7 +23,7 @@ extern ASM_PFX(mRebasedFlag)
extern ASM_PFX(mSmmRelocationOriginalAddress) extern ASM_PFX(mSmmRelocationOriginalAddress)
global ASM_PFX(gPatchSmmCr3) global ASM_PFX(gPatchSmmCr3)
global ASM_PFX(gSmmCr4) global ASM_PFX(gPatchSmmCr4)
global ASM_PFX(gSmmCr0) global ASM_PFX(gSmmCr0)
global ASM_PFX(gSmmJmpAddr) global ASM_PFX(gSmmJmpAddr)
global ASM_PFX(gSmmInitStack) global ASM_PFX(gSmmInitStack)
@ -51,8 +51,8 @@ ASM_PFX(SmmStartup):
ASM_PFX(gPatchSmmCr3): ASM_PFX(gPatchSmmCr3):
mov cr3, eax mov cr3, eax
o32 lgdt [cs:ebp + (ASM_PFX(gcSmiInitGdtr) - ASM_PFX(SmmStartup))] o32 lgdt [cs:ebp + (ASM_PFX(gcSmiInitGdtr) - ASM_PFX(SmmStartup))]
DB 0x66, 0xb8 ; mov eax, imm32 mov eax, strict dword 0 ; source operand will be patched
ASM_PFX(gSmmCr4): DD 0 ASM_PFX(gPatchSmmCr4):
or ah, 2 ; enable XMM registers access or ah, 2 ; enable XMM registers access
mov cr4, eax mov cr4, eax
mov ecx, 0xc0000080 ; IA32_EFER MSR mov ecx, 0xc0000080 ; IA32_EFER MSR