Commit d4963e31 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86: Make kvm_queued_exception a properly named, visible struct 



Move the definition of "struct kvm_queued_exception" out of kvm_vcpu_arch
in anticipation of adding a second instance in kvm_vcpu_arch to handle
exceptions that occur when vectoring an injected exception and are
morphed to VM-Exit instead of leading to #DF.

Opportunistically take advantage of the churn to rename "nr" to "vector".

No functional change intended.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Reviewed-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Link: https://lore.kernel.org/r/20220830231614.3580124-15-seanjc@google.com


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

arch/x86/include/asm/kvm_host.h

+13 −10
Original line number Diff line number Diff line
@@ -641,6 +641,17 @@ struct kvm_vcpu_xen { 
	struct timer_list poll_timer;

};



struct kvm_queued_exception {

	bool pending;

	bool injected;

	bool has_error_code;

	u8 vector;

	u32 error_code;

	unsigned long payload;

	bool has_payload;

	u8 nested_apf;

};



struct kvm_vcpu_arch {

	/*

	 * rip and regs accesses must go through
@@ -739,16 +750,8 @@ struct kvm_vcpu_arch { 


	u8 event_exit_inst_len;



	struct kvm_queued_exception {

		bool pending;

		bool injected;

		bool has_error_code;

		u8 nr;

		u32 error_code;

		unsigned long payload;

		bool has_payload;

		u8 nested_apf;

	} exception;

	/* Exceptions to be injected to the guest. */

	struct kvm_queued_exception exception;



	struct kvm_queued_interrupt {

		bool injected;

arch/x86/kvm/svm/nested.c

+25 −22
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ static void nested_save_pending_event_to_vmcb12(struct vcpu_svm *svm, 
	unsigned int nr;



	if (vcpu->arch.exception.injected) {

		nr = vcpu->arch.exception.nr;

		nr = vcpu->arch.exception.vector;

		exit_int_info = nr | SVM_EVTINJ_VALID | SVM_EVTINJ_TYPE_EXEPT;



		if (vcpu->arch.exception.has_error_code) {
@@ -1310,42 +1310,45 @@ int nested_svm_check_permissions(struct kvm_vcpu *vcpu) 


static bool nested_exit_on_exception(struct vcpu_svm *svm)

{

	unsigned int nr = svm->vcpu.arch.exception.nr;

	unsigned int vector = svm->vcpu.arch.exception.vector;



	return (svm->nested.ctl.intercepts[INTERCEPT_EXCEPTION] & BIT(nr));

	return (svm->nested.ctl.intercepts[INTERCEPT_EXCEPTION] & BIT(vector));

}



static void nested_svm_inject_exception_vmexit(struct vcpu_svm *svm)

static void nested_svm_inject_exception_vmexit(struct kvm_vcpu *vcpu)

{

	unsigned int nr = svm->vcpu.arch.exception.nr;

	struct kvm_queued_exception *ex = &vcpu->arch.exception;

	struct vcpu_svm *svm = to_svm(vcpu);

	struct vmcb *vmcb = svm->vmcb;



	vmcb->control.exit_code = SVM_EXIT_EXCP_BASE + nr;

	vmcb->control.exit_code = SVM_EXIT_EXCP_BASE + ex->vector;

	vmcb->control.exit_code_hi = 0;



	if (svm->vcpu.arch.exception.has_error_code)

		vmcb->control.exit_info_1 = svm->vcpu.arch.exception.error_code;

	if (ex->has_error_code)

		vmcb->control.exit_info_1 = ex->error_code;



	/*

	 * EXITINFO2 is undefined for all exception intercepts other

	 * than #PF.

	 */

	if (nr == PF_VECTOR) {

		if (svm->vcpu.arch.exception.nested_apf)

			vmcb->control.exit_info_2 = svm->vcpu.arch.apf.nested_apf_token;

		else if (svm->vcpu.arch.exception.has_payload)

			vmcb->control.exit_info_2 = svm->vcpu.arch.exception.payload;

	if (ex->vector == PF_VECTOR) {

		if (ex->nested_apf)

			vmcb->control.exit_info_2 = vcpu->arch.apf.nested_apf_token;

		else if (ex->has_payload)

			vmcb->control.exit_info_2 = ex->payload;

		else

			vmcb->control.exit_info_2 = svm->vcpu.arch.cr2;

	} else if (nr == DB_VECTOR) {

			vmcb->control.exit_info_2 = vcpu->arch.cr2;

	} else if (ex->vector == DB_VECTOR) {

		/* See inject_pending_event.  */

		kvm_deliver_exception_payload(&svm->vcpu);

		if (svm->vcpu.arch.dr7 & DR7_GD) {

			svm->vcpu.arch.dr7 &= ~DR7_GD;

			kvm_update_dr7(&svm->vcpu);

		kvm_deliver_exception_payload(vcpu, ex);



		if (vcpu->arch.dr7 & DR7_GD) {

			vcpu->arch.dr7 &= ~DR7_GD;

			kvm_update_dr7(vcpu);

		}

	} else {

		WARN_ON(ex->has_payload);

	}

	} else

		WARN_ON(svm->vcpu.arch.exception.has_payload);



	nested_svm_vmexit(svm);

}
@@ -1383,7 +1386,7 @@ static int svm_check_nested_events(struct kvm_vcpu *vcpu) 
                        return -EBUSY;

		if (!nested_exit_on_exception(svm))

			return 0;

		nested_svm_inject_exception_vmexit(svm);

		nested_svm_inject_exception_vmexit(vcpu);

		return 0;

	}

arch/x86/kvm/svm/svm.c

+6 −8
Original line number Diff line number Diff line
@@ -463,22 +463,20 @@ static int svm_update_soft_interrupt_rip(struct kvm_vcpu *vcpu) 


static void svm_inject_exception(struct kvm_vcpu *vcpu)

{

	struct kvm_queued_exception *ex = &vcpu->arch.exception;

	struct vcpu_svm *svm = to_svm(vcpu);

	unsigned nr = vcpu->arch.exception.nr;

	bool has_error_code = vcpu->arch.exception.has_error_code;

	u32 error_code = vcpu->arch.exception.error_code;



	kvm_deliver_exception_payload(vcpu);

	kvm_deliver_exception_payload(vcpu, ex);



	if (kvm_exception_is_soft(nr) &&

	if (kvm_exception_is_soft(ex->vector) &&

	    svm_update_soft_interrupt_rip(vcpu))

		return;



	svm->vmcb->control.event_inj = nr

	svm->vmcb->control.event_inj = ex->vector

		| SVM_EVTINJ_VALID

		| (has_error_code ? SVM_EVTINJ_VALID_ERR : 0)

		| (ex->has_error_code ? SVM_EVTINJ_VALID_ERR : 0)

		| SVM_EVTINJ_TYPE_EXEPT;

	svm->vmcb->control.event_inj_err = error_code;

	svm->vmcb->control.event_inj_err = ex->error_code;

}



static void svm_init_erratum_383(void)

arch/x86/kvm/vmx/nested.c

+20 −22
Original line number Diff line number Diff line
@@ -446,29 +446,27 @@ static bool nested_vmx_is_page_fault_vmexit(struct vmcs12 *vmcs12, 
 */

static int nested_vmx_check_exception(struct kvm_vcpu *vcpu, unsigned long *exit_qual)

{

	struct kvm_queued_exception *ex = &vcpu->arch.exception;

	struct vmcs12 *vmcs12 = get_vmcs12(vcpu);

	unsigned int nr = vcpu->arch.exception.nr;

	bool has_payload = vcpu->arch.exception.has_payload;

	unsigned long payload = vcpu->arch.exception.payload;



	if (nr == PF_VECTOR) {

		if (vcpu->arch.exception.nested_apf) {

	if (ex->vector == PF_VECTOR) {

		if (ex->nested_apf) {

			*exit_qual = vcpu->arch.apf.nested_apf_token;

			return 1;

		}

		if (nested_vmx_is_page_fault_vmexit(vmcs12,

						    vcpu->arch.exception.error_code)) {

			*exit_qual = has_payload ? payload : vcpu->arch.cr2;

		if (nested_vmx_is_page_fault_vmexit(vmcs12, ex->error_code)) {

			*exit_qual = ex->has_payload ? ex->payload : vcpu->arch.cr2;

			return 1;

		}

	} else if (vmcs12->exception_bitmap & (1u << nr)) {

		if (nr == DB_VECTOR) {

			if (!has_payload) {

				payload = vcpu->arch.dr6;

				payload &= ~DR6_BT;

				payload ^= DR6_ACTIVE_LOW;

	} else if (vmcs12->exception_bitmap & (1u << ex->vector)) {

		if (ex->vector == DB_VECTOR) {

			if (ex->has_payload) {

				*exit_qual = ex->payload;

			} else {

				*exit_qual = vcpu->arch.dr6;

				*exit_qual &= ~DR6_BT;

				*exit_qual ^= DR6_ACTIVE_LOW;

			}

			*exit_qual = payload;

		} else

			*exit_qual = 0;

		return 1;
@@ -3764,7 +3762,7 @@ static void vmcs12_save_pending_event(struct kvm_vcpu *vcpu, 
	     is_double_fault(exit_intr_info))) {

		vmcs12->idt_vectoring_info_field = 0;

	} else if (vcpu->arch.exception.injected) {

		nr = vcpu->arch.exception.nr;

		nr = vcpu->arch.exception.vector;

		idt_vectoring = nr | VECTORING_INFO_VALID_MASK;



		if (kvm_exception_is_soft(nr)) {
@@ -3868,11 +3866,11 @@ static int vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu) 
static void nested_vmx_inject_exception_vmexit(struct kvm_vcpu *vcpu,

					       unsigned long exit_qual)

{

	struct kvm_queued_exception *ex = &vcpu->arch.exception;

	u32 intr_info = ex->vector | INTR_INFO_VALID_MASK;

	struct vmcs12 *vmcs12 = get_vmcs12(vcpu);

	unsigned int nr = vcpu->arch.exception.nr;

	u32 intr_info = nr | INTR_INFO_VALID_MASK;



	if (vcpu->arch.exception.has_error_code) {

	if (ex->has_error_code) {

		/*

		 * Intel CPUs do not generate error codes with bits 31:16 set,

		 * and more importantly VMX disallows setting bits 31:16 in the
@@ -3882,11 +3880,11 @@ static void nested_vmx_inject_exception_vmexit(struct kvm_vcpu *vcpu, 
		 * generate "full" 32-bit error codes, so KVM allows userspace

		 * to inject exception error codes with bits 31:16 set.

		 */

		vmcs12->vm_exit_intr_error_code = (u16)vcpu->arch.exception.error_code;

		vmcs12->vm_exit_intr_error_code = (u16)ex->error_code;

		intr_info |= INTR_INFO_DELIVER_CODE_MASK;

	}



	if (kvm_exception_is_soft(nr))

	if (kvm_exception_is_soft(ex->vector))

		intr_info |= INTR_TYPE_SOFT_EXCEPTION;

	else

		intr_info |= INTR_TYPE_HARD_EXCEPTION;
@@ -3917,7 +3915,7 @@ static void nested_vmx_inject_exception_vmexit(struct kvm_vcpu *vcpu, 
static inline unsigned long vmx_get_pending_dbg_trap(struct kvm_vcpu *vcpu)

{

	if (!vcpu->arch.exception.pending ||

	    vcpu->arch.exception.nr != DB_VECTOR)

	    vcpu->arch.exception.vector != DB_VECTOR)

		return 0;



	/* General Detect #DBs are always fault-like. */

arch/x86/kvm/vmx/vmx.c

+9 −11
Original line number Diff line number Diff line
@@ -1659,7 +1659,7 @@ static void vmx_update_emulated_instruction(struct kvm_vcpu *vcpu) 
	 */

	if (nested_cpu_has_mtf(vmcs12) &&

	    (!vcpu->arch.exception.pending ||

	     vcpu->arch.exception.nr == DB_VECTOR))

	     vcpu->arch.exception.vector == DB_VECTOR))

		vmx->nested.mtf_pending = true;

	else

		vmx->nested.mtf_pending = false;
@@ -1686,15 +1686,13 @@ static void vmx_clear_hlt(struct kvm_vcpu *vcpu) 


static void vmx_inject_exception(struct kvm_vcpu *vcpu)

{

	struct kvm_queued_exception *ex = &vcpu->arch.exception;

	u32 intr_info = ex->vector | INTR_INFO_VALID_MASK;

	struct vcpu_vmx *vmx = to_vmx(vcpu);

	unsigned nr = vcpu->arch.exception.nr;

	bool has_error_code = vcpu->arch.exception.has_error_code;

	u32 error_code = vcpu->arch.exception.error_code;

	u32 intr_info = nr | INTR_INFO_VALID_MASK;



	kvm_deliver_exception_payload(vcpu);

	kvm_deliver_exception_payload(vcpu, ex);



	if (has_error_code) {

	if (ex->has_error_code) {

		/*

		 * Despite the error code being architecturally defined as 32

		 * bits, and the VMCS field being 32 bits, Intel CPUs and thus
@@ -1705,21 +1703,21 @@ static void vmx_inject_exception(struct kvm_vcpu *vcpu) 
		 * the upper bits to avoid VM-Fail, losing information that

		 * does't really exist is preferable to killing the VM.

		 */

		vmcs_write32(VM_ENTRY_EXCEPTION_ERROR_CODE, (u16)error_code);

		vmcs_write32(VM_ENTRY_EXCEPTION_ERROR_CODE, (u16)ex->error_code);

		intr_info |= INTR_INFO_DELIVER_CODE_MASK;

	}



	if (vmx->rmode.vm86_active) {

		int inc_eip = 0;

		if (kvm_exception_is_soft(nr))

		if (kvm_exception_is_soft(ex->vector))

			inc_eip = vcpu->arch.event_exit_inst_len;

		kvm_inject_realmode_interrupt(vcpu, nr, inc_eip);

		kvm_inject_realmode_interrupt(vcpu, ex->vector, inc_eip);

		return;

	}



	WARN_ON_ONCE(vmx->emulation_required);



	if (kvm_exception_is_soft(nr)) {

	if (kvm_exception_is_soft(ex->vector)) {

		vmcs_write32(VM_ENTRY_INSTRUCTION_LEN,

			     vmx->vcpu.arch.event_exit_inst_len);

		intr_info |= INTR_TYPE_SOFT_EXCEPTION;