Unverified Commit c2cd749e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!829 [sync] PR-739: Fix kvm-unit-tests vmx_cr4_osxsave_test case failed 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/739 
 
https://gitee.com/openeuler/kernel/issues/I72190 
 
Link:https://gitee.com/openeuler/kernel/pulls/829

 

Reviewed-by: default avatarKevin Zhu <zhukeqian1@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 2d0e3041 9dbcae86

arch/x86/kvm/cpuid.c

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ void kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu) 
					   MSR_IA32_MISC_ENABLE_MWAIT);

	}

}

EXPORT_SYMBOL_GPL(kvm_update_cpuid_runtime);



static void kvm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu)

{

arch/x86/kvm/svm/svm.c

+3 −0
Original line number Diff line number Diff line
@@ -1711,6 +1711,9 @@ void svm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) 
	cr4 |= host_cr4_mce;

	to_svm(vcpu)->vmcb->save.cr4 = cr4;

	vmcb_mark_dirty(to_svm(vcpu)->vmcb, VMCB_CR);



	if ((cr4 ^ old_cr4) & (X86_CR4_OSXSAVE | X86_CR4_PKE))

		kvm_update_cpuid_runtime(vcpu);

}



static void svm_set_segment(struct kvm_vcpu *vcpu,

arch/x86/kvm/vmx/vmx.c

+4 −0
Original line number Diff line number Diff line
@@ -3251,6 +3251,7 @@ static bool vmx_is_valid_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) 


void vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)

{

	unsigned long old_cr4 = vcpu->arch.cr4;

	struct vcpu_vmx *vmx = to_vmx(vcpu);

	/*

	 * Pass through host's Machine Check Enable value to hw_cr4, which
@@ -3307,6 +3308,9 @@ void vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) 


	vmcs_writel(CR4_READ_SHADOW, cr4);

	vmcs_writel(GUEST_CR4, hw_cr4);



	if ((cr4 ^ old_cr4) & (X86_CR4_OSXSAVE | X86_CR4_PKE))

		kvm_update_cpuid_runtime(vcpu);

}



void vmx_get_segment(struct kvm_vcpu *vcpu, struct kvm_segment *var, int seg)

arch/x86/kvm/x86.c

+0 −8
Original line number Diff line number Diff line
@@ -1081,9 +1081,6 @@ int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) 
	    (!(cr4 & X86_CR4_PCIDE) && (old_cr4 & X86_CR4_PCIDE)))

		kvm_mmu_reset_context(vcpu);



	if ((cr4 ^ old_cr4) & (X86_CR4_OSXSAVE | X86_CR4_PKE))

		kvm_update_cpuid_runtime(vcpu);



	return 0;

}

EXPORT_SYMBOL_GPL(kvm_set_cr4);
@@ -9835,7 +9832,6 @@ static int __set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs) 
{

	struct msr_data apic_base_msr;

	int mmu_reset_needed = 0;

	int cpuid_update_needed = 0;

	int pending_vec, max_bits, idx;

	struct desc_ptr dt;

	int ret = -EINVAL;
@@ -9870,11 +9866,7 @@ static int __set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs) 
	vcpu->arch.cr0 = sregs->cr0;



	mmu_reset_needed |= kvm_read_cr4(vcpu) != sregs->cr4;

	cpuid_update_needed |= ((kvm_read_cr4(vcpu) ^ sregs->cr4) &

				(X86_CR4_OSXSAVE | X86_CR4_PKE));

	kvm_x86_ops.set_cr4(vcpu, sregs->cr4);

	if (cpuid_update_needed)

		kvm_update_cpuid_runtime(vcpu);



	idx = srcu_read_lock(&vcpu->kvm->srcu);

	if (is_pae_paging(vcpu)) {