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.web09.724.1583190467344265849 for ; Mon, 02 Mar 2020 15:07:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=YX9el6ZM; 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=gqHx4ydW9YlFUctpjCJq27A4Mz+JbLHFd8gNLHl9gGd7ibEtWm/BNGFbc3Ddqc9fYv1BDpq7pADpczkYv+Mq1s8MPA6tsiXZwwHVtsBC9P7+F41mj35AfkL68F6MEO6DZi52DjLzXp+91E461AKRqjqC4UZTNyG65OYT5TNziX7Gtb9EtEKyfMvbEViCy+XllYC7Ya+GQ5x5f2f4TR9dOXCbAAew7GsoVJLxMoG6udB9wIfqPjZC5oPOPIbjQxFpgGNbKzohwJAqN/BY/NEL9kMjfv+dUIXRMPez12LTzR7i/Lpu3wyLMY+ItEM/o0gWNpkfw7Kwmwb+swJ8GNPeCw== 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=l/c9Z7J3IWirOW6Cgp2/fR8mays5Q9rgaT55WyEBICE=; b=RoKwh4tRDVyg9i8tt2qcZPva2zWIvd9vw4rNS2tWsktrh08/+WgjTiUbZRYGSBXcVr9tgRmFatWoHCXpg42HCBkh5HFxTiXCxVkRegHtNxSqq3C/UiUHYxCBDTv62iJ+ybRmIy+8+7XAaM+wYXFSecF9utTyustzSaXx8r73O8cypO+XQP2CTdGGoFfCv1otptZOQZFmFS5AWyii0/N8Wxw2Okm06mxB2EzMhCOmF+bSBKemruTeeViCB+WZHEKTfomUsRRMLt18GO8XeWFqwhxk8ZcK/ye3VNCZj+7MZIlQZKlrkvb4jNPIqapBauVnvhXqx+4DgA0pWZEnGujkrw== 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=l/c9Z7J3IWirOW6Cgp2/fR8mays5Q9rgaT55WyEBICE=; b=YX9el6ZMZ/IBr9eJxBhlKSyOzP1OI4JRzmJiVNcTS/+HGwhqhJiwA3e6NOFSKOvylI8M84cpZOy/yjpd5sM8KygPX8jZ+KBBoNlSB6OXIF8n+xwMccSNrsIWhXLblJ9XInJe/8Hq3u598o5NMXzDDfKokHmYV0Ib8e8eAgBxydI= 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:46 +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:46 +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 18/42] UefiCpuPkg/CpuExceptionHandler: Add support for RDPMC NAE events Date: Mon, 2 Mar 2020 17:06:49 -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:45 +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: ce566c3f-ea44-4322-64f9-08d7befe8522 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)(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: d18eAjuB8UEWsyS9TG6DDQvk79S7YkD15XbVq/oTOmRWrnE3zca0m8kSAfiDzrZJ2hoUjIm+oYiLYBvabVfgeWOXqqbKHH0f1YSKOJZBQrVQ9Fvg6AEXpEqXLfWpPkh4WrKlhMqeNHc2TRCCLlSbcWJUorze7/CgRXk3G6bZbjPJR6LIxYfYF8/aQebnTG6VSFVmHbUPv/Yej1/YWMH9j4uR+msHK6Cy/QEp1B2XiN0gx3Vt+CFiTqJsKif1MHOyiZ6SjMvH3hGpraAPD+qSx4zqflQkrfo12Z1r/k57FE7bBsCoP8njg3LPaSMmlFpdEmz5WOPJwHciLFdgUV4AnkCKo1MBEjRtlcQBxr5byKNd8tRSB/9NsO3R/+CHIO1dFgEE3CHahndsieanzXqvcw2/gZcxVkc2rH6QhqD4uB1F8IWPAOufyV+CvYJTCc8VKlQskLCb7BcZdg/ykXtpYzRBmqjxQLya+rtueF5UBQvgQ9zW3QAr8yr7X3WoWXzaBWKCW+cIU9I+lp0rPT/RQw== X-MS-Exchange-AntiSpam-MessageData: JSpdk89M0weZVgmhpWX4FJ0KkREH7kMi7EMGlL8xVKZyettiKEctRxW/7WXxVfqlanrA//zeqeUIvM8PBh/U08P0GXiUvqJ61QCMz8Uj5rocf7YoJ5ywewWMWYx84Y32OybvzedjgE2lMRYX1hheIg== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: ce566c3f-ea44-4322-64f9-08d7befe8522 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2020 23:07:46.2537 (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: RfjrJBqs+WOLCXkLEI7EbdGpAUrCSPxC61ene3FhHuMSzqTBdt72aMGu5pgnFj8Be35heLHNon0a7PGjxk7j9Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4041 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 82f42d905068..595ef0fa066b 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