From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM04-SN1-obe.outbound.protection.outlook.com (NAM04-SN1-obe.outbound.protection.outlook.com [40.107.70.61]) by mx.groups.io with SMTP id smtpd.web11.58105.1595863728428861189 for ; Mon, 27 Jul 2020 08:28:48 -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=GCrmeW8C; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.70.61, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hcTRAX01HIfvxflc3oaDHCoOMBPUfaS9QBzMPkJI8S1vfwMFIjvg3PemWX2HRrHjlyNtftMGRt/210muofoY4DL9KYeMgAeBedcIKL3yWbeb605wahfph2ZXuURO773Ke50wLrR9SRaDfPeRlFqxXrh1agARNSIBHRtEQpVauCZ6i5s6TQmAlPqO83EOwyUryDFGpkGp1uo1uIXaIJel/N5TLVH1xFSi60NwZHcnhfpAw2hZQRU2eEMXfLtrcMxzSU7x+NCsdcUbyhVqHinrYHCKxvDUaR9nSB4i5hUVD6aipiXBIl1+jPsYll8MtBSmAehtYG3a1g2m0bnjNrl7pg== 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=z7KM/QY3QdiNzO0sLsMAJB/dGUXDqeKlzSZHqwBk/3M=; b=RZxNd8cqvo5XTqt6fJwtPI+t5RLbOLZo9fnU6NU38evjWT8Dn/iDDsgmVmnf67O4y8veOoIf1fg7QL5N4NO9ADQfQyxlct99PL1Bss0aCGIiYbEV1+5q6ulC0pIKdA12nV5KnjTo3IQNMBLEG3atlNf0zlJebphFzrPBYewqVeBdG9gNFMnkIXsJmYjkNCuIyNXsaeMuWJM+rYtiYNKTYUoDHPNgTGA6CxHb14ypqN3F+/ko2R3j+3NbKx0Qx+ATou6ggCcnLdm2/NVHqEG/OT9b+O7uFQExO4eiLImWyq+bU+UPx4JPUncLIEfS1j4PVRtNxIms3JM+Zs8fDJOp9g== 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=z7KM/QY3QdiNzO0sLsMAJB/dGUXDqeKlzSZHqwBk/3M=; b=GCrmeW8CARSmRBgKvf38/NtMfX3181wGbU0glPjQ0NWICzZWMI0LZNQy6mEG6cUJ3zFMKfFDcpBIFNwjDbXcQ9LxMhVc4ukm46HlvHlrfLzJWcmtv6L137Gvfeqx7fOjOVTL8iAOKwB60y5aKwSWRK++yNXOJg1A+loUrw2U42g= 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 DM5PR12MB1163.namprd12.prod.outlook.com (2603:10b6:3:7a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.25; Mon, 27 Jul 2020 15:28:47 +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.3216.031; Mon, 27 Jul 2020 15:28:47 +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 v12 16/46] OvmfPkg/VmgExitLib: Add support for MSR_PROT NAE events Date: Mon, 27 Jul 2020 10:25:57 -0500 Message-ID: <6e72b5c8e75b18fd1c02b06b5cf29ee0924f2017.1595863587.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-ClientProxiedBy: SN1PR12CA0060.namprd12.prod.outlook.com (2603:10b6:802:20::31) 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 SN1PR12CA0060.namprd12.prod.outlook.com (2603:10b6:802:20::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.21 via Frontend Transport; Mon, 27 Jul 2020 15:28:46 +0000 X-Mailer: git-send-email 2.27.0 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 48c8da94-3562-4049-3fc9-08d83241c14b X-MS-TrafficTypeDiagnostic: DM5PR12MB1163: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: diW5arVs7xKyxwLQuW0pHvq5fmci/SkFCO4/D8M4hd1WBoCAFDhG9P+HHVz9k2QsvzKsrHaHM8I5QZROxfG6d49WWrwckGLWQdINCYArRRFrajUlFi++DbgIK+w4K0/XHjE/FXDWlzScdTukGBHUQF6SLWX3wcIsiOs6Gw1wHM/u1IBZc6H7YgRLurzT3KgMRgCVotg5DLXY7avUM+aS4S+dFsXile9ko2HJ4qz/DiEYdSPzTI9cRTJTwej+bu8ow7NzS52yigUY95oiEnBhTA3/0utjBP9l3Opw17nsYVhbIy/nfs44xzzlYniltmtPzgKZvZrnP0Dr+z1kyl2sP+YbRKFWK9rijnvzUu99cqrubKabF0jPS9Xr5yfuveKjfAEHJOVyzKRMxiCoQ6KLed9noTKqIjL4exCHHX1X08HRyoeORprTE/PyescKjzhzKgV3P5TNwXZq8u2koCxtQQ== 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;SFTY:;SFS:(4636009)(376002)(39860400002)(346002)(396003)(136003)(366004)(26005)(7696005)(16526019)(52116002)(186003)(66946007)(2616005)(66556008)(316002)(36756003)(956004)(966005)(5660300002)(66476007)(54906003)(6666004)(478600001)(2906002)(4326008)(6486002)(8676002)(8936002)(6916009)(83380400001)(86362001)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: REktPDWCRb5aQdcsYT9pkWJz0D7UnUPI/Mt9E0c79mliyhzwEUf7LNCByA/1+5rMeNUUNjFrf8jBDDmnykfwh5fW0TOI8wKYJTb7LKN/doP/HYWocsmsBNDoRWxOJC/RNuhrIWOzc0fF/Uzw/SmhXkpTtgsd2kW8kUiQw3S14F5s9SUDuRz2DrfDcc9J6n1zqeIlXhcPGIwtlbp71p4b37wLosUQ07kGlnoPEw2lYZFQoSXjTnPAg/7iSE95G34765PiVJiZ/QW40H4MGl/8TnWBi3lFwi5x8QOLZHyFdRjHDm+W83T9Hs2dXHAfz9z6c3NKWxLHh26UQDhLJRQcsiRus3gGVYmbqv6QsJd99GI7taonm9WmHkfTKBHTd72YuycMCMrHHZpdzc7y1LJPJ/1yuTc+dU9J9P2W+uDVoirg3YjEhvDoKbfFR3+4ICE5n/YQVPJzRXZnFvt6lquvG0GCR6Ee+WrpPAZIloFvYJ0= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 48c8da94-3562-4049-3fc9-08d83241c14b X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jul 2020 15:28:47.1221 (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: VUm0BErdv/ydKfvBXZ8h3gq06TPpJS9hGSGzxe+nxp+6hXdYuLETSR9Ska1HQxrZLKYjPqQ2PiXoaHAeXOz02A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1163 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 MSR_PROT intercept generates a #VC exception. VMGEXIT must be used to allow the hypervisor to handle this intercept. Add support to construct the required GHCB values to support an MSR_PROT NAE event. Parse the instruction that generated the #VC exception to determine whether it is RDMSR or WRMSR, setting the required register register values in the GHCB and creating the proper SW_EXIT_INFO1 value in the GHCB. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Acked-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c b/OvmfPkg/Librar= y/VmgExitLib/VmgExitVcHandler.c index 1c9c272a250e..dbedd4e9f95d 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c +++ b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c @@ -374,6 +374,67 @@ UnsupportedExit ( return Status; } =20 +/** + Handle an MSR event. + + Use the VMGEXIT instruction to handle either a RDMSR or WRMSR 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 +MsrExit ( + IN OUT GHCB *Ghcb, + IN OUT EFI_SYSTEM_CONTEXT_X64 *Regs, + IN SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINT64 ExitInfo1, Status; + + ExitInfo1 =3D 0; + + switch (*(InstructionData->OpCodes + 1)) { + case 0x30: // WRMSR + ExitInfo1 =3D 1; + Ghcb->SaveArea.Rax =3D Regs->Rax; + GhcbSetRegValid (Ghcb, GhcbRax); + Ghcb->SaveArea.Rdx =3D Regs->Rdx; + GhcbSetRegValid (Ghcb, GhcbRdx); + // + // fall through + // + case 0x32: // RDMSR + Ghcb->SaveArea.Rcx =3D Regs->Rcx; + GhcbSetRegValid (Ghcb, GhcbRcx); + break; + default: + return UnsupportedExit (Ghcb, Regs, InstructionData); + } + + Status =3D VmgExit (Ghcb, SVM_EXIT_MSR, ExitInfo1, 0); + if (Status !=3D 0) { + return Status; + } + + if (ExitInfo1 =3D=3D 0) { + if (!GhcbIsRegValid (Ghcb, GhcbRax) || + !GhcbIsRegValid (Ghcb, GhcbRdx)) { + return UnsupportedExit (Ghcb, Regs, InstructionData); + } + Regs->Rax =3D Ghcb->SaveArea.Rax; + Regs->Rdx =3D Ghcb->SaveArea.Rdx; + } + + return 0; +} + /** Build the IOIO event information. =20 @@ -705,6 +766,10 @@ VmgExitHandleVc ( NaeExit =3D IoioExit; break; =20 + case SVM_EXIT_MSR: + NaeExit =3D MsrExit; + break; + default: NaeExit =3D UnsupportedExit; } --=20 2.27.0