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

UefiCpuPkg/ExceptionLib: Add CET support. 

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1521

Add information dump for Control Protection exception.

Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yao Jiewen <jiewen.yao@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Regression-tested-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Jiewen Yao 2019-02-22 21:30:35 +08:00 committed by Liming Gao
parent 0aac2f777a
commit 0d25074cbc
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
CPU Exception Handler Library common functions. CPU Exception Handler Library common functions.
Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR> Copyright (c) 2012 - 2019, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -20,7 +20,7 @@
// //
// 1 means an error code will be pushed, otherwise 0 // 1 means an error code will be pushed, otherwise 0
// //
CONST UINT32 mErrorCodeFlag = 0x00027d00; CONST UINT32 mErrorCodeFlag = 0x00227d00;
// //
// Define the maximum message length // Define the maximum message length
@ -49,7 +49,8 @@ CONST CHAR8 *mExceptionNameStr[] = {
"#AC - Alignment Check", "#AC - Alignment Check",
"#MC - Machine-Check", "#MC - Machine-Check",
"#XM - SIMD floating-point", "#XM - SIMD floating-point",
"#VE - Virtualization" "#VE - Virtualization",
"#CP - Control Protection"
}; };
#define EXCEPTION_KNOWN_NAME_NUM (sizeof (mExceptionNameStr) / sizeof (CHAR8 *)) #define EXCEPTION_KNOWN_NAME_NUM (sizeof (mExceptionNameStr) / sizeof (CHAR8 *))

3
UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.h
View File

@ -1,7 +1,7 @@
/** @file /** @file
Common header file for CPU Exception Handler Library. Common header file for CPU Exception Handler Library.
Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR> Copyright (c) 2012 - 2019, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -39,6 +39,7 @@
#define IA32_PF_EC_RSVD BIT3 #define IA32_PF_EC_RSVD BIT3
#define IA32_PF_EC_ID BIT4 #define IA32_PF_EC_ID BIT4
#define IA32_PF_EC_PK BIT5 #define IA32_PF_EC_PK BIT5
#define IA32_PF_EC_SS BIT6
#define IA32_PF_EC_SGX BIT15 #define IA32_PF_EC_SGX BIT15
#include "ArchInterruptDefs.h" #include "ArchInterruptDefs.h"

5
UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ArchExceptionHandler.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
IA32 CPU Exception Handler functons. IA32 CPU Exception Handler functons.
Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR> Copyright (c) 2012 - 2019, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -326,13 +326,14 @@ DumpCpuContext (
); );
if (ExceptionType == EXCEPT_IA32_PAGE_FAULT) { if (ExceptionType == EXCEPT_IA32_PAGE_FAULT) {
InternalPrintMessage ( InternalPrintMessage (
" I:%x R:%x U:%x W:%x P:%x PK:%x S:%x", " I:%x R:%x U:%x W:%x P:%x PK:%x SS:%x SGX:%x",
(SystemContext.SystemContextIa32->ExceptionData & IA32_PF_EC_ID) != 0, (SystemContext.SystemContextIa32->ExceptionData & IA32_PF_EC_ID) != 0,
(SystemContext.SystemContextIa32->ExceptionData & IA32_PF_EC_RSVD) != 0, (SystemContext.SystemContextIa32->ExceptionData & IA32_PF_EC_RSVD) != 0,
(SystemContext.SystemContextIa32->ExceptionData & IA32_PF_EC_US) != 0, (SystemContext.SystemContextIa32->ExceptionData & IA32_PF_EC_US) != 0,
(SystemContext.SystemContextIa32->ExceptionData & IA32_PF_EC_WR) != 0, (SystemContext.SystemContextIa32->ExceptionData & IA32_PF_EC_WR) != 0,
(SystemContext.SystemContextIa32->ExceptionData & IA32_PF_EC_P) != 0, (SystemContext.SystemContextIa32->ExceptionData & IA32_PF_EC_P) != 0,
(SystemContext.SystemContextIa32->ExceptionData & IA32_PF_EC_PK) != 0, (SystemContext.SystemContextIa32->ExceptionData & IA32_PF_EC_PK) != 0,
(SystemContext.SystemContextIa32->ExceptionData & IA32_PF_EC_SS) != 0,
(SystemContext.SystemContextIa32->ExceptionData & IA32_PF_EC_SGX) != 0 (SystemContext.SystemContextIa32->ExceptionData & IA32_PF_EC_SGX) != 0
); );
} }

5
UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchExceptionHandler.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
x64 CPU Exception Handler. x64 CPU Exception Handler.
Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR> Copyright (c) 2012 - 2019, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -299,13 +299,14 @@ DumpCpuContext (
); );
if (ExceptionType == EXCEPT_IA32_PAGE_FAULT) { if (ExceptionType == EXCEPT_IA32_PAGE_FAULT) {
InternalPrintMessage ( InternalPrintMessage (
" I:%x R:%x U:%x W:%x P:%x PK:%x S:%x", " I:%x R:%x U:%x W:%x P:%x PK:%x SS:%x SGX:%x",
(SystemContext.SystemContextX64->ExceptionData & IA32_PF_EC_ID) != 0, (SystemContext.SystemContextX64->ExceptionData & IA32_PF_EC_ID) != 0,
(SystemContext.SystemContextX64->ExceptionData & IA32_PF_EC_RSVD) != 0, (SystemContext.SystemContextX64->ExceptionData & IA32_PF_EC_RSVD) != 0,
(SystemContext.SystemContextX64->ExceptionData & IA32_PF_EC_US) != 0, (SystemContext.SystemContextX64->ExceptionData & IA32_PF_EC_US) != 0,
(SystemContext.SystemContextX64->ExceptionData & IA32_PF_EC_WR) != 0, (SystemContext.SystemContextX64->ExceptionData & IA32_PF_EC_WR) != 0,
(SystemContext.SystemContextX64->ExceptionData & IA32_PF_EC_P) != 0, (SystemContext.SystemContextX64->ExceptionData & IA32_PF_EC_P) != 0,
(SystemContext.SystemContextX64->ExceptionData & IA32_PF_EC_PK) != 0, (SystemContext.SystemContextX64->ExceptionData & IA32_PF_EC_PK) != 0,
(SystemContext.SystemContextX64->ExceptionData & IA32_PF_EC_SS) != 0,
(SystemContext.SystemContextX64->ExceptionData & IA32_PF_EC_SGX) != 0 (SystemContext.SystemContextX64->ExceptionData & IA32_PF_EC_SGX) != 0
); );
} }