On 05/19/20 23:50, Lendacky, Thomas wrote:
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2198
>
> Under SEV-ES, a MONITOR/MONITORX intercept generates a #VC exception.
> VMGEXIT must be used to allow the hypervisor to handle this intercept.
>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
> ---
> .../Library/VmgExitLib/X64/VmgExitVcHandler.c | 45 +++++++++++++++++++
> 1 file changed, 45 insertions(+)
>
> diff --git a/OvmfPkg/Library/VmgExitLib/X64/VmgExitVcHandler.c b/OvmfPkg/Library/VmgExitLib/X64/VmgExitVcHandler.c
> index 716f21a9ee0e..9b7639069276 100644
> --- a/OvmfPkg/Library/VmgExitLib/X64/VmgExitVcHandler.c
> +++ b/OvmfPkg/Library/VmgExitLib/X64/VmgExitVcHandler.c
> @@ -843,6 +843,47 @@ MmioExit (
> return Status;
> }
>
> +/**
> + Handle a MONITOR event.
> +
> + Use the VMGEXIT instruction to handle a MONITOR 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
> +
> + @retval 0 Event handled successfully
> + @retval Others New exception value to propagate
> +
> +**/
> +STATIC
> +UINT64
> +MonitorExit (
> + 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 = Regs->Rax; // Identity mapped, so VA = PA
> + GhcbSetRegValid (Ghcb, GhcbRax);
> + Ghcb->SaveArea.Rcx = Regs->Rcx;
> + GhcbSetRegValid (Ghcb, GhcbRcx);
> + Ghcb->SaveArea.Rdx = Regs->Rdx;
> + GhcbSetRegValid (Ghcb, GhcbRdx);
> +
> + Status = VmgExit (Ghcb, SVM_EXIT_MONITOR, 0, 0);
> + if (Status) {
> + return Status;
> + }
> +
> + return 0;
> +}
> +
(1) Please see my feedback under:
[PATCH v8 18/46] OvmfPkg/VmgExitLib: Add support for WBINVD NAE events
and pick the same approach here that you prefer there.
With that:
Acked-by: Laszlo Ersek <lersek@redhat.com>
Thanks
Laszlo
> /**
> Handle a WBINVD event.
>
> @@ -1494,6 +1535,10 @@ VmgExitHandleVc (
> NaeExit = WbinvdExit;
> break;
>
> + case SVM_EXIT_MONITOR:
> + NaeExit = MonitorExit;
> + break;
> +
> case SVM_EXIT_NPF:
> NaeExit = MmioExit;
> break;
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#60153): https://edk2.groups.io/g/devel/message/60153
Mute This Topic: https://groups.io/mt/74336580/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-