Commit 206c07d6 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/bugs' into x86/core, to merge dependent commits 

Prepare to resolve conflicts with an upstream series of fixes that conflict
with pending x86 changes:

  6f5bf947 Merge tag 'its-for-linus-20250509' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents fa6b90ee 1f4bb068

arch/x86/include/asm/nospec-branch.h

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ DECLARE_STATIC_KEY_FALSE(mds_idle_clear); 


DECLARE_STATIC_KEY_FALSE(switch_mm_cond_l1d_flush);



DECLARE_STATIC_KEY_FALSE(mmio_stale_data_clear);

DECLARE_STATIC_KEY_FALSE(cpu_buf_vm_clear);



extern u16 mds_verw_sel;

arch/x86/include/asm/processor.h

+1 −0
Original line number Diff line number Diff line
@@ -734,6 +734,7 @@ void store_cpu_caps(struct cpuinfo_x86 *info); 


enum l1tf_mitigations {

	L1TF_MITIGATION_OFF,

	L1TF_MITIGATION_AUTO,

	L1TF_MITIGATION_FLUSH_NOWARN,

	L1TF_MITIGATION_FLUSH,

	L1TF_MITIGATION_FLUSH_NOSMT,

arch/x86/kernel/cpu/bugs.c

+675 −508

File changed.

Preview size limit exceeded, changes collapsed.

arch/x86/kvm/vmx/vmx.c

+7 −1
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ static int vmx_setup_l1d_flush(enum vmx_l1d_flush_state l1tf) 
		case L1TF_MITIGATION_OFF:

			l1tf = VMENTER_L1D_FLUSH_NEVER;

			break;

		case L1TF_MITIGATION_AUTO:

		case L1TF_MITIGATION_FLUSH_NOWARN:

		case L1TF_MITIGATION_FLUSH:

		case L1TF_MITIGATION_FLUSH_NOSMT:
@@ -7358,10 +7359,14 @@ static noinstr void vmx_vcpu_enter_exit(struct kvm_vcpu *vcpu, 
	 * mitigation for MDS is done late in VMentry and is still

	 * executed in spite of L1D Flush. This is because an extra VERW

	 * should not matter much after the big hammer L1D Flush.

	 *

	 * cpu_buf_vm_clear is used when system is not vulnerable to MDS/TAA,

	 * and is affected by MMIO Stale Data. In such cases mitigation in only

	 * needed against an MMIO capable guest.

	 */

	if (static_branch_unlikely(&vmx_l1d_should_flush))

		vmx_l1d_flush(vcpu);

	else if (static_branch_unlikely(&mmio_stale_data_clear) &&

	else if (static_branch_unlikely(&cpu_buf_vm_clear) &&

		 kvm_arch_has_assigned_device(vcpu->kvm))

		mds_clear_cpu_buffers();
@@ -7700,6 +7705,7 @@ int vmx_vm_init(struct kvm *kvm) 
		case L1TF_MITIGATION_FLUSH_NOWARN:

			/* 'I explicitly don't care' is set */

			break;

		case L1TF_MITIGATION_AUTO:

		case L1TF_MITIGATION_FLUSH:

		case L1TF_MITIGATION_FLUSH_NOSMT:

		case L1TF_MITIGATION_FULL: