Commit af36aed7 authored by liangtian's avatar liangtian Committed by Zheng Zengkai
Browse files

x86: KVM: Fixed the bug that WAITmax cannot be updated in real time 

virt inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I53PTV?from=project-issue


CVE: NA

-----------------------------------------------------

Since the reset function is in kvm_intel module instead of kvm
module, the attribute weak function in kvm_main.c could not be found, which
would cause st_max in X86 never be refreshed.
The solution is to define the reset function in x86.c under the kvm module.

Signed-off-by: default avatarliangtian <liangtian13@huawei.com>
Reviewed-by: default avatarKeqian Zhu <zhukeqian1@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 66302644

arch/x86/kvm/vmx/vmx.c

+0 −5
Original line number Diff line number Diff line
@@ -367,11 +367,6 @@ static u32 vmx_segment_access_rights(struct kvm_segment *var); 
static __always_inline void vmx_disable_intercept_for_msr(struct kvm_vcpu *vcpu,

							  u32 msr, int type);



void kvm_arch_vcpu_stat_reset(struct kvm_vcpu_stat *vcpu_stat)

{

	vcpu_stat->st_max = 0;

}



void vmx_vmexit(void);



#define vmx_insn_failed(fmt...)		\

arch/x86/kvm/x86.c

+5 −0
Original line number Diff line number Diff line
@@ -11472,6 +11472,11 @@ int kvm_handle_invpcid(struct kvm_vcpu *vcpu, unsigned long type, gva_t gva) 
}

EXPORT_SYMBOL_GPL(kvm_handle_invpcid);



void kvm_arch_vcpu_stat_reset(struct kvm_vcpu_stat *vcpu_stat)

{

        vcpu_stat->st_max = 0;

}



EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_exit);

EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_fast_mmio);

EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_inj_virq);