From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.44]) by mx.groups.io with SMTP id smtpd.web11.5530.1595366565091683515 for ; Tue, 21 Jul 2020 14:22:45 -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=GeQg/LqW; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.244.44, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T1ASFl/f5KOIVgbxPGgg46s/HpZh0PWnDF++vbtt1WW8DeGNBkyPM+jhUZnGV9zigz0nZa+BGMa4GR7ZLur5icS/X1oiYamIhhOqaNOV+NOFtS5CWXLbHq9YbMBQLZ08YlE5mxGx+fYyPBhgjM9B3hOkLEH+qdWhF9Utz9jaADGNeOsSERp8LwFoXik2XEIrxwVjtuTI/WHAMkCKOydXkcusKsy2h2s2eLoTsSFsnMKnS7xRqgBrbOdFeyFFoXSjIoYA+b+D6g78wXjELdrF9XydfO/TPWVMZsEz8aqOwYSRYgOhKCCtc2sGW8gp8lzpiP4MD1PIq9jXldfUbZjVjA== 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=ZjVVuiwHeP+968zAj0IwHX0+QqqlX6bbPf7fHZnCoW9SpHOHlPM9T8E+gwMdymmRiZw1v/zCKfX+Z+ilweelX6I4c0wkixEz4dbiY3yEheeqJF0MRSCCTisaI6mwU6gBBCS74Fu4Q8bP4v/mdxZNyovbYoKpu02Wev7LUm6jxG87a7zwRpz8/0vl7omoc8KMxevJzI3HRrtT3KO0VCvBgxqIZ1wPpWWgwyHBOP6lnIoRCBBqs0Aac23DeFCPx77kaDtXgowbrfQY2lZiFeVpAkZc+LJi2n0paekdt/acJxV322R0tpgzPG8O743UC2kvYnoF1xd10OeZwdPlv4HXnA== 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=GeQg/LqWXsj4+br1GK1AVesWha2NqFrx2JXdUwUcdk5eUPfT0OAtsFKR2PwL9sYCk7zyTdRPAuachaTKdP84JB/jap+h9GtYd/mvTj9vtUxu/cMKaM1UKFmkNBmtakQebgAfollAMQj+nXZHhnmUUd/E96m0O6GDPFTmc1Y0S5E= 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 CY4PR12MB1143.namprd12.prod.outlook.com (2603:10b6:903:38::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.25; Tue, 21 Jul 2020 21:22:43 +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:22:43 +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 22/46] OvmfPkg/VmgExitLib: Add support for VMMCALL NAE events Date: Tue, 21 Jul 2020 16:18:59 -0500 Message-ID: <37907ae12cd09fcf942d6af57e74c4d623dbf28d.1595366363.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-ClientProxiedBy: DM5PR15CA0071.namprd15.prod.outlook.com (2603:10b6:3:ae::33) 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 DM5PR15CA0071.namprd15.prod.outlook.com (2603:10b6:3:ae::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.19 via Frontend Transport; Tue, 21 Jul 2020 21:22:42 +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: 0f64feef-9e14-4efa-c84e-08d82dbc3471 X-MS-TrafficTypeDiagnostic: CY4PR12MB1143: 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: XAyP52WhJ0SDgudHA2+03sbcLZMqfNXgcCWKE+2P00VAbHPKuirwEa3sgXLLTG1M3PiKZLoSVhh5SycMGYxrENxyfoDdWno8sbOZI3tCnC231/GHVEoz4EL5/B86q4m3tU+JXi/HuN+1c/cK53b4DkO6CObWcSc5qYrbUGf/wVNvgewGa15zZ+JzzuTk7L3qmZOQ+Xqjh8pET04ahMMI8vL4PJiWU1uQgDp1qLye+DQ/W2OBqlyO/XkIO0clsma/VGBrsaF0DH25dVnz0vB4v16+PlV6zPz1Rz9a/gy4MePZ8tQk07e4finhriEqInb9saHzoImUgSRCrU0mfU9SRwYlcLt4R/GpqNYDbLpAmXSxCP8wwlRJPSaiwDpkCl8z6TQI+yHn1rnFQCQL6SqERxF1V03no2iY74vuj0AK82XHuZkmJlQCrPBxzsHnGttrg5Uapeo2ZJAqtpiUNfykeQ== 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)(396003)(346002)(136003)(39860400002)(376002)(366004)(966005)(6916009)(26005)(6486002)(86362001)(8936002)(2906002)(66946007)(36756003)(8676002)(16526019)(186003)(2616005)(956004)(54906003)(478600001)(4326008)(66556008)(66476007)(7696005)(6666004)(52116002)(5660300002)(83380400001)(316002)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 1DBm/EH4vJKOg/pOg3Yx/NpBi/r6T+xycOY/MtrH8PupIWhYwq08DGILl1JHiOsAKYb0Xx8TNMFYKWFvGT81HF5Ys0KAgMOVJDNxqUU3bySM+o6sKkEICxY9jlCPN+NiVMy2wLGtxvoPJrKT2uGYGlY3YrMeGtib4nBpSSaQvLnC7byhvjZ/5+oDTUmzs3vonkAT9ttl5kv6IhGEAjzfalWc+wDsmNbs0hHS/wqTPNHi2wzlopln9rcFK4gf7Cg6hXRcEaImiwN5eP7BCKTX79NyQUfQYdO5eGAgSnx4r9CNgfCo2ANnYuHDw8EmpppJUFAs4FejXOY6CxWCZ/ZoHiFc1j8WtPo+NbGkpfCCfgzAtOAEHV2C8evEyvyybF7NnpWa9v8jvg/2m19JsQU6pei9cMrIRdJOh2LUNFlMPeh1kFwdjOyEcOu5C/bM0YMRI4zGNB1nEiDEx1++cUQCUx3pfBnc4rUK2gam9EiwFDo= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f64feef-9e14-4efa-c84e-08d82dbc3471 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:22:43.2167 (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: sOqi9Kij5B4HMVtmyScZ4NvQIx3zX3xhBJrRK6bfVZCxS/jSnX9Whw/ggVgUrnZpuqWCBsz36knn37BEvBALwg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1143 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