From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (NAM11-CO1-obe.outbound.protection.outlook.com [40.107.220.79]) by mx.groups.io with SMTP id smtpd.web10.9804.1597325144311501756 for ; Thu, 13 Aug 2020 06:25:44 -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=b//X/chW; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.220.79, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CHyAU8S90+NjqayPXidiwPX+lfi6LanMeEN4uxC9eVng2Xz24ERQkdJ6JYyM46o+z7F8Kn+Uogz0iLhEXdwosPxrzbQ3yI0r+6CtaZjCcaAMFa5gxJyHYROg6LjBaAkUbpE/zIbjTnLOlSZvqw/v6ke6PLi4rQDhrde4PL5QZPZEplI9RRFWEdZ9PZAA82df63dEvGFpu/rWJtBekQT/ZuLiPtjON3ug1Cfj2RWmANOZMf2O0sYrF0WzqPPJ5ySiAVGiYtqpCJXIe01lqFZ2sakZ47NHQGH2okTclBAjSf5HYqgq4W/tjfJy9nCluWZ/ZAzwUwK4SvGpxc3eCQJwJA== 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=rhlXNPIALud4T1J2Rhd3DmjVS9A8fuU+/kAJKARwgUw=; b=QPfvSc2dBUO68fc28E6trO3daD1muVdT7enPD2IVJ9pD9Zlvo5OtfxHsB395ITMa/tZ2CbG/hZ1+MR+kN4uq/l4+Z5Wb3qcbJBHI+o44Mut46Hyvk75EVi3WfkSCrhBkohjAlm6nGN4zM9OB/omgzYi9LR0fYR1ArGoWnN6HUS6Q69DN26pTm+3kflUrKdINfSn8LLAmCwMySXij8OouuvjpQJJqWz9yXoM9jUKK2mXJBsdm9V4H9l7JAhPd82F4qgK9Ie8p3uRpKOgAGf1VzTY02d+KFy/INYPqB8phCZQUi7ghqwMIMJtx0riTe2EeH7s66Olr5YIQMazdbhGTMw== 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=rhlXNPIALud4T1J2Rhd3DmjVS9A8fuU+/kAJKARwgUw=; b=b//X/chW6n4NgBMpXsVg4zAcf1QhZGHe0ZDCOaVjg43honkt2pjVhglW3CuFhxUNJAGFcN5bfy4fwDJoxdOOnbh/O1K7EFW6CpXnhOwqPmw7kF3Dm/Kr6TF8Qyt11HerjybmXYPrOyrqZOYvKqzDg+T5988U55Yviw7y9FpD7Lw= 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 DM5PR1201MB0026.namprd12.prod.outlook.com (2603:10b6:4:52::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3261.20; Thu, 13 Aug 2020 13:25:43 +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.3261.025; Thu, 13 Aug 2020 13:25:43 +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 v15 15/46] OvmfPkg/VmgExitLib: Add support for CPUID NAE events Date: Thu, 13 Aug 2020 08:23:02 -0500 Message-ID: X-Mailer: git-send-email 2.28.0 In-Reply-To: References: X-ClientProxiedBy: DM5PR15CA0048.namprd15.prod.outlook.com (2603:10b6:4:4b::34) 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 DM5PR15CA0048.namprd15.prod.outlook.com (2603:10b6:4:4b::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.16 via Frontend Transport; Thu, 13 Aug 2020 13:25:42 +0000 X-Mailer: git-send-email 2.28.0 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 2b594168-55bb-4d71-8973-08d83f8c60d1 X-MS-TrafficTypeDiagnostic: DM5PR1201MB0026: 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: IkhS/4yqVdFOq6JNuysh/TiosHx4GMsb/K1fsx7iKVF65fetErENdPS6OPkcGoH1JRIdr1RR14mULupWLdjsMvvedmFGanESDEusC0ipCqjbJRgik3kP3repTGItXcQ9UTnDNrow/EwdVeIHV7U/ESxFujY2UKHJpVLkgdBR5c5n9mpDZb0aJ5FeDjcSrsOsAoDYSXxRdqzcJtdQ2JKhnMCT5RbE5nd9iPU/Y5piHy+pe07Z1A+QnV7CMd5LvJTAx1Wg5ffRwwvE4xxo4NTZmfE8gv38Rku9nwLvDNzGBF/DLBNYT1+MRBcrmtxSa5wXaCqbhtdXwA3PfF3HPCgFu9i6aQz1PEMhaa16XNyQ2KdozXnhkOUuL5M7bQTMPGHaIFcIHS3nYzduYGI9VWL3GToRKEndk4jcaL/dhXQGGqaTKsMXBv0JSxUDMayf2MEyPZ9vt8hLak2EbzciaT1Z6A== 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)(376002)(136003)(346002)(396003)(366004)(39860400002)(316002)(8936002)(5660300002)(83380400001)(54906003)(8676002)(6486002)(2906002)(6666004)(6916009)(956004)(2616005)(4326008)(66476007)(26005)(52116002)(7696005)(66556008)(16526019)(36756003)(966005)(478600001)(66946007)(86362001)(186003)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: fXtwJNCh2Dvnw3Bd63y9orXW9KqgASb+YM0SqqJsKfRtaKZ34Fc9zBqXTDud3nUbIpGRr+KhD/7+xt3Z2fq3j14GFV9vGzTgAH+uH5oySq3/j44e5K1MVs7g9n15sJdL2RPhcWnTzSLv4KZGWQAPthPI7Hm5/wORcO16qN6UtjItH69ph2n94/EueQEaeq/0CNlEqX7S1nqNkTf99Vx+mvKiQi6D7uBrvKUEhj5LnEzM5wTztbrGBu7TYXSySWzMAFB+jCMqM6MUHljShbPX780gdeyTv6t8cX4huSxv3QbCJcYVRO6v4QEhmSTqOlO7f2HkXfbTt3LdWUVF8EBBpHDv6WElqFWWM5/3Yy6lYc64tvPlcRYJk6jLLXhnVtyCoUsGjgaXtRUznhoAHC+SQwHgI002Z+4JslQN5CZee48hl4u75riBiLs5cO46aSv5wMUiyfKPNArlicFDg1hHWQs3hr3pAhChGVS6Pr9t7E93Lb7k9qSYfMucH02rGQaiznTSCz1D2Z/TjbWs4G4St6fvC1e3PNPw8xedNY6AG5VqtgHxY5iT0N9WE8atL2WtLolDsb5/dk6GO/LQP2n2dC/DRXyNC47PkwHPdHVEairARE1gADZJ8fbVX864+H7e+qE2GM+T/iYie6co2c75fg== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b594168-55bb-4d71-8973-08d83f8c60d1 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2020 13:25:42.8869 (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: K54J7RWf0lW5r/cfNloATyYrcR6oeXWkr1s7itIsw+co9676IGHPhpSdd2OShhmQEZe7g8yjaxD51SgTGSnTqg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1201MB0026 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 bc2e270a7ce8..476e94ce5fb7 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.28.0