From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=lJZXh5bI; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.76.89, mailfrom: thomas.lendacky@amd.com) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (NAM02-CY1-obe.outbound.protection.outlook.com [40.107.76.89]) by groups.io with SMTP; Thu, 19 Sep 2019 12:52:54 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kl9WW4F04qXpZks59nvA4LgCISH/tvBGBVKc55YRZar9mwvD7dfNwtiYzsRn90TH8m4TUDYb/pOJJaH4+4XjJrekyBUqHz/72yQVqbAFgtg5A7QLUv+BwuUMSpz4T0g6Um874ScfTKSPz0lEMrmD8WFlPasjBF6KBS/VnL3o+ilw7jyzeX6eAoQKYsJ+o7UnlVzksqNjXNrmn0XlyHFD67jiZpo82RzK74v6za2MIMBuA+tdM2vq1TP9Ke+YG9uUQKmqcRnOB/ZEIYMOZIobCY7rADe1CYi39hoIC3F2wJWHTxq6RHHFyuSNpR2TuahzPFx22rn8Hufaf5/lX+x33g== 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=ZgFnw5tFs/6MsZq6zozMczB2OyMQyk63WUnL0AlxTkQ=; b=AUqsZGuyKHf5sPxdeMVNgWIuRIcm5m/Ns6qn1P8WpQ9QmTc1xfK9xUOTzzu6SE+wZEHg1D62Xo5aoc7V65EFdIOZnfvbFdWRO7SKTydLDy77ck3jj/HXULooM3wg3+NEHAq4Oi6udZJBWKdjcu0RZaAyMfJHQcXq+3EYKhGKy84K47dszFOoA2HzJIC+E+vbddnbcWfE9j61sHah44HMiCj1qKA4uALgSKtBQl966lI8lXDxu35u/RgaktwtLIfwnGp4ZalYHbL/aG7DCuAFcQEERz/sf2yQHisYLOWCbwmrhXE5Pv8/GYZGQPP8sAtfr9GO7ZgERG755gTDFAt+fA== 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=ZgFnw5tFs/6MsZq6zozMczB2OyMQyk63WUnL0AlxTkQ=; b=lJZXh5bIqA6BeQp9TpatoXh0oDb1DOD6WAje1xZ+/9CHewPYW14BMBjug1Q0ELKk54ZKATNmAPJYydIr+RqUbHlm6fGxgWN5AKvJyeEH0jomNF6saQMrXyIZpykOlooggewU1Mhrpmjypw2SC86irYEvI0+WxueJyJl6gewsfm0= Received: from DM6PR12MB3163.namprd12.prod.outlook.com (20.179.104.150) by DM6PR12MB3228.namprd12.prod.outlook.com (20.179.105.96) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2263.13; Thu, 19 Sep 2019 19:52:53 +0000 Received: from DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::400e:f0c3:7ca:2fcc]) by DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::400e:f0c3:7ca:2fcc%6]) with mapi id 15.20.2284.009; Thu, 19 Sep 2019 19:52:53 +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 , "Singh, Brijesh" Subject: [RFC PATCH v2 25/44] UefiCpuPkg/CpuExceptionHandler: Add support for WBINVD NAE events Thread-Topic: [RFC PATCH v2 25/44] UefiCpuPkg/CpuExceptionHandler: Add support for WBINVD NAE events Thread-Index: AQHVbyPSDVowdtqWjk6OrO/HmwGS7A== Date: Thu, 19 Sep 2019 19:52:52 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.17.1 x-clientproxiedby: SN4PR0501CA0146.namprd05.prod.outlook.com (2603:10b6:803:2c::24) To DM6PR12MB3163.namprd12.prod.outlook.com (2603:10b6:5:182::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [165.204.78.1] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0f58dfd5-fea4-474f-4da8-08d73d3af52b x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(5600167)(711020)(4605104)(1401327)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020);SRVR:DM6PR12MB3228; x-ms-traffictypediagnostic: DM6PR12MB3228: 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: 016572D96D x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(1496009)(366004)(376002)(396003)(136003)(39860400002)(346002)(189003)(199004)(4326008)(26005)(446003)(25786009)(52116002)(19627235002)(71200400001)(71190400001)(8936002)(81156014)(81166006)(256004)(8676002)(186003)(50226002)(2351001)(2616005)(102836004)(486006)(11346002)(476003)(66066001)(386003)(6506007)(66446008)(14454004)(76176011)(99286004)(6486002)(36756003)(5640700003)(66556008)(118296001)(3846002)(316002)(7736002)(2501003)(1730700003)(6116002)(5660300002)(478600001)(54906003)(6916009)(966005)(6436002)(2906002)(64756008)(305945005)(86362001)(6512007)(6306002)(66476007)(66946007);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR12MB3228;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-message-info: rp6mJmQHZNPCy94QfY3unZaJ16W3I6CB6rD9Ycw35LP4qvi3ECt+q1jEYTrxHz5CnK4Bl+b3T5YtQ5LRxRxrR2Ipc5VP15ujbm9DGhYL47Z7DDsQmgp/L+J9rScaG4+OCVW89OQ2zq2ojHJm6/WJFGL9TPWkFNKixIpznXRzr5MMvp3+5ChNLCE1L4KmfzM35eSRD+dqZiaj6zl9Cz1jqDE3n/2z6BGdMwAt+a8K379vN1wNPx1ohBzWB98J1duYXl5vUpkqWUahG2yd71efqULNBGuW1pnu6N/3SqTKQEB2nkryGN2qZf25l5i24juR7AJLzad2L2UhMHxLnhUsTXJn1cURo4DsI/esRXcj9ZqhRlOnJAczC4KjMvH+b2lGsn5KNfC1Lwy18l3/E2jed6hnBaLBebWn3Df0k11pM68= MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f58dfd5-fea4-474f-4da8-08d73d3af52b X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Sep 2019 19:52:52.9036 (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: GaxcCtjrCPqIenuFuobqUYww+VQ/Fmq2vFwbvVWxgjOf8cWzGdueK/+MS+V6JaCaxGmEJm82jeeRPVbgqJh6Jw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3228 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-ID: <74280DA801D63143BA9DB131D089250D@namprd12.prod.outlook.com> Content-Transfer-Encoding: quoted-printable From: Tom Lendacky BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2198 Under SEV-ES, a WBINVD 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 | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c= b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c index aac460c388e3..f8966cc3eca0 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c @@ -555,6 +555,24 @@ UnsupportedExit ( return Status; } =20 +STATIC +UINTN +WbinvdExit ( + GHCB *Ghcb, + EFI_SYSTEM_CONTEXT_X64 *Regs, + SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINTN Status; + + Status =3D VmgExit (Ghcb, SvmExitWbinvd, 0, 0); + if (Status) { + return Status; + } + + return 0; +} + STATIC UINTN MsrExit ( @@ -875,6 +893,10 @@ DoVcCommon ( NaeExit =3D MsrExit; break; =20 + case SvmExitWbinvd: + NaeExit =3D WbinvdExit; + break; + case SvmExitNpf: NaeExit =3D MmioExit; break; --=20 2.17.1