update SMM shadow fixes to v3

[pve-kernel.git] / patches / kernel / 0018-KVM-x86-emulator-update-the-emulation-mode-after-rsm.patch

diff --git a/patches/kernel/0018-KVM-x86-emulator-update-the-emulation-mode-after-rsm.patch b/patches/kernel/0018-KVM-x86-emulator-update-the-emulation-mode-after-rsm.patch
index b18ccf55aac06f790f62facbd6b84b5d6a420b99..0f1c9ca89b271f750bb3b01a7235c5b83b9c7bd4 100644 (file)
--- a/patches/kernel/0018-KVM-x86-emulator-update-the-emulation-mode-after-rsm.patch
+++ b/patches/kernel/0018-KVM-x86-emulator-update-the-emulation-mode-after-rsm.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Maxim Levitsky <mlevitsk@redhat.com>
-Date: Tue, 21 Jun 2022 18:08:55 +0300
+Date: Wed, 3 Aug 2022 18:50:02 +0300
 Subject: [PATCH] KVM: x86: emulator: update the emulation mode after rsm
 
 This ensures that RIP will be correctly written back,
@@ -17,15 +17,15 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
-index 9e305e0cd815..c582639ea2b4 100644
+index 6a597d68d456..49697d589f87 100644
 --- a/arch/x86/kvm/emulate.c
 +++ b/arch/x86/kvm/emulate.c
-@@ -2635,6 +2635,11 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt)
+@@ -2639,6 +2639,11 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt)
        if (ret != X86EMUL_CONTINUE)
                goto emulate_shutdown;
  
 +
-+      ret = update_emulation_mode(ctxt);
++      ret = emulator_recalc_and_set_mode(ctxt);
 +      if (ret != X86EMUL_CONTINUE)
 +              goto emulate_shutdown;
 +