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

Commit 6f05485d authored by Jan Kiszka's avatar Jan Kiszka Committed by Paolo Bonzini
Browse files

KVM: VMX: Fix guest debugging while in L2 



When we take a #DB or #BP vmexit while in guest mode, we first of all
need to check if there is ongoing guest debugging that might be
interested in the event. Currently, we unconditionally leave L2 and
inject the event into L1 if it is intercepting the exceptions. That
breaks things marvelously.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 5bb16016

arch/x86/kvm/vmx.c

+17 −0
Original line number Diff line number Diff line
@@ -968,6 +968,16 @@ static inline bool is_exception_n(u32 intr_info, u8 vector) 
		(INTR_TYPE_HARD_EXCEPTION | vector | INTR_INFO_VALID_MASK);

}



static inline bool is_debug(u32 intr_info)

{

	return is_exception_n(intr_info, DB_VECTOR);

}



static inline bool is_breakpoint(u32 intr_info)

{

	return is_exception_n(intr_info, BP_VECTOR);

}



static inline bool is_page_fault(u32 intr_info)

{

	return is_exception_n(intr_info, PF_VECTOR);
@@ -7753,6 +7763,13 @@ static bool nested_vmx_exit_handled(struct kvm_vcpu *vcpu) 
		else if (is_no_device(intr_info) &&

			 !(vmcs12->guest_cr0 & X86_CR0_TS))

			return false;

		else if (is_debug(intr_info) &&

			 vcpu->guest_debug &

			 (KVM_GUESTDBG_SINGLESTEP | KVM_GUESTDBG_USE_HW_BP))

			return false;

		else if (is_breakpoint(intr_info) &&

			 vcpu->guest_debug & KVM_GUESTDBG_USE_SW_BP)

			return false;

		return vmcs12->exception_bitmap &

				(1u << (intr_info & INTR_INFO_VECTOR_MASK));

	case EXIT_REASON_EXTERNAL_INTERRUPT: