RFC: https://bugzilla.tianocore.org/show_bug.cgi?id=3429
Add base support to handle #VE exceptions. Update the common exception handlers to invoke the VmTdExitHandleVe () function of the VmgExitLib library when a #VE is encountered. A non-zero return code will propagate to the targeted exception handler. Cc: Brijesh Singh <[email protected]> Cc: Erdem Aktas <[email protected]> Cc: James Bottomley <[email protected]> Cc: Jiewen Yao <[email protected]> Cc: Tom Lendacky <[email protected]> Cc: Eric Dong <[email protected]> Cc: Ray Ni <[email protected]> Cc: Rahul Kumar <[email protected]> Cc: Gerd Hoffmann <[email protected]> Acked-by: Gerd Hoffmann <[email protected]> Reviewed-by: Ray Ni <[email protected]> Signed-off-by: Min Xu <[email protected]> --- .../PeiDxeSmmCpuException.c | 53 ++++++++++++----- .../SecPeiCpuException.c | 57 +++++++++++++------ 2 files changed, 79 insertions(+), 31 deletions(-) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiDxeSmmCpuException.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiDxeSmmCpuException.c index 762ea2460f91..f47a80dcab8f 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiDxeSmmCpuException.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiDxeSmmCpuException.c @@ -24,25 +24,48 @@ CommonExceptionHandlerWorker ( IN EXCEPTION_HANDLER_DATA *ExceptionHandlerData ) { + EFI_STATUS Status; EXCEPTION_HANDLER_CONTEXT *ExceptionHandlerContext; RESERVED_VECTORS_DATA *ReservedVectors; EFI_CPU_INTERRUPT_HANDLER *ExternalInterruptHandler; - if (ExceptionType == VC_EXCEPTION) { - EFI_STATUS Status; - // - // #VC needs to be handled immediately upon enabling exception handling - // and therefore can't use the RegisterCpuInterruptHandler() interface. - // - // Handle the #VC: - // On EFI_SUCCESS - Exception has been handled, return - // On other - ExceptionType contains (possibly new) exception - // value - // - Status = VmgExitHandleVc (&ExceptionType, SystemContext); - if (!EFI_ERROR (Status)) { - return; - } + switch (ExceptionType) { + case VC_EXCEPTION: + // + // #VC needs to be handled immediately upon enabling exception handling + // and therefore can't use the RegisterCpuInterruptHandler() interface. + // + // Handle the #VC: + // On EFI_SUCCESS - Exception has been handled, return + // On other - ExceptionType contains (possibly new) exception + // value + // + Status = VmgExitHandleVc (&ExceptionType, SystemContext); + if (!EFI_ERROR (Status)) { + return; + } + + break; + + case VE_EXCEPTION: + // + // #VE needs to be handled immediately upon enabling exception handling + // and therefore can't use the RegisterCpuInterruptHandler() interface. + // + // Handle the #VE: + // On EFI_SUCCESS - Exception has been handled, return + // On other - ExceptionType contains (possibly new) exception + // value + // + Status = VmTdExitHandleVe (&ExceptionType, SystemContext); + if (!EFI_ERROR (Status)) { + return; + } + + break; + + default: + break; } ExceptionHandlerContext = (EXCEPTION_HANDLER_CONTEXT *)(UINTN)(SystemContext.SystemContextIa32); diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuException.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuException.c index c614d5b0b6f1..6e5216380da8 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuException.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuException.c @@ -25,22 +25,47 @@ CommonExceptionHandler ( IN EFI_SYSTEM_CONTEXT SystemContext ) { - if (ExceptionType == VC_EXCEPTION) { - EFI_STATUS Status; - // - // #VC needs to be handled immediately upon enabling exception handling - // and therefore can't use the RegisterCpuInterruptHandler() interface - // (which isn't supported under Sec and Pei anyway). - // - // Handle the #VC: - // On EFI_SUCCESS - Exception has been handled, return - // On other - ExceptionType contains (possibly new) exception - // value - // - Status = VmgExitHandleVc (&ExceptionType, SystemContext); - if (!EFI_ERROR (Status)) { - return; - } + EFI_STATUS Status; + + switch (ExceptionType) { + case VC_EXCEPTION: + // + // #VC needs to be handled immediately upon enabling exception handling + // and therefore can't use the RegisterCpuInterruptHandler() interface + // (which isn't supported under Sec and Pei anyway). + // + // Handle the #VC: + // On EFI_SUCCESS - Exception has been handled, return + // On other - ExceptionType contains (possibly new) exception + // value + // + Status = VmgExitHandleVc (&ExceptionType, SystemContext); + if (!EFI_ERROR (Status)) { + return; + } + + break; + + case VE_EXCEPTION: + // + // #VE needs to be handled immediately upon enabling exception handling + // and therefore can't use the RegisterCpuInterruptHandler() interface + // (which isn't supported under Sec and Pei anyway). + // + // Handle the #VE: + // On EFI_SUCCESS - Exception has been handled, return + // On other - ExceptionType contains (possibly new) exception + // value + // + Status = VmTdExitHandleVe (&ExceptionType, SystemContext); + if (!EFI_ERROR (Status)) { + return; + } + + break; + + default: + break; } // -- 2.29.2.windows.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#87950): https://edk2.groups.io/g/devel/message/87950 Mute This Topic: https://groups.io/mt/89989225/21656 Mute #ve:https://edk2.groups.io/g/devel/mutehashtag/ve Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
