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.47]) by mx.groups.io with SMTP id smtpd.web11.21093.1594737110379995715 for ; Tue, 14 Jul 2020 07:31:50 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=UDKajbr0; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.93.47, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RCcj0COhVneXc8ut1UDl8EuFIIlBehUjkIqss7FB3xuOClSVKc/Neikb8isk5uwlCRRZlFIHWNGfbkNi6tvUXU/1ccxFAXkJKmwjV99skmb4tfllU8n84EpK8BUOdvkDHaqstq/l4IQGvNuk8QEvVfyg+FOwXkRpI5d5+Xh0W246X1S4r1OqRWcvoqQ6h/YagErh9M7LwaV5NZpIFmBi0gjfisY2moZA0U41VufIs9b1zMIyi4ChCZ48ZtflDfH3K303UGna/79GrsbYQzJiuM1AAou1YHDtODVuqMIsJpboe2D1gY6WrOTNWgpp/wZQq5cys6LK5LvyCgczSr7UFA== 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=DefcxGXcet0YpbciDB6cqSIPAFoRtyFhEUPqxpHT3rE=; b=D0mwmt8Oy8745ByHzLQQsqUQ8WdK6zejbjR1XgYHHuPhWuwdu2SV5A/sVqj2VZLmtWgn+fIry6Ifv82C2XYXluQGHQNkVp0fu9M+gl5jdfxSUyg4xo8dOjLjVSt42erbPfNrJW3wCrZbQVGBTp8TFGpH78lN9kEThu3uphPz7UR2lpe8RSxyLxeP+g67VzS4IcfE7576FtJlPB8VO97caG27t65s/tlxKKvXEsQ4cWiRbCFv/glKGA+agwaR3x8odPKfY+EfKlJADAfJarA2/IBxrGqgFNbVaQXE7e9bp48Um/YSWiG0aCtMqIeyaDQhLpVArC1K0AV9RtW5wE7byA== 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=DefcxGXcet0YpbciDB6cqSIPAFoRtyFhEUPqxpHT3rE=; b=UDKajbr0dLYK/aPyAD/zNZULOOvCWzPj57Y465JzRMNRvtpk+QPACeJcp6g89LdmyySUrCZ0pyC/mTlqWH61/hlA3g+0Xr0c6ApnhHagQJBeVggv5QYhM1DikNHEp8xHOLbPFG8NYNlmlXvvIvb5S8Nt9Okpb5PNuO8bYkFVsSU= 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 DM6PR12MB3177.namprd12.prod.outlook.com (2603:10b6:5:187::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.22; Tue, 14 Jul 2020 14:31:48 +0000 Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::25ec:e6ba:197c:4eb0]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::25ec:e6ba:197c:4eb0%8]) with mapi id 15.20.3174.026; Tue, 14 Jul 2020 14:31:48 +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: [PATCH v10 15/46] OvmfPkg/VmgExitLib: Add support for CPUID NAE events Date: Tue, 14 Jul 2020 09:27:46 -0500 Message-ID: <6d0f22b47916200abf1690f87ff926f1ebcd5623.1594736896.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-ClientProxiedBy: SN6PR01CA0030.prod.exchangelabs.com (2603:10b6:805:b6::43) 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 SN6PR01CA0030.prod.exchangelabs.com (2603:10b6:805:b6::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.22 via Frontend Transport; Tue, 14 Jul 2020 14:31:47 +0000 X-Mailer: git-send-email 2.27.0 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 31545f1f-c194-4755-0b20-08d82802a447 X-MS-TrafficTypeDiagnostic: DM6PR12MB3177: 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: BCL:0; X-Microsoft-Antispam-Message-Info: PIEccOTly4iQzZ2Sp9q9ybxuk9rUlN2gVYy9cRkt+/xjhNoG9YRSVmCA1M6o5aXhZ6/c5eV8Zo2cYCmOLTwTXb2bNvzWEazEabAJN8wcCNNb53sDueN7OcmozBAUISHPoEDel2Z+KInQ0LwB5AWea5q9vy8K3b9DiHqVMNwwS+nMHMhzmju2y2VmEA/ZKJbv8nhNVHuG2q5/CT74j9iQBkdILC1JipJr8ugpcuwBi649M+4EeyZqm02ABb0sdC8q4HN3NVCk1n33NUoiCczET2wHbNNAsQM6azKlQA1FSDs3zoqgZUdGVEGZwIgpHr3tbesNDcHhEcyGBpsnhou3FzettJNLDLv+Piwp7zdUc1ufpwTccV97MpcCOOD565R+7KJxwWZV+7PexTYgWwHMD6LBt6iZoCSiOq3KieSWq+jeR/M11wDaKt659bYKx5tU5e9lkhveix3fFVDRumkksQ== 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)(396003)(39860400002)(136003)(346002)(366004)(376002)(86362001)(478600001)(8676002)(54906003)(6916009)(2906002)(8936002)(956004)(6486002)(2616005)(52116002)(966005)(7696005)(66946007)(4326008)(66476007)(186003)(66556008)(16526019)(26005)(83380400001)(5660300002)(316002)(36756003)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: ZCdDXvIU3y/uiXTzn4WZeF+pYUPmJWw7zzQQIPj2uRGOWZzmaAef26nEonxRKxnRIl0/Q1/cK7Jecpon90lKowIQXNKb10dj50MNybGYPY1uSk0uQnSeOsbTaHa45QOvSWz7+Mq+g4deeMyFHJqKWSLInO9EvYf6ED8ufBCFFNQljl9BHQ4yTgbYnehilRIZIVb7w5AuQZO1hjQBd5N2vMwXdNcNP27KwEitcJvlcjdRa+d4nDqRP7K0M/BNA+zttWM1vfp+WYyip7VDu8FbvYD79pHMIY0iO2+9qjbxoYROhfeQZSU0wGofBuUbt3s0bdMPRSaDGrz0hV3eIQdau7tR+Incl4rMcVXe2Z7/qEXqjuwTb1/b1MaAajyBrbK3hyFHK3M+i/FsV6F88VZNHL0sqBx2f9LuwZRHWAenJUsHt02DN00Z3wAAcuAiCtYip6OS5YSVYXsD9lGCdUFZhv4fkykuC37f4E/iC9a8efg= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 31545f1f-c194-4755-0b20-08d82802a447 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2020 14:31:48.6948 (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: I4aza2lB2TeabVHe6Qz9N/1ZIW//bvLmXPKYPI2Guy+pmaGZTZ2+74jRzBNWD+LMojP6BB0Iw7UXVnFi6Dk3Tg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3177 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable From: Tom Lendacky 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 b6ac3552894f..1c9c272a250e 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 + + @retval 0 Event handled successfully + @return 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