From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM04-BN3-obe.outbound.protection.outlook.com (NAM04-BN3-obe.outbound.protection.outlook.com [40.107.68.66]) by mx.groups.io with SMTP id smtpd.web12.10844.1591363682824292193 for ; Fri, 05 Jun 2020 06:28:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=po0b5A29; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.68.66, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fCNLq8scBelY0Q26CRXxnfH/7OUiC7+F0R3SXGABMDvJPgPSucMg/jz85F3giYkr2ncWKkj0Kij9HvOmvrfz93P4sTl1H40rQP7Ic16NU23xmq7Mhj5PyQ0DEg6Ht+tlLQZgLycauZlOQpxpWeDtivKe48ywKY0kBjjOYNECcBiJ6oWt+72H1hSi7LSDmLjdtb5pDXw46DsJ5eZYUwCDR1FnUf/8IYdD4iYNbNEBOXV6Tg0Y8gJjcnSa6gGO8g/3HqoO2uFt+Cx1sPZAa8XQ+mboEF0gsBpNpjUUe+HqhBjDmHZgjIwRSRjh1bsS8NpK8M8Uj+FXiPM98XY8TLOVOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yA4J3U11NYyyVzuqds5rp8jDIWOpIdodWpg3egBvKxw=; b=mNn/+ac4x9C0Zr0yg1/nK/OVF5oycmI9/3emmw2ihW4/Aa9VT5/aQYAev7JmBcrjUQPtIh5/LCfKeZwuDDTCAVQuuiEPLeP277aoZRfPBgKBZCr00A1dgRfUyh2UUpeJjIuAjhxOWWZ6eMERC+5QHgjM4DTwTXl50//2rOx6OJo/z1fMHwGkTfNYlpe+NMk81kWRdKYF2uVWkiRxk6QywvDkTLSfDLEXeSrpmul1Qlwt6xqCD7ar+ZAzyNGpeaV19ICrPkNxdh4ut8ERt3ww4/HwQa44S9LMOiEAFhPdmz3UvuLAD0uPCcQMISbkB8n9xczSwuuWQLjCW5cPzRL+mA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yA4J3U11NYyyVzuqds5rp8jDIWOpIdodWpg3egBvKxw=; b=po0b5A29pux3HbMjhu1s187ZolZLb6QvCJqOsQxzx1cL87usGnH8oY9RRfZ9wwTWbZDz5mXT/eeb/s1Na4Ah6zvRpsinL++jrQgKrfCjN4m1e4uzkd/hn2wyGxGJNc+mS7dKw7FHR/ub4Bj99Fxx+VZknR0fMah0eDDE3AbDcZw= Authentication-Results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=amd.com; Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM5PR12MB1356.namprd12.prod.outlook.com (2603:10b6:3:74::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3066.20; Fri, 5 Jun 2020 13:28:00 +0000 Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4ce1:9947:9681:c8b1]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4ce1:9947:9681:c8b1%10]) with mapi id 15.20.3066.019; Fri, 5 Jun 2020 13:28:00 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io Cc: Brijesh Singh , Ard Biesheuvel , Eric Dong , Jordan Justen , Laszlo Ersek , Liming Gao , Michael D Kinney , Ray Ni Subject: [PATCH v9 11/46] UefiCpuPkg/CpuExceptionHandler: Add base support for the #VC exception Date: Fri, 5 Jun 2020 08:27:02 -0500 Message-Id: <5a16f89d5319cf4972e20a7f66e4e28aa1cc0a91.1591363657.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-ClientProxiedBy: DM5PR19CA0060.namprd19.prod.outlook.com (2603:10b6:3:116::22) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) Return-Path: thomas.lendacky@amd.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from tlendack-t1.amd.com (165.204.77.1) by DM5PR19CA0060.namprd19.prod.outlook.com (2603:10b6:3:116::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3066.18 via Frontend Transport; Fri, 5 Jun 2020 13:27:59 +0000 X-Mailer: git-send-email 2.27.0 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 7637820e-70be-4fea-438b-08d80954445d X-MS-TrafficTypeDiagnostic: DM5PR12MB1356: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-Forefront-PRVS: 0425A67DEF X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L2zkR4AWs0IW+HPkKxqhRdtYBs0GIW90gjYvYSwpsKOTsOtVBy7L7+5r40inZg/rv0Yyc3x4EqbWmiTUlGFl8w8SvaDpjMEKhHEc1Tn6BIbMffAxbl8WzyAq/uyPkqlNOdlgSeFG8Sm2SKspRZHVjJfFjaYEpusGjN1iAexasGgHrDgfRHjQhtgBiIW4hORe6zXPy/y0ZVj9rR+GPCEVq+9on5yVVzy02fYIUKV3WqY5uvFvdYXSB8kRfN/1wDNE5aJu1BWvOb/teebUx2KLurK5fHq9d+NfqocBgKy+lhHHK9jBOPzPtqJzCYTdkktSyOkj17/D0r6pQ+kOPcc7WTBjLCUW3ItJ4HiJ0E/4a5beUUPGtpRTPWD395h4jfKEYY0u4SL4PcAIOVD4VxYsQ2S20PTnx62gDQnp09D5Mw1ppiQYaybHbzkEN0V8lUkxI26WXzvwWq5FKbInvUq0bGTiS8FVPPIqrtZn+VyeG5rnCykQZzrLVPgbCmNA7hwQ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR12MB1355.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(39860400002)(376002)(346002)(136003)(366004)(396003)(478600001)(54906003)(26005)(5660300002)(2906002)(43170500006)(83380400001)(186003)(66556008)(8936002)(4326008)(6486002)(6916009)(16526019)(8676002)(86362001)(66476007)(966005)(7696005)(36756003)(316002)(52116002)(6666004)(956004)(66946007)(2616005)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: I8f1Sq6yEqtIRBvUqwNQHnuQNpm+e7h/rSQtQh0L9gGl8PVNt9C3yIybTfwMqiZqQq03v5NI1XgjIsWNqcRU6Utx+5/niFrnELFeLt4/dMGmhwbADW4bnNnLnT4i5/BYh0AR6mF2vpzQnaqI8SnkDcYCBgVHZVzD4ER45x0M3299puKNrjIohTU1hIHo8eOh7o5cWyGDbFnuMsz7UEuAyuzUvwMNF9zw0nHXh8NEjYc0WiFExHZoAEskO632nZ7HfKIMMDiz5FPlQribn/jDyWQAd4BErhQ4tsL0QxGtcd+1PJwhbDrM5+lALOevZHRl6+oq5VjqNzJaGMDdKNqvfvhjAbdKY5tFfmvwyKW20WYxF4eXhevcMkYTuMjoIP5wggBCloXqh086rl2NKyQBAyos/vaVmCz37QHcmNNTMya7bF2hO8Q/eb7QA2quQRr7ilKx6Ykt2yfDpiP2wGGZJCp8qgI3zDgRkvsn2bIG4C4= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7637820e-70be-4fea-438b-08d80954445d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2020 13:28:00.3829 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jw7EqwHm7oNLkKCyERlNl9do3qjwDWiKIuAWhWbH6c2BM04ie2yvnMTocxPAjt3QpAOfvYcUN8uh0gH7PzPPUw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1356 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2198 Add base support to handle #VC exceptions. Update the common exception handlers to invoke the VmgExitHandleVc () function of the VmgExitLib library when a #VC is encountered. A non-zero return code will propagate to the targeted exception handler. Under SEV-ES, a DR7 read or write intercept generates a #VC exception. To avoid exception recursion, a #VC exception will not try to read and push the actual debug registers into the EFI_SYSTEM_CONTEXT_X64 struct and instead push zeroes. The #VC exception handler does not make use of the debug registers from the saved context and the exception processing exit code does not attempt to restore the debug register values. Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Signed-off-by: Tom Lendacky --- UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf = | 1 + UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf = | 1 + UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf= | 1 + UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf = | 1 + UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerL= ib.inf | 1 + UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.c = | 10 +++++++++- UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiDxeSmmCpuException.c = | 20 +++++++++++++++++++- UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuException.c = | 19 +++++++++++++++++++ UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm = | 17 +++++++++++++++++ UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/Xcode5ExceptionHandlerAsm.na= sm | 17 +++++++++++++++++ 10 files changed, 86 insertions(+), 2 deletions(-) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandl= erLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandle= rLib.inf index 61e2ec30b089..07b34c92a892 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.i= nf +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.i= nf @@ -57,3 +57,4 @@ [LibraryClasses] PeCoffGetEntryPointLib=0D MemoryAllocationLib=0D DebugLib=0D + VmgExitLib=0D diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandl= erLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandle= rLib.inf index 093374944df6..feae7b3e06de 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.i= nf +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.i= nf @@ -52,6 +52,7 @@ [LibraryClasses] HobLib=0D MemoryAllocationLib=0D SynchronizationLib=0D + VmgExitLib=0D =0D [Pcd]=0D gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard # CONSUMES=0D diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHa= ndlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuException= HandlerLib.inf index 6d25cafe2ca3..967cb61ba6d9 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLi= b.inf +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLi= b.inf @@ -48,3 +48,4 @@ [LibraryClasses] PrintLib=0D LocalApicLib=0D PeCoffGetEntryPointLib=0D + VmgExitLib=0D diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandl= erLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandle= rLib.inf index 2ffbbccc302f..4cdb11c04ea0 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.i= nf +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.i= nf @@ -51,4 +51,5 @@ [LibraryClasses] LocalApicLib=0D PeCoffGetEntryPointLib=0D DebugLib=0D + VmgExitLib=0D =0D diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExcep= tionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPei= CpuExceptionHandlerLib.inf index 7e21beaab6f2..743c2aa76684 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHan= dlerLib.inf +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHan= dlerLib.inf @@ -53,3 +53,4 @@ [LibraryClasses] PrintLib=0D LocalApicLib=0D PeCoffGetEntryPointLib=0D + VmgExitLib=0D diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.c= b/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.c index 8adbd43fefb4..c9003b10e552 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.c @@ -14,7 +14,7 @@ //=0D // 1 means an error code will be pushed, otherwise 0=0D //=0D -CONST UINT32 mErrorCodeFlag =3D 0x00227d00;=0D +CONST UINT32 mErrorCodeFlag =3D 0x20227d00;=0D =0D //=0D // Define the maximum message length=0D @@ -45,6 +45,14 @@ CONST CHAR8 *mExceptionNameStr[] =3D { "#XM - SIMD floating-point",=0D "#VE - Virtualization",=0D "#CP - Control Protection"=0D + "Reserved",=0D + "Reserved",=0D + "Reserved",=0D + "Reserved",=0D + "Reserved",=0D + "Reserved",=0D + "Reserved",=0D + "#VC - VMM Communication",=0D };=0D =0D #define EXCEPTION_KNOWN_NAME_NUM (sizeof (mExceptionNameStr) / sizeof (CH= AR8 *))=0D diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiDxeSmmCpuExceptio= n.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiDxeSmmCpuException.c index 6a2670d55918..892d349d4b37 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiDxeSmmCpuException.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiDxeSmmCpuException.c @@ -6,8 +6,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =0D **/=0D =0D -#include "CpuExceptionCommon.h"=0D #include =0D +#include =0D +#include "CpuExceptionCommon.h"=0D =0D /**=0D Internal worker function for common exception handler.=0D @@ -27,6 +28,23 @@ CommonExceptionHandlerWorker ( RESERVED_VECTORS_DATA *ReservedVectors;=0D EFI_CPU_INTERRUPT_HANDLER *ExternalInterruptHandler;=0D =0D + if (ExceptionType =3D=3D VC_EXCEPTION) {=0D + EFI_STATUS Status;=0D + //=0D + // #VC needs to be handled immediately upon enabling exception handlin= g=0D + // and therefore can't use the RegisterCpuInterruptHandler() interface= .=0D + //=0D + // Handle the #VC:=0D + // On EFI_SUCCESS - Exception has been handled, return=0D + // On other - ExceptionType contains (possibly new) exception= =0D + // value=0D + //=0D + Status =3D VmgExitHandleVc (&ExceptionType, SystemContext);=0D + if (!EFI_ERROR (Status)) {=0D + return;=0D + }=0D + }=0D +=0D ExceptionHandlerContext =3D (EXCEPTION_HANDLER_CONTEXT *) (UINTN) (Syst= emContext.SystemContextIa32);=0D ReservedVectors =3D ExceptionHandlerData->ReservedVectors;=0D ExternalInterruptHandler =3D ExceptionHandlerData->ExternalInterruptHand= ler;=0D diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuException.c= b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuException.c index 20148db74cf8..52c6886f0372 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuException.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuException.c @@ -7,6 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/=0D =0D #include =0D +#include =0D #include "CpuExceptionCommon.h"=0D =0D CONST UINTN mDoFarReturnFlag =3D 0;=0D @@ -24,6 +25,24 @@ CommonExceptionHandler ( IN EFI_SYSTEM_CONTEXT SystemContext=0D )=0D {=0D + if (ExceptionType =3D=3D VC_EXCEPTION) {=0D + EFI_STATUS Status;=0D + //=0D + // #VC needs to be handled immediately upon enabling exception handlin= g=0D + // and therefore can't use the RegisterCpuInterruptHandler() interface= =0D + // (which isn't supported under Sec and Pei anyway).=0D + //=0D + // Handle the #VC:=0D + // On EFI_SUCCESS - Exception has been handled, return=0D + // On other - ExceptionType contains (possibly new) exception= =0D + // value=0D + //=0D + Status =3D VmgExitHandleVc (&ExceptionType, SystemContext);=0D + if (!EFI_ERROR (Status)) {=0D + return;=0D + }=0D + }=0D +=0D //=0D // Initialize the serial port before dumping.=0D //=0D diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandler= Asm.nasm b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAs= m.nasm index 3814f9de3703..2a5545ecfd41 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm @@ -18,6 +18,8 @@ ; CommonExceptionHandler()=0D ;=0D =0D +%define VC_EXCEPTION 29=0D +=0D extern ASM_PFX(mErrorCodeFlag) ; Error code flags for exceptions=0D extern ASM_PFX(mDoFarReturnFlag) ; Do far return flag=0D extern ASM_PFX(CommonExceptionHandler)=0D @@ -224,6 +226,9 @@ HasErrorCode: push rax=0D =0D ;; UINT64 Dr0, Dr1, Dr2, Dr3, Dr6, Dr7;=0D + cmp qword [rbp + 8], VC_EXCEPTION=0D + je VcDebugRegs ; For SEV-ES (#VC) Debug registers ignore= d=0D +=0D mov rax, dr7=0D push rax=0D mov rax, dr6=0D @@ -236,7 +241,19 @@ HasErrorCode: push rax=0D mov rax, dr0=0D push rax=0D + jmp DrFinish=0D =0D +VcDebugRegs:=0D +;; UINT64 Dr0, Dr1, Dr2, Dr3, Dr6, Dr7 are skipped for #VC to avoid excep= tion recursion=0D + xor rax, rax=0D + push rax=0D + push rax=0D + push rax=0D + push rax=0D + push rax=0D + push rax=0D +=0D +DrFinish:=0D ;; FX_SAVE_STATE_X64 FxSaveState;=0D sub rsp, 512=0D mov rdi, rsp=0D diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/Xcode5ExceptionH= andlerAsm.nasm b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/Xcode5Except= ionHandlerAsm.nasm index 19198f273137..26cae56cc5cf 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/Xcode5ExceptionHandlerA= sm.nasm +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/Xcode5ExceptionHandlerA= sm.nasm @@ -18,6 +18,8 @@ ; CommonExceptionHandler()=0D ;=0D =0D +%define VC_EXCEPTION 29=0D +=0D extern ASM_PFX(mErrorCodeFlag) ; Error code flags for exceptions=0D extern ASM_PFX(mDoFarReturnFlag) ; Do far return flag=0D extern ASM_PFX(CommonExceptionHandler)=0D @@ -225,6 +227,9 @@ HasErrorCode: push rax=0D =0D ;; UINT64 Dr0, Dr1, Dr2, Dr3, Dr6, Dr7;=0D + cmp qword [rbp + 8], VC_EXCEPTION=0D + je VcDebugRegs ; For SEV-ES (#VC) Debug registers ignore= d=0D +=0D mov rax, dr7=0D push rax=0D mov rax, dr6=0D @@ -237,7 +242,19 @@ HasErrorCode: push rax=0D mov rax, dr0=0D push rax=0D + jmp DrFinish=0D =0D +VcDebugRegs:=0D +;; UINT64 Dr0, Dr1, Dr2, Dr3, Dr6, Dr7 are skipped for #VC to avoid excep= tion recursion=0D + xor rax, rax=0D + push rax=0D + push rax=0D + push rax=0D + push rax=0D + push rax=0D + push rax=0D +=0D +DrFinish:=0D ;; FX_SAVE_STATE_X64 FxSaveState;=0D sub rsp, 512=0D mov rdi, rsp=0D --=20 2.27.0