From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM04-SN1-obe.outbound.protection.outlook.com (NAM04-SN1-obe.outbound.protection.outlook.com [40.107.70.45]) by mx.groups.io with SMTP id smtpd.web11.58122.1595863745938667268 for ; Mon, 27 Jul 2020 08:29:06 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=uCIs2bUh; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.70.45, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WGAcU2XM5hyhD7dfT46zuOEsDQc9wdE8vmHVSL/ef4HFnFwyvOgOvw5PhfwIQ1/IMUzU9kMKDxI+SxElGgifB2NMGxnB65IMR6b24HgYVfknHZfEPYIOoOKIyXKZsMylGF+Jj+KIIq02zjLeENBjztD+R2JGbBMSrIvVm6xFqr23OD5D9utpSnLAo5P6KItzO9kMXSL2C0m9DkDA5Vueg4KcQr/HZpli6+AKSu5P3/JoJAnH/iyNubuN+rKVTOTLRBl6Ft+RSkh6AiOZxzfgALe6uA+iKdy+INQ+z1aZBRuzva0kx5jUXqLQyJWg4kPBXsohzZ4oXq9bYugpCSWYlw== 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=crbmyZ65afRC34Vt1/yjGXXSEbQgatvY+leMn0es1AI=; b=gvaA6Tkaocl6mfvYY90aY04HBnYYawb3vYEx7VzXklK9zSMamMMcR/zSa6Wka8B7xm8KwHET9ZMUN1XoDPsY2tP2iRrFtFNnDi+cxzgG/TGT5SaQ2OAZML4vDnJjEMjY6agu+SdXUsn2pRdYbkerNjhQUU3m6c694bE2ImkVjquYBO6BHJ/9DxTmEktRJegvqJrBdVlfuYP/a9Jl99QPXV1CQu6bktHzVu/G8GWr6WtemhnE44XhV7JvIB0ii29K8FpnRPEwN8lYarIkCZ4BNxAjn/A+VndQ9R4JPP4DJFzUgEyhaC2FB3EmtPOiYrFc+h+A3DbpQROweSF3Acm4ow== 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=crbmyZ65afRC34Vt1/yjGXXSEbQgatvY+leMn0es1AI=; b=uCIs2bUhfIwoVI96Wm2mVPquf51cdA4HOZg/fKJSd2p9zfMtT8XanVpJwekJS1JrD9A3emU7dGkMhuWNTn25lK0bCPjq4sWVO6WvFde9YQhF2Mt/PHuBY/Obn5WigxpWhPe8BWRnVbtJCyDjEWYTZ5TEOsX+93bSzgnY5cI/GwM= 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 DM5PR12MB1163.namprd12.prod.outlook.com (2603:10b6:3:7a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.25; Mon, 27 Jul 2020 15:29:02 +0000 Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::25ec:e6ba:197c:4eb0]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::25ec:e6ba:197c:4eb0%8]) with mapi id 15.20.3216.031; Mon, 27 Jul 2020 15:29:02 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Ard Biesheuvel , Eric Dong , Jordan Justen , Laszlo Ersek , Liming Gao , Michael D Kinney , Ray Ni Subject: [PATCH v12 18/46] OvmfPkg/VmgExitLib: Add support for WBINVD NAE events Date: Mon, 27 Jul 2020 10:25:59 -0500 Message-ID: <16b66c1895c3dc572afe86656e6bcf866ddd8b8f.1595863587.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-ClientProxiedBy: DM5PR13CA0048.namprd13.prod.outlook.com (2603:10b6:3:7b::34) 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 DM5PR13CA0048.namprd13.prod.outlook.com (2603:10b6:3:7b::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.9 via Frontend Transport; Mon, 27 Jul 2020 15:29:02 +0000 X-Mailer: git-send-email 2.27.0 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 1f627b86-a317-4196-19e9-08d83241ca98 X-MS-TrafficTypeDiagnostic: DM5PR12MB1163: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1UIfRt36NHaaRRPxuEg8WixWdOmm6n9clBigQ9AxLYLVYhNyOZBRuA5nwIcXWMeyNYTClRyhU+38mlrYjVlDRhF5O0zZrn0EDq0CKsNK0ub8pIDNoZj51+YyZi+3gPkdK7Hs9yZsm7hs+Qit9LZkVrRmAz7xviBETY/DhUgn/A64ABh93mtk+ME+q5OlsWc7phfCR3Ywra4kygx58abCjU4JTWFMrFT+63UJ0Bcst3JEI2zz7zNvKK+80PzLhyYXFxSdYMEZdPYmn31sVpbr+7SQW/BO4gVPie3TA8MVG/My9dsEfP4GGo5VO6fIfcTC8DnZabRmdGipDDeDL973SKzFpvZLXXyEUDIMNWJA1jWll0ha/k0IJHSTlhLppAxrbwfmRKHfwzbeUTnOjZhViat0SCZmbs+1x//5GDYqtmXI77I5IPejGm2+fLDztM9hYM+2+MK7/I6WWU0oQRe4/g== 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)(346002)(396003)(136003)(366004)(26005)(7696005)(16526019)(52116002)(186003)(66946007)(2616005)(66556008)(316002)(36756003)(956004)(966005)(5660300002)(66476007)(54906003)(6666004)(478600001)(2906002)(4326008)(6486002)(8676002)(8936002)(6916009)(83380400001)(86362001)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: qw+XSvVZ0jwMUMmGxwl4qrfy1QyqMBlAd3pUMOIf2AoMGl2DTiDJWejh33EoFFFA6BXPJw/568AG0lO4Wb3R17d7T5zecvivDr4mg0J6PMCLau/S+EcItb0/LTcbHahlKgfKzV8Fls7MbVyAHktwKvQuY+Zl5yP3P9VOl40Jj3wF1F+P4A19Bx1xMpcRsNmF5zGEbUxc8fXjDraFOYJLIGMSYjaTDZYEKxxZrX4hiLi2Dxb1ykjd4wMMtq++VCVRxbMMNcmTQIDWfF7r7n2DJWbOxP7rc2EtaF2wz6ZtvHpp3mTRB0Tf663ZCupveY0TizNjHHlu1L6gUuHgWv20FEUKG3A3icpkGm3jxzD6OG/xM2S1gGwWKYzpeLnFp/1hCKdd7u/HXJvQs46n4eMMQp1gA0hM/5dPdK+eHsvYeqIb7EgO75iV1XZgxMmL8+GQMAZSWDXgyLECv3g0twDbo4M8m/qoOrN8jSvK3LbGqSQ= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f627b86-a317-4196-19e9-08d83241ca98 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jul 2020 15:29:02.7663 (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: zL8SWRrSek97ZTY+5Q8HsJIrwcZxbqqnzfokLWO4A1TR2K4BjvD+V38iC/dj3F6pGpL560yxc/XokgsCIpbTgA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1163 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable From: Tom Lendacky BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2198 Under SEV-ES, a WBINVD 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 Acked-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c b/OvmfPkg/Librar= y/VmgExitLib/VmgExitVcHandler.c index 0e502ac14819..bf07f960e380 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c +++ b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c @@ -856,6 +856,31 @@ MmioExit ( return Status; } =20 +/** + Handle a WBINVD event. + + Use the VMGEXIT instruction to handle a WBINVD event. + + @param[in, out] Ghcb Pointer to the Guest-Hypervisor Communi= cation + Block + @param[in, out] Regs x64 processor context + @param[in] InstructionData Instruction parsing context + + @retval 0 Event handled successfully + @return New exception value to propagate + +**/ +STATIC +UINT64 +WbinvdExit ( + IN OUT GHCB *Ghcb, + IN OUT EFI_SYSTEM_CONTEXT_X64 *Regs, + IN SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + return VmgExit (Ghcb, SVM_EXIT_WBINVD, 0, 0); +} + /** Handle an MSR event. =20 @@ -1252,6 +1277,10 @@ VmgExitHandleVc ( NaeExit =3D MsrExit; break; =20 + case SVM_EXIT_WBINVD: + NaeExit =3D WbinvdExit; + break; + case SVM_EXIT_NPF: NaeExit =3D MmioExit; break; --=20 2.27.0