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.45]) by mx.groups.io with SMTP id smtpd.web10.1354.1585071691231708611 for ; Tue, 24 Mar 2020 10:41:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=s4DIigXN; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.243.45, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GDCqrsdveu5t2KjiubPj+fbuj1ZgxLRDucOmXJiAlRJG53joMin+cjsstLSQ+3xmaDw3xJZwUqzJwQcsPvPZ/iOkmErYLtnpmcys5ZVkihE3rcPRhVqGRmwzQnedgWtkGwTsZ8KGH/OFQPQaT2ryGIkDS+ucq140GqltOaho+mT4XqyAHOdni4szzqy1gjaaPBTHSYDLnN4x/lMBTcWulM76xeVqD6V+bsUHBB6cOCtgDDqWwZ5QMWEMFXjAf+EWXB9+KEDavwi1vRO3qwYOosP+Y51SxKj/tO4GgV2/be8obaniuoAY13ES+jLvgTM4UPFbUjn+wwqEm6gO3Q6oxg== 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=gQ9Q8wKAv2imCE/hSKBJfwPnpJH531wjoxXqf4kV02M=; b=RfEeftmPYjFl3QDHSqUXrcOJRw1x68ojbGvfQNtTJ08Fi8YjQaZu4WpV4KiEKuyY+KQ7byoHcTu4shGwrhVR4zndI9fKLr34YXZkbCTlpGml9Y3feLA/RSPHhzWaserKN6KjRis5HIGLxCX/nQTR9V73Gz3xX8E6yWf291W+yJGZdkHcOXEF6fWH/CQBCWtwiqVBJcX5XWF9TsAD0NKdP/eamk8F94Eh3ZGU0DrfzBovNcbtTR9qUL0kc9DvKqg8EG8h6tYQfvqultLB4o1MN6dN6Rinp16ajrdEwbh8f76AVF8r48xo72oOuJA/NgPVfnOM9OPJO4lljGuHF3dJAg== 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=gQ9Q8wKAv2imCE/hSKBJfwPnpJH531wjoxXqf4kV02M=; b=s4DIigXNytr0zVBcVGb2eToVOzj8FIeesI6F5G7jIlsvZpl8GfoN5ZQETXrVjUpzEPubUKc9fWim98KdeB6XrvYs4Dp89WJqKywHhWeg3Ny2N+3mB90nxk6eoI2a2y86w7APnm9obVYr3ZFbtfDqWe7z5h/uSBx2sVfAZJPtFZ8= 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:30 +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:30 +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 21/42] UefiCpuPkg/CpuExceptionHandler: Add support for RDTSCP NAE events Date: Tue, 24 Mar 2020 12:40:35 -0500 Message-Id: <648e40fb9da3877a8ee757a612deace29f460e95.1585071656.git.thomas.lendacky@amd.com> 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:29 +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: 97e8d07b-449f-42f0-4681-08d7d01a95d4 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: pSZ6gII/Xunki4DEo69o0u5aMItpkDrkxgR7o1kUCIOj0zp5vOB2NIhP3vuuDYc7fPlgmkOZ+U4FaGmeZI2GXoypXhH6u4aB4Q+/ZvZ/qnwD4fX7Jhh8NogmiONKvk1DaTvRAahWQsdV7kr1sgFrk5G5xr0RQoypCoHBGPITfBpDWAKAjWo8aZih4ar1OBCHvlwvHNBALafiFpV0OjFQU+KT+spOcWR1uhfTy57r2A8q/YvHVLaP6w7REJKDHMmXxT73Hw13/sOFAsfrhVVDa2f9LiHrUmFdJFpsMZpJDrvodUhpUSfQZOe4AO41DoUtx46IJRqKmHtEDRf0esWm8O4t+ZDkp5YtJwPhG8sAt4k4kX16cr3SRpWo3eDDvGwARf9hek1PaH/hT86Cvxbwsam1XcrjEREk09avR+i8Ml3tSd01U8o1SDEqw4wL1yaYK9JnW4WIIu6mh1qG63fW4Cy0pG4sZRw6iQjGZue5zYc0AsHVk06gCZWUzB9ZbOmXY74/j3a4O8Ul6+V4BzuBUIJlHdvKjL/AOe0G2YHC//BjDMGwV9sxTvmgLz6FDDgnFXmYSC/xfo/knrSQN81xWA== X-MS-Exchange-AntiSpam-MessageData: WuSlpsvfjfBSnZr2h1mukV8Ix4FjQTIouzbol0SyQVGrC27PfTn3QG8nxTcTFHUjP/h5SqoH1TX4AdcWN+VI/Zf5o4QBVJ54LQX/7Zp4W1XIktnaGOCvMyysVp5wARJVex9rUdYI1b77rbfEFd9IvQ== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97e8d07b-449f-42f0-4681-08d7d01a95d4 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2020 17:41:30.0576 (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: KqU1Od2uGmX1ge0ypXVLW6HZU/0A6QbU/g5N7SYqQ8tjo0UR6D1A9EohMwAo+TEYTsswP1mN8LGG0SgpEsSbOg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3915 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2198 Under SEV-ES, a RDTSCP 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 | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c index 7b57229a770c..fcd4738b2915 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c @@ -609,6 +609,35 @@ WbinvdExit ( return 0; } +STATIC +UINT64 +RdtscpExit ( + GHCB *Ghcb, + EFI_SYSTEM_CONTEXT_X64 *Regs, + SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINT64 Status; + + DecodeModRm (Regs, InstructionData); + + Status = VmgExit (Ghcb, SvmExitRdtscp, 0, 0); + if (Status) { + return Status; + } + + if (!GhcbIsRegValid (Ghcb, GhcbRax) || + !GhcbIsRegValid (Ghcb, GhcbRcx) || + !GhcbIsRegValid (Ghcb, GhcbRdx)) { + return UnsupportedExit (Ghcb, Regs, InstructionData); + } + Regs->Rax = Ghcb->SaveArea.Rax; + Regs->Rcx = Ghcb->SaveArea.Rcx; + Regs->Rdx = Ghcb->SaveArea.Rdx; + + return 0; +} + STATIC UINT64 VmmCallExit ( @@ -1039,6 +1068,10 @@ DoVcCommon ( NaeExit = VmmCallExit; break; + case SvmExitRdtscp: + NaeExit = RdtscpExit; + break; + case SvmExitWbinvd: NaeExit = WbinvdExit; break; -- 2.17.1