From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (NAM02-CY1-obe.outbound.protection.outlook.com [40.107.76.72]) by mx.groups.io with SMTP id smtpd.web11.481.1587577362870832179 for ; Wed, 22 Apr 2020 10:42:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=dAXTdlbp; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.76.72, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RC0S/pdhafxWRWCcNRkV0ufg0HeGhEFS0SwNrPRMWtzFcGD7xlVRsPc6D8S9SvZEc6DamSMT09EdXr3yshJkksQe+aUySmN4qHMsKPLKPEmowaHhna5yV21lDNlJYaBkK/dGj1Kn6A+3hTWjvP1Sw0Dw9biIiGtNUGPKbEDq4hQnjzjnwKIdb3WtaPDk4qyITG3TMjGzG66VBdo+5JqvAu3ZQ4yuNIPQi7O6RHix/P2btsMDxlc3jd9ib/93O05KVmY9Lx0yOIJ3mR4rC/J+36VUdNGIrw/6h9zwqHjQYBwsOYOk0vWpQsF+hwMic8nttKY4hqW8hi2jE70iiSATNQ== 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=ABtuou2ryLCMpTzGfqMIMps1Z/Z+BYdpyzz8iZ6enjg=; b=gVyM2lRSX8BqmmR3BsMuRhwF67IuazEY5lrO1Sj/HS71t636JPN5pL3XqMn0LDiHG1XkEvFgFjJnsrEVxyK0m4Wi/ifccnC+iqEQHTZ1jWWresWgtxG8Q5RcrETQJoD1XR9slgJUto2B14/eQ4R0gFTjHEKd1CgNw73qzdi66vd0m2af3Yv/ye0OAUsRj00HmcVZewttVT/X7eTLIE3THu4DAO0tfgvB4oCGJ6+WUHTcDRX1H3j/oVpa+h0dJHZ2tSmibx70RcczsadIYdPXuJP+OSUQvKpOAaX7KRmLW9yvKGbp4/yp3t2c7T1ziWMbIr8P+isokr/PFx4apoBtLQ== 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=ABtuou2ryLCMpTzGfqMIMps1Z/Z+BYdpyzz8iZ6enjg=; b=dAXTdlbpvrKspuGznqmaJUsFNOHePUirth1IK8+F6bOr7U++2eTCALA8abWTZiYXirB+zqMwAln8YYbpboOM9lCDWD/qIQiaBOF2yK26O35W1QwFu/zvm93ywNGpnDU8nUWTiX6Uo1dFVw8MNUI3smgG0sRW2PLkg7QYaekFSpk= 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 DM6PR12MB3449.namprd12.prod.outlook.com (2603:10b6:5:3b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25; Wed, 22 Apr 2020 17:42:41 +0000 Received: from DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::9ae:cb95:c925:d5bf]) by DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::9ae:cb95:c925:d5bf%4]) with mapi id 15.20.2921.030; Wed, 22 Apr 2020 17:42:41 +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 v7 24/43] UefiCpuPkg/CpuExceptionHandler: Add support for MWAIT/MWAITX NAE events Date: Wed, 22 Apr 2020 12:41:39 -0500 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: DM5PR04CA0060.namprd04.prod.outlook.com (2603:10b6:3:ef::22) 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 DM5PR04CA0060.namprd04.prod.outlook.com (2603:10b6:3:ef::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Wed, 22 Apr 2020 17:42:40 +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: bbf3dc3b-2b32-4712-c188-08d7e6e48e24 X-MS-TrafficTypeDiagnostic: DM6PR12MB3449:|DM6PR12MB3449: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-Forefront-PRVS: 03818C953D X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR12MB3163.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(10009020)(4636009)(136003)(346002)(376002)(39860400002)(366004)(396003)(66556008)(16526019)(66476007)(186003)(5660300002)(4326008)(86362001)(54906003)(8936002)(81156014)(966005)(6486002)(66946007)(316002)(19627235002)(52116002)(7696005)(956004)(36756003)(6916009)(2906002)(2616005)(8676002)(478600001)(26005)(136400200001);DIR:OUT;SFP:1101; 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: dQmoZ0gDrrvOn93oUVRUGbGx5FklxHeRPgq0oQbzPcak3E+wwRRpjqNLucmMbDxVyrva/xvidFRysN+8dcwQBpp7UYN/y1EqMv6kpoNNv4h3XLRHyUyU0m3lHd6XAZexyT90P/XIqkg98MyUAfdokQd1N06yij9rws0r7r+jglC4vhHzXzawjTkkGYjJsFcdxn80Ichr8qCIvbsYml7t99UGZ8AYMCW8+ThASo99WknJLU2489bmu2PUJyn4H4WdzfB/1Mafws6hX+tBVKYtyVpwwIr82HqADNhuZktm5JFXUuiKmAFPFgVGumqe1YcTqrFVZtybt+bOuuvSsgLKu9VkKAjERd8uxAWVaj2TwgFOo6V8EMcPTCvx09N3fPCq2qUSRGDmBDYDFnOwqHtNsOnuq6fmQUEMve7UO8ul6UUOWp8HtYFMA00QqeVn44muPIE9FAhFYFYVtE/NRGFbx7/7kxg2BuDjAdvdtuSYAA4H3NGHkHu288pJKF9Wwg/qEDLmhhJ3svH7mYMo85rzswVKHjsGCFU531mKQxHQZQDaMnIn9rw3pmDo4Tv5GoO1XrI6mHePNplmN4t0vR1d3g== X-MS-Exchange-AntiSpam-MessageData: p7Ppoaqki+u/eUhkcrpke0pdvLgc0oBp3qlheDxlqIOi8KEIdft2XtpRIX0uG4+kBVs2bBHMzH2fUQRS86z/hI+JJ3fKls0vNXawaHMqBnfHeNUHRgH+EhiF/LWMhNg/Rwau+p9cYt02lS6TGxYdBA== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: bbf3dc3b-2b32-4712-c188-08d7e6e48e24 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2020 17:42:40.9539 (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: Y7DHLgF9d+75iCK+ixtbUlxOZ7ugBYR8n++3EiaSCbOFXU01kEVitEFruETdyUWXQtIsiiyrmeSjSxR6V5WBTQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3449 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2198 Under SEV-ES, a MWAIT/MWAITX 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 | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c index 890451ff97a2..023e7dc31202 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c @@ -836,6 +836,45 @@ MmioExit ( return Status; } +/** + Handle a MWAIT event. + + Use the VMGEXIT instruction to handle a MWAIT 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 +MwaitExit ( + IN OUT GHCB *Ghcb, + IN OUT EFI_SYSTEM_CONTEXT_X64 *Regs, + IN SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINT64 Status; + + DecodeModRm (Regs, InstructionData); + + Ghcb->SaveArea.Rax = Regs->Rax; + GhcbSetRegValid (Ghcb, GhcbRax); + Ghcb->SaveArea.Rcx = Regs->Rcx; + GhcbSetRegValid (Ghcb, GhcbRcx); + + Status = VmgExit (Ghcb, SvmExitMwait, 0, 0); + if (Status) { + return Status; + } + + return 0; +} + /** Handle a MONITOR event. @@ -1518,6 +1557,10 @@ DoVcCommon ( NaeExit = MonitorExit; break; + case SvmExitMwait: + NaeExit = MwaitExit; + break; + case SvmExitNpf: NaeExit = MmioExit; break; -- 2.17.1