From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (NAM11-CO1-obe.outbound.protection.outlook.com [40.107.220.53]) by mx.groups.io with SMTP id smtpd.web11.964.1589925113172337211 for ; Tue, 19 May 2020 14:51:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=bVWcITrG; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.220.53, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Sh3QfpV7Z7Vyc7h/i6OjLnP+xXLB4LdS5D62O3DlV8Y4rqcJa06S/D/utTpJ2g1IUozJR2mYDURaD/QXJd5vBOfcFsC1cvUY4+UsMni4jxL9l5xwPJ2yzwCWDRn45N/+k3rUixjOnSBhAoU/eV3nYi7g3xzXqUt7WYA4qN+sVuWIljHijYwLujp3xBhElza0cPBOUMDz1EHX48Uxxr84RmEuM2VsxWaefTt5y+MxCRTg3sjWfOqyRKUs02c0wzvi/bKsgQ/gnO0EfdzFT4/DPI57D2ADlg4ooHzgW34D/k6bbqhtXiR7/kYkKff9A/E9Sr4Q1qHMEVx5yAaGqz3mKA== 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=FJfPdhnSMeXMfIkAm/2BbaDdZ0VvBaioJXEf8mhb3Ww=; b=Xz9DKhyyoKg4d8ojrRiB6Xp38CwWIqC3kFF6E7kvje18EpNp5ALxvq1bRrDW/cemf6Kaz5MHn4W+Olpiyp3WQX8YDCBDnYPgp5HGbZyIq7QlINs5xvP/8n6Fe6akx2XEO5AyjGP+agjyxwvPVMQNqSqki7tH7q4DN8YBnTRVaHv1znfSYD6X6t/LRn2f7ZO58gSKleTaC3zU5t0TSB7mjEWqohcu3snr3c5eWgdAfbkHNfqnvpFBoFRDzyY7pyDw0OmZQVCq66lajGKyAiic0zhj0JQRWHnK/ko7RtgMqfH+l2A/JX1k+dw5Hb7MTPS+LTgvB9lLCfoJ1CV6T8VkcA== 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=FJfPdhnSMeXMfIkAm/2BbaDdZ0VvBaioJXEf8mhb3Ww=; b=bVWcITrGqAMyA9JpLfceudEX/Y2TsPhX0GvUeQP2G845Q4gHRxHjUoNybmzqQ8T954+UNq9r+9rEsjj2Sx8AY/Iq2s+WyTKZEJ7mA/s0wE4w5xnL4fcZw3ym1/2sbFbuvIIeRglWfN10UIJv9ENxldaacfEXhycbpDnCbEpzs0w= 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 DM5PR12MB2504.namprd12.prod.outlook.com (2603:10b6:4:b5::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.20; Tue, 19 May 2020 21:51:51 +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.3000.034; Tue, 19 May 2020 21:51:51 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io Cc: Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Michael D Kinney , Liming Gao , Eric Dong , Ray Ni , Brijesh Singh , Ard Biesheuvel Subject: [PATCH v8 22/46] OvmfPkg/VmgExitLib: Add support for VMMCALL NAE events Date: Tue, 19 May 2020 16:50:50 -0500 Message-Id: <0b9f13ded4d404ffee90a73848fc67b91010269f.1589925074.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: DM6PR11CA0048.namprd11.prod.outlook.com (2603:10b6:5:14c::25) 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 DM6PR11CA0048.namprd11.prod.outlook.com (2603:10b6:5:14c::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.25 via Frontend Transport; Tue, 19 May 2020 21:51:51 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: ee254765-b09f-4fa9-6c94-08d7fc3ed6a9 X-MS-TrafficTypeDiagnostic: DM5PR12MB2504: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-Forefront-PRVS: 040866B734 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NshD4MzfIL0+/RmqzheH6+2rhvA7yhcWmNYMxvwocV1VcR8qdDvXJz3mAyZcAlCy1AWLyYOFk9FAgtfgMwSmBVfcjTL3DX94fj0Tu2bpA8jZ5LOovf45Vn/f4nLVllip6hlfXAQ4xuc7vFNY5Pthr86KWXkhyk/2pHd4ie75PQFPhSe+r3hsr8HS2Xt/fps/hoyGAf5sp17bCbi3r22XXyzHWsT5CioCq2+gOB84kRy4zHvRq9llCkEGSoAsJjFHgRaeUWJXgRm23EhPlkQj/Mn0VV+dvU+ZB9J5i9jphbYcvlHvZpaXZH3Hj8VDf8y6y/9kG1Wb4EXeo8qOV5+eHXwyp9+Tqxdq1JNYX9ZL0BF29ZpgrX4eTLXctKdUERF3IPc3wA6rTdTrRATdvz5SGZULTEw+d6WjEFRhfeSjy5tnCZxayTra5G1Ydmrv3y6zXB138wtSA/H2aeGIVxgnEeFPeet8+BlcYNea10aDXqtAtnKuij5LKFQL3dg+0xCYe7vruDY8Azlu0bI4aQOHsMo+TJO+gMASq+bxqk2pUeZiRoRdZ3ASe39AgvLsN8Irq1R8V31nL1vD5s2QikIQGA== 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)(376002)(39860400002)(136003)(346002)(396003)(366004)(316002)(86362001)(2906002)(54906003)(7696005)(52116002)(2616005)(956004)(66946007)(66476007)(19627235002)(66556008)(36756003)(26005)(16526019)(186003)(4326008)(8676002)(5660300002)(966005)(6486002)(8936002)(6916009)(478600001)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: KAfVnGcrym3B2cY+4jUF+ZgDfxl1Un5ggOsDXZ0JJMrnIwZdtuyoB1gc0xyYIE/HLDnpztXKLCpnhDHJgmXAuaUqCIZ3rnoJ12Nawrw3JzFq4xr8CWlOrRQjU6N1A0et+tHR4LqIGu52bqKb5+/F2+XAkmgY2W69pfzRdZmmYjAUkwYfbECLiGUBamRbC0rgBYhprOEfr4G28Ell32BnU5HB1R0lZMAtmouF7s1d64yQ1MFsu4BeMtKAH0QwTMsvQfNgj7bYA1CDbuOPGgoiUlSxvm93mFw0Avstlbq+sPgGgdDK+qhL06RovRXIgXu4/q1vjqJNWHEhy9O9WJkHVgm1+gjxZz2iGF22kqZgfN/KB0UKcU/HpIJvozWxhmX2A8VqdlDe3MooGK4qwzylUPkTDUBNzDHjeFXeHekHkbKvRgAcO40x3heUB4iQTwUXnq3zD+3MwuQn+9W0m58bK8NlSN/f0/vVM4tNlX408sE= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee254765-b09f-4fa9-6c94-08d7fc3ed6a9 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2020 21:51:51.7553 (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: +H5pthu7UwJwBcMlAM72cNThjzHtHL/RYRhGiAdbaB2K7Te1TzS2tijEiT2lIe8NJUMykDarHTwuoXczqKntlQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2504 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2198 Under SEV-ES, a VMMCALL intercept generates a #VC exception. VMGEXIT must be used to allow the hypervisor to handle this intercept. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Signed-off-by: Tom Lendacky --- .../Library/VmgExitLib/X64/VmgExitVcHandler.c | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/OvmfPkg/Library/VmgExitLib/X64/VmgExitVcHandler.c b/OvmfPkg/Library/VmgExitLib/X64/VmgExitVcHandler.c index 0b7f24fd962c..bf1555234d69 100644 --- a/OvmfPkg/Library/VmgExitLib/X64/VmgExitVcHandler.c +++ b/OvmfPkg/Library/VmgExitLib/X64/VmgExitVcHandler.c @@ -875,6 +875,50 @@ WbinvdExit ( return 0; } +/** + Handle a VMMCALL event. + + Use the VMGEXIT instruction to handle either a VMMCALL event. + + @param[in, out] Ghcb Pointer to the Guest-Hypervisor Communication + Block + @param[in, out] Regs x64 processor context + @param[in] InstructionData Instruction parsing context + + @retval 0 Event handled successfully + @retval Others New exception value to propagate + +**/ +STATIC +UINT64 +VmmCallExit ( + IN OUT GHCB *Ghcb, + IN OUT EFI_SYSTEM_CONTEXT_X64 *Regs, + IN SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINT64 Status; + + DecodeModRm (Regs, InstructionData); + + Ghcb->SaveArea.Rax = Regs->Rax; + GhcbSetRegValid (Ghcb, GhcbRax); + Ghcb->SaveArea.Cpl = (UINT8) (Regs->Cs & 0x3); + GhcbSetRegValid (Ghcb, GhcbCpl); + + Status = VmgExit (Ghcb, SVM_EXIT_VMMCALL, 0, 0); + if (Status) { + return Status; + } + + if (!GhcbIsRegValid (Ghcb, GhcbRax)) { + return UnsupportedExit (Ghcb, Regs, InstructionData); + } + Regs->Rax = Ghcb->SaveArea.Rax; + + return 0; +} + /** Handle an MSR event. @@ -1395,6 +1439,10 @@ VmgExitHandleVc ( NaeExit = MsrExit; break; + case SVM_EXIT_VMMCALL: + NaeExit = VmmCallExit; + break; + case SVM_EXIT_WBINVD: NaeExit = WbinvdExit; break; -- 2.17.1