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

Commit f92653ee authored by Jan Kiszka's avatar Jan Kiszka Committed by Avi Kivity
Browse files

KVM: x86: Add kvm_is_linear_rip 



Based on Gleb's suggestion: Add a helper kvm_is_linear_rip that matches
a given linear RIP against the current one. Use this for guest
single-stepping, more users will follow.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 116a4752

arch/x86/include/asm/kvm_host.h

+3 −1
Original line number Diff line number Diff line
@@ -362,8 +362,8 @@ struct kvm_vcpu_arch { 
	u64 *mce_banks;



	/* used for guest single stepping over the given code position */

	u16 singlestep_cs;

	unsigned long singlestep_rip;



	/* fields used by HYPER-V emulation */

	u64 hv_vapic;

};
@@ -820,4 +820,6 @@ int kvm_cpu_get_interrupt(struct kvm_vcpu *v); 
void kvm_define_shared_msr(unsigned index, u32 msr);

void kvm_set_shared_msr(unsigned index, u64 val, u64 mask);



bool kvm_is_linear_rip(struct kvm_vcpu *vcpu, unsigned long linear_rip);



#endif /* _ASM_X86_KVM_HOST_H */

arch/x86/kvm/x86.c

+13 −8
Original line number Diff line number Diff line
@@ -5376,11 +5376,9 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, 
		vcpu->arch.switch_db_regs = (vcpu->arch.dr7 & DR7_BP_EN_MASK);

	}



	if (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP) {

		vcpu->arch.singlestep_cs =

			get_segment_selector(vcpu, VCPU_SREG_CS);

		vcpu->arch.singlestep_rip = kvm_rip_read(vcpu);

	}

	if (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP)

		vcpu->arch.singlestep_rip = kvm_rip_read(vcpu) +

			get_segment_base(vcpu, VCPU_SREG_CS);



	/*

	 * Trigger an rflags update that will inject or remove the trace
@@ -5871,6 +5869,15 @@ int kvm_arch_interrupt_allowed(struct kvm_vcpu *vcpu) 
	return kvm_x86_ops->interrupt_allowed(vcpu);

}



bool kvm_is_linear_rip(struct kvm_vcpu *vcpu, unsigned long linear_rip)

{

	unsigned long current_rip = kvm_rip_read(vcpu) +

		get_segment_base(vcpu, VCPU_SREG_CS);



	return current_rip == linear_rip;

}

EXPORT_SYMBOL_GPL(kvm_is_linear_rip);



unsigned long kvm_get_rflags(struct kvm_vcpu *vcpu)

{

	unsigned long rflags;
@@ -5885,9 +5892,7 @@ EXPORT_SYMBOL_GPL(kvm_get_rflags); 
void kvm_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags)

{

	if (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP &&

	    vcpu->arch.singlestep_cs ==

			get_segment_selector(vcpu, VCPU_SREG_CS) &&

	    vcpu->arch.singlestep_rip == kvm_rip_read(vcpu))

	    kvm_is_linear_rip(vcpu, vcpu->arch.singlestep_rip))

		rflags |= X86_EFLAGS_TF | X86_EFLAGS_RF;

	kvm_x86_ops->set_rflags(vcpu, rflags);

}