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.67]) by mx.groups.io with SMTP id smtpd.web12.4233.1596829339556035071 for ; Fri, 07 Aug 2020 12:42:19 -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=rjBmwrXh; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.92.67, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nod3w68v297Bq1C8HVneuQcLRzyvnkol4sqoV1fj6oiV20eRixBsZ8xGw0Xb1LgkSwnYvzos1miFTntJ1Pbhrb6glkaJSXYMp+PkkxPiJj+jjXGwHkl4KUj48afHp+/c/TSiXFq0wAuIUa3x4qem6fcqcIGMDAZUKc3bADXzXFNq7ggBo2JHpjrWWPEZiJdl5IQCTgXD5OlLV5VLzdfB/TxTpEuKX8dVPewrZ8XMMeNpKnwfE+IOxFmzTfx4dOzRE2+QS3izgVU0Q89cGgMFDMY5UDxgFV+hDZbqSkNyAW4WsZaGobL8vxqM7JVyHm2blp5pmklY9ozI/st+iHA+4A== 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=d00K2p9wGq3eOi/6hoKeg0U80JcDhc9VJVDfMfmKMog=; b=USgsM8Rl6EpLJ5c3s6M+GM0VgGXdhMjbZpC0I9bDPHiZ0ahlIH3abU2/D+6neC0kAXNe7VupCc5nkNCiz9HR6zqtgPkm5WHAilJoa6n8vVcoB1GK8rxPscB24UdPWseMaBNsnSsyZH8mmMWidLNn6KuzMDt4tCOLDtr6vi2CZL56EghPxNJGfcz4S4B8y/iP7rAq4UyZ/AirIaQ1KR87Eygv6ut3D4upcsMw/8E6LTC0mBsdThQVGYHeE04S6WQASn4JR32OTwx7GKuUujsPHWvHwmgdsRFv9tOBr4psjID0jWRSwHGN6xXrCXcLNci/PnjiZwqQaAynA9zMtNfveg== 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=d00K2p9wGq3eOi/6hoKeg0U80JcDhc9VJVDfMfmKMog=; b=rjBmwrXhjAU+hj2wzO5QV9lQKo98U1K+ha2L//GnEjBDD35ZcA+g6zKbLWO3qIqYoZvtkIdFdGUEaNNvpI2NsiKUcAMLE3FzOiC8vHnIaxRCflatN0Yj72S0UNHsXDtowfvkVNEvQpWaA5g1LXN5doMebX4igrUUChpFNNrVpJ4= 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 CY4PR12MB1352.namprd12.prod.outlook.com (2603:10b6:903:3a::13) by CY4PR12MB1798.namprd12.prod.outlook.com (2603:10b6:903:11a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3261.19; Fri, 7 Aug 2020 19:42:17 +0000 Received: from CY4PR12MB1352.namprd12.prod.outlook.com ([fe80::9181:78bf:bf0:702b]) by CY4PR12MB1352.namprd12.prod.outlook.com ([fe80::9181:78bf:bf0:702b%5]) with mapi id 15.20.3239.024; Fri, 7 Aug 2020 19:42:17 +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 v14 19/46] OvmfPkg/VmgExitLib: Add support for RDTSC NAE events Date: Fri, 7 Aug 2020 14:39:04 -0500 Message-ID: <5f68d178f0e64a8ba3994faff8ef66bc26a3ec58.1596829170.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-ClientProxiedBy: DM5PR06CA0093.namprd06.prod.outlook.com (2603:10b6:3:4::31) To CY4PR12MB1352.namprd12.prod.outlook.com (2603:10b6:903:3a::13) 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 DM5PR06CA0093.namprd06.prod.outlook.com (2603:10b6:3:4::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3261.19 via Frontend Transport; Fri, 7 Aug 2020 19:42:17 +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: 1ad58a6c-6593-4768-30c7-08d83b09fe12 X-MS-TrafficTypeDiagnostic: CY4PR12MB1798: 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: dshebcWVuV8EANWcSSN6MXNzO0jzT0dPVt7JGUgy4qxtofTjjMUaCbEokHWuVI2rM7qt5pv+K6IiDvekGDs5IsUegwA5YYWFulIDsQJThiHFOnNG7yLu7fYnKbc9RAuuY9Z/ncqX2kzzUE9NdidyeyEqDP+o/+DYHwXCdRmNL0aW86xo3dT3XwwYTzPz0N4u5ZdXhltfPsVNcqrM0XUF3kk1IbQjFoHcbmrsS6cYrUSrijz0wGPhlGMsMjDQSzoU0OJVxVh9AyH/IRKCbjFKNGUUcLsqKcjS48keI7J6QzBctH6Zp8sONDOOELNRPyrYesn7CCVgcGZPsCwQk2VpQTQ7suTOyluRwP2jtiswCABpuUgK9VDfPiDtB0et9URh7JHkoaE6VjIcRSr87xLy6HylaUGmaY8cYHOYzVsgo+h/TpBrMIs8I9UgMYaOwoVqPG1OueTMkPU8/qwYrGl7lw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CY4PR12MB1352.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(376002)(136003)(366004)(39860400002)(346002)(396003)(4326008)(66946007)(6486002)(2906002)(66556008)(66476007)(5660300002)(966005)(478600001)(8676002)(7696005)(26005)(8936002)(16526019)(186003)(86362001)(956004)(6916009)(36756003)(2616005)(6666004)(52116002)(316002)(54906003)(83380400001)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: QhrZv5k4BZtmXNN0p1LlTU3Ub+w9Wg41hXPckCy0Txg+3WqjDmIgo/3LMdE02aiSBqWKQF46clrik3+VBVirz6OkhxsfkdlXVG1itNPmyX6kfcZ7nNrCl3FVxX8iax7JtdS+Yb5bUEbdG6w04lYqJQXA57AKyjlcr7DBNkFE83Eb2C5Zd2H1k3CFwS0QahXLfiW+7sRAu2UboxkrPPfC18S91C9eo5Jlh8zaErlFnRdmq3Zm77/WLfd5eKESKSX2Ky6ybbDESu30PNuBtm3MYBpgWw2Mg4egljRmWUrKrCUVN77KwOKqWrTApH9imi61RPlxgqVza+V/wH9s2UVV8GinImrFXvzdaGrtgyFaARSXZhoEfHpCcUN0frdXJ+1W6ibHoRMOvLrvTnPpJQlTKWJfO6APtRhfTGYHEi6wh16DSmiRx0OWhpI9eg4uBN1Dfib6Ol89MPTdzeeP6gEWaMnQLy7UMDQ6t7WKSh0tQlO5MYZ7Z6zYXEtwk0kJTkghj5SXArPFRXKr9Rbpv1a0lTNp0QUBp84UnD7GBZZymJgOLQXvPrktKNn1S0K3aGykYnHLa/LFPrvK9bqFzPirDu4vwGGu0kZo787k9FRoaYQ9vxASiBFz9pI64S9kMTV/GnCqRG+YPL3ofBV3hK3pug== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1ad58a6c-6593-4768-30c7-08d83b09fe12 X-MS-Exchange-CrossTenant-AuthSource: CY4PR12MB1352.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2020 19:42:17.8213 (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: XBui/cpXwwuzceytSJALmyKfmgRk6F1thm5biGz3mz1oDear6/F4xXu03BOe3441LOvCsStMBqC486sAODUcTA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1798 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 RDTSC intercept generates a #VC exception. VMGEXIT must be used to allow the hypervisor to handle this intercept. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Acked-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c b/OvmfPkg/Librar= y/VmgExitLib/VmgExitVcHandler.c index bf07f960e380..65af57046063 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c +++ b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c @@ -1221,6 +1221,45 @@ CpuidExit ( return 0; } =20 +/** + Handle a RDTSC event. + + Use the VMGEXIT instruction to handle a RDTSC 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 +RdtscExit ( + IN OUT GHCB *Ghcb, + IN OUT EFI_SYSTEM_CONTEXT_X64 *Regs, + IN SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINT64 Status; + + Status =3D VmgExit (Ghcb, SVM_EXIT_RDTSC, 0, 0); + if (Status !=3D 0) { + return Status; + } + + if (!GhcbIsRegValid (Ghcb, GhcbRax) || + !GhcbIsRegValid (Ghcb, GhcbRdx)) { + return UnsupportedExit (Ghcb, Regs, InstructionData); + } + Regs->Rax =3D Ghcb->SaveArea.Rax; + Regs->Rdx =3D Ghcb->SaveArea.Rdx; + + return 0; +} + /** Handle a #VC exception. =20 @@ -1265,6 +1304,10 @@ VmgExitHandleVc ( =20 ExitCode =3D Regs->ExceptionData; switch (ExitCode) { + case SVM_EXIT_RDTSC: + NaeExit =3D RdtscExit; + break; + case SVM_EXIT_CPUID: NaeExit =3D CpuidExit; break; --=20 2.27.0