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.88]) by mx.groups.io with SMTP id smtpd.web10.13521.1574280459809158591 for ; Wed, 20 Nov 2019 12:07:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=RBoSWO2B; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.76.88, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AATJljCJ/A9v/eaIyrpA0cV351sP1dgQlkNPbXdX5v8BD45PLDaRHKE3Bdf7uZ0u3IZdPjSDp6ZF6izzd0PCMCQQGNBLi/AlX0X+CM6Hi1exB6osH0m9ILb0slCQ8rxEsYqGU2ejKtZde5rkyx6h33NgzGHFAmBqFZWbXnJtqEIFj1JlhZJXM2dskbyCQ8npisJ5IQMuB5t7/BxpRrb1ai8Yze/WrAQCkekVOh1SdgzVe4YqVZkmsM/TID58UkD5vq0pypVRlRTbkG5q4NOnIC8mXwXB3EIrTy1i3S8cozBcAGS3KRzlj0qrBHkccvyq0bGzxFPxeGpQHJlOMNEBiw== 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=qMBVSG6XZJQRhmKnfGaqn4rzF3XfDSsfWZwn1DNW0NY=; b=TYlasaLLtugHhCONexAW7lfapB2oAD4BaUoIqZHw58nH6azRkDMpymAAs5tlikr3oJS+6UOD4VFEDx2NNtCiOVmHr9VHGAYX/V9g6BSXnYyF/UD9UFI2qXOwx0WmbxhaxYpPRrZlll8dfegciSsG+NByBosGAtw3C7l9UbpgjS1TRFHURZouiGyhEQNCQf01+3PQ4mpeCZlDzEm7Hr1XUuuxp3dg5dz5gaZeQLD/k2trlCsw+M+ojUpC8BTMMqHhfbxtCbGZAFOiJ4G7pQ4SeNb2sYWtWc7unsxOHl8h+CMAyFyntxfM6YdN4Rj/lWf8bMxqlv4bnLZfS7K8mX+sSQ== 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=qMBVSG6XZJQRhmKnfGaqn4rzF3XfDSsfWZwn1DNW0NY=; b=RBoSWO2BDzYFGx19ZfDnV2S++KweFEnRVucKpfSPwG0t9I6hoPdRbyYUcTg4RD1liJ2pJBOgIqHSsF/RGWYLs4ReBEoAjcY8YgHztPLzeiyYU245CWsoMvr2t+rFpBwiaENq9KNsPqPfk3/Q7lFsug8PE+If1GgrGBKaVkvFZRI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; Received: from DM6PR12MB3163.namprd12.prod.outlook.com (20.179.71.154) by DM6PR12MB3675.namprd12.prod.outlook.com (10.255.76.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2451.28; Wed, 20 Nov 2019 20:07:38 +0000 Received: from DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::dd0c:8e53:4913:8ef4]) by DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::dd0c:8e53:4913:8ef4%5]) with mapi id 15.20.2451.031; Wed, 20 Nov 2019 20:07:38 +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: [RFC PATCH v3 21/43] UefiCpuPkg/CpuExceptionHandler: Add support for MWAIT/MWAITX NAE events Date: Wed, 20 Nov 2019 14:06:43 -0600 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: DM3PR12CA0087.namprd12.prod.outlook.com (2603:10b6:0:57::31) To DM6PR12MB3163.namprd12.prod.outlook.com (2603:10b6:5:15e::26) Return-Path: thomas.lendacky@amd.com MIME-Version: 1.0 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: f95aca0d-a2ef-4308-4070-08d76df54aa6 X-MS-TrafficTypeDiagnostic: DM6PR12MB3675: X-MS-Exchange-PUrlCount: 1 X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2000; X-Forefront-PRVS: 02272225C5 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(1496009)(4636009)(376002)(346002)(396003)(39860400002)(366004)(136003)(189003)(199004)(2361001)(50226002)(81156014)(81166006)(8676002)(2906002)(6486002)(99286004)(66476007)(486006)(47776003)(66556008)(25786009)(2616005)(476003)(54906003)(11346002)(118296001)(8936002)(316002)(2351001)(7736002)(305945005)(66066001)(6916009)(86362001)(16586007)(3846002)(6116002)(48376002)(14454004)(478600001)(966005)(5660300002)(66946007)(446003)(76176011)(36756003)(51416003)(6506007)(386003)(50466002)(52116002)(4326008)(6436002)(6666004)(6306002)(6512007)(19627235002)(26005)(186003);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR12MB3675;H:DM6PR12MB3163.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; 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: 5GGYKoxQbPiMraiQh0gpfjDjsr+iDxQ5gcRq4y/eMOQtSSexaLaSfgNzpeAMq1zTru1en1KVHKpEiX2e0/efM29xy4rKUYkKtr3cafvH+DzYVa7tIDrqpDQf4OY/rnW6REexgTliyvbSHdr1JquPc9ik2BZJDMmk9QWFhOmi3bOuLjRQm4ozl7cYE/vwn2ckUIoFeo5yiYhQj71HFlKX1J1zhJO0TnqgjI32Wyj8D233Y81a2cis2M81gmt1ODxB/Q2ddM2RTRDC91ZGWGEfDRiofYfx31wAyG94tL2ZUMAMYcKgvDdmOmYgMWHAm5Or9xWaB6VYhOpr8iiQhu+Ek5c9zETh1bGWUcVc3zwivKOEsHmnxloGjaJBROC9Pug1T8mmtIKlaGRlFG6qLI8zWB+05ihGjuMAUNT+O6mtlK36GdAPpzgc/y6Oaj10241hc74gu6EIo+3KyUU7qTAoiMrG/7Ft6pOgx20FC/5RZZ8= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: f95aca0d-a2ef-4308-4070-08d76df54aa6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2019 20:07:38.5037 (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: xeg+pIs65h0YHx/yHEG1Bnn9dM2g+zXpmIE5TRDgB79X/NGqHZS4G5XxJARAH0/t30hUTQWoLXxhw9CrUVWF2w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3675 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/AMDSevVcCommon.c | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c index eeaf524467a7..1d7c34e7e442 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c @@ -585,6 +585,31 @@ UnsupportedExit ( return Status; } +STATIC +UINTN +MwaitExit ( + GHCB *Ghcb, + EFI_SYSTEM_CONTEXT_X64 *Regs, + SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINTN 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; +} + STATIC UINTN MonitorExit ( @@ -1112,6 +1137,10 @@ DoVcCommon ( NaeExit = MonitorExit; break; + case SvmExitMwait: + NaeExit = MwaitExit; + break; + case SvmExitNpf: NaeExit = MmioExit; break; -- 2.17.1