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.66]) by mx.groups.io with SMTP id smtpd.web09.725.1583190468155458029 for ; Mon, 02 Mar 2020 15:07:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=wgGo1Kp0; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.93.66, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NxXZPaORR+c7vN1g7WoIxcQOdX1MdCBKs1txG3pO9WxxpQSKFjs9wa/4PwnikjaEPnEg+uTybnvYowyamsB+GRFN6MsRS4Ky4Dop6p3RWFgTlDcbCK6curoEHnzc39pi4412etcl/aCxQzrVYM21sZmGG63EJnJBei9wdhWRAbWLFW+v5g7lUjcCpPWJ4u8fWWZC7I9jzgdhATbGWp2F9vAiZfwugwcRqy+bqlHsmuY8crIfgCe3ucCQ+erK3D5JWVnmcOkDzDX5nAI6WCvLNfXE+2Ixs2huC9KjQG18asdiSJ9uBPtUC/KlGNBYW1atZkdQy67J2z2kvCo1oNRMmg== 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=DFr179rZTNQ5IQ9i/ClWFD4wLb8YinN6EtgxP8x1C00=; b=ejgUB9uFugz6QzMvSHYxr5ko+S4hssvICh9PYvFTzd2ph3qyBoFG4StfxCAsL574/R3C3vv09Zq/1QokL8HAkKNqCUj3xvvPO1ZBIH8XvMBWUwwYhNU/OzpIDZwRbBgxGoxLiLomqZIUiMboLz42BwJZx7nyOUDh87t8EBYrP4A/f8wIYwwEa8ggvCxqpSdAYV/04a5hA+r+JR18tz189Wo8j6XpFHap3sl0WUTNUwu1wbKJeurVpHNbVTh0jguIuviaZxEw2Ss2o2hHi9B8GrBG6elPgIyiztZ2kQxPR2SM/g7W7JlggC6VXtzQDMUfWwz3HTEThEQUbW2dSu/R8A== 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=DFr179rZTNQ5IQ9i/ClWFD4wLb8YinN6EtgxP8x1C00=; b=wgGo1Kp0n7xn+XaVn++gi8/r5MXVkbxjaWTpPhKgix1EPH9SktAV2Nw7wuBWJVynM7d2r7iTJhb3hlA8/92o8aOYSe5fd2eJGi6KkXS91o7aTWTQV1nOWspmN1UK3vIg9+1s16ZPZOPqx6X96gcV+AjgFfCi1nTT3nQBd3pwFsQ= 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:47 +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:47 +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 19/42] UefiCpuPkg/CpuExceptionHandler: Add support for INVD NAE events Date: Mon, 2 Mar 2020 17:06:50 -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:46 +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: 9d37d866-9a0c-42a0-e1e8-08d7befe85aa 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: OVeMAAcuYEfOdOn/pR23tFG5FQOcHV4/Tg1gcdMv29by3BAOSJqRYiBLr/b1l4OzlqUpREq3gMPsPVtWoKE1HrXWp/0Dkq59OSt6Sjx9nc8pXGJY2TEvHMbVFONK54nAJ6UdpLy1b0rUSOdgLNFXeDBd195sFRVo9xieQi1IdLXEAhKIzTQv186Bph1RSIKEQAvbJYXXKE+4kJvW+9eg81VoIgXp5Pv2mwz0bSKg+G5iNciX9gamr7lc/gwf+zLKEDnD/4qumrZ4KYrKvr//Myss2Aa3CpBOBP6sKRnH0SSzzORFiB93ceJbeP0gDIvcX2DM7N+KQl1VojafYdPeKAA1Z9/+WFqNNEnkJqBRiWPLhIw1haPv1Cx5yyxhHii67y1cFI5VPr1yvdXC52jQGhLwh5WSPP4zAraoOTSScCpRdCyZVllKIMMlqISr6TnQqnCWcCsj4kUTIikb2w2oLuNWxmRcT9eFY6P6fQNfzQZtBLU+aO/VmmctjyTWwRD5u+z2B/LNjvIU8Q4paeVFCQ== X-MS-Exchange-AntiSpam-MessageData: 3youiCTrzliPhSshN1m64zPi/5Wo90LrAh3fXjaIkLuZG2vqIF+So6A6BpvNjl+YIJrcc09ozvA7fINFYBkPdNSDM0xi+CQMzdQZN+q72epuBFBuGaNC0m0PDkW1YQoQYhRJ0y50QQ4Zy7FYv9yNfw== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d37d866-9a0c-42a0-e1e8-08d7befe85aa X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2020 23:07:47.1642 (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: /RLUi8Fla7kT/IK9+0rYmaPu+qkSWFf+EAJuaLIB5aE3JOPnT1UPGIJI7AC0ddj+oiB2iJfcQNlKG5HzSWr6kw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4041 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2198 Under SEV-ES, a INVD 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 | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c index 595ef0fa066b..a0dd5e2adcc9 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c @@ -856,6 +856,24 @@ IoioExit ( return 0; } +STATIC +UINT64 +InvdExit ( + GHCB *Ghcb, + EFI_SYSTEM_CONTEXT_X64 *Regs, + SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINT64 Status; + + Status = VmgExit (Ghcb, SvmExitInvd, 0, 0); + if (Status) { + return Status; + } + + return 0; +} + STATIC UINT64 CpuidExit ( @@ -975,6 +993,10 @@ DoVcCommon ( NaeExit = CpuidExit; break; + case SvmExitInvd: + NaeExit = InvdExit; + break; + case SvmExitIoioProt: NaeExit = IoioExit; break; -- 2.17.1