mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
x86/kvm/vmx: Make noinstr clean
commit 742ab6df97
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: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
accb8cfd50
commit
7070bbb66c
3 changed files with 6 additions and 6 deletions
|
@ -380,9 +380,9 @@ static __always_inline void vmx_disable_fb_clear(struct vcpu_vmx *vmx)
|
||||||
if (!vmx->disable_fb_clear)
|
if (!vmx->disable_fb_clear)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
rdmsrl(MSR_IA32_MCU_OPT_CTRL, msr);
|
msr = __rdmsr(MSR_IA32_MCU_OPT_CTRL);
|
||||||
msr |= FB_CLEAR_DIS;
|
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 */
|
/* Cache the MSR value to avoid reading it later */
|
||||||
vmx->msr_ia32_mcu_opt_ctrl = msr;
|
vmx->msr_ia32_mcu_opt_ctrl = msr;
|
||||||
}
|
}
|
||||||
|
@ -393,7 +393,7 @@ static __always_inline void vmx_enable_fb_clear(struct vcpu_vmx *vmx)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
vmx->msr_ia32_mcu_opt_ctrl &= ~FB_CLEAR_DIS;
|
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)
|
static void vmx_update_fb_clear_dis(struct kvm_vcpu *vcpu, struct vcpu_vmx *vmx)
|
||||||
|
|
|
@ -11173,9 +11173,9 @@ void kvm_arch_end_assignment(struct kvm *kvm)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(kvm_arch_end_assignment);
|
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);
|
EXPORT_SYMBOL_GPL(kvm_arch_has_assigned_device);
|
||||||
|
|
||||||
|
|
|
@ -988,7 +988,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;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue