From: "Lendacky, Thomas" <thomas.lendacky@amd.com>
To: devel@edk2.groups.io
Cc: Brijesh Singh <brijesh.singh@amd.com>,
Ard Biesheuvel <ard.biesheuvel@arm.com>,
Eric Dong <eric.dong@intel.com>,
Jordan Justen <jordan.l.justen@intel.com>,
Laszlo Ersek <lersek@redhat.com>,
Liming Gao <liming.gao@intel.com>,
Michael D Kinney <michael.d.kinney@intel.com>,
Ray Ni <ray.ni@intel.com>
Subject: [PATCH v9 15/46] OvmfPkg/VmgExitLib: Add support for CPUID NAE events
Date: Fri, 5 Jun 2020 08:27:06 -0500 [thread overview]
Message-ID: <2b2b229690e2a2422e35c9a4df0431085c76b1ca.1591363657.git.thomas.lendacky@amd.com> (raw)
In-Reply-To: <cover.1591363657.git.thomas.lendacky@amd.com>
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2198
Under SEV-ES, a CPUID 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 a CPUID NAE
event. Additionally, CPUID 0x0000_000d (CPUID_EXTENDED_STATE) requires
XCR0 to be supplied in the GHCB, so add support to issue the XGETBV
instruction.
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
---
OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c | 60 ++++++++++++++++++++
1 file changed, 60 insertions(+)
diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c
index b74b13045cfd..1e0b2bf399da 100644
--- a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c
+++ b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c
@@ -11,6 +11,7 @@
#include <Library/BaseMemoryLib.h>
#include <Library/VmgExitLib.h>
#include <Register/Amd/Msr.h>
+#include <Register/Intel/Cpuid.h>
#include <IndustryStandard/InstructionParsing.h>
//
@@ -597,6 +598,61 @@ IoioExit (
return 0;
}
+/**
+ Handle a CPUID event.
+
+ Use the VMGEXIT instruction to handle a CPUID event.
+
+ @param[in, out] Ghcb Pointer to the Guest-Hypervisor Communication
+ Block
+ @param[in, out] Regs x64 processor context
+ @param[in] InstructionData Instruction parsing context
+
+ @return 0 Event handled successfully
+ @return Others New exception value to propagate
+
+**/
+STATIC
+UINT64
+CpuidExit (
+ IN OUT GHCB *Ghcb,
+ IN OUT EFI_SYSTEM_CONTEXT_X64 *Regs,
+ IN SEV_ES_INSTRUCTION_DATA *InstructionData
+ )
+{
+ UINT64 Status;
+
+ Ghcb->SaveArea.Rax = Regs->Rax;
+ GhcbSetRegValid (Ghcb, GhcbRax);
+ Ghcb->SaveArea.Rcx = Regs->Rcx;
+ GhcbSetRegValid (Ghcb, GhcbRcx);
+ if (Regs->Rax == CPUID_EXTENDED_STATE) {
+ IA32_CR4 Cr4;
+
+ Cr4.UintN = AsmReadCr4 ();
+ Ghcb->SaveArea.XCr0 = (Cr4.Bits.OSXSAVE == 1) ? AsmXGetBv (0) : 1;
+ GhcbSetRegValid (Ghcb, GhcbXCr0);
+ }
+
+ Status = VmgExit (Ghcb, SVM_EXIT_CPUID, 0, 0);
+ if (Status != 0) {
+ return Status;
+ }
+
+ if (!GhcbIsRegValid (Ghcb, GhcbRax) ||
+ !GhcbIsRegValid (Ghcb, GhcbRbx) ||
+ !GhcbIsRegValid (Ghcb, GhcbRcx) ||
+ !GhcbIsRegValid (Ghcb, GhcbRdx)) {
+ return UnsupportedExit (Ghcb, Regs, InstructionData);
+ }
+ Regs->Rax = Ghcb->SaveArea.Rax;
+ Regs->Rbx = Ghcb->SaveArea.Rbx;
+ Regs->Rcx = Ghcb->SaveArea.Rcx;
+ Regs->Rdx = Ghcb->SaveArea.Rdx;
+
+ return 0;
+}
+
/**
Handle a #VC exception.
@@ -641,6 +697,10 @@ VmgExitHandleVc (
ExitCode = Regs->ExceptionData;
switch (ExitCode) {
+ case SVM_EXIT_CPUID:
+ NaeExit = CpuidExit;
+ break;
+
case SVM_EXIT_IOIO_PROT:
NaeExit = IoioExit;
break;
--
2.27.0
next prev parent reply other threads:[~2020-06-05 13:28 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-05 13:26 [PATCH v9 00/46] SEV-ES guest support Lendacky, Thomas
2020-06-05 13:26 ` [PATCH v9 01/46] MdeModulePkg: Create PCDs to be used in support of SEV-ES Lendacky, Thomas
2020-06-05 13:26 ` [PATCH v9 02/46] UefiCpuPkg: Create PCD " Lendacky, Thomas
2020-06-12 0:50 ` [edk2-devel] " Dong, Eric
2020-06-05 13:26 ` [PATCH v9 03/46] MdePkg: Add the MSR definition for the GHCB register Lendacky, Thomas
2020-06-05 13:26 ` [PATCH v9 04/46] MdePkg: Add a structure definition for the GHCB Lendacky, Thomas
2020-06-05 13:26 ` [PATCH v9 05/46] MdeModulePkg/DxeIplPeim: Support GHCB pages when creating page tables Lendacky, Thomas
2020-06-05 13:26 ` [PATCH v9 06/46] MdePkg/BaseLib: Add support for the XGETBV instruction Lendacky, Thomas
2020-07-03 2:39 ` [edk2-devel] " Zhiguang Liu
2020-07-06 20:13 ` Lendacky, Thomas
2020-06-05 13:26 ` [PATCH v9 07/46] MdePkg/BaseLib: Add support for the VMGEXIT instruction Lendacky, Thomas
2020-06-05 13:26 ` [PATCH v9 08/46] UefiCpuPkg: Implement library support for VMGEXIT Lendacky, Thomas
2020-06-12 0:56 ` Dong, Eric
2020-06-18 7:23 ` Dong, Eric
2020-06-18 14:09 ` Lendacky, Thomas
2020-06-19 7:47 ` [edk2-devel] " Dong, Eric
2020-06-19 13:50 ` Lendacky, Thomas
2020-06-19 14:21 ` Dong, Eric
2020-06-19 15:38 ` Laszlo Ersek
2020-06-23 1:16 ` Dong, Eric
2020-06-23 12:58 ` Lendacky, Thomas
2020-07-02 7:04 ` Dong, Eric
2020-07-06 20:03 ` Lendacky, Thomas
2020-07-07 15:36 ` Laszlo Ersek
2020-07-07 15:50 ` Lendacky, Thomas
2020-07-07 17:11 ` Lendacky, Thomas
2020-07-08 13:07 ` Lendacky, Thomas
2020-07-08 16:25 ` Laszlo Ersek
2020-07-08 15:24 ` bit-fields [was: PATCH v9 08/46 UefiCpuPkg: Implement library support for VMGEXIT] Laszlo Ersek
2020-06-05 13:27 ` [PATCH v9 09/46] OvmfPkg: Prepare OvmfPkg to use the VmgExitLib library Lendacky, Thomas
2020-06-10 12:08 ` Laszlo Ersek
2020-06-10 14:15 ` Lendacky, Thomas
2020-06-11 14:20 ` Laszlo Ersek
2020-06-05 13:27 ` [PATCH v9 10/46] UefiPayloadPkg: Prepare UefiPayloadPkg " Lendacky, Thomas
2020-06-05 13:27 ` [PATCH v9 11/46] UefiCpuPkg/CpuExceptionHandler: Add base support for the #VC exception Lendacky, Thomas
2020-06-12 1:02 ` Dong, Eric
2020-06-05 13:27 ` [PATCH v9 12/46] OvmfPkg/VmgExitLib: Implement library support for VmgExitLib in OVMF Lendacky, Thomas
2020-06-10 12:26 ` Laszlo Ersek
2020-06-10 14:54 ` Lendacky, Thomas
2020-06-05 13:27 ` [PATCH v9 13/46] OvmfPkg/VmgExitLib: Add support for IOIO_PROT NAE events Lendacky, Thomas
2020-06-10 12:34 ` Laszlo Ersek
2020-06-05 13:27 ` [PATCH v9 14/46] OvmfPkg/VmgExitLib: Support string IO " Lendacky, Thomas
2020-06-10 12:39 ` Laszlo Ersek
2020-06-05 13:27 ` Lendacky, Thomas [this message]
2020-06-10 12:41 ` [PATCH v9 15/46] OvmfPkg/VmgExitLib: Add support for CPUID " Laszlo Ersek
2020-06-05 13:27 ` [PATCH v9 16/46] OvmfPkg/VmgExitLib: Add support for MSR_PROT " Lendacky, Thomas
2020-06-10 12:43 ` Laszlo Ersek
2020-06-05 13:27 ` [PATCH v9 17/46] OvmfPkg/VmgExitLib: Add support for NPF NAE events (MMIO) Lendacky, Thomas
2020-06-11 8:30 ` Laszlo Ersek
2020-06-11 15:09 ` Lendacky, Thomas
2020-06-05 13:27 ` [PATCH v9 18/46] OvmfPkg/VmgExitLib: Add support for WBINVD NAE events Lendacky, Thomas
2020-06-11 8:33 ` Laszlo Ersek
2020-06-05 13:27 ` [PATCH v9 19/46] OvmfPkg/VmgExitLib: Add support for RDTSC " Lendacky, Thomas
2020-06-11 8:35 ` Laszlo Ersek
2020-06-05 13:27 ` [PATCH v9 20/46] OvmfPkg/VmgExitLib: Add support for RDPMC " Lendacky, Thomas
2020-06-11 9:05 ` Laszlo Ersek
2020-06-05 13:27 ` [PATCH v9 21/46] OvmfPkg/VmgExitLib: Add support for INVD " Lendacky, Thomas
2020-06-11 9:06 ` Laszlo Ersek
2020-06-05 13:27 ` [PATCH v9 22/46] OvmfPkg/VmgExitLib: Add support for VMMCALL " Lendacky, Thomas
2020-06-11 9:08 ` Laszlo Ersek
2020-06-05 13:27 ` [PATCH v9 23/46] OvmfPkg/VmgExitLib: Add support for RDTSCP " Lendacky, Thomas
2020-06-11 9:09 ` Laszlo Ersek
2020-06-05 13:27 ` [PATCH v9 24/46] OvmfPkg/VmgExitLib: Add support for MONITOR/MONITORX " Lendacky, Thomas
2020-06-11 9:10 ` Laszlo Ersek
2020-06-05 13:27 ` [PATCH v9 25/46] OvmfPkg/VmgExitLib: Add support for MWAIT/MWAITX " Lendacky, Thomas
2020-06-11 9:10 ` Laszlo Ersek
2020-06-05 13:27 ` [PATCH v9 26/46] OvmfPkg/VmgExitLib: Add support for DR7 Read/Write " Lendacky, Thomas
2020-06-11 9:24 ` Laszlo Ersek
2020-06-11 9:31 ` Laszlo Ersek
2020-06-11 15:16 ` Lendacky, Thomas
2020-06-05 13:27 ` [PATCH v9 27/46] OvmfPkg/MemEncryptSevLib: Add an SEV-ES guest indicator function Lendacky, Thomas
2020-06-05 13:27 ` [PATCH v9 28/46] OvmfPkg: Add support to perform SEV-ES initialization Lendacky, Thomas
2020-06-05 13:27 ` [PATCH v9 29/46] OvmfPkg: Create a GHCB page for use during Sec phase Lendacky, Thomas
2020-06-11 9:56 ` Laszlo Ersek
2020-06-11 15:25 ` Lendacky, Thomas
2020-06-11 17:52 ` Laszlo Ersek
2020-06-05 13:27 ` [PATCH v9 30/46] OvmfPkg/PlatformPei: Reserve GHCB-related areas if S3 is supported Lendacky, Thomas
2020-06-05 13:27 ` [PATCH v9 31/46] OvmfPkg: Create GHCB pages for use during Pei and Dxe phase Lendacky, Thomas
2020-06-05 13:27 ` [PATCH v9 32/46] OvmfPkg/PlatformPei: Move early GDT into ram when SEV-ES is enabled Lendacky, Thomas
2020-06-05 13:27 ` [PATCH v9 33/46] UefiCpuPkg: Create an SEV-ES workarea PCD Lendacky, Thomas
2020-06-12 1:03 ` Dong, Eric
2020-06-05 13:27 ` [PATCH v9 34/46] OvmfPkg: Reserve a page in memory for the SEV-ES usage Lendacky, Thomas
2020-06-11 10:03 ` Laszlo Ersek
2020-06-05 13:27 ` [PATCH v9 35/46] OvmfPkg/PlatformPei: Reserve SEV-ES work area if S3 is supported Lendacky, Thomas
2020-06-05 13:27 ` [PATCH v9 36/46] OvmfPkg/ResetVector: Add support for a 32-bit SEV check Lendacky, Thomas
2020-06-11 10:08 ` Laszlo Ersek
2020-06-05 13:27 ` [PATCH v9 37/46] OvmfPkg/Sec: Add #VC exception handling for Sec phase Lendacky, Thomas
2020-06-05 13:27 ` [PATCH v9 38/46] OvmfPkg/Sec: Enable cache early to speed up booting Lendacky, Thomas
2020-06-05 13:27 ` [PATCH v9 39/46] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: Bypass flash detection with SEV-ES Lendacky, Thomas
2020-06-05 17:58 ` [PATCH v9 40/46] UefiCpuPkg: Add a 16-bit protected mode code segment descriptor Lendacky, Thomas
2020-06-16 8:24 ` Dong, Eric
2020-06-05 17:58 ` [PATCH v9 41/46] UefiCpuPkg/MpInitLib: Add CPU MP data flag to indicate if SEV-ES is enabled Lendacky, Thomas
2020-06-12 1:03 ` Dong, Eric
2020-06-05 17:58 ` [PATCH v9 42/46] UefiCpuPkg: Allow AP booting under SEV-ES Lendacky, Thomas
2020-06-05 17:58 ` [PATCH v9 43/46] OvmfPkg: Use the SEV-ES work area for the SEV-ES AP reset vector Lendacky, Thomas
2020-06-18 7:43 ` Dong, Eric
2020-06-18 14:50 ` Lendacky, Thomas
2020-06-19 7:40 ` [edk2-devel] " Dong, Eric
2020-06-05 17:58 ` [PATCH v9 44/46] OvmfPkg: Move the GHCB allocations into reserved memory Lendacky, Thomas
2020-06-05 17:58 ` [PATCH v9 45/46] UefiCpuPkg/MpInitLib: Prepare SEV-ES guest APs for OS use Lendacky, Thomas
2020-06-05 17:58 ` [PATCH v9 46/46] Maintainers.txt: Add reviewers for the OvmfPkg SEV-related files Lendacky, Thomas
2020-06-11 10:21 ` Laszlo Ersek
2020-06-11 11:06 ` Brijesh Singh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2b2b229690e2a2422e35c9a4df0431085c76b1ca.1591363657.git.thomas.lendacky@amd.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox