On 06/05/20 15:27, Tom Lendacky wrote: > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2198 > > Under SEV-ES, a WBINVD intercept generates a #VC exception. VMGEXIT must be > used to allow the hypervisor to handle this intercept. > > Cc: Jordan Justen <jordan.l.jus...@intel.com> > Cc: Laszlo Ersek <ler...@redhat.com> > Cc: Ard Biesheuvel <ard.biesheu...@arm.com> > Acked-by: Laszlo Ersek <ler...@redhat.com> > Signed-off-by: Tom Lendacky <thomas.lenda...@amd.com> > --- > OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c | 29 ++++++++++++++++++++ > 1 file changed, 29 insertions(+) > > diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c > b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c > index c2646d45506a..37c15c4f6240 100644 > --- a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c > +++ b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c > @@ -854,6 +854,31 @@ MmioExit ( > return Status; > } > > +/** > + Handle a WBINVD event. > + > + Use the VMGEXIT instruction to handle a WBINVD 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 > +WbinvdExit ( > + IN OUT GHCB *Ghcb, > + IN OUT EFI_SYSTEM_CONTEXT_X64 *Regs, > + IN SEV_ES_INSTRUCTION_DATA *InstructionData > + ) > +{ > + return VmgExit (Ghcb, SVM_EXIT_WBINVD, 0, 0); > +} > + > /** > Handle an MSR event. > > @@ -1250,6 +1275,10 @@ VmgExitHandleVc ( > NaeExit = MsrExit; > break; > > + case SVM_EXIT_WBINVD: > + NaeExit = WbinvdExit; > + break; > + > case SVM_EXIT_NPF: > NaeExit = MmioExit; > break; >
Looks good, thanks! -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#61121): https://edk2.groups.io/g/devel/message/61121 Mute This Topic: https://groups.io/mt/74692428/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
