From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (NAM11-CO1-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web11.694.1583190475799820802 for ; Mon, 02 Mar 2020 15:07:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=RZ893V55; spf=none, err=SPF record not found (domain: amd.com, ip: , mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RdPtESpV0OnLQd//uaiZPWKYBF/LuAEINfU+24knwS5hlOyADPzx/aLDhNbQ5JV+SSfRtoJMJwnxW2APjNRhYoDfufJoZZu6fLTKnog1yAuD3MEF9BWJw1JxgrXq1a/IgkzkNmwwE1qbzLFyEbJURXNnqboFPOytnyjQT5ybCJaR+u51SB7fyelo7I1oJp5STE8FKyXUavQh0F+i8XvOnJld5TxQesLXfidqgZMjywbMuDL03HANalQzPlcSkxgjFiwCoZ8cwGt18Kjh/Vkqo+kpYY+ZkL9M2BroucgKXf2FCsxM+xHkmmwnc3wYkQr1MSHqSu9KBa0S8fRA4q+RbA== 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=b/cJ+YgL24ruItlxnJrnIg0NEJ4MLq8KHPC093NllUY=; b=HP2a0GafF+oj5aH0Ywj4H9k39KhXSVQFYva0geO0wC/nhzwRBPCbmoJ++ntuD6FTv1sLDRm1MQ9hxcJF2FFWRMRc696X7/KIz+DoSvTDXLaUcZbCrDSde6ZhSVmDcKwSvza52rFtzDI1H3WbHGcaQsfbunmB6KaUcnTfphYX+YuuhtCWaFceb1762w59LPzX9bTmVPVTSFCbg5epLlf/5wdRphuPmqsux3AzwdkdmGeVqxW5CjL/FAJfBeIsnY8WrP1vjK7zNGNvCXdMofHSaCC69hIuRwmk8FfY9h1cmgSv3AojcwS9y6wzx2H+zPljCV17qKWwa1tYDkuBdbv/NQ== 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=b/cJ+YgL24ruItlxnJrnIg0NEJ4MLq8KHPC093NllUY=; b=RZ893V555Jjpi0sb1qleCi86zmPv1RrIi7j4en0zUgYaup3iUfTE1Z6OZRE/LuG6Lhox2+6ubSqEOofLNiZfARVDnEZzF9zPezKEyPvkaBSXNqb9uuI3YJxGvnImrKy1PMvBnSPpwVCKsEpGQy+uPUPGvFs2gB7Pl0uZDe4fpks= 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 DM6PR12MB4201.namprd12.prod.outlook.com (2603:10b6:5:216::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2772.18; Mon, 2 Mar 2020 23:07:50 +0000 Received: from DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::f0f9:a88f:f840:2733]) by DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::f0f9:a88f:f840:2733%7]) with mapi id 15.20.2772.019; Mon, 2 Mar 2020 23:07:50 +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 v5 23/42] UefiCpuPkg/CpuExceptionHandler: Add support for MWAIT/MWAITX NAE events Date: Mon, 2 Mar 2020 17:06:54 -0600 Message-Id: <39e5528af8aeeab437941691c1bc85d9b0ade353.1583190432.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: DM5PR2001CA0013.namprd20.prod.outlook.com (2603:10b6:4:16::23) 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 DM5PR2001CA0013.namprd20.prod.outlook.com (2603:10b6:4:16::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2772.16 via Frontend Transport; Mon, 2 Mar 2020 23:07:50 +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: fd1048d1-cb18-4f7d-0a20-08d7befe87c7 X-MS-TrafficTypeDiagnostic: DM6PR12MB4201:|DM6PR12MB4201: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2000; X-Forefront-PRVS: 033054F29A X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4636009)(376002)(366004)(136003)(346002)(396003)(39860400002)(199004)(189003)(66946007)(8936002)(54906003)(316002)(81156014)(81166006)(19627235002)(6486002)(6916009)(66556008)(8676002)(4326008)(66476007)(52116002)(7696005)(2616005)(5660300002)(2906002)(36756003)(186003)(966005)(86362001)(478600001)(16526019)(26005)(956004);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR12MB4201;H:DM6PR12MB3163.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX: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: 1zlWYkR3ZJTChjNRGtRlvd3xXpV2buFE1L58i4jaElctNFtijj19EezDqRNbhfdqwcWH8PVmbIKBw+/muWFGblaOAvIfp2hQTZWbdYv9/N7Nd7bkWUGKFPLOkSJam8r4ahUypYQPWERPJ8YFoJlfJVXuX78ioAUqd09VB4vZsWySZlfQksNAiuGySMFz+K7smF6nNLmFjqyOI7pUtqoP9vBqaPBT3WXoNtfLnpXZpPY9JJUH+0S3N+50waxxhL3xIUc8uGsOQ20ocZfKOaZeftZnTzaS4v8QOUIf6lxj4BNL2VfyTZrtCIzq99LRw48p8jb8yD7ESvUa8jE9LcUas42/5LisZD3g5frdadruxZSf+AdGiDmGkleDnHQczpqr1KvbmrZ7JKh3pmBq8c2it20Pg0gBYPo69g/tAK3/z3V+3pCUbpTZlKq4IRYKOkloMRgMBM1o6y0TNW3bg1Tv0fR10d/yhLOsvzV8m8LaIDIRpa6tNeJHMzTOPPxE0Ng5LjmJ1feGV45m/ysIZMxjQQ== X-MS-Exchange-AntiSpam-MessageData: yAg48RO0eCM2xHSsqfQKv5DjgEVdGx8LbwC+77YMabd+qWT7zyaLPCdD4yMey4jlwC9SDnkt0lNdpETvdvurujsqkmQsS+nZJrKILuB41QrOmSMYNmrQWehBkSs8UFinl5PC5ygmjwzMu9shYfafZA== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd1048d1-cb18-4f7d-0a20-08d7befe87c7 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2020 23:07:50.6542 (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: /ImjmoY/0ACpjBdh8cHayhORjjPth33flht9gA8e1bi3O0vV79J1VPKKbQn1KskLr5mNeyVRuf5VxSdMg/9NKQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4201 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 | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c index 784229c5ca8d..c35cfabd4069 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c @@ -591,6 +591,31 @@ MmioExit ( return Status; } +STATIC +UINT64 +MwaitExit ( + GHCB *Ghcb, + EFI_SYSTEM_CONTEXT_X64 *Regs, + 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; +} + STATIC UINT64 MonitorExit ( @@ -1107,6 +1132,10 @@ DoVcCommon ( NaeExit = MonitorExit; break; + case SvmExitMwait: + NaeExit = MwaitExit; + break; + case SvmExitNpf: NaeExit = MmioExit; break; -- 2.17.1