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.45]) by mx.groups.io with SMTP id smtpd.web11.13463.1574280458792298156 for ; Wed, 20 Nov 2019 12:07:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=C8P32sPo; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.76.45, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jvqMRQGKRukq193SPPulK2rG/cx3PrE8hSEw+a46E8uJidox4ZfTaKoSskJol8xlO2PkshGn6sthGtzWu1yCy0+gFT/FxactOGJzK6UeAlxlCenCuWEvsDIwuTQWwL1kRRD+QH+E2/z4OwgemC3sEGr++SMEpu4b3m9Z2nxOG1l8e+baVsJrC6O4X0UC3pDWx/B4GTkg1K9a8eqXLhPpg8zTJhHA9x5JeUTBzNpHxDH/kpnNTRh2bmP2XRB4Pm2JLqwoD8dMlEh0FXzWGCeqbnrsc7fweydu67dxPzPp3g5zGnw6oEPZeGriniJi1fX4+BL/NYl6jWWT7Ql5X5QN/A== 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=sAINZ63cRwHhJ+8pzhRsFWbVRqLlRW3dFtWwVhJVQgs=; b=fpnJHy163xZP68Bjo0dEPgz/R/LZZD7EVd5jlo3DaO2q2d2k2DDUnqZN+8CIxN+x8Tv0NNGSgESlD5cYBGwUVI3Jh12cJoHPNLrJ9P6xffTXWj7+BrfEJzpMG3+p0nXvA3IRFmKiwbPu4PoI+cjF0/mfgfvJfWVFtSfKCdfJuy6gyywbnVvQUymOgeMTxaRxYYhhQP7fUIpNbB9thooxJGO/UXC3+rQIFHYGGY99PI64WIAox+IasGqKmKGN2NUg7KWZfW17es4cnPmXYc+WtAbdm2uIAk3v6mvrv3hRgxirbLGndke5ksLmzIBLeZz5mtIpqR/dxmRkcCs+vQP30A== 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=sAINZ63cRwHhJ+8pzhRsFWbVRqLlRW3dFtWwVhJVQgs=; b=C8P32sPoZnQwDLuzJ2EWPEfezU97pIEkRaQ3BhRJi5vFPioufyDMPgQl6fMiRq9GChcq2UkyRFpuVd44gKiR2Ssbw2fW/VCJrljrOpTlCgj1A+QcZ7dYoPaRBNQ2aI5VS3/BL5hcnPkhpbPASmw6FhTYEzHr0FyvuE8nRjx7HPo= 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:37 +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:37 +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 20/43] UefiCpuPkg/CpuExceptionHandler: Add support for MONITOR/MONITORX NAE events Date: Wed, 20 Nov 2019 14:06:42 -0600 Message-Id: <481d45039c413ffbd595e4c4c22021ebcaa512a9.1574280425.git.thomas.lendacky@amd.com> 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: f4ea7d7c-6ef3-4ba7-7b0e-08d76df54a09 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: yDqYDVh9lLB9n82JkHO85f4gJVkTxOGx3hcDng4tXnJ/9VkKdX6oL5qoC8GECQZ6tpM1cYPCC8igNn9TGJ7uVnHuoqjdZWsCIsk0vUMhahnwp+xztpVszlnF9c3YuV2kfikvjZHIq3GZpLn0A2+pnv7PqMfV1EGaPGjXQyB36oRLCK6PFf/odkUpM8raq72IyWq9r06axsjDpLRrxRh5gaNHNRg+9LYoNicAJmn+M87kem2RWCjBCw2iRTbAxfSaZt+xgzzApcpgp44LWoNDEs0RhgBNyQ3tiET08skbDOslRyetCZI3CNSlN/oy/nvypZDUz4RSvPvD+nufcZsDGkhch8ifnjyGfI7xZzUUh+cb5zWd6B80wzf/s3QrZPxPwus5IXlSTNz9wat0+F9OC77RodbEu5yQ2UPGLlA/rmW88WnieQpt0QAwrvTctnSoBjAxuusndHvgEav4ojgP3arRgO4RWkOrAA8UQ/VaPdg= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: f4ea7d7c-6ef3-4ba7-7b0e-08d76df54a09 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2019 20:07:37.5353 (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: pDx30PYQmKtoHnBAij6uiE8yr5j2ghl0ZMUi7bqEtMIJRp4/o6T/FJATAwwUo7Y9T2z/1JLR+9BB+YFfQG4pHA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3675 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2198 Under SEV-ES, a MONITOR/MONITORX 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 | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c index 425b1c533532..eeaf524467a7 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c @@ -585,6 +585,33 @@ UnsupportedExit ( return Status; } +STATIC +UINTN +MonitorExit ( + GHCB *Ghcb, + EFI_SYSTEM_CONTEXT_X64 *Regs, + SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINTN Status; + + DecodeModRm (Regs, InstructionData); + + Ghcb->SaveArea.Rax = Regs->Rax; // Identity mapped, so VA = PA + GhcbSetRegValid (Ghcb, GhcbRax); + Ghcb->SaveArea.Rcx = Regs->Rcx; + GhcbSetRegValid (Ghcb, GhcbRcx); + Ghcb->SaveArea.Rdx = Regs->Rdx; + GhcbSetRegValid (Ghcb, GhcbRdx); + + Status = VmgExit (Ghcb, SvmExitMonitor, 0, 0); + if (Status) { + return Status; + } + + return 0; +} + STATIC UINTN WbinvdExit ( @@ -1081,6 +1108,10 @@ DoVcCommon ( NaeExit = WbinvdExit; break; + case SvmExitMonitor: + NaeExit = MonitorExit; + break; + case SvmExitNpf: NaeExit = MmioExit; break; -- 2.17.1