From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com [40.107.243.68]) by mx.groups.io with SMTP id smtpd.web10.1350.1585071687534951620 for ; Tue, 24 Mar 2020 10:41:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=iGzhASVV; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.243.68, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NHXGPhzTKCcWBsY8FwhjyZy7mDooH4pnzt9ns8fgB8NDOFVvkXlHg5GK8i+Ha0AIO85qeTrEc1oUkQXIIx1iuZ6SBFCK3Ec93bkeiTBpW1xSyKE94uXXqAdpI2SM/W2md7l+uDrq6RPXutjfXGyIjTuc0KzhlRMpkPqNYOUbdUC9H+3AGgR077OVbHAntf9v1b9moKt/uao6UeH1HWo43kDL8qpOeK172PLkFjLcQ0OaMP6rOOmoYUWUCNhYqwVzbqy8+K6l0O2t9viAVDDEg9UBf04pBOY4tNU9P9PAZOSwT1WynKqV2dRiwcRyQMxccYTw4ELvuuFbqeIHz0X9GA== 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=pBvl0cVKmnzxEn7WhRAQB88pvIROneHoIyEVOYbVxfE=; b=QS8cOHBfZEYfA1mx5p5chPMjAhR74YHDbYc/ndz9teoH5b4LbZLRhkjfGUOj/Ke91qi9emE+Bwtb5d3TsgkZcg1Y+4aTdjdC81FYyKTNiB29J60XcpTGOtI1j7G+k6q6LnR4YeBEVZNgmOQbj1iVdCvlqdQ9V2/YWX+cHsgIPPnBwuFBe4bhLPlChu+8J75Z/PRn9Ctt1VMGWoXFj29Gz4ZA26o5sKpq5CskoTDsCFBeHF54oTGbKOJktUYQ6gDyR3YZVMom3VgMiwz4euYUkc0G+3RRsYf8uBQhIY4cO+rGc28w+kxEMXIbUJXTaYrAm4TTgPRfs7QI6mBWUOhy8A== 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=pBvl0cVKmnzxEn7WhRAQB88pvIROneHoIyEVOYbVxfE=; b=iGzhASVVNwYxSwvnWbQ5Ko5VHFcNhdQ5/IJcGPAE8Ki7dSfkq0mIFaZvkAhCX4TYEjV4RxpW6Qp9tBKYwEnSxp2SsnOTgzsSexuCqPtTvei1AsLpNxajaF46Ro55wPUXnFiUc+h7jR/DKDk4ZOoxlSg38PlwJ4HM6qr1bU2z/gE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; Received: from DM6PR12MB3163.namprd12.prod.outlook.com (2603:10b6:5:15e::26) by DM6PR12MB3915.namprd12.prod.outlook.com (2603:10b6:5:1c4::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2835.22; Tue, 24 Mar 2020 17:41:26 +0000 Received: from DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::f0f9:a88f:f840:2733]) by DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::f0f9:a88f:f840:2733%7]) with mapi id 15.20.2835.023; Tue, 24 Mar 2020 17:41:26 +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 v6 17/42] UefiCpuPkg/CpuExceptionHandler: Add support for RDTSC NAE events Date: Tue, 24 Mar 2020 12:40:31 -0500 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: DM5PR06CA0025.namprd06.prod.outlook.com (2603:10b6:3:5d::11) To DM6PR12MB3163.namprd12.prod.outlook.com (2603:10b6:5:15e::26) 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 DM5PR06CA0025.namprd06.prod.outlook.com (2603:10b6:3:5d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2835.19 via Frontend Transport; Tue, 24 Mar 2020 17:41:25 +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: 6379ec0e-5b0f-4156-10de-08d7d01a9378 X-MS-TrafficTypeDiagnostic: DM6PR12MB3915:|DM6PR12MB3915: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2000; X-Forefront-PRVS: 03524FBD26 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4636009)(376002)(366004)(346002)(136003)(396003)(39860400002)(8676002)(8936002)(186003)(316002)(54906003)(16526019)(956004)(66476007)(36756003)(6486002)(19627235002)(66946007)(6916009)(66556008)(2616005)(26005)(4326008)(966005)(81156014)(478600001)(81166006)(5660300002)(2906002)(6666004)(7696005)(52116002)(86362001)(136400200001);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR12MB3915;H:DM6PR12MB3163.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords; 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: RHl5drPG61GuRX8L1z0WvpQK82I9bE1rDLmA2Lu92+1VUVz0APYw1SOvVUNaAdaapBfD1QY/nassJ6/nWNt216jyNDFOTNizWbhCReybmSdGPjpjlF6gPSL/jJw5Ryd4yZKMSpEzLjLnTMZe0wTocLL5mDBoeihjkVq0ALhyMWdvJOzqcO2PMPNptb1LYbqRpnpdi0LlKMIJSVLpR2owLlYNQSuPtZZoajU5F2kILt/st4YY0eZnjn8+o3voO/xMoUNES4c167WXOZxuf685kDo4f/hs6S4WgLn6DdEu9lRusifYZY/C+GSYoHeOJQemXCcT8G05Ro5M6wxpiGFcOsXdsK1toWzxXQgyEgsR2PfledThOXeRePxaMWi9QLe8D+oMlnd3Ae4cbb+UX5KynQ9mTwtcmdbKiA/YpmJvk4/KDYT91WtSdhXW+GR9p6vkxDD2y0qAnaxOMzMNUtK+bCtTa6pKca896JYFonFRYc47KFy6eT1DpDEAP0lg4okCVJGReRX2nYARM1YIiMZgIdmLZvxRXUNUoaQZRSrk+MVgw+jK8k2Lpg12Fs267DaNwaWhKT0Kd/tcLB/ompfEYQ== X-MS-Exchange-AntiSpam-MessageData: 5qV3YUMsORYfWogVmeLAYlAJTZAcIxVH2h8/s8AonYvrgEqzppdz4/J/8oUCw7Pnjq9oI5hSK0h80d32CaLWvGPjNC3FG9L6gCrCPVAuXnUhx4Vbyrzb16IFUVXuTbGGUQYijGZZaUPmTjMomcg2lg== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6379ec0e-5b0f-4156-10de-08d7d01a9378 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2020 17:41:26.0339 (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: lmC75bQRCKYC7+CBTdKJEuq3WlI5uj7hnnpcAuGB0Rtd3aNWq2KsnwXSUJAcYns3Wb1iBWj3nIFjAT2VHVgLbA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3915 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2198 Under SEV-ES, a RDTSC intercept generates a #VC exception. VMGEXIT must be used to allow the hypervisor to handle this intercept. Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Signed-off-by: Tom Lendacky --- .../X64/ArchAMDSevVcHandler.c | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c index 55e18c47921e..9de04f6d31f6 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c @@ -894,6 +894,31 @@ CpuidExit ( return 0; } +STATIC +UINT64 +RdtscExit ( + GHCB *Ghcb, + EFI_SYSTEM_CONTEXT_X64 *Regs, + SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINT64 Status; + + Status = VmgExit (Ghcb, SvmExitRdtsc, 0, 0); + if (Status) { + return Status; + } + + if (!GhcbIsRegValid (Ghcb, GhcbRax) || + !GhcbIsRegValid (Ghcb, GhcbRdx)) { + return UnsupportedExit (Ghcb, Regs, InstructionData); + } + Regs->Rax = Ghcb->SaveArea.Rax; + Regs->Rdx = Ghcb->SaveArea.Rdx; + + return 0; +} + UINTN DoVcCommon ( GHCB *Ghcb, @@ -910,6 +935,10 @@ DoVcCommon ( ExitCode = Regs->ExceptionData; switch (ExitCode) { + case SvmExitRdtsc: + NaeExit = RdtscExit; + break; + case SvmExitCpuid: NaeExit = CpuidExit; break; -- 2.17.1