From: Joerg Roedel Date: Wed, 19 May 2021 13:52:45 +0000 (+0200) Subject: x86/sev-es: Forward page-faults which happen during emulation X-Git-Tag: v5.10.40~48 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=367c90f2bc1be8932ba2afdc5ce3209417fcdd46;p=thirdparty%2Fkernel%2Fstable.git x86/sev-es: Forward page-faults which happen during emulation commit c25bbdb564060adaad5c3a8a10765c13487ba6a3 upstream. When emulating guest instructions for MMIO or IOIO accesses, the #VC handler might get a page-fault and will not be able to complete. Forward the page-fault in this case to the correct handler instead of killing the machine. Fixes: 0786138c78e7 ("x86/sev-es: Add a Runtime #VC Exception Handler") Signed-off-by: Joerg Roedel Signed-off-by: Borislav Petkov Cc: stable@vger.kernel.org # v5.10+ Link: https://lkml.kernel.org/r/20210519135251.30093-3-joro@8bytes.org Signed-off-by: Greg Kroah-Hartman --- diff --git a/arch/x86/kernel/sev-es.c b/arch/x86/kernel/sev-es.c index 54c0585410ff9..e0cdab7cb632b 100644 --- a/arch/x86/kernel/sev-es.c +++ b/arch/x86/kernel/sev-es.c @@ -1269,6 +1269,10 @@ static __always_inline void vc_forward_exception(struct es_em_ctxt *ctxt) case X86_TRAP_UD: exc_invalid_op(ctxt->regs); break; + case X86_TRAP_PF: + write_cr2(ctxt->fi.cr2); + exc_page_fault(ctxt->regs, error_code); + break; case X86_TRAP_AC: exc_alignment_check(ctxt->regs, error_code); break;