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=3n58Lgk8; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.78.55, mailfrom: thomas.lendacky@amd.com) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (NAM03-BY2-obe.outbound.protection.outlook.com [40.107.78.55]) by groups.io with SMTP; Thu, 19 Sep 2019 12:52:57 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EcYbFs608TETLDICmEafPXBM1Je/psMqSzOQBpIHZh/dirEFYRlFTJOiMZPR+ebyVQ7DahbYLGyei+ITLYu1d1W7OcmpmyDfX1eERGuYj4oNdwRyNkCt1dFDNfsUw44NQCdjIotkUQh59ZV+7h4P6f66g8egROKL1L7YS3mJJDtcvQ2M6fJJlZfALoNdLfLJfHtgUergSRdFoWNv+u84PZUyxKy5AJHSr6eu+pve+vYtnN+09ziBKy6/9fRuWAEFlB3R9UQrBNhKr6KRkE17mCqbbKMOO8zGOImBUctrw2bxpgWMY6EMTNbZGiAcxgPoYN4T56UfqkxBqaw56V5XOA== 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=DV1stvOZd4mxtshdylnnwQZu3Ld/Vv4HZEZGhdIqmeQ=; b=ShxDGOQgSqzY41WrlCFQ33jI+QhogIhD3w7+QZImT2q5MFGVbOB+rcGhFwlAhN26mYr6vfw/3GDPV2venI0qJrC3jzMrmt5maruIm2XeBePHDQ2D/GgNIVZaJFWvltekeibP2YHJ56u0tMfvzXrK170rRS1VyXYUmbZCtQGATPUYfmRa5JZ8/a85V4JrhfNa0FZx303D171bpUclQIi6tncAt5tOI4gyl0ANkd5vRnCnYeGd61rx6QknsN/2zBjX7FIQ4zdlRx4NfdWF+Y63FBtMJpiOJ7zUaKKmjW8MsFNb73MyOdiBbjg6Np7yYz9hxx9JXUb5soAA1cJox3q7sw== 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=DV1stvOZd4mxtshdylnnwQZu3Ld/Vv4HZEZGhdIqmeQ=; b=3n58Lgk8JwS0KZT+BEQ9/0uyDvL0qz5uHjfKkrfYnautnRY7vGO1Xkr46R1slePjoublmr99R0dUipjLFvVoAA1TvRN88is9MnaPbZaGO9nefm9DpdT+kuRW5GL6ssLTi8C8m7tVa1pADv6Ronlkz6YH5oC5xrgmlZ+q8VRE8co= 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:56 +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:56 +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 28/44] UefiCpuPkg/CpuExceptionHandler: Add support for INVD NAE events Thread-Topic: [RFC PATCH v2 28/44] UefiCpuPkg/CpuExceptionHandler: Add support for INVD NAE events Thread-Index: AQHVbyPUp8zJOTDtVE+ScIhRAEPhkg== Date: Thu, 19 Sep 2019 19:52:55 +0000 Message-ID: <7c463aa5fea42e15c689c1a5ffc382e2500f8706.1568922729.git.thomas.lendacky@amd.com> 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: f2c24f90-8ff6-4e7d-0e9f-08d73d3af704 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: dRMcgEfRBXiH2vtOLh3UcAnrCxlttT5W+hBHX5wONX5205qkVDY2HNBHoOdZLHmkiHmm1bG4BrGEVyfqVUJZ7jrN6AImPyk3R2xXBzYE/k/561ZMF8z9K9r47cl6oOZ1tXWf8e3+p/dPCn6G23UDZMiNi/LF38DF02RKFru0oK9Cf+HlZQgR862JqWLUwCCuUWgWXxDtb7lTC6h7PYNnaKhXim44mCiL9bB5ZV6GvWPh65FAU/FyP0OSp1jtE+E3xNsDG0RYKKbnw05w+ahIPVP2KI/qpc0gv17siWJHIxoLOViV5gWqBgXWL+rQ4IEOy0XSabbuymqMlLQsyymwbckX6JSNw7F5gEgUl/pZAT8dSFXJ2j5WHQFBjF6JEaCm5Gybqenm4/RgE6VLORUbeSMZMFg466gw2M3XstS02/8= MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: f2c24f90-8ff6-4e7d-0e9f-08d73d3af704 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Sep 2019 19:52:55.9879 (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: jxBAkRQ0SESOiyAw8Kd7i4HlZFNwZEHHlny0K8pChxtqUyK+ZGcnHsrreOotfU0C9uTR/QTR4v7YR4B/j27gBw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3228 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-ID: <98BF0B4DF30A674EB8E7269F15095DA5@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 INVD 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 a6534e1a59bb..a4a840401398 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c @@ -826,6 +826,24 @@ IoioExit ( return 0; } =20 +STATIC +UINTN +InvdExit ( + GHCB *Ghcb, + EFI_SYSTEM_CONTEXT_X64 *Regs, + SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINTN Status; + + Status =3D VmgExit (Ghcb, SvmExitInvd, 0, 0); + if (Status) { + return Status; + } + + return 0; +} + STATIC UINTN CpuidExit ( @@ -948,6 +966,10 @@ DoVcCommon ( NaeExit =3D CpuidExit; break; =20 + case SvmExitInvd: + NaeExit =3D InvdExit; + break; + case SvmExitIoioProt: NaeExit =3D IoioExit; break; --=20 2.17.1