From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (NAM11-DM6-obe.outbound.protection.outlook.com [40.107.223.50]) by mx.groups.io with SMTP id smtpd.web11.5518.1595366515662480706 for ; Tue, 21 Jul 2020 14:21:55 -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=fc89vBwo; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.223.50, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BmuRCOC6PVEUFeN6Lol9Y42Nvf3amX1/7Q3f1jXTXGcp3nnaavcI8wSeduZc/f1YBOHbeuGuKirUYln8CuRRidIHYJZeY4XshtUZ2e6eWcmmN1oPk5tKAonIpUilF+EaIx7aJut6clEeSIiCZJBmJGhiFB1ciTvc25DRMrlT5dovkXOazG09buYorhyIAwMShCOrZQmMV4Z4gwLAA+ZhH6Vg4zMK3HeFsDRCEhAMxjbhV9ZZmjw2CTXy4jd03LzZKyV7BCBxr6WeUv8EuMsVI2ZJJhxvRIhzC6lJ/A9149sPMVKuenn8w56VJlhxxZef0Q6PQ9SeThH1ze2SoChDPA== 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=oKcz1TyLtTP53xz9r5Abi1rLrbM0xBrqgPfQtZR7EfRzTaWLAdNdbJ1dNeDs+AVMCNIGoGOk28IL2yGuTIm5fgVpoaiQWScut+bCcvEgL8yNFKacAMMtFHAM/wWukS/QJm+a6oLKD6a5+AgSss1S58XqjMzBz1PF0+UTmYv+N/xjUEcaASb7Mz3MCKkWiT6V7iJpPxObgJ4SC4vmeGIxsJWR41ht4fH6ZqbP6seQlkQtcW1LesO0N9nF2JraiC22VfBuiqb5OhFj44hsWGVq/RINLlRfNC8ZjYO7DDcTgKzz46b/niX8rXzRUG1rhj272WOW/BvWbPpyo/CCe/FKhA== 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=fc89vBwoXTi2WIJ3C0MwSWVIdyAmH79iiGr6ScriDyOlYnauTQqKZBy+y+jUYmYqdPxkHBbY+fgqusk44u2TC82DlmGXdZtQ/WYKa5UaUAJcwFsNO/blpv8SCMyXr69DDkvKCzGfEsuyUfc30+l8rP87yKtRLx2NmhWNY0FPreY= 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 CY4PR12MB1352.namprd12.prod.outlook.com (2603:10b6:903:3a::13) by CY4PR12MB1606.namprd12.prod.outlook.com (2603:10b6:910:10::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.23; Tue, 21 Jul 2020 21:21:53 +0000 Received: from CY4PR12MB1352.namprd12.prod.outlook.com ([fe80::9181:78bf:bf0:702b]) by CY4PR12MB1352.namprd12.prod.outlook.com ([fe80::9181:78bf:bf0:702b%5]) with mapi id 15.20.3216.020; Tue, 21 Jul 2020 21:21:53 +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 v11 16/46] OvmfPkg/VmgExitLib: Add support for MSR_PROT NAE events Date: Tue, 21 Jul 2020 16:18:53 -0500 Message-ID: <91f16c26903a7d26ca9457f4d2d1631505a8c7cd.1595366363.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-ClientProxiedBy: SN4PR0501CA0035.namprd05.prod.outlook.com (2603:10b6:803:40::48) To CY4PR12MB1352.namprd12.prod.outlook.com (2603:10b6:903:3a::13) 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 SN4PR0501CA0035.namprd05.prod.outlook.com (2603:10b6:803:40::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.17 via Frontend Transport; Tue, 21 Jul 2020 21:21:52 +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: 981c7022-3929-4322-d552-08d82dbc16e4 X-MS-TrafficTypeDiagnostic: CY4PR12MB1606: 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: ocRboPTsE7k+fc67sfYrF0SrERRaIOkNL76xwQnAH0EtQG8snhbQxaANqvQwBQAsnPkN6La/GAd6HWimR1N6GQK5IWnhsGMB9tM23LRbo00VNKPAqFOO3og4aD2KY8hMNytlFJPRc+gdlvdjEsPp1pzzf7hr5mRo+DAOyJmJzIUQFFC7QID0lt9uyHL/IocrUgVuUTeN/rOthTlz9lKhwre0XKIw8cHZNGQd+OiwhLX9pWdHpPdlnOVLLWkPwY0DrURj7Pj9G2bTx+IjR4ix0/0FF+zilweiK5zEhw9oDSBKgw3Y2WfW1c2thkj3dN4yoeFFgGEqSMzvvTMR/87FXKx26wXl5CZqbkkNOGXGbOJkMa56i7/LWXrLmzkY88x6qrzjDaNuMIa2r5mMbhc1O4l8Ws0QeQDdqUD12MwwY8Tgmt/gJOWa5oTD66m/xCrY+nnTyt+QhoFaLPGNaXqIrQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CY4PR12MB1352.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(136003)(39860400002)(346002)(396003)(366004)(376002)(6916009)(54906003)(2616005)(956004)(316002)(26005)(4326008)(186003)(66476007)(36756003)(16526019)(66556008)(66946007)(2906002)(6486002)(8676002)(52116002)(83380400001)(966005)(5660300002)(478600001)(86362001)(8936002)(7696005)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: hFLDJ9UbZI0iZ/nXK3liJTbqjQYinM+8WzXfwnSRHJ5yKc5EqetO8Wb7XYuLOU8QoEnv2mshtkxNRjpC8C580BQfvlOWNeLTkCun7UG2X2cWgDSxRy7G+7xh5RaJHsTELSW7/V0VJdIhNGisB0fWsJveg73aHGFPXMeK4i3LSet9QOjUe31UZci2uABtG1S8WCxBj4OcB1Ue5WFlFaS+EkRtRlH+vpsfDZmiYUfCHQCHCZYeK7rBj/aaZ5y+Qu3oetmwSwFdJg4E3u7uZmdWeavC0dt0Xt92BoJAgg73PFe1lW4rtU9G294BhPARW1azz739v7t5Dl7Me8D+LoRCjeGCyzhEAaMqyFZJvHDavyK2d2vodvorwPxpFTHKjuin5bjcs1DUDquYdcfEu8aLJJZLhhUDuuOTCxTZnhEUbFoOlA2Aew0ZO4THeX4A34p3BiN9Fv8Pp2vZ8FNohohux/69HeMpM7uiXHdng3Tb1v8= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 981c7022-3929-4322-d552-08d82dbc16e4 X-MS-Exchange-CrossTenant-AuthSource: CY4PR12MB1352.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2020 21:21:53.6041 (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: YAneDSer2ZHqLP9TOHdq8y9sGIxdfNvkN9f/5ztMtPgiPU1TJMR4jcYJSARljv6mu4z77hRY6pS/YvcH5zthAQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1606 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