From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (NAM10-BN7-obe.outbound.protection.outlook.com [40.107.92.80]) by mx.groups.io with SMTP id smtpd.web12.9769.1597325221772745554 for ; Thu, 13 Aug 2020 06:27:02 -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=Sw4mXzyv; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.92.80, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DOblADb8RRvtzQged9UWvJZD3T36vL6hhqylylb+UwREXvMcopkf66VHrrOAomEFnLKOH5fQnTmiChMYBXLmHcDxP8BQ+VuPbXQvxFS70zyZlINzvZcUnEYqtvJMVfOwo0YvOnMtDZLkd5tj9i4XeVBIbJhZSrknBX8mec38/egMzG/OgidZHAu19JH+8s023eC/tLGI3a0Tjw9UfFMd2KD9q4P4xIR5IA/+xcwYoMAOY5HiWOf21ss8+LqT1WcDqpfMvdtuIQTikKneThlwjPxCf+GHGAx9TH6+oV6EqyX1aK147XWs+Oc95uvCEXNqA1u4y5v9oLhY3qyeaRBfZA== 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=SgF0/85MzJPBFuSFTk07sQCvmtdcu1hh/6VOuFMwyMk=; b=XwPM/ywkRxbcm1CV0JLK6KIK6r8KzzVqdMJLctgsCbCT3WOdacjCRXFHn8M+Icsug89/q8PVsiCAXb+dwJDFJ3kzgIim2U7PQxJ9DAO2iZyrGzmbSDNHr74pCOITs5fttUj1J+h+tbK1YeM4iNtlw9Qrp+xrfuzfdobz7CjifIPoI2fzU2i6m7xJgz8V9mOr8uodBc9eoDaAQFx6NIn7AaZNO0o0uO6xlkPftMwd0ZDWMg1ds70WHYcN+Aj7XebcxC/eVSjiUUnm/R4NcB5AnPZS3m+l+E8aKTzJnDA2IBX91xsGGoIhVmRGLTODR7MOZKDwtYE9LgCBG6fbK5ucuA== 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=SgF0/85MzJPBFuSFTk07sQCvmtdcu1hh/6VOuFMwyMk=; b=Sw4mXzyvtbWt7lOIKGGwRvoGMYfJSzRS9tpc6LvjD3yrUcUcZdXk4LPwkQ7hFGIBbSKY08x/HpyEY4OUAi9OyXIE3hsVF3o7n6B5AtjIGzVc+OlPDHic8Gfv4vqqtce8o/YvXvixNXNZBDyRLHpiznrnY+VrdKi5d5JDZLwNv7k= 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 DM6PR12MB4220.namprd12.prod.outlook.com (2603:10b6:5:21d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.15; Thu, 13 Aug 2020 13:27:00 +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.3261.025; Thu, 13 Aug 2020 13:27:00 +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 v15 25/46] OvmfPkg/VmgExitLib: Add support for MWAIT/MWAITX NAE events Date: Thu, 13 Aug 2020 08:23:12 -0500 Message-ID: X-Mailer: git-send-email 2.28.0 In-Reply-To: References: X-ClientProxiedBy: DM5PR1401CA0019.namprd14.prod.outlook.com (2603:10b6:4:4a::29) 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 DM5PR1401CA0019.namprd14.prod.outlook.com (2603:10b6:4:4a::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.16 via Frontend Transport; Thu, 13 Aug 2020 13:26:59 +0000 X-Mailer: git-send-email 2.28.0 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 3bc8cc45-f93a-41c0-4e2b-08d83f8c8eed X-MS-TrafficTypeDiagnostic: DM6PR12MB4220: 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: 0WwOY2JEUx6GlfwZpYPprbxJ8d39/6pLyRpx2YYW5WuUOUYoDxpFLVkD+c/6hiu3BB+7eGwdhioFcIORB/OPEis2TtACJVWjGPxOAL7sIguq+yNh1TuRrQJNQ45LC07X47G+x4vz3pCvOuqS91NOK7QK8KPh6tAt8cgJaeKeD1jX0oYHaHKJQogDthdtcatwJAK8dwsdW0CYDmdObN0pnequJsuNXpUs9rrra6qe0P0863r7uoDukr9SzStKJoBhBcfKE5/OACBLoH2LprN5SXh2Ar+zC2S6gdlqIzrYX9+zTH7kKsefwlVOu5CgucFljheyEDyUTSQ1z51yJ3gSp6I5X9jkTlFOYwj7gPHVyWSPzOYms3Qwz2ezJA6NnnRN9AjRgqD7KP9VEnCwqoEIAVCvvIyKidZ6lH7pKegbothCK3P380I86Bar7BwSfZebVxC552ShixFf6IhSiT0cbg== 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;SFS:(4636009)(366004)(136003)(396003)(346002)(39860400002)(376002)(2906002)(956004)(36756003)(66556008)(54906003)(86362001)(966005)(2616005)(6666004)(6916009)(478600001)(8676002)(66476007)(316002)(83380400001)(52116002)(6486002)(7696005)(8936002)(66946007)(5660300002)(186003)(4326008)(16526019)(26005)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: o2Q6zLgvJm6RtWt1z2CFRTqV0mDEOnjIgigZLPO1tEyAPqA7q8ypsMLbF0usNX9KGa2z3Aa9h332t2a6t6jdDwR+IHjyZwJXbupepZ+1jlatJA5lBAns9wnBe1+cnivVuheSMuQML2YC7I2YDrM7/elV61gwGBCpw14v7Bh3d7mCk94j8VAdAhi1WkRsVZB8UEp/G/thmMBiD5tN080uoHeTZDsbKrO44+MkFBdEDAVt53hiohq5RqI+5TtCYOMqKkt/BaXC+/7yV+65kmYAoqXE3JT4fqUqy6fS/mNvtmP68bwBqKWTzZmZr+lDTRqTkNnQEHXnPBguTrmBHKgvNxxQP9TgdLJGPPSfI6VGgvte1yOI30EX+1RldARnCgEY6bDjhBd0FxDW6OOLfFrXZnFtmuDelQuD0b2YsAA/p8fm4CMn+L6i6hg5X1q//XJIIH4x0hdLPmGawLN+Fz6S+RjO2nHWhx5zQWm9IJANgNV7ln6xW1OQDM0uMJ3qCAZpKzmpZuvMmYX6kf2M9GKvb2E3/u4FgprdKaObd45LYsAXGvLTPBl3/dLhtC02Q9NKAVNdO0AVT8/bdUljdegU6eQjVDb0R8Sm9fZjPuUsufIB62gDi1nIn2zXQaavYkj1CccBbR9dLbJCpVfivUbvuw== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3bc8cc45-f93a-41c0-4e2b-08d83f8c8eed X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2020 13:27:00.1512 (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: HPRHWJA7YChFWplWvp6LjusXIIsR60DKEKteGMWtdkOvAR/l7YMrjOkKPayXZqY1lRgSGuVgbzb82AoAWhrk0Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4220 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 1e8b8ce424c3..a741b080dd1a 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c +++ b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c @@ -858,6 +858,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 @@ -1534,6 +1566,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.28.0