From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (NAM10-MW2-obe.outbound.protection.outlook.com [40.107.94.48]) by mx.groups.io with SMTP id smtpd.web12.485.1587577359275953164 for ; Wed, 22 Apr 2020 10:42:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=WGZIIcpj; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.94.48, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MnjZ+FusFJRS6iZqoQzTwgqN/PKae56P6lzDilHt3pX8TmjunLhGLnV0U89GMln3IV4ul0AcuL/g5hOfLoUiYs1ajsnVWa/Yx1sTxnjDFdW2TpIh4LBqus5d9R9H49YQd9ccqEe8wCCLNSfjyEHJX6zcrn8OblWU5jLoJNk6OQ/rtp5UOTbRTQjaqXvNw707AxqRC6/wD1r0Nk4bvwBWs4POBO5476Z4FCkyxUtKUp6MqopZ2sNHVAkFi3FNZh4zj8kgRpnkRKD0mb3e18wYgW9MKDO8+iErTL7gFxQZF/INl5yQH2Gh+2NbQkHEz5T7RkcA2oRW1Is8cNIAZbibcQ== 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=A66VtuUdAuCTsRKRcapSSfzw4bIUM3lxhTQTp8ARLbY=; b=iWDjzV4nsJphUGzPYgTgES8UVU+ooO1TGLGRHd7kkRcnM2BfydnETh0/TyjLQVgvYLI3i/0iRyHJHBKg4XvEnOW3LDpmOmlUyFtndukY9N7frMNvml9/c2BCSYO0nJAsSAQ8i3g63uC7pcBCwx9P9M3FjMNGqN/1ZbsR0i1HN2m+E//HBfl5mebQDJ6plAASbD+QxoXfeNTLd7Z+Tu6wLYFSsTQy+/7emcKs0x0eg9EOKYSFiQulbG0keJizp0Zwx/ZtN/LfDWGNCwPpVCcaQ6KXIksdMbPEWD7I8I4xclYdw/u3oAbeJZiErBGepK5aS86phGaa/PkSf9yVF+e0Yg== 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=A66VtuUdAuCTsRKRcapSSfzw4bIUM3lxhTQTp8ARLbY=; b=WGZIIcpj01OlC/yWo0dbOO9Zltih6HnvP59rpo9uucK0d7Lqbjx11tn/yDNSxOq4wcCa05/i7M/d3rHyZ/5sRKSo1iBgErfY04oWaH1oW5S7ydFSAXir5RcQ57BjyeKbXkGP1OD3UvWO2PxxHPQi8i40aomuDVcz2ad3cJtl4TM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; Received: from DM6PR12MB3163.namprd12.prod.outlook.com (2603:10b6:5:15e::26) by DM6PR12MB4580.namprd12.prod.outlook.com (2603:10b6:5:2a8::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.29; Wed, 22 Apr 2020 17:42:38 +0000 Received: from DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::9ae:cb95:c925:d5bf]) by DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::9ae:cb95:c925:d5bf%4]) with mapi id 15.20.2921.030; Wed, 22 Apr 2020 17:42:38 +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 Subject: [PATCH v7 21/43] UefiCpuPkg/CpuExceptionHandler: Add support for VMMCALL NAE events Date: Wed, 22 Apr 2020 12:41:36 -0500 Message-Id: <64c381a9f692cccc30141a6ba0a71ac14749ea12.1587577317.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: DM5PR04CA0060.namprd04.prod.outlook.com (2603:10b6:3:ef::22) To DM6PR12MB3163.namprd12.prod.outlook.com (2603:10b6:5:15e::26) 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 DM5PR04CA0060.namprd04.prod.outlook.com (2603:10b6:3:ef::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Wed, 22 Apr 2020 17:42:37 +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: 889eb8ea-2993-4432-c18e-08d7e6e48c65 X-MS-TrafficTypeDiagnostic: DM6PR12MB4580:|DM6PR12MB4580: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-Forefront-PRVS: 03818C953D X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR12MB3163.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(10009020)(4636009)(376002)(136003)(346002)(39860400002)(366004)(396003)(36756003)(8676002)(6916009)(186003)(86362001)(8936002)(81156014)(4326008)(54906003)(52116002)(7696005)(966005)(2906002)(16526019)(316002)(478600001)(66476007)(19627235002)(6486002)(2616005)(26005)(956004)(66946007)(66556008)(5660300002)(136400200001);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Dtd6o6TYXMKocAAgZDqzMH+g4kxdvbij63rUqvc63psO0QBjx0Mmna4bDodY/09YRTOFQEZUWZGiQyYOk4wIIMcp1skRwzugAA3iJjPQ2y3l/LVeHmkUUHcoKsLtEqcTUQXedPl7yFAQWrlriSxPTyMeIog0NaR575neMVK/aSZvdZlyjR1k5yGGjf008bIivnwnDcyonuQ0adJA6UfBb5MKy/Na3SfPPv6Me7FtNP3/VgzmQupKPDKmI7xIpNwGAx9gHl/yrwYDIclMACGeHegcGSMeDGg29mGNLE9YtexcG7kCf9wtzcryUMaYJSK23zIrQFdkNug6F6QFqOJKbdO31Z3Su8c3RWaWN16kzzM1dO2yIDNaetLbf/70Azv3BRmEJ7SlpkTpro8aas9Cs3ccJvAWYsz/WPOS5wkA7GPsEj1SMcJ+3H9ujx3VyZDhOdXZZyiCn0y3UDfLjjv48ErE0qFfaaaBvlA/jBdA58vKE8JmkhZqbTUdyyKF8Dnc/gdo9bi6t5VdpUo4OO8GbwB3kOjsxBGIqaYfuwGWStVOisvWsdk37KgaDUZMKSDwwYy9GCitDsUMBI8v7mBmCw== X-MS-Exchange-AntiSpam-MessageData: HQp3Ad7MH090TQlXYnpx7TZyGZ05mbbWElpEIIKz00LNMYg+D1AdMFng2xc/zJxUlzHwYRuqvk8jTeUc/RwMMlGDjvLb3PkF9ZP6Gr7r/n/7ZgQIc0g+ocK0PR2JW5vSCjNdb3Bf6DUFJXkzM5H0GQ== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 889eb8ea-2993-4432-c18e-08d7e6e48c65 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2020 17:42:38.0454 (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: 9coRUyPQS3ujCS9Ts+uIrZw/QNyAyTU+bqgnjeM+bM5RQAQvsq/qqRv8v5Qpyyfr2xCRmVvC+QjpZt5XjUSKww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4580 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: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Signed-off-by: Tom Lendacky --- .../X64/ArchAMDSevVcHandler.c | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c index d42d84608854..4b425696b345 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c @@ -868,6 +868,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, SvmExitVmmCall, 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. @@ -1374,6 +1418,10 @@ DoVcCommon ( NaeExit = MsrExit; break; + case SvmExitVmmCall: + NaeExit = VmmCallExit; + break; + case SvmExitWbinvd: NaeExit = WbinvdExit; break; -- 2.17.1