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.54]) by mx.groups.io with SMTP id smtpd.web12.58116.1595863775544287367 for ; Mon, 27 Jul 2020 08:29:35 -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=LdtsZTLf; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.70.54, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MgLYZg7F6RayYFH5+p9cHgfLawPZKZ91+mOpYMqMSQJ2XqNXrbLTcTeF3RZvZP91GNmSY+r7zeKBIHKrHmKYhI4m06PFm1N78cDPnSvPbAMd1dEVT/Regsyyf9IjwyBWr3KgSwzJOUpwBkq6U7rcVJAS1iW39TK7Stu3gYj4Bo6xFjRpnkQKFfUAp94wCgtZn3n7n4Ue+XabtrWpjg+jda2PL2fKX7qy9fjngX0ZrgEOVgPdAjRF14FAGjpDO8TZpvwl7siA9c2CSv/ZOSsyFzlLwKjb/CKzsLtBWG6qt+cMbj4C14UAz3q8Tr4hogH2NxJRim87YKoA4u3XBzL4zQ== 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=8NTCnoZUa8l7fJRJjHTmN6rj4HEhSC81uhz1zBZyzhs=; b=DAeRzAAioChwu/rAZDcJsbqr/mwEKMBNcnnFbd15dLpT0jj8cvAClmUdE/zE1NdI39m3MeXphO+NbBSS40FIA3wqtwE03TNL8qnkcw93Vyh+T3bxG2Vb+o0Uq/iQbsus9NxXCmYZtpNBBaLRVIUF38DR7ZLjoC9gO49xqwmV1HYyzD8NOp1WWdZ5JhhdQT9xmPgTAQ7Q0/Qo4ROw29EPnrVp/p1vTDsIVBujl+lcwnQPl9dwepul52QcNxFwyMunOKMJJ9IbzvXY7LnET/KK1Oy6dgiE9Q9nfvo8rL9CRySxL4gKWNHzZqrSLyefPgP4KQaNS90eZglQVEll6AhyWQ== 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=8NTCnoZUa8l7fJRJjHTmN6rj4HEhSC81uhz1zBZyzhs=; b=LdtsZTLfMOHXkvV1sINjSpSR7muf3tmwPK3WEr5lac+0PYqXwCdkr1MdO1QBylIgcv5K/vps4oQjjb5ocrmaJEJDMPvt1A7CzgtiTVOQx0/dIvm9qIINj3LuLXuqDZJvn0eXUvIhc9x8y/an8jbMeluRZhKQlwCkWuW++Zs6V50= 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:29:33 +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:29:33 +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 22/46] OvmfPkg/VmgExitLib: Add support for VMMCALL NAE events Date: Mon, 27 Jul 2020 10:26:03 -0500 Message-ID: <36a4717619ce8a9393c192b2980288eff555d24c.1595863587.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-ClientProxiedBy: DM5PR17CA0067.namprd17.prod.outlook.com (2603:10b6:3:13f::29) 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 DM5PR17CA0067.namprd17.prod.outlook.com (2603:10b6:3:13f::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.22 via Frontend Transport; Mon, 27 Jul 2020 15:29:33 +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: bba5f657-b4cc-4181-103a-08d83241dd14 X-MS-TrafficTypeDiagnostic: DM5PR12MB1163: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9urbPbHZqaSISmxmlNBs/BNKoQroncobH235eDB/Qtk5UpN4DQCBNSvtfHd9pZRRzW/8dZiZEUE9J8P2SIlzBTlvaLr1SgnieUsbPOOF/4sBiBVuclQ7hd/vtFkp13XxgwC61pQ9Mk02SfhE4BpBy1RhR8/jYkoFDR/jLHU7ND74vvkYlDyVS8hhlLXV7VxHi75T4C0C4X543lHqkuJxXzD5V0VfLF/WQRpOgBVyvCyNRu0J+IRC3fbLQ8nBBs3a9SH2ZSscSzkRnloXsmQsUrzrER/QQiu6t9bzf+5LK+O8ZNpmQQdTEuW1M56L5eVcGnT2YkS0x7KSlIrjiuWvPXXK/G8v5W4Ep3vRTfUM++s4u5iNaFphlwm/QjF3aribOpy3oJ9gYZ5nU+6fos+39ryjdXmIrhc0hd+83c46+X5KOix4J95s7NxPq/Mb2iuEE1UCSc55tiEmAtHGB1i/xA== 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: YJu/8QKuSNwvz4bUhfZ+I8LCWT0Fh+LDeKdb9hV2/jVqqiR+jeXDkKu2yJhaMXVfiXOTvETTRi87cJtZIov9XcdY3xnBDzTT1s3fZ0HHhRBHpQ/Jt/5yI8WVz9lCWKvkDD5/4QG3dBijpW/pTrp5k1fiJVA459JdLUL14BjPPmVNg6Vh09D4SK5YuELNedJBiG/K1/ZmakmBLrW7/idWxThYIS9UNAlNWe0e50m1s5cVKQPtO2Y1ih0/veG2m2vs4YfczGMif7MCdKU/4WK+xOPGSRmYO1hw8C/fRqUJIa1HKNiGXY7OIBNmfFZg11QXnJzdM6ehTKeYBXaXNZmAcPH//Zm0+eaHn65TPtkV8mgNE5vT9/y6Pi202fv2DykQTFKWxisPqNDrYpwzU8ttBdn3rCopt62XKspmPEy2oOpoOZa1QS6vt4Ays8dJXunWdhrSVo/9P22nHkKJx7U8IjCcZZlflcoPovZE3GeIZzk= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: bba5f657-b4cc-4181-103a-08d83241dd14 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:29:33.7467 (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: x7UQ2ECUoePpTqiniyxK1bvXs310hF1qJ0qQw0dKpfO90St+vbbW9zPoXcHMFEtQZbA2y85WZAiBuIZFXjcjzA== 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 VMMCALL intercept generates a #VC exception. VMGEXIT must be used to allow the hypervisor to handle this intercept. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Acked-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c b/OvmfPkg/Librar= y/VmgExitLib/VmgExitVcHandler.c index af5264095b98..54134f37e614 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c +++ b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c @@ -881,6 +881,50 @@ WbinvdExit ( return VmgExit (Ghcb, SVM_EXIT_WBINVD, 0, 0); } =20 +/** + Handle a VMMCALL event. + + Use the VMGEXIT instruction to handle a VMMCALL 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 +VmmCallExit ( + IN OUT GHCB *Ghcb, + IN OUT EFI_SYSTEM_CONTEXT_X64 *Regs, + IN SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINT64 Status; + + DecodeModRm (Regs, InstructionData); + + Ghcb->SaveArea.Rax =3D Regs->Rax; + GhcbSetRegValid (Ghcb, GhcbRax); + Ghcb->SaveArea.Cpl =3D (UINT8) (Regs->Cs & 0x3); + GhcbSetRegValid (Ghcb, GhcbCpl); + + Status =3D VmgExit (Ghcb, SVM_EXIT_VMMCALL, 0, 0); + if (Status !=3D 0) { + return Status; + } + + if (!GhcbIsRegValid (Ghcb, GhcbRax)) { + return UnsupportedExit (Ghcb, Regs, InstructionData); + } + Regs->Rax =3D Ghcb->SaveArea.Rax; + + return 0; +} + /** Handle an MSR event. =20 @@ -1395,6 +1439,10 @@ VmgExitHandleVc ( NaeExit =3D MsrExit; break; =20 + case SVM_EXIT_VMMCALL: + NaeExit =3D VmmCallExit; + break; + case SVM_EXIT_WBINVD: NaeExit =3D WbinvdExit; break; --=20 2.27.0