From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.71]) by mx.groups.io with SMTP id smtpd.web09.726.1583190468914513789 for ; Mon, 02 Mar 2020 15:07:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=GrT6PMAk; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.93.71, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nifDah8z57IjybdZ/zO9mKwjKy8/5fPBXPgvlhCf8mfxeeL2UWmc8Z0eSCkj62cIfnHYtXBMedGFtg3a0JwhqYInh5/TZjuhYRW3dpeGWHiJNgY/0+Gz/6Ay2+nRZidvWI77qIFwPsHi6JzIlNOyLDoGlSx5zcBJeJRAmsjHx98/hrWh44H2f2DGXGqqBzzO8be2mlCGpvRzfGxajiyBl7mmdRBOlyzkSD/9Wxz7zXEwLGev1zF3AXtC7Tgn3XXxh8UjDAmTHw4JwShd/cCOBD22b7tbtajLFTlhtzYKuwPahs2art0tUpBfnoepAB4DX2+Ke6IbEMBfJW5g9OgYuw== 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=tPSm/3ZSsT8UfFUdi6V/LsxfbPwJgvhDHcy50MyS/X8=; b=FsEunJVcUTZbKpmmaKT9mxMNb4xliiaAGMy6uZLcRLxHg6bDMxbcpVIAZaky3968jHbaNLh3yNL1jNMaLugVT2ulPsvBNvHxqr0DjHmNGHVPVYEDiUMR+LJRbuOx6m+vsO89N4qjAOyS6zlqOoEXs4OYpYsxUG/EtsNhFYKqkcSz/Jvu9pjY25bsAhMVsg8xm2xcl/m2qye2RxJ5c5op3pInFVhsGR9+X65/atcLAH/vyTPBxKPNFb9UgmmFMoLubQWjxM2NNy+R3MxXKGQ5b46KMQ2pLSTH+6HbZJqd4hnYS1NtwLHOhDeo6exldnrZWNUz9iBIYf5htKjnfTIdhg== 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=tPSm/3ZSsT8UfFUdi6V/LsxfbPwJgvhDHcy50MyS/X8=; b=GrT6PMAkeggSjFal8SjHIPOAm+2UH9a/1kyj1+5TMNZXEBQmu3GTNj3KWZA1mbReG3Uv5yShQSMzKqChDk9UyukY3G8E9+FQtkNDYPKS9MsYmrte/KfhGq0pME2BkZV7lsy0uT2Sbf2Z2EBWCryHfQuqoSkmUVr7EA8BzZcFk+s= 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 DM6PR12MB4041.namprd12.prod.outlook.com (2603:10b6:5:210::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2772.15; Mon, 2 Mar 2020 23:07:48 +0000 Received: from DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::f0f9:a88f:f840:2733]) by DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::f0f9:a88f:f840:2733%7]) with mapi id 15.20.2772.019; Mon, 2 Mar 2020 23:07:48 +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 v5 20/42] UefiCpuPkg/CpuExceptionHandler: Add support for VMMCALL NAE events Date: Mon, 2 Mar 2020 17:06:51 -0600 Message-Id: <41b6c9f654ab0c5e845b1c279bcfd57ed4101da9.1583190432.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: DM5PR2001CA0013.namprd20.prod.outlook.com (2603:10b6:4:16::23) 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 DM5PR2001CA0013.namprd20.prod.outlook.com (2603:10b6:4:16::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2772.16 via Frontend Transport; Mon, 2 Mar 2020 23:07:47 +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: 3cc2e294-3bf2-4c6c-a9b0-08d7befe8623 X-MS-TrafficTypeDiagnostic: DM6PR12MB4041:|DM6PR12MB4041: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2000; X-Forefront-PRVS: 033054F29A X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4636009)(376002)(39860400002)(366004)(346002)(396003)(136003)(199004)(189003)(478600001)(86362001)(5660300002)(81156014)(36756003)(6916009)(316002)(4326008)(54906003)(2906002)(6486002)(8936002)(81166006)(8676002)(966005)(956004)(2616005)(6666004)(66476007)(66556008)(7696005)(52116002)(19627235002)(66946007)(186003)(26005)(16526019);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR12MB4041;H:DM6PR12MB3163.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; 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: Dd8OlUpwGDACNn1ZlOR7d7XS9D5gRkGcjZqoPpe+s/gbr2umgQJoghm6hyJ7wHDoMoTJLcPvdiiHEBZJ8hzzgGN9NpODJf1i5NQdNAB7geh9PBtCdXUMPwXxRYBQD2xjucvEQvNePtfY5EBBvj7ZUW8QSEnTKkIJbziftjL1wr5deZ6T47z8C2gf062WJ5cz96dM5ySCyBOG6xnV/1mB2dc37M4IRa8s7tOJ0oQlPAqNSBtKrsbdlOcngbdEpYCXKxeTlLZ3QoqIS234vRFX58BjCOuVQzoN6QE/7zqrwv0B5aonoQDS7Kym/02Cgt5mPlgHfOfkTRX6/zj4qCEtZA6jEUaizllkpueFOfrNmvxfd/ag4bdJr1RFBN2O9g8H4jiZt8sTc84cIgEgurJFUsKKRluW0CHqbLc46vuXOYfowsxDynbPhEDtbdj+lVwssaoeW/iQL22eXN9ROLgS94Vbnk3vIbOrWb+MymZ/9neZhhbyOh0v+ToI5L3p/9cdOl6IVJRg2U5m11yF6uxd9A== X-MS-Exchange-AntiSpam-MessageData: Qy2ier9cRgMjtLwTuGaW/S5JLcEm6i+wuy4xapGpXKc5zxJCGVrtxPnttcCZz4zUCc9dYwALWp/9FIibtulDpcudLIH8mjDBNXNoJIh/2E6eAHhYJ8hkUX4WAEutvl7h8p1NkuHEREq3Qzx4ZNKZPw== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3cc2e294-3bf2-4c6c-a9b0-08d7befe8623 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2020 23:07:47.9608 (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: jjk35CVd2KvzChfRyh7vcGHo3nKnOqJz3cCwysVTfLFBOW+uZSInX49STcCyTP3CoIbQtz87ksR8rmSAmXpgrQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4041 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 | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c index a0dd5e2adcc9..354d027f08f3 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c @@ -609,6 +609,36 @@ WbinvdExit ( return 0; } +STATIC +UINT64 +VmmCallExit ( + GHCB *Ghcb, + EFI_SYSTEM_CONTEXT_X64 *Regs, + 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; +} + STATIC UINT64 MsrExit ( @@ -1005,6 +1035,10 @@ DoVcCommon ( NaeExit = MsrExit; break; + case SvmExitVmmCall: + NaeExit = VmmCallExit; + break; + case SvmExitWbinvd: NaeExit = WbinvdExit; break; -- 2.17.1