drop queue-5.10/kvm-x86-emulator-update-the-emulation-mode-after-rsm.patch

Does nothing :(

diff --git a/queue-5.10/kvm-x86-emulator-update-the-emulation-mode-after-rsm.patch b/queue-5.10/kvm-x86-emulator-update-the-emulation-mode-after-rsm.patch
deleted file mode 100644 (file)
index a6cbf57..0000000
--- a/queue-5.10/kvm-x86-emulator-update-the-emulation-mode-after-rsm.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 1a486c91185478cad25036affe91050eebd95be6 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 Oct 2022 15:47:30 +0300
-Subject: KVM: x86: emulator: update the emulation mode after rsm
-
-From: Maxim Levitsky <mlevitsk@redhat.com>
-
-[ Upstream commit 055f37f84e304e59c046d1accfd8f08462f52c4c ]
-
-Update the emulation mode after RSM so that RIP will be correctly
-written back, because the RSM instruction can switch the CPU mode from
-32 bit (or less) to 64 bit.
-
-This fixes a guest crash in case the #SMI is received while the guest
-runs a code from an address > 32 bit.
-
-Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
-Message-Id: <20221025124741.228045-13-mlevitsk@redhat.com>
-Cc: stable@vger.kernel.org
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/kvm/emulate.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
-index 63efccc8f429..716d54b624e0 100644
---- a/arch/x86/kvm/emulate.c
-+++ b/arch/x86/kvm/emulate.c
-@@ -2746,6 +2746,15 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt)
- 
-       ctxt->ops->post_leave_smm(ctxt);
- 
-+      /*
-+       * Note, the ctxt->ops callbacks are responsible for handling side
-+       * effects when writing MSRs and CRs, e.g. MMU context resets, CPUID
-+       * runtime updates, etc...  If that changes, e.g. this flow is moved
-+       * out of the emulator to make it look more like enter_smm(), then
-+       * those side effects need to be explicitly handled for both success
-+       * and shutdown.
-+       */
-+
-       return X86EMUL_CONTINUE;
- }
- 
--- 
-2.35.1
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 95b78d12a5882e6c63c002ba38ef8e334f71667c..df62b1af22d21ecbd20a8eb97dada180d3921650 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -95,7 +95,6 @@ iio-light-apds9960-fix-wrong-register-for-gesture-gain.patch
 iio-core-fix-entry-not-deleted-when-iio_register_sw_trigger_type-fails.patch
 init-kconfig-fix-cc_has_asm_goto_tied_output-test-wi.patch
 nios2-add-force-for-vmlinuz.gz.patch
-kvm-x86-emulator-update-the-emulation-mode-after-rsm.patch
 mmc-sdhci-brcmstb-re-organize-flags.patch
 mmc-sdhci-brcmstb-enable-clock-gating-to-save-power.patch
 mmc-sdhci-brcmstb-fix-sdhci_reset_all-for-cqhci.patch