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.70]) by mx.groups.io with SMTP id smtpd.web12.58132.1595863797883995085 for ; Mon, 27 Jul 2020 08:29:58 -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=1OZRtels; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.70.70, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZjAuQ7PSq3ea5CTQr+FHo3ZDspiutU0al1jK3iuxz+lzk7QsIXDQoBAAIN9RgBRLzDfZ4AyxoftRYmfqGQRf2PUyYGpji6xeZ3VMnoHntbGZ10qNlvvrzJQxNK0yJKTFbhVoF92qvG/hRz7oRGXoHgByA9i3LNShLhPwP/2q5oKR/3dRsmwcdY42L3/2oxjBA++HEa5qwIGpUMAAZ8z2PHcTdbrEO5KYwCfhO9tZEcgd8xaBel3oAg9BujZTVdYKXtsp0NPHjkQ48oIpeP+ovrLkH4335W6vHjoEAADwL6xhuvHM+1cTT85lFe3ZL9wOZWwdmrwWCNP+rCCByAvJvA== 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=4ovVcxdgW2M+goyz4Wril5Z4GVk0Gp8R9simGO5DPIA=; b=RLNl8rz40Of3VKV38SpO08gxeAhN1tTzdUGnbCmCKpHXqHy5G5fnJOIz9lY0Ga1Y/MEY26CqXjPyLEZwDwALzb0m+wX0q3FKL+DRJokm4uv1LbxjdoTHho92HEP4Ivuu6LmoKgZc6MM82hSZq2NR2LOq2IFReE01Adw9wqV8a8YoSvzbrSlUUv9pif8EullAc2ABoYLbGmfRHY6z9PpSjVyZNjpJkK1i9kTvEtCfybWzYryFKlL+yWY8TPy49gSDBjbcyl7nTA/uCfpZAH2TNE/dUX2+QpdkntV4VaxlbXGottspnY1JQYNzhsnGbkYi605vz0qI+ev6Y/FjSa9V5A== 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=4ovVcxdgW2M+goyz4Wril5Z4GVk0Gp8R9simGO5DPIA=; b=1OZRtelsmJVGfdGqL4h5cZqcoPbnaOdyQNHeNhgln9vf7qEMvd/Q/hUXSq0CpZOROxxfKKqYTyitqIQpI70nFrOrSbSoOHIphr6PxU/J/eU0v+++t1Csld+2JrmvZtb6JI8GzVSAj9UE2EzmZ8H/2HJSMiSL1qIv+DkSw2OPEyg= 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:56 +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:56 +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 25/46] OvmfPkg/VmgExitLib: Add support for MWAIT/MWAITX NAE events Date: Mon, 27 Jul 2020 10:26:06 -0500 Message-ID: <32a26ee284ebdd085a309fa934b5a8c3d69900e9.1595863587.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-ClientProxiedBy: DM6PR21CA0003.namprd21.prod.outlook.com (2603:10b6:5:174::13) 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 DM6PR21CA0003.namprd21.prod.outlook.com (2603:10b6:5:174::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3261.0 via Frontend Transport; Mon, 27 Jul 2020 15:29:55 +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: 4856e3d5-eef2-472d-19c7-08d83241eaa7 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: tTYaA153OOQorjB7syxgl0W5cZtfjc/Sz9s6loeRJ2YjN8MeU6qp9cUyNrOb5mL1OmlM282HUb/14E9cBvBCOYT6E8tRCbvMCOrTmdqgTR60cKgfkvcyravhiNBkh86VLgbE4N9Z2Yj/sLRcJDCNMonq9ORnIkgO623QSCFrF8X6pT1PPjgl/F5QiLxCE+IeRsFusSqgglcw0M0OEqfMcM7+VFxow4crwHW0X69QvSYrYl2RYXpNsdZBEEjIaDKn765Kjg+qOH9772ZRzN5qHnCo2CijH2CMJYcNDMtp2kOhaJInNY3KRdMyp1T03GosaO6iEWVCn1SmyU/yBgUhlrDK0Qv+TgjatXDiPi3Zinuc14CXNzrRDyH9mRDQ55FpchV63V8PFk9RQwTT7U9+rNHkkHtfC8eNEibjHWLv7C1RjYfZG9BJuE+9roCwmT2CFja+HuWqWLlaYktpnxVvqw== 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: 1jkidhd5hGGQNDv2zlUPRAo3GUJt1MM4FOaLFrO8n4X0E3ostbdm0yJHRZ5Zha2afVLq3kc1Sll9jJCV0Fkew/G4EAAiV1G7BxgM/p0rF+gNHljslkIXAdfhs7LzQxaZGGffIkWlWAew+Gt3Hk58AGZ3wjb6tt5J8FyHrhMBezo9ZO0PHfQC8arM6D7NbDzzQ5IGEUt/k+AVoZ2td4Kqgg6mgv32lJlnUoHTBOUlFbtQ19aveUQCNkCTLSQQXa2wbEodAVV6OQQuJEcBPBGXMr0927AGIom/Ji4oFSPN+buX+qGvWN7QUCvjOSymPkmpGzRQu2jovhVAMzzU+JVMiCrubN5EjOF569a7cszuZcZ4iOXUGkt0Q8CAy4Ni1F3nVg6xX4ORA6rS6FPKLao4BgU3Jy63+NYrjN+lDlWDu0QJ1hMdErQWEZQiVjAqZkDVnvFtgm+BgTaFdARhDfBmokFC2K1CkxLjGutdEjGyNt0= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4856e3d5-eef2-472d-19c7-08d83241eaa7 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:56.5347 (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: gxNc8/nEzm7paF383fh59QAnPM/wIj1cVvNARJvpW58ovIf+CntaY6Cv8EMvpxRErGHPiHBHS/HXZwYgNFJY/A== 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 MWAIT/MWAITX 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 | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c b/OvmfPkg/Librar= y/VmgExitLib/VmgExitVcHandler.c index fe08b1e0ff49..e70e0ef82f68 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c +++ b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c @@ -856,6 +856,38 @@ MmioExit ( return Status; } =20 +/** + Handle a MWAIT event. + + Use the VMGEXIT instruction to handle a MWAIT 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 +MwaitExit ( + IN OUT GHCB *Ghcb, + IN OUT EFI_SYSTEM_CONTEXT_X64 *Regs, + IN SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + DecodeModRm (Regs, InstructionData); + + Ghcb->SaveArea.Rax =3D Regs->Rax; + GhcbSetRegValid (Ghcb, GhcbRax); + Ghcb->SaveArea.Rcx =3D Regs->Rcx; + GhcbSetRegValid (Ghcb, GhcbRcx); + + return VmgExit (Ghcb, SVM_EXIT_MWAIT, 0, 0); +} + /** Handle a MONITOR event. =20 @@ -1532,6 +1564,10 @@ VmgExitHandleVc ( NaeExit =3D MonitorExit; break; =20 + case SVM_EXIT_MWAIT: + NaeExit =3D MwaitExit; + break; + case SVM_EXIT_NPF: NaeExit =3D MmioExit; break; --=20 2.27.0