From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (NAM11-DM6-obe.outbound.protection.outlook.com [40.107.223.69]) by mx.groups.io with SMTP id smtpd.web10.923.1589925112403000242 for ; Tue, 19 May 2020 14:51:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=fuIL7Pmh; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.223.69, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cFBkzqiCSfveMLAvSemFkr2rA9AlR/tdJPG1T6IZGnvGeAez03gsKYFnSxQG1mF7ESwgENduAzCaPB4ZgqFqrZWInaeJB7VYUDemLRwduQvbVNAXr9zMjRF5WLuaZxBQR1+wKfF3C6XhL+qQvaFSYouel0CpIX+JU+x4HzbLFFppWY/fsLTon2KmqTsuV3Aeg70zmKqaiGP8kfZ3UtKjBBL3PCKe0lQLn/o7PynU55i+di7wH5NJd0Xjj1UxH/7VG2yusmJ99DKVmqkStIvPDjVZkM0/NP/Tt7FP5kBfWCBabAr6Jzuoj0DtCgV+rCyRSc17BdT0mjEzhRgOIZzkVA== 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=taMMfOYuYl8YDRQPYa3HOJxw4YrqSGuNefbBhcXxYNI=; b=NdZaIYztyntgU7ckSvcCRjxckAMihtI9qE1cNUFn6ho917mmX9PihrwgxxbO0rSaSWKamd+9zoe2CZiI7zDR4hBqvLm7b4rAI7DmDCxgTQ3KlFjAO66HKS+Ta2I9EJ7h1Dwx5uznh4EqHyCAgQjHqngltwmKExPVf0oIDEcgtSo4dzZ88N3F/G94GFY10R3P+OAJzHG84r61h0mY1ZxmH0Z9ANSlBV7zhq3uDT0AzYdvAZ1Le+XhuGf5fVIp+SEUtkT62XnZ3aBoKG2hWeFBItyj5kmEEa0mxWf87iuS9Lf25NiW0+BC/DSd8nmiH9gizFx1hzGO74hK9ZrZjGPtsg== 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=taMMfOYuYl8YDRQPYa3HOJxw4YrqSGuNefbBhcXxYNI=; b=fuIL7PmhrmyHK0R2upeTIdKscYhsVxJGLLR5e9DyISmjcCQyBoaCbmaik0Sjxkmg+hWheA3G1NpkU1CWrhAOUanr4cLJ/lgi4INy9ubDtmEBvsYtGponXs1KTJMPU2zThtod4CzM9mLBxHvdQhzG//zQ+3alGpp068FQStfBqhY= Authentication-Results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=amd.com; Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM5PR12MB2504.namprd12.prod.outlook.com (2603:10b6:4:b5::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.20; Tue, 19 May 2020 21:51:51 +0000 Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4ce1:9947:9681:c8b1]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4ce1:9947:9681:c8b1%10]) with mapi id 15.20.3000.034; Tue, 19 May 2020 21:51:50 +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 , Ard Biesheuvel Subject: [PATCH v8 21/46] OvmfPkg/VmgExitLib: Add support for INVD NAE events Date: Tue, 19 May 2020 16:50:49 -0500 Message-Id: <2649c46e37aa68b17ba5af83ee4cad225ce0d47b.1589925074.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: DM6PR11CA0048.namprd11.prod.outlook.com (2603:10b6:5:14c::25) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) 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 DM6PR11CA0048.namprd11.prod.outlook.com (2603:10b6:5:14c::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.25 via Frontend Transport; Tue, 19 May 2020 21:51:50 +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: a6e02d8c-ecd1-4eab-1f09-08d7fc3ed624 X-MS-TrafficTypeDiagnostic: DM5PR12MB2504: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-Forefront-PRVS: 040866B734 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1GbcmO+BPmwWECczkD2vT6mbVCKnAKIIGT+kOh/VPjXIjqmi9C5QBMcDJRuX3P/TdlJlGgesvGY6q/m7whpgFTAUw8nZbwKN530+EEFgBi+KtTws2DMZm7NZKx5jbUDeLIoszVI0ZWlvs1ZHgVpd6XFnzP05nKfxzrOw3RWNnelfDHLk8clUHAYNJ6NEL9+bCXPpEFzXTEDtpZC4GUF6lahqX/K6elU3nWx3jGpP80g5D7F8xgxGeYZzXZSkN8833ieycxcVn74wwlUjaODLaFnAwo8CtebFhkWVDdU1JXNWyVVYaBFaXxlMyH2RIU5BSDkonYkLoLCX19S2XhRHklBNyCOS93o603ThpVFqDW8FF4+jKYd7wBpF9xgaj2z/N8IaqI81CqeuqB16N/KKhOnPzpjjinvA44y9pn1lIKrFOuinzB2YeiKp+CT0KKHQRfGDmj6qEsNqBFmmi2+aCj/dPojT5vY97VYnp4+pauqZ8b6mruE3AIzmPfLL4wl+wj4akuJ3gk+eT+aTBhxGFoGLqU94hQrx/BRKrPQeCSYcB/LATk+KOEGE3dZ6Wy7+N/qbgdYguHFBL66AZQK0Iw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR12MB1355.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(376002)(39860400002)(136003)(346002)(396003)(366004)(316002)(86362001)(2906002)(54906003)(7696005)(52116002)(2616005)(956004)(66946007)(66476007)(19627235002)(66556008)(36756003)(26005)(16526019)(186003)(4326008)(8676002)(5660300002)(966005)(6486002)(8936002)(6916009)(478600001)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: tm2xO32JsjHDUud8DhBdSj98pUqdMm9zqIXv1eOuRyCjRXhuRFI1HoFvMMcUO8RnGUwS1TFa9YuzRNyyHNgpmbw+cQbONGmapS8t7fAxHFrvILyCSzvisvvK5opuRKrx3lYdEwaMBqGwGK8BxrIEBuO7OyWkqdZsBYlPzu1PnUHXT8f5RTdgzDzdiy8iybJy2drp2Nh2bTzu+X4I0hFRF9DpPOOMAlNI64+unck07mCJdGfsZzZARiPokRocNbBoHnN+jQLDhWINXDkcx38SxIgFvLjF4YR7lWsrXF+t6R17xMTb0yft4fVGVGoDL3idsiqQy/6QngzkjsQBwxicggSDy8oujBIFdyDfe5lkE3K7D1fGwxi+PgFh/1iWivDXCgZsWT9XXQmnnzRpkspiViL8xIeh3RS5JrQxUKUke+YRJJf3KIWjgbfY4RFTJjpDMLhCxqPS6njZr0xbkVpXvLfhiONFql7AyuHtqWPssTQ= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6e02d8c-ecd1-4eab-1f09-08d7fc3ed624 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2020 21:51:50.8627 (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: SHfv6q8yT/iSo+5K49KiqJ5SUNMaTqYkLxDNgRX+sEDVruBovTGT6DUF6a1z2RhVTahIkb2dukyVSpc9VAVE1g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2504 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: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Signed-off-by: Tom Lendacky --- .../Library/VmgExitLib/X64/VmgExitVcHandler.c | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/OvmfPkg/Library/VmgExitLib/X64/VmgExitVcHandler.c b/OvmfPkg/Library/VmgExitLib/X64/VmgExitVcHandler.c index d6b35b3019c3..0b7f24fd962c 100644 --- a/OvmfPkg/Library/VmgExitLib/X64/VmgExitVcHandler.c +++ b/OvmfPkg/Library/VmgExitLib/X64/VmgExitVcHandler.c @@ -1162,6 +1162,38 @@ IoioExit ( return 0; } +/** + Handle a INVD event. + + Use the VMGEXIT instruction to handle a INVD 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 +InvdExit ( + IN OUT GHCB *Ghcb, + IN OUT EFI_SYSTEM_CONTEXT_X64 *Regs, + IN SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINT64 Status; + + Status = VmgExit (Ghcb, SVM_EXIT_INVD, 0, 0); + if (Status) { + return Status; + } + + return 0; +} + /** Handle a CPUID event. @@ -1351,6 +1383,10 @@ VmgExitHandleVc ( NaeExit = CpuidExit; break; + case SVM_EXIT_INVD: + NaeExit = InvdExit; + break; + case SVM_EXIT_IOIO_PROT: NaeExit = IoioExit; break; -- 2.17.1