From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.63]) by mx.groups.io with SMTP id smtpd.web11.478.1587577357012350279 for ; Wed, 22 Apr 2020 10:42:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=e4oAapBe; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.93.63, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iF4sqyW5KQhHPemtXJ85K3DH9O3rIZ+ah8jVvX1853rxnUCkG9s0n3SA8ckvNQBDEjqkAQkXTH3mhhSWcKT+HrUAt7L00WybfmjQxhIOH+pTTQnS3lAPLS98AmHfW3d42RA62Vi9ABmkLX1IMdHYtHQ1ki/mvRMFCfpVpJPoRjTw12HyiPkBu8dRq751GzfxN88mfbWY0wO/m16fgvyrsJlHEbkkTQEVko24SYYaRI+vNwRl0xUpRw5cw6rd1qcuhEPD7rnVl2VuuuevdX7pWA+/9LEV+Zzb6JlcqVSVD9X/H/2FIeCdi7kznqS2lhN2yif1Pysu/dwM00ZQtJxH+A== 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=KxZY8jrh0jkkXCh+FXEJ4FaUndAGYRRF4V7hCqAf0Cc=; b=QsHTSk8kD+dGIJVv37lc1JGpz/r3lEHSA/yTucIDQq5oCsskRf9bk3hvCbKFrnTcU/lVLS7ckLUhzGuoNpGA3IQ8vAOShllBdqeSf+hlGf4WJ4NNx5H4WLhXu3pggJjDT1G5TB4vEi9q8t6xI/MY+9Ix91YQoBwyNX9SSA/pEUXH3Uutl4usFCXjhQg+T6FQteLV6iI3cBnQnQwGtOW4boXvdBifTVbY0oA+n9s5sYkVKiW3ecIsqDGOFCW0wfgubrwnzuf/wYg+HqZq00AJJE5DOZ6F6+XKid/MvKMiHRK0NbFZrRtAig4dSqjZTwKkEX+DgDHzr37uJLRxnIj6dg== 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=KxZY8jrh0jkkXCh+FXEJ4FaUndAGYRRF4V7hCqAf0Cc=; b=e4oAapBeKkkMUUr4GkHlMM+qL/twUSiMXgrlfzDX+B0oc1nKbgvDCHYKnuiUZvyhC4nOaH4zYc8uuT9aQxp2DnL3Ncu3XSwGMt2prrEE6o51hOigX85sti/awjcllB7TT69RcVh+xTXyOCr4Ukt4rCVLIdixfRDtsJuE9v4xgcY= 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 DM6PR12MB4580.namprd12.prod.outlook.com (2603:10b6:5:2a8::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.29; Wed, 22 Apr 2020 17:42:35 +0000 Received: from DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::9ae:cb95:c925:d5bf]) by DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::9ae:cb95:c925:d5bf%4]) with mapi id 15.20.2921.030; Wed, 22 Apr 2020 17:42:35 +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 v7 19/43] UefiCpuPkg/CpuExceptionHandler: Add support for RDPMC NAE events Date: Wed, 22 Apr 2020 12:41:34 -0500 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: DM5PR04CA0060.namprd04.prod.outlook.com (2603:10b6:3:ef::22) 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 DM5PR04CA0060.namprd04.prod.outlook.com (2603:10b6:3:ef::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Wed, 22 Apr 2020 17:42:34 +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: 21447a2e-978f-4f6e-b394-08d7e6e48ab5 X-MS-TrafficTypeDiagnostic: DM6PR12MB4580:|DM6PR12MB4580: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-Forefront-PRVS: 03818C953D X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR12MB3163.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(10009020)(4636009)(376002)(136003)(346002)(39860400002)(366004)(396003)(36756003)(8676002)(6916009)(186003)(86362001)(8936002)(81156014)(4326008)(54906003)(52116002)(7696005)(966005)(2906002)(16526019)(316002)(478600001)(66476007)(19627235002)(6486002)(2616005)(26005)(956004)(66946007)(66556008)(5660300002)(136400200001);DIR:OUT;SFP:1101; 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: QB54JxipR9QDN3u9XZeiqFFlcufCEKyXDNDsPUt4LNN+Mb37kKmaatQ3zZNmvY9qBsEZLoXuPmltteR3b8bFPLLNJ/23ZPG5GJIXnwPU8A0feuddIKMeXbYb4KEqoWEIjruYTW/JYcbsn3jq+HrnhlfvF61z9jMUejP4xvBV5cfGojNM+nwFAGr0kMvI4SMYheeZNQw8/ynWxtulouHBpte2QnVRZJE6lsgGfxhoSW1QX48jEsZMtcBeu8C9LoCaPohhuaNhiH9gZZudbmg4+yG9B0q1ID59ZeW2y7wm0sSb7d1LJ3VyU3WY0awd2tDvI4nK8L+U+p5GpzD0DQa8NuGrPWTLY0WYmOrArc7Ar8j3QZu04uYnzouMhxg8/xN6n7Pl+4+NLAJpDla2FBfj20hklZD/46LAGaFmtPT/K7CyNwMFw+FlhKV4XUB2++SMCF9r8ZvtiXzB40GE/j9xZvybJ7CJoFBrTTFflyBGEU3CYq8vxZ3PzCDZqQ/DgQg7vr3RJkXKHgOD/1wtEaJZKFXABCNe8Dezy1PFhXTZUP+B6bz9WxAHZS07kXrqkvsOXQIM+JoxiI72cV+v5MpGGg== X-MS-Exchange-AntiSpam-MessageData: fM9VfFL5s6kmoh8/MLG2BIioGMdKy5mlKIbLWRV22+++EMvYNNJo27L0m2V3pEhsFPEnYmXOBH7kfwjFo7/1Re/sZkb25ZBO1L5Nb4cmoybVttR1KydPXB0J/UgeKhcJAtdR6YZ5+TtaqWINZTZhbA== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21447a2e-978f-4f6e-b394-08d7e6e48ab5 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2020 17:42:35.7636 (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: i/zhB1+tE0s2MpDVik0rgFUAC5zOBblEpzdJHAoyY+2safXuTeJHg45g5BQy3IKLzUPoBMDmUyU1BKsWgYtjsg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4580 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 | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c index edd868c584a6..64db5eef128f 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c @@ -1207,6 +1207,48 @@ CpuidExit ( return 0; } +/** + Handle a RDPMC event. + + Use the VMGEXIT instruction to handle a RDPMC event. + + @param[in, out] Ghcb Pointer to the Guest-Hypervisor Communication + Block + @param[in, out] Regs x64 processor context + @param[in] InstructionData Instruction parsing context + + @retval 0 Event handled successfully + @retval Others New exception value to propagate + +**/ +STATIC +UINT64 +RdpmcExit ( + IN OUT GHCB *Ghcb, + IN OUT EFI_SYSTEM_CONTEXT_X64 *Regs, + IN 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; +} + /** Handle a RDTSC event. @@ -1280,6 +1322,10 @@ DoVcCommon ( NaeExit = RdtscExit; break; + case SvmExitRdpmc: + NaeExit = RdpmcExit; + break; + case SvmExitCpuid: NaeExit = CpuidExit; break; -- 2.17.1