From nobody Sun Feb 8 14:56:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+60785+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+60785+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1591363689742449.44468656975505; Fri, 5 Jun 2020 06:28:09 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id QZnzYY1788612xypyV13Gwj0; Fri, 05 Jun 2020 06:28:09 -0700 X-Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com [40.107.243.77]) by mx.groups.io with SMTP id smtpd.web10.10760.1591363685572495677 for ; Fri, 05 Jun 2020 06:28:05 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ezaaE7LlPWEbr1MrD5cLGzmiLAdwOC8eH29JVSkqxwmtpH+HGoulsrlvk7dF+b1qr3RMOlBBiMiVT62HEqPIRF6nvPJ3NUIqCIo8Oms0aA4dTyeIeYYwUizISmZ7QdoZg1Lug/ybhxJchJcz74CvyclSxPeGR5rVFKyK+TI4iumlYdarwb5UAWR3g5WBn8yzGfyFFl315ximotLHEhsD1z2hwv1ITm8htEIeB63tnwGPN/5DjLEQrBySS0RCtdoFjDaRdCWMsTXQR404+yJsTQTsTyGrp9viC+yrTumuDnVOcdeWS45Ws4ITKcEhDPx0d40k5Rli4XTynhjhUgniLw== 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=5N0pQC22O2zQeuJ8+4hpT8Vka8IP8hPOHDSMLDyCDoo=; b=Z2XgPYLKYMeddDfDn4xI4G29LmkXrzY6ph3ulQp7CkYUuOdra6rQnQ6eE2Ly4GHVWgWQoOpzk7ptqBMDmfmCYcQ5xCOBF3xHPX2idnshbCwJpAgZB9u8m9cdwFNhImuIEbyrSAL7li64aOxDO75CWPs5a/2XOClrFcWaUCvh22RMYnpelYV4/f+4UXxn4ZS8jkhh8hjEWx05mY0ZL+IHyrktjns21TZkUYRJhkOE+o3UG5fI9vJZv/DjLQii5ZKSWxXV+A4TmeX6rs0i8VEv0vClmOl+057zQps1e83buSPjIvtQnb8+g4zS50v4QDymM6kcSWySLKjQPNkAhCAj1A== 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 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM5PR12MB1354.namprd12.prod.outlook.com (2603:10b6:3:7a::17) 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:04 +0000 X-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:04 +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: [edk2-devel] [PATCH v9 15/46] OvmfPkg/VmgExitLib: Add support for CPUID NAE events Date: Fri, 5 Jun 2020 08:27:06 -0500 Message-Id: <2b2b229690e2a2422e35c9a4df0431085c76b1ca.1591363657.git.thomas.lendacky@amd.com> 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) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-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:28:03 +0000 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 575dcb21-ecd4-4587-e09b-08d80954469c X-MS-TrafficTypeDiagnostic: DM5PR12MB1354: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: mqt9npnNkWHI0/BJynbz0RSKSs8BawHPJFKSzjpVCnZtAfi9Aq8x7y01pCcD1juQhidlZ0cTstiiydIlSX7+UUz/8j6GYZlAFB3iS67/B8ateHs+TlCu0fHt6B71Ojle+/Uu8ePY+N1w5cNICiyXj2HWO7dY0ZN+gdur14uN6rTg0MqWCwM/bCV2JSh3+NgP9uOj7JM4B5fV6qnNDTIrlzdFQJBwZCcwaTdKn2Zc6wcZfaXpHPS3fvp2UAYEjSAdhZN3bSzLglQnw6ZWLSc6+/0lAAX1MMb/9STl3a0R/OGZ3/yZ5eSsPVvgNhHyY/lK8YDaP81Par/rst34FVDy0Rsg3iYWqGPK9sm+X2aBSxStkBY+jn9nfCPbsW7speMl5z4OghuwEAdLPGE8Uu+wrPndLoIhl4EqGLBvfLfMHVxPWdnQ/SgMJqLReotdpcZRdvIHbUie5VGlomiQxwOg9A== X-MS-Exchange-AntiSpam-MessageData: WApqi0rE+ZLZneBqp7vAljkYJ+zlLfYSjRa2EslY571fFXj2mB773rZMC2YQJDWXhO3Q9J0PFWrodJfUJz9T1qPgz8XVOsVQoblcIv2uQfYM+cYwne1xNcAQFChGbF7B5V0SBUV98l0e0WVrZrs4XZidsvHdCvWon9W25iNoFiRErDmxdCjmiOHSJxvt70ZmCDzp99UWOO0zLLDMZLUpqrP95gZcTGmdbguqe/HWMPZ08G4XCoDA6FAz1PNCCxAiqnJw8Hvbmo2XrHwSiCqWrTViNBRXtPkXYHARgln4geQKWcaAIW7LaEvgP6hsL4LEufR4PlKq8SZiRjpvrl+ouvi8cK8FGywEbg1Rg0sqO5KwHv7EuKN4H6mLwriC0S4d46R4QmwlI4QsgY8GVXSxnJhMQFHVznXwyHrvYyIZUZnihNaF9wOOWQ+i5KeIGPGubZ7eqThd7/7yRu4XNoXCYZjIq5D5Hynt9z6nEnvzTN4= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 575dcb21-ecd4-4587-e09b-08d80954469c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2020 13:28:04.1623 (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: 445c6EjNnNK8h8K4RxlxWkMkxFv6ZRbTYoLDJY6TklyUcV683KsnCJNgYRfBHgjLzjWcUuMiM+4OIPz1tbGBfA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1354 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,thomas.lendacky@amd.com X-Gm-Message-State: wVCSmPjzeLONwXLY6HRv7wolx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1591363689; bh=w2hlof/cJDq9sZVhwVRGA+lH9CCy2/MBB2M4mfhCeBI=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=DCZXbV6DVOOOmz7MRJ2Qp+S6jFBWae377ryzD3985ePlcnwKDJsOOe5GamYMroYACBH /uiCQM1uj8WgaW7l3JEaDtvTo7Thc0SzuEFV+uDUBK6L+fAXCeu4qFxxO4ilAxoX1VSlF ZI4EWyZ2CzWOQVLeLiVzhJXDaQvt6QdQy7E= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2198 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 (CPUID_EXTENDED_STATE) requires XCR0 to be supplied in the GHCB, so add support to issue the XGETBV instruction. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Acked-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c | 60 ++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c b/OvmfPkg/Librar= y/VmgExitLib/VmgExitVcHandler.c index b74b13045cfd..1e0b2bf399da 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c +++ b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c @@ -11,6 +11,7 @@ #include #include #include +#include #include =20 // @@ -597,6 +598,61 @@ IoioExit ( return 0; } =20 +/** + Handle a CPUID event. + + Use the VMGEXIT instruction to handle a CPUID event. + + @param[in, out] Ghcb Pointer to the Guest-Hypervisor Communi= cation + Block + @param[in, out] Regs x64 processor context + @param[in] InstructionData Instruction parsing context + + @return 0 Event handled successfully + @return Others New exception value to propagate + +**/ +STATIC +UINT64 +CpuidExit ( + IN OUT GHCB *Ghcb, + IN OUT EFI_SYSTEM_CONTEXT_X64 *Regs, + IN SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINT64 Status; + + Ghcb->SaveArea.Rax =3D Regs->Rax; + GhcbSetRegValid (Ghcb, GhcbRax); + Ghcb->SaveArea.Rcx =3D Regs->Rcx; + GhcbSetRegValid (Ghcb, GhcbRcx); + if (Regs->Rax =3D=3D CPUID_EXTENDED_STATE) { + IA32_CR4 Cr4; + + Cr4.UintN =3D AsmReadCr4 (); + Ghcb->SaveArea.XCr0 =3D (Cr4.Bits.OSXSAVE =3D=3D 1) ? AsmXGetBv (0) : = 1; + GhcbSetRegValid (Ghcb, GhcbXCr0); + } + + Status =3D VmgExit (Ghcb, SVM_EXIT_CPUID, 0, 0); + if (Status !=3D 0) { + return Status; + } + + if (!GhcbIsRegValid (Ghcb, GhcbRax) || + !GhcbIsRegValid (Ghcb, GhcbRbx) || + !GhcbIsRegValid (Ghcb, GhcbRcx) || + !GhcbIsRegValid (Ghcb, GhcbRdx)) { + return UnsupportedExit (Ghcb, Regs, InstructionData); + } + Regs->Rax =3D Ghcb->SaveArea.Rax; + Regs->Rbx =3D Ghcb->SaveArea.Rbx; + Regs->Rcx =3D Ghcb->SaveArea.Rcx; + Regs->Rdx =3D Ghcb->SaveArea.Rdx; + + return 0; +} + /** Handle a #VC exception. =20 @@ -641,6 +697,10 @@ VmgExitHandleVc ( =20 ExitCode =3D Regs->ExceptionData; switch (ExitCode) { + case SVM_EXIT_CPUID: + NaeExit =3D CpuidExit; + break; + case SVM_EXIT_IOIO_PROT: NaeExit =3D IoioExit; break; --=20 2.27.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#60785): https://edk2.groups.io/g/devel/message/60785 Mute This Topic: https://groups.io/mt/74692425/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-