This is a note to let you know that I've just added the patch titled KVM: x86: Add BHI_NO to the 6.6-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: kvm-x86-add-bhi_no.patch and it can be found in the queue-6.6 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 17233fed1ef4341bd93eff6906af3f7c8e93e818 Mon Sep 17 00:00:00 2001 From: Daniel Sneddon <daniel.sneddon@xxxxxxxxxxxxxxx> Date: Wed, 13 Mar 2024 09:49:17 -0700 Subject: KVM: x86: Add BHI_NO From: Daniel Sneddon <daniel.sneddon@xxxxxxxxxxxxxxx> commit ed2e8d49b54d677f3123668a21a57822d679651f upstream. Intel processors that aren't vulnerable to BHI will set MSR_IA32_ARCH_CAPABILITIES[BHI_NO] = 1;. Guests may use this BHI_NO bit to determine if they need to implement BHI mitigations or not. Allow this bit to be passed to the guests. Signed-off-by: Daniel Sneddon <daniel.sneddon@xxxxxxxxxxxxxxx> Signed-off-by: Pawan Gupta <pawan.kumar.gupta@xxxxxxxxxxxxxxx> Signed-off-by: Daniel Sneddon <daniel.sneddon@xxxxxxxxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Reviewed-by: Alexandre Chartre <alexandre.chartre@xxxxxxxxxx> Reviewed-by: Josh Poimboeuf <jpoimboe@xxxxxxxxxx> Signed-off-by: Daniel Sneddon <daniel.sneddon@xxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1621,7 +1621,7 @@ static bool kvm_is_immutable_feature_msr ARCH_CAP_PSCHANGE_MC_NO | ARCH_CAP_TSX_CTRL_MSR | ARCH_CAP_TAA_NO | \ ARCH_CAP_SBDR_SSDP_NO | ARCH_CAP_FBSDP_NO | ARCH_CAP_PSDP_NO | \ ARCH_CAP_FB_CLEAR | ARCH_CAP_RRSBA | ARCH_CAP_PBRSB_NO | ARCH_CAP_GDS_NO | \ - ARCH_CAP_RFDS_NO | ARCH_CAP_RFDS_CLEAR) + ARCH_CAP_RFDS_NO | ARCH_CAP_RFDS_CLEAR | ARCH_CAP_BHI_NO) static u64 kvm_get_arch_capabilities(void) { Patches currently in stable-queue which might be from daniel.sneddon@xxxxxxxxxxxxxxx are queue-6.6/x86-bhi-define-spec_ctrl_bhi_dis_s.patch queue-6.6/x86-bhi-add-support-for-clearing-branch-history-at-syscall-entry.patch queue-6.6/x86-bhi-mitigate-kvm-by-default.patch queue-6.6/x86-bhi-enumerate-branch-history-injection-bhi-bug.patch queue-6.6/x86-syscall-don-t-force-use-of-indirect-calls-for-system-calls.patch queue-6.6/x86-bugs-change-commas-to-semicolons-in-spectre_v2-sysfs-file.patch queue-6.6/x86-bhi-add-bhi-mitigation-knob.patch queue-6.6/kvm-x86-add-bhi_no.patch