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.41]) by mx.groups.io with SMTP id smtpd.web11.692.1583190469882102946 for ; Mon, 02 Mar 2020 15:07:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=Ik3QIls9; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.93.41, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Px6WbliewGizRftxgOZLpED+m37Ixs0m+MN89JGAa7mlfJ/1LCm598lU66o/XS4FTQpV7XtWivj5UteaTmequPn2X7yi9g8iapevWIR3NVq+EVZv8viEaQ94Em9DufHtQgIUU90qWBpdbJOY0/al9G4hPWsayINx9v4RwjCL7Osb0tP8IVVpdqqeQdcjvrmq1qhk14yUMGPbK8ZtoivSJszMHFjIGFbPqvcmBO00CGS7/ZFOYuRbBqGJ2a5mQWEPJ30i+BQKU4HmqDKGJaQflVR6kfg/feUCQmCi6xg5y6ENVGjrrN5/9LK2dOZ0dMES2K2d14OZNQthnAKDLbvb4g== 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=mqnLKKIRXGA2NN6qiGGt4yubeJJ5QELu3VOYNqgYxB8=; b=fqGCdfOL4+wyHz/j1GJT06xrgqg92DuaJxi+8cAOu55pPTyMa/XK+go0O+Vl5XVwsTXjI/zm41Eq3+AKOaHpVD/9/DdEqpYwJqTr7qVk0xP2ah2bbrGEbrxsJ1uVhro5ap+or5knaCsg2klS02mt12dc6IE2tZ6Mkg4mwkcW+8QMEjv+LGiPyJ8XOeJGeKzjOuz5KR5EBXJ/YigFuNUdDZMaLwgSup9L8zdZfDYf4zI55FNtwz9QAszz624jno2mrCwRqvhHmr1MQ+5nWYlcKLENIAsmJ/1pl7hEpVDjZhDXi4ZdU1nsGC+eqxLa5mlX8mA7n14NtZtWRWrHC1+tAw== 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=mqnLKKIRXGA2NN6qiGGt4yubeJJ5QELu3VOYNqgYxB8=; b=Ik3QIls93cpXeim0wc0rLKiAYBoTz+9BUZXP3nzTW4NEHqikOKkqjkw1Afdb1J6kE4H0PK+VFwi7pHqciUEj24NDgE5ez9Ne2DYf4n5lJzlM/ca4fkZWcgEdN+v32jUhnVbma5ngxmgKtxPP+y9pXoXmfLZUnY8+KJu/5MFy9B8= 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 DM6PR12MB4041.namprd12.prod.outlook.com (2603:10b6:5:210::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2772.15; Mon, 2 Mar 2020 23:07:48 +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.2772.019; Mon, 2 Mar 2020 23:07:48 +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 v5 21/42] UefiCpuPkg/CpuExceptionHandler: Add support for RDTSCP NAE events Date: Mon, 2 Mar 2020 17:06:52 -0600 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: DM5PR2001CA0013.namprd20.prod.outlook.com (2603:10b6:4:16::23) 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 DM5PR2001CA0013.namprd20.prod.outlook.com (2603:10b6:4:16::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2772.16 via Frontend Transport; Mon, 2 Mar 2020 23:07:48 +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: e1acd954-f0ae-4bcd-4555-08d7befe86a7 X-MS-TrafficTypeDiagnostic: DM6PR12MB4041:|DM6PR12MB4041: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2000; X-Forefront-PRVS: 033054F29A X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4636009)(376002)(39860400002)(366004)(346002)(396003)(136003)(199004)(189003)(478600001)(86362001)(5660300002)(81156014)(36756003)(6916009)(316002)(4326008)(54906003)(2906002)(6486002)(8936002)(81166006)(8676002)(966005)(956004)(2616005)(6666004)(66476007)(66556008)(7696005)(52116002)(19627235002)(66946007)(186003)(26005)(16526019);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR12MB4041;H:DM6PR12MB3163.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; 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: 0Xx0+Zn9v9mEWA45iePe8FprjH1JqCo7zy20WqDkwqg/Jamb1ex5ua/nSHrIuAT2lWLDl+lqueyKf1Q1aKmdIIGyQ9uqScPG8HvzOxFP95EOvdE4hsMhsQ5ifjTpViqLKt6xX0Tczvm5nCj5eMcJf1SKw2/pICVMsDZZTqL88aS5fEkBx8r/RSkYR97IdSCAbTnqLgBxeaIyP8/PAyy6fm9+IBw5R5NM0cOTpFP2aBjgKzAkW7nTPM0Z1PCbC89PhErfTzOb0UAvp3DWqJRE0QawYomocS4CinDG4SdTo9o8Nc7+8vm6GGu0NiB+cCl8U7b82+6+PfPBk685QacVWxZaneLIkXpAU9YUBzTSdmrTTmNp2kLaQHhI1hfyaMelmbuYSPEmKn0Heqc6SwHp93L4AUC5bfjnDsOUXOmG2xWz3Ai84pDIb9MZXjjxjrP5TiLae8CXsJ3p0PrgeKRahglPTJRwrg4SR5JwyLARqcudavsXVW10BIscQE/sZmxeMQYkMLrdyLcQVFq7a8AObw== X-MS-Exchange-AntiSpam-MessageData: Em4nQR13a8gnuXJv0bCZlk71wVAHgs8plltfegUY41cOdUqwJNzlOvFZBrLsFZ1tO6g4zlx6jtKvI7jCuiHO3P/Z64Nqjxa3Dju6IDlLJuReLfydyyzqJjUaoKI3owqWpX7ztWzs7zyto83V6ZYWPA== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1acd954-f0ae-4bcd-4555-08d7befe86a7 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2020 23:07:48.8822 (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: sP2mc8XToy0q1+0xnSa15t7lRBj1s/WEm9IQPgqWdOBYAnnNRURopoRy8CcV5TwuK4uJ00x33rIV/HNghmBbAg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4041 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 354d027f08f3..0a27ade69310 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