Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 893cd858 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Greg Kroah-Hartman
Browse files

x86/kvm/vmx: Make noinstr clean 



commit 742ab6df974ae8384a2dd213db1a3a06cf6d8936 upstream.

The recent mmio_stale_data fixes broke the noinstr constraints:

  vmlinux.o: warning: objtool: vmx_vcpu_enter_exit+0x15b: call to wrmsrl.constprop.0() leaves .noinstr.text section
  vmlinux.o: warning: objtool: vmx_vcpu_enter_exit+0x1bf: call to kvm_arch_has_assigned_device() leaves .noinstr.text section

make it all happy again.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f62d272c

arch/x86/kvm/vmx/vmx.c

+3 −3
Original line number Diff line number Diff line
@@ -359,9 +359,9 @@ static __always_inline void vmx_disable_fb_clear(struct vcpu_vmx *vmx) 
	if (!vmx->disable_fb_clear)

		return;



	rdmsrl(MSR_IA32_MCU_OPT_CTRL, msr);

	msr = __rdmsr(MSR_IA32_MCU_OPT_CTRL);

	msr |= FB_CLEAR_DIS;

	wrmsrl(MSR_IA32_MCU_OPT_CTRL, msr);

	native_wrmsrl(MSR_IA32_MCU_OPT_CTRL, msr);

	/* Cache the MSR value to avoid reading it later */

	vmx->msr_ia32_mcu_opt_ctrl = msr;

}
@@ -372,7 +372,7 @@ static __always_inline void vmx_enable_fb_clear(struct vcpu_vmx *vmx) 
		return;



	vmx->msr_ia32_mcu_opt_ctrl &= ~FB_CLEAR_DIS;

	wrmsrl(MSR_IA32_MCU_OPT_CTRL, vmx->msr_ia32_mcu_opt_ctrl);

	native_wrmsrl(MSR_IA32_MCU_OPT_CTRL, vmx->msr_ia32_mcu_opt_ctrl);

}



static void vmx_update_fb_clear_dis(struct kvm_vcpu *vcpu, struct vcpu_vmx *vmx)

arch/x86/kvm/x86.c

+2 −2
Original line number Diff line number Diff line
@@ -10329,9 +10329,9 @@ void kvm_arch_end_assignment(struct kvm *kvm) 
}

EXPORT_SYMBOL_GPL(kvm_arch_end_assignment);



bool kvm_arch_has_assigned_device(struct kvm *kvm)

bool noinstr kvm_arch_has_assigned_device(struct kvm *kvm)

{

	return atomic_read(&kvm->arch.assigned_device_count);

	return arch_atomic_read(&kvm->arch.assigned_device_count);

}

EXPORT_SYMBOL_GPL(kvm_arch_has_assigned_device);

include/linux/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -955,7 +955,7 @@ static inline void kvm_arch_end_assignment(struct kvm *kvm) 
{

}



static inline bool kvm_arch_has_assigned_device(struct kvm *kvm)

static __always_inline bool kvm_arch_has_assigned_device(struct kvm *kvm)

{

	return false;

}