From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.71]) by mx.groups.io with SMTP id smtpd.web11.1228.1585071688349182851 for ; Tue, 24 Mar 2020 10:41:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=sAQHr5jZ; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.244.71, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N6SlMoUEXRlE1ZNvTn6wtk937pUXFG1T2xZWAqScJLxqnswUFPpFuWP1Wtp5fxxYYeStIHjax+rSoyJkItABLbfcw4Z2/yJKNHI3NcMX8m3VRVF6B9EukN0Q2EkUBKb90d4AUa3cZhkGEQSe3i4NI4ZGsNU7cly6hSKMJCqmOTJYlZLAoupUikGdN02/q9pDLuZkYEkk0pGzJr04wVzgFBeakfTMAAkrwVRJ/VEN0y7sbJOSmodpl3RI5SVtMxtKJeM+M/zsr5oiURiWHWEA9ZlieqFua9fGxhi+JU5QKLDjCuReScHNlzaGrcOb+ZgcsS08W+F6S+rltbaW+Ke4yQ== 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=A0gL+27tK8J5tqENRzvsBcL5QM5Av5CYAd0wa/1wUFs=; b=B/bp3OlmpNNsnMnsKy9se8+6EOpBFaujrGK6kjyN+YQJRSkE1LuQE1a7kDJL3e/iW7Ve2ImOXpdV4KMHTA8uEMFCrv6FxLTH2A3udrAPi/3Y22f1Vcax6SWVUceTD+p6lZXBhuida8wPLBxPfpFZ6EdKGQuqih0TPLjmhBVhw4MpCUePC3VquNRbyBZXEf3BTfPlxumYej2cJi7Vwm/5A7+t0Y55/7lH+/gKrsYKF/MmU8fVoyj3+Pe4ZJ5qAECRvPNXObsYT+sHQm2ejWyWMbNjQC7RUrV7zDTk7YDy6Z5unz0Nyse84JXIXzCbWx1ol+qzEWf00UFxWTdnIBpxXQ== 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=A0gL+27tK8J5tqENRzvsBcL5QM5Av5CYAd0wa/1wUFs=; b=sAQHr5jZYbysXkBeiGpy3UUjdGwpu/5d3QTQmiWJuiglm2MKY32Y9QIkAnGZpphE73Q/Rk9ajHzxyDzsX2Y8WzGNoK6oo+hW1xhS/+YBiVf/WNWL3ce0dMz0Gxk24ZshTWNZ1tGcwS21a5rj0xyP4+jWUkbaYW7ICFH2iqt3npw= 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:27 +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:27 +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 18/42] UefiCpuPkg/CpuExceptionHandler: Add support for RDPMC NAE events Date: Tue, 24 Mar 2020 12:40:32 -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:26 +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: 305acabe-c125-4eee-73b1-08d7d01a9403 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: t4Ai9vG1viqTu+Hmyw6wszcdQvCaKWNEro7LNmKHbvmwndKWxIdAe2C2vOhm5dDGXJOFUXPV8n8KeKH8jaRkHrhmzcuLiBW+DIdvTv51DfZzUiBkSwE2lkYiDzo4NZQJLTVYbWKWHSJFqHm1H7tvd6CSiPH+pCidEiKjvOmhgr3BXgXPSIsEmEyqN5jdkyRKJl063aaoyCF4ihYDfyLJI8rO9DmZpiq1mKDQBuvhbWXK5nimQm4i4LQIoWuhElahvGNklKgJ9f3cCfp/S1rDG3tuyVfoeSMRN4FBWIjLKtJ01Q3dSNQI9rrIwBaNfUKiEVKDZBACtNqpNaK2IIQC81kVXwtjVAx/bdlhnT8VawRtdbmMoPzeLPyL4gIxronQh5CP3737IjEYNSNa5DBIiG+kqgUThVjHy1DVYhWsDFgYQWbttKPjE+q7fRuMUqMXGGDHUG6uCzmmHkDq1vNxFNDaHdtMgqO1olTuuSc53oHPca0BFpdXYH25lppTqgyGcMrm7GPjjd1q1YfMiy3T9YPOxrCD1p+aFgxHnqyL+GS2Pm6Iz4GDY0BX9Nm8fimCLjtUdyFMq8ec9KS9McAg/g== X-MS-Exchange-AntiSpam-MessageData: 5bgVr0cEyHutDPisfistRkQOHcIOHqEnHFe+5c+d+RRvg3yqtW1GK6dDXjd2Kowtc9eVWhY0VOIlxYrPU8DTjgDdz6cJuD9Gf3pX5DX7hdfQ5UK7Bnfck0mfdZELC3zOHhyoLIsoJZP8lJc8DAApIQ== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 305acabe-c125-4eee-73b1-08d7d01a9403 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2020 17:41:27.0324 (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: iOiVLKSpggcKF77xDgxMs9quW38qNVxZFF8qQnwSvmlPeJbcgSPmGp7S+ONRjHGfiozlpvP7Rm2KBIBJQqtlWA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3915 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2198 Under SEV-ES, a RDPMC 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 | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c index 9de04f6d31f6..ea67648d12ff 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c @@ -894,6 +894,34 @@ CpuidExit ( return 0; } +STATIC +UINT64 +RdpmcExit ( + GHCB *Ghcb, + EFI_SYSTEM_CONTEXT_X64 *Regs, + SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINT64 Status; + + Ghcb->SaveArea.Rcx = Regs->Rcx; + GhcbSetRegValid (Ghcb, GhcbRcx); + + Status = VmgExit (Ghcb, SvmExitRdpmc, 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; +} + STATIC UINT64 RdtscExit ( @@ -939,6 +967,10 @@ DoVcCommon ( NaeExit = RdtscExit; break; + case SvmExitRdpmc: + NaeExit = RdpmcExit; + break; + case SvmExitCpuid: NaeExit = CpuidExit; break; -- 2.17.1