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

Commit 082d06ed authored by Wanpeng Li's avatar Wanpeng Li Committed by Paolo Bonzini
Browse files

KVM: X86: Introduce handle_ud() 



Introduce handle_ud() to handle invalid opcode, this function will be
used by later patches.

Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: default avatarLiran Alon <liran.alon@oracle.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim KrÄmář <rkrcmar@redhat.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Liran Alon <liran.alon@oracle.com>
Signed-off-by: default avatarWanpeng Li <wanpengli@tencent.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4fde8d57

arch/x86/kvm/svm.c

+1 −8
Original line number Diff line number Diff line
@@ -2676,14 +2676,7 @@ static int bp_interception(struct vcpu_svm *svm) 


static int ud_interception(struct vcpu_svm *svm)

{

	int er;



	er = emulate_instruction(&svm->vcpu, EMULTYPE_TRAP_UD);

	if (er == EMULATE_USER_EXIT)

		return 0;

	if (er != EMULATE_DONE)

		kvm_queue_exception(&svm->vcpu, UD_VECTOR);

	return 1;

	return handle_ud(&svm->vcpu);

}



static int ac_interception(struct vcpu_svm *svm)

arch/x86/kvm/vmx.c

+2 −8
Original line number Diff line number Diff line
@@ -6434,14 +6434,8 @@ static int handle_exception(struct kvm_vcpu *vcpu) 
	if (is_nmi(intr_info))

		return 1;  /* already handled by vmx_vcpu_run() */



	if (is_invalid_opcode(intr_info)) {

		er = emulate_instruction(vcpu, EMULTYPE_TRAP_UD);

		if (er == EMULATE_USER_EXIT)

			return 0;

		if (er != EMULATE_DONE)

			kvm_queue_exception(vcpu, UD_VECTOR);

		return 1;

	}

	if (is_invalid_opcode(intr_info))

		return handle_ud(vcpu);



	error_code = 0;

	if (intr_info & INTR_INFO_DELIVER_CODE_MASK)

arch/x86/kvm/x86.c

+13 −0
Original line number Diff line number Diff line
@@ -4840,6 +4840,19 @@ int kvm_write_guest_virt_system(struct x86_emulate_ctxt *ctxt, 
}

EXPORT_SYMBOL_GPL(kvm_write_guest_virt_system);



int handle_ud(struct kvm_vcpu *vcpu)

{

	enum emulation_result er;



	er = emulate_instruction(vcpu, EMULTYPE_TRAP_UD);

	if (er == EMULATE_USER_EXIT)

		return 0;

	if (er != EMULATE_DONE)

		kvm_queue_exception(vcpu, UD_VECTOR);

	return 1;

}

EXPORT_SYMBOL_GPL(handle_ud);



static int vcpu_is_mmio_gpa(struct kvm_vcpu *vcpu, unsigned long gva,

			    gpa_t gpa, bool write)

{

arch/x86/kvm/x86.h

+2 −0
Original line number Diff line number Diff line
@@ -255,6 +255,8 @@ int kvm_write_guest_virt_system(struct x86_emulate_ctxt *ctxt, 
	gva_t addr, void *val, unsigned int bytes,

	struct x86_exception *exception);



int handle_ud(struct kvm_vcpu *vcpu);



void kvm_vcpu_mtrr_init(struct kvm_vcpu *vcpu);

u8 kvm_mtrr_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn);

bool kvm_mtrr_valid(struct kvm_vcpu *vcpu, u32 msr, u64 data);