From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (NAM10-BN7-obe.outbound.protection.outlook.com [40.107.92.62]) by mx.groups.io with SMTP id smtpd.web12.1641.1580857335440137478 for ; Tue, 04 Feb 2020 15:02:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=2lQQ3zNX; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.92.62, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K/n+mMNfVVV+ypfil20M6MJBB1CFsDVa/Hzs/Ncw+Nb1EV3cj2LyvOlZCv5MqaYWGoNY6Fad8EzcG0dfb7VO/TMm68txKZ/UJt3qsK9SAmNcbtRN7ORjwZnVp+c6VG33NRAKErGneCpRakWQjJ7IRFM4+IfWcaFxNt32oJKSQxLULaVpRjjgHFgp61e9VN0Gvq2DZVR1/eVD21DpZqAoJTBZUWTtmqyA6JzN+JiD/ha+x1ehoTvOaWW7hcMTC6E05eDWG0IhLRXELsGdlk2hqG46X/VW/YyorOaTDViOhFIJbywuCLzvqFYt9Kw7p0RoBsTiRmFLOIDYNPb4eGlZ4A== 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=e4sCynUDNTguoOsRaoHBwYCnHnkjbuRAknq4q2jM3jo=; b=DSHThlacqk8LnrApMtYi1YPx1rr6PfZo047F44GXqmiL3TYS54fwQfG1rmebYJyqkQaUMrLZs2a+bG8MYj7iTwySKaWHt+kNPoRofgYvgJYJhOZKUHc9W/8GjRwZhLLl3jtjUmsHH1RjDugAdLID3TQWcte/ufX1ZJH0ojEl2cXoH83M/I0uASd9EloLVhv31vYi7aTdsIn8mmh7oP7csGFShem8K/xgGyf1svdmGICz9dJvtIIeQ0eWNXkUaa7AHdxyaoGvnXa19E6ZpTsDFt3nddjBAbgGb6IhMD1Npjaa86IW54v2Op1vBwZGBTeAxCNyfTXWBjX0lkb2Y7oz6g== 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=e4sCynUDNTguoOsRaoHBwYCnHnkjbuRAknq4q2jM3jo=; b=2lQQ3zNX9o/bpYii2dqUEA3IMGjr8lnupWWytaySKYIMPBgVK89denUtgnXwutXRD/V85cceODGc4zKAhhENDkVs1E9yqbCD+N1Q39sV/icEJlsnHoLvHEcOLJ8rGNwG7jUijRlLznwEnrAVnSTDVpqy2SbKrTOzyrqb7OXugps= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; Received: from DM6PR12MB3163.namprd12.prod.outlook.com (20.179.71.154) by DM6PR12MB3930.namprd12.prod.outlook.com (10.255.174.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2686.29; Tue, 4 Feb 2020 23:02:12 +0000 Received: from DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::a0cd:463:f444:c270]) by DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::a0cd:463:f444:c270%7]) with mapi id 15.20.2707.020; Tue, 4 Feb 2020 23:02:12 +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 v4 11/40] UefiCpuPkg/CpuExceptionHandler: Add support for CPUID NAE events Date: Tue, 4 Feb 2020 17:01:15 -0600 Message-Id: <61424c7a4070ebef96d4853dcae61864dcd4a3e0.1580857303.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: SN6PR16CA0062.namprd16.prod.outlook.com (2603:10b6:805:ca::39) To DM6PR12MB3163.namprd12.prod.outlook.com (2603:10b6:5:15e::26) Return-Path: thomas.lendacky@amd.com MIME-Version: 1.0 Received: from tlendack-t1.amd.com (165.204.77.1) by SN6PR16CA0062.namprd16.prod.outlook.com (2603:10b6:805:ca::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2686.32 via Frontend Transport; Tue, 4 Feb 2020 23:02:11 +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: ecdf3262-e5f8-401f-39cf-08d7a9c64500 X-MS-TrafficTypeDiagnostic: DM6PR12MB3930:|DM6PR12MB3930: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-Forefront-PRVS: 03030B9493 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4636009)(39860400002)(366004)(376002)(136003)(396003)(346002)(199004)(189003)(4326008)(478600001)(6916009)(81156014)(2616005)(956004)(81166006)(8676002)(966005)(316002)(54906003)(19627235002)(2906002)(6486002)(66476007)(66556008)(52116002)(7696005)(186003)(26005)(16526019)(5660300002)(86362001)(36756003)(66946007)(8936002);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR12MB3930;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: T4PcZdIIJxLmsjzJmV2Ns28piZ+9ebNUtQnHg/9NH00zhZGnmEbBdFHPMn4pTGo3HgE6YxnG+Qym+ZtZienSfcolEEk9qk6W2tTI+v+RNNI2UIsA+AR4Pb4mM/yRQLyfW2F9LmVk8guc9G4Swu8UFu3NcE9t0avhzKI7cLM1vT1qBe4O/TvRccH2a3RNneNQz2joTh+cSM5Yt5l3ix9+ZO2SlbtUZ9J8Vi0/Wa69HE3aLz7UegZhpPJNpqW7lnSIjmMFF508nZExwHpnGIzkoGw2N2N3mwXu+h10OAJ5C7HHlTQL8GzdZBG5DSLpeBZpHMTygcrGEsa5wx6t72yAPb/62lR/Wze67U8o/6luBdDrypugEykNVbG8ia7tWjE9pVco0mxpvNBT4GQdOT3uYhCvE9hj6VqimphL/63F0WayV4VwgOIp6YrW6enE8OWsuVyFMrDsHOVxkPMspZLUmxL0wXiNSUv4eMRgPQ2YPiSNw/r8+BH9TgxWGYUBAVg1rfdCBmXLWK3av7/4CJBFqQ== X-MS-Exchange-AntiSpam-MessageData: g6K1YJQ0/6NQNkr2gycXtOe1X5r68xupb7bF4H9TWMp7u8ai4iwXAWbH6PQeD/4CGdflUEG0P/xpxVhfNzLyUi/bhycG3BwH1PwxnZWu7SDWLRrNBTATGIatMUbIOHJHM4Ji7SIWqa7x8IqiJQsFRA== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: ecdf3262-e5f8-401f-39cf-08d7a9c64500 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2020 23:02:12.4924 (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: 5qbJyQjUMEx/eYvilZpwxKpum8NU8f88WTsfkbV3MI1qGDyiPxonqddZIU1EoazRDjVKi/uF9727m7Qm3LR1Yw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3930 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2198 Under SEV-ES, a CPUID intercept generates a #VC exception. VMGEXIT must be used to allow the hypervisor to handle this intercept. Add support to construct the required GHCB values to support a CPUID NAE event. Additionally, CPUID 0x0000_000d requires XCR0 to be supplied in the GHCB, so add support to issue the XGETBV instruction. Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Signed-off-by: Tom Lendacky --- .../X64/AMDSevVcCommon.c | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c index 49609c5ef22f..90541c9a0390 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c @@ -11,6 +11,8 @@ #include #include "AMDSevVcCommon.h" +#define CR4_OSXSAVE (1 << 18) + typedef enum { LongMode64Bit = 0, LongModeCompat32Bit, @@ -494,6 +496,44 @@ IoioExit ( return 0; } +STATIC +UINT64 +CpuidExit ( + GHCB *Ghcb, + EFI_SYSTEM_CONTEXT_X64 *Regs, + SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINT64 Status; + + Ghcb->SaveArea.Rax = Regs->Rax; + GhcbSetRegValid (Ghcb, GhcbRax); + Ghcb->SaveArea.Rcx = Regs->Rcx; + GhcbSetRegValid (Ghcb, GhcbRcx); + if (Regs->Rax == 0x0000000d) { + Ghcb->SaveArea.XCr0 = (AsmReadCr4 () & CR4_OSXSAVE) ? AsmXGetBv (0) : 1; + GhcbSetRegValid (Ghcb, GhcbXCr0); + } + + Status = VmgExit (Ghcb, SvmExitCpuid, 0, 0); + if (Status) { + return Status; + } + + if (!GhcbIsRegValid (Ghcb, GhcbRax) || + !GhcbIsRegValid (Ghcb, GhcbRbx) || + !GhcbIsRegValid (Ghcb, GhcbRcx) || + !GhcbIsRegValid (Ghcb, GhcbRdx)) { + return UnsupportedExit (Ghcb, Regs, InstructionData); + } + Regs->Rax = Ghcb->SaveArea.Rax; + Regs->Rbx = Ghcb->SaveArea.Rbx; + Regs->Rcx = Ghcb->SaveArea.Rcx; + Regs->Rdx = Ghcb->SaveArea.Rdx; + + return 0; +} + UINTN DoVcCommon ( GHCB *Ghcb, @@ -510,6 +550,10 @@ DoVcCommon ( ExitCode = Regs->ExceptionData; switch (ExitCode) { + case SvmExitCpuid: + NaeExit = CpuidExit; + break; + case SvmExitIoioProt: NaeExit = IoioExit; break; -- 2.17.1