Commit bbefd4fc authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: move kvm_inject_gp up from kvm_set_xcr to callers 



Push the injection of #GP up to the callers, so that they can just use
kvm_complete_insn_gp.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent fd238002

arch/x86/kvm/svm/svm.c

+2 −5
Original line number Diff line number Diff line
@@ -2357,11 +2357,8 @@ static int xsetbv_interception(struct vcpu_svm *svm) 
	u64 new_bv = kvm_read_edx_eax(&svm->vcpu);

	u32 index = kvm_rcx_read(&svm->vcpu);



	if (kvm_set_xcr(&svm->vcpu, index, new_bv) == 0) {

		return kvm_skip_emulated_instruction(&svm->vcpu);

	}



	return 1;

	int err = kvm_set_xcr(&svm->vcpu, index, new_bv);

	return kvm_complete_insn_gp(&svm->vcpu, err);

}



static int rdpru_interception(struct vcpu_svm *svm)

arch/x86/kvm/vmx/vmx.c

+2 −3
Original line number Diff line number Diff line
@@ -5223,9 +5223,8 @@ static int handle_xsetbv(struct kvm_vcpu *vcpu) 
	u64 new_bv = kvm_read_edx_eax(vcpu);

	u32 index = kvm_rcx_read(vcpu);



	if (kvm_set_xcr(vcpu, index, new_bv) == 0)

		return kvm_skip_emulated_instruction(vcpu);

	return 1;

	int err = kvm_set_xcr(vcpu, index, new_bv);

	return kvm_complete_insn_gp(vcpu, err);

}



static int handle_apic_access(struct kvm_vcpu *vcpu)

arch/x86/kvm/x86.c

+4 −6
Original line number Diff line number Diff line
@@ -986,13 +986,11 @@ static int __kvm_set_xcr(struct kvm_vcpu *vcpu, u32 index, u64 xcr) 


int kvm_set_xcr(struct kvm_vcpu *vcpu, u32 index, u64 xcr)

{

	if (static_call(kvm_x86_get_cpl)(vcpu) != 0 ||

	    __kvm_set_xcr(vcpu, index, xcr)) {

		kvm_inject_gp(vcpu, 0);

	if (static_call(kvm_x86_get_cpl)(vcpu) == 0)

		return __kvm_set_xcr(vcpu, index, xcr);



	return 1;

}

	return 0;

}

EXPORT_SYMBOL_GPL(kvm_set_xcr);



bool kvm_is_valid_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)