]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop kvm-vmx-allow-guest-to-set-debugctl.rtm_debug-if-rtm-is-supported.patch from...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 12 Aug 2025 16:57:40 +0000 (18:57 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 12 Aug 2025 16:57:40 +0000 (18:57 +0200)
Breaks the build :(

queue-5.15/kvm-vmx-allow-guest-to-set-debugctl.rtm_debug-if-rtm-is-supported.patch [deleted file]
queue-5.15/series
queue-6.1/kvm-vmx-allow-guest-to-set-debugctl.rtm_debug-if-rtm-is-supported.patch [deleted file]
queue-6.1/series
queue-6.12/kvm-vmx-allow-guest-to-set-debugctl.rtm_debug-if-rtm-is-supported.patch [deleted file]
queue-6.12/series
queue-6.6/kvm-vmx-allow-guest-to-set-debugctl.rtm_debug-if-rtm-is-supported.patch [deleted file]
queue-6.6/series

diff --git a/queue-5.15/kvm-vmx-allow-guest-to-set-debugctl.rtm_debug-if-rtm-is-supported.patch b/queue-5.15/kvm-vmx-allow-guest-to-set-debugctl.rtm_debug-if-rtm-is-supported.patch
deleted file mode 100644 (file)
index d8c604e..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From 17ec2f965344ee3fd6620bef7ef68792f4ac3af0 Mon Sep 17 00:00:00 2001
-From: Sean Christopherson <seanjc@google.com>
-Date: Tue, 10 Jun 2025 16:20:06 -0700
-Subject: KVM: VMX: Allow guest to set DEBUGCTL.RTM_DEBUG if RTM is supported
-
-From: Sean Christopherson <seanjc@google.com>
-
-commit 17ec2f965344ee3fd6620bef7ef68792f4ac3af0 upstream.
-
-Let the guest set DEBUGCTL.RTM_DEBUG if RTM is supported according to the
-guest CPUID model, as debug support is supposed to be available if RTM is
-supported, and there are no known downsides to letting the guest debug RTM
-aborts.
-
-Note, there are no known bug reports related to RTM_DEBUG, the primary
-motivation is to reduce the probability of breaking existing guests when a
-future change adds a missing consistency check on vmcs12.GUEST_DEBUGCTL
-(KVM currently lets L2 run with whatever hardware supports; whoops).
-
-Note #2, KVM already emulates DR6.RTM, and doesn't restrict access to
-DR7.RTM.
-
-Fixes: 83c529151ab0 ("KVM: x86: expose Intel cpu new features (HLE, RTM) to guest")
-Cc: stable@vger.kernel.org
-Link: https://lore.kernel.org/r/20250610232010.162191-5-seanjc@google.com
-Signed-off-by: Sean Christopherson <seanjc@google.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/x86/include/asm/msr-index.h |    1 +
- arch/x86/kvm/vmx/vmx.c           |    4 ++++
- 2 files changed, 5 insertions(+)
-
---- a/arch/x86/include/asm/msr-index.h
-+++ b/arch/x86/include/asm/msr-index.h
-@@ -359,6 +359,7 @@
- #define DEBUGCTLMSR_FREEZE_PERFMON_ON_PMI     (1UL << 12)
- #define DEBUGCTLMSR_FREEZE_IN_SMM_BIT 14
- #define DEBUGCTLMSR_FREEZE_IN_SMM     (1UL << DEBUGCTLMSR_FREEZE_IN_SMM_BIT)
-+#define DEBUGCTLMSR_RTM_DEBUG         BIT(15)
- #define MSR_PEBS_FRONTEND             0x000003f7
---- a/arch/x86/kvm/vmx/vmx.c
-+++ b/arch/x86/kvm/vmx/vmx.c
-@@ -2018,6 +2018,10 @@ static u64 vcpu_supported_debugctl(struc
-       if (!guest_cpuid_has(vcpu, X86_FEATURE_BUS_LOCK_DETECT))
-               debugctl &= ~DEBUGCTLMSR_BUS_LOCK_DETECT;
-+      if (boot_cpu_has(X86_FEATURE_RTM) &&
-+          (host_initiated || guest_cpu_cap_has(vcpu, X86_FEATURE_RTM)))
-+              debugctl |= DEBUGCTLMSR_RTM_DEBUG;
-+
-       return debugctl;
- }
index 08a84bb2f2b486fc4c8c4726626616dd0035607b..c294350b97e17144df5638a420524a0394adb3f6 100644 (file)
@@ -252,7 +252,6 @@ usb-serial-option-add-foxconn-t99w709.patch
 net-usbnet-avoid-potential-rcu-stall-on-link_change-event.patch
 net-usbnet-fix-the-wrong-netif_carrier_on-call.patch
 alsa-intel_hdmi-fix-off-by-one-error-in-__hdmi_lpe_audio_probe.patch
-kvm-vmx-allow-guest-to-set-debugctl.rtm_debug-if-rtm-is-supported.patch
 mips-mm-tlb-r4k-uniquify-tlb-entries-on-init.patch
 mm-hmm-move-pmd_to_hmm_pfn_flags-to-the-respective-ifdeffery.patch
 usb-gadget-fix-use-after-free-in-composite_dev_cleanup.patch
diff --git a/queue-6.1/kvm-vmx-allow-guest-to-set-debugctl.rtm_debug-if-rtm-is-supported.patch b/queue-6.1/kvm-vmx-allow-guest-to-set-debugctl.rtm_debug-if-rtm-is-supported.patch
deleted file mode 100644 (file)
index d72c9f0..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From 17ec2f965344ee3fd6620bef7ef68792f4ac3af0 Mon Sep 17 00:00:00 2001
-From: Sean Christopherson <seanjc@google.com>
-Date: Tue, 10 Jun 2025 16:20:06 -0700
-Subject: KVM: VMX: Allow guest to set DEBUGCTL.RTM_DEBUG if RTM is supported
-
-From: Sean Christopherson <seanjc@google.com>
-
-commit 17ec2f965344ee3fd6620bef7ef68792f4ac3af0 upstream.
-
-Let the guest set DEBUGCTL.RTM_DEBUG if RTM is supported according to the
-guest CPUID model, as debug support is supposed to be available if RTM is
-supported, and there are no known downsides to letting the guest debug RTM
-aborts.
-
-Note, there are no known bug reports related to RTM_DEBUG, the primary
-motivation is to reduce the probability of breaking existing guests when a
-future change adds a missing consistency check on vmcs12.GUEST_DEBUGCTL
-(KVM currently lets L2 run with whatever hardware supports; whoops).
-
-Note #2, KVM already emulates DR6.RTM, and doesn't restrict access to
-DR7.RTM.
-
-Fixes: 83c529151ab0 ("KVM: x86: expose Intel cpu new features (HLE, RTM) to guest")
-Cc: stable@vger.kernel.org
-Link: https://lore.kernel.org/r/20250610232010.162191-5-seanjc@google.com
-Signed-off-by: Sean Christopherson <seanjc@google.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/x86/include/asm/msr-index.h |    1 +
- arch/x86/kvm/vmx/vmx.c           |    4 ++++
- 2 files changed, 5 insertions(+)
-
---- a/arch/x86/include/asm/msr-index.h
-+++ b/arch/x86/include/asm/msr-index.h
-@@ -379,6 +379,7 @@
- #define DEBUGCTLMSR_FREEZE_PERFMON_ON_PMI     (1UL << 12)
- #define DEBUGCTLMSR_FREEZE_IN_SMM_BIT 14
- #define DEBUGCTLMSR_FREEZE_IN_SMM     (1UL << DEBUGCTLMSR_FREEZE_IN_SMM_BIT)
-+#define DEBUGCTLMSR_RTM_DEBUG         BIT(15)
- #define MSR_PEBS_FRONTEND             0x000003f7
---- a/arch/x86/kvm/vmx/vmx.c
-+++ b/arch/x86/kvm/vmx/vmx.c
-@@ -2068,6 +2068,10 @@ static u64 vmx_get_supported_debugctl(st
-           (host_initiated || intel_pmu_lbr_is_enabled(vcpu)))
-               debugctl |= DEBUGCTLMSR_LBR | DEBUGCTLMSR_FREEZE_LBRS_ON_PMI;
-+      if (boot_cpu_has(X86_FEATURE_RTM) &&
-+          (host_initiated || guest_cpu_cap_has(vcpu, X86_FEATURE_RTM)))
-+              debugctl |= DEBUGCTLMSR_RTM_DEBUG;
-+
-       return debugctl;
- }
index eea4737a5773a4cf2f2219d09fcb7331a53e0e1b..bf6917dac5184bf54e14ea9779061914ae1de103 100644 (file)
@@ -248,7 +248,6 @@ x86-sev-evict-cache-lines-during-snp-memory-validation.patch
 alsa-intel_hdmi-fix-off-by-one-error-in-__hdmi_lpe_audio_probe.patch
 alsa-scarlett2-add-retry-on-eproto-from-scarlett2_usb_tx.patch
 x86-fpu-delay-instruction-pointer-fixup-until-after-warning.patch
-kvm-vmx-allow-guest-to-set-debugctl.rtm_debug-if-rtm-is-supported.patch
 mips-mm-tlb-r4k-uniquify-tlb-entries-on-init.patch
 mm-hmm-move-pmd_to_hmm_pfn_flags-to-the-respective-ifdeffery.patch
 usb-gadget-fix-use-after-free-in-composite_dev_cleanup.patch
diff --git a/queue-6.12/kvm-vmx-allow-guest-to-set-debugctl.rtm_debug-if-rtm-is-supported.patch b/queue-6.12/kvm-vmx-allow-guest-to-set-debugctl.rtm_debug-if-rtm-is-supported.patch
deleted file mode 100644 (file)
index 63fe260..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From 17ec2f965344ee3fd6620bef7ef68792f4ac3af0 Mon Sep 17 00:00:00 2001
-From: Sean Christopherson <seanjc@google.com>
-Date: Tue, 10 Jun 2025 16:20:06 -0700
-Subject: KVM: VMX: Allow guest to set DEBUGCTL.RTM_DEBUG if RTM is supported
-
-From: Sean Christopherson <seanjc@google.com>
-
-commit 17ec2f965344ee3fd6620bef7ef68792f4ac3af0 upstream.
-
-Let the guest set DEBUGCTL.RTM_DEBUG if RTM is supported according to the
-guest CPUID model, as debug support is supposed to be available if RTM is
-supported, and there are no known downsides to letting the guest debug RTM
-aborts.
-
-Note, there are no known bug reports related to RTM_DEBUG, the primary
-motivation is to reduce the probability of breaking existing guests when a
-future change adds a missing consistency check on vmcs12.GUEST_DEBUGCTL
-(KVM currently lets L2 run with whatever hardware supports; whoops).
-
-Note #2, KVM already emulates DR6.RTM, and doesn't restrict access to
-DR7.RTM.
-
-Fixes: 83c529151ab0 ("KVM: x86: expose Intel cpu new features (HLE, RTM) to guest")
-Cc: stable@vger.kernel.org
-Link: https://lore.kernel.org/r/20250610232010.162191-5-seanjc@google.com
-Signed-off-by: Sean Christopherson <seanjc@google.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/x86/include/asm/msr-index.h |    1 +
- arch/x86/kvm/vmx/vmx.c           |    4 ++++
- 2 files changed, 5 insertions(+)
-
---- a/arch/x86/include/asm/msr-index.h
-+++ b/arch/x86/include/asm/msr-index.h
-@@ -417,6 +417,7 @@
- #define DEBUGCTLMSR_FREEZE_PERFMON_ON_PMI     (1UL << 12)
- #define DEBUGCTLMSR_FREEZE_IN_SMM_BIT 14
- #define DEBUGCTLMSR_FREEZE_IN_SMM     (1UL << DEBUGCTLMSR_FREEZE_IN_SMM_BIT)
-+#define DEBUGCTLMSR_RTM_DEBUG         BIT(15)
- #define MSR_PEBS_FRONTEND             0x000003f7
---- a/arch/x86/kvm/vmx/vmx.c
-+++ b/arch/x86/kvm/vmx/vmx.c
-@@ -2185,6 +2185,10 @@ static u64 vmx_get_supported_debugctl(st
-           (host_initiated || intel_pmu_lbr_is_enabled(vcpu)))
-               debugctl |= DEBUGCTLMSR_LBR | DEBUGCTLMSR_FREEZE_LBRS_ON_PMI;
-+      if (boot_cpu_has(X86_FEATURE_RTM) &&
-+          (host_initiated || guest_cpu_cap_has(vcpu, X86_FEATURE_RTM)))
-+              debugctl |= DEBUGCTLMSR_RTM_DEBUG;
-+
-       return debugctl;
- }
index b4dec9b278ec9421b6069d91cc66b6da20bca883..1eaf31f6fa21499fff084ef9b5acc9b83d8e25c3 100644 (file)
@@ -357,7 +357,6 @@ alsa-hda-realtek-fix-mute-led-for-hp-victus-16-s0xxx.patch
 alsa-hda-realtek-fix-mute-led-for-hp-victus-16-d1xxx-mb-8a26.patch
 platform-x86-intel-pmt-fix-a-crashlog-null-pointer-access.patch
 x86-fpu-delay-instruction-pointer-fixup-until-after-warning.patch
-kvm-vmx-allow-guest-to-set-debugctl.rtm_debug-if-rtm-is-supported.patch
 s390-mm-remove-possible-false-positive-warning-in-pte_free_defer.patch
 mips-mm-tlb-r4k-uniquify-tlb-entries-on-init.patch
 mm-hmm-move-pmd_to_hmm_pfn_flags-to-the-respective-ifdeffery.patch
diff --git a/queue-6.6/kvm-vmx-allow-guest-to-set-debugctl.rtm_debug-if-rtm-is-supported.patch b/queue-6.6/kvm-vmx-allow-guest-to-set-debugctl.rtm_debug-if-rtm-is-supported.patch
deleted file mode 100644 (file)
index 748eaac..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From 17ec2f965344ee3fd6620bef7ef68792f4ac3af0 Mon Sep 17 00:00:00 2001
-From: Sean Christopherson <seanjc@google.com>
-Date: Tue, 10 Jun 2025 16:20:06 -0700
-Subject: KVM: VMX: Allow guest to set DEBUGCTL.RTM_DEBUG if RTM is supported
-
-From: Sean Christopherson <seanjc@google.com>
-
-commit 17ec2f965344ee3fd6620bef7ef68792f4ac3af0 upstream.
-
-Let the guest set DEBUGCTL.RTM_DEBUG if RTM is supported according to the
-guest CPUID model, as debug support is supposed to be available if RTM is
-supported, and there are no known downsides to letting the guest debug RTM
-aborts.
-
-Note, there are no known bug reports related to RTM_DEBUG, the primary
-motivation is to reduce the probability of breaking existing guests when a
-future change adds a missing consistency check on vmcs12.GUEST_DEBUGCTL
-(KVM currently lets L2 run with whatever hardware supports; whoops).
-
-Note #2, KVM already emulates DR6.RTM, and doesn't restrict access to
-DR7.RTM.
-
-Fixes: 83c529151ab0 ("KVM: x86: expose Intel cpu new features (HLE, RTM) to guest")
-Cc: stable@vger.kernel.org
-Link: https://lore.kernel.org/r/20250610232010.162191-5-seanjc@google.com
-Signed-off-by: Sean Christopherson <seanjc@google.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/x86/include/asm/msr-index.h |    1 +
- arch/x86/kvm/vmx/vmx.c           |    4 ++++
- 2 files changed, 5 insertions(+)
-
---- a/arch/x86/include/asm/msr-index.h
-+++ b/arch/x86/include/asm/msr-index.h
-@@ -380,6 +380,7 @@
- #define DEBUGCTLMSR_FREEZE_PERFMON_ON_PMI     (1UL << 12)
- #define DEBUGCTLMSR_FREEZE_IN_SMM_BIT 14
- #define DEBUGCTLMSR_FREEZE_IN_SMM     (1UL << DEBUGCTLMSR_FREEZE_IN_SMM_BIT)
-+#define DEBUGCTLMSR_RTM_DEBUG         BIT(15)
- #define MSR_PEBS_FRONTEND             0x000003f7
---- a/arch/x86/kvm/vmx/vmx.c
-+++ b/arch/x86/kvm/vmx/vmx.c
-@@ -2165,6 +2165,10 @@ static u64 vmx_get_supported_debugctl(st
-           (host_initiated || intel_pmu_lbr_is_enabled(vcpu)))
-               debugctl |= DEBUGCTLMSR_LBR | DEBUGCTLMSR_FREEZE_LBRS_ON_PMI;
-+      if (boot_cpu_has(X86_FEATURE_RTM) &&
-+          (host_initiated || guest_cpu_cap_has(vcpu, X86_FEATURE_RTM)))
-+              debugctl |= DEBUGCTLMSR_RTM_DEBUG;
-+
-       return debugctl;
- }
index f9eda6c6af6a9d373752be18f77742141eb632bc..733617aa6ad663d15a3c61934e7628026f247326 100644 (file)
@@ -257,7 +257,6 @@ x86-sev-evict-cache-lines-during-snp-memory-validation.patch
 alsa-intel_hdmi-fix-off-by-one-error-in-__hdmi_lpe_audio_probe.patch
 alsa-scarlett2-add-retry-on-eproto-from-scarlett2_usb_tx.patch
 x86-fpu-delay-instruction-pointer-fixup-until-after-warning.patch
-kvm-vmx-allow-guest-to-set-debugctl.rtm_debug-if-rtm-is-supported.patch
 mips-mm-tlb-r4k-uniquify-tlb-entries-on-init.patch
 mm-hmm-move-pmd_to_hmm_pfn_flags-to-the-respective-ifdeffery.patch
 usb-gadget-fix-use-after-free-in-composite_dev_cleanup.patch