KVM: New guest debug interface (d0bfb940) · Commits · 戴 / test

This rips out the support for KVM_DEBUG_GUEST and introduces a new IOCTL instead: KVM_SET_GUEST_DEBUG. The IOCTL payload consists of a generic part, controlling the "main switch" and the single-step feature. The arch specific part adds an x86 interface for intercepting both types of debug exceptions separately and re-injecting them when the host was not interested. Moveover, the foundation for guest debugging via debug registers is layed. To signal breakpoint events properly back to userland, an arch-specific data block is now returned along KVM_EXIT_DEBUG. For x86, the arch block contains the PC, the debug exception, and relevant debug registers to tell debug events properly apart. The availability of this new interface is signaled by KVM_CAP_SET_GUEST_DEBUG. Empty stubs for not yet supported archs are provided. Note that both SVM and VTX are supported, but only the latter was tested yet. Based on the experience with all those VTX corner case, I would be fairly surprised if SVM will work out of the box. Signed-off-by:

Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by:

Avi Kivity <avi@redhat.com>

arch/ia64/include/asm/kvm.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -214,4 +214,11 @@ struct kvm_sregs {
		struct kvm_fpu {
		};

		struct kvm_debug_exit_arch {
		};

		/* for KVM_SET_GUEST_DEBUG */
		struct kvm_guest_debug_arch {
		};

		#endif

arch/ia64/kvm/kvm-ia64.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1303,8 +1303,8 @@ int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu vcpu, struct kvm_fpu fpu)
		return -EINVAL;
		}

		int kvm_arch_vcpu_ioctl_debug_guest(struct kvm_vcpu *vcpu,
		struct kvm_debug_guest *dbg)
		int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
		struct kvm_guest_debug *dbg)
		{
		return -EINVAL;
		}

arch/powerpc/include/asm/kvm.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -52,4 +52,11 @@ struct kvm_fpu {
		__u64 fpr[32];
		};

		struct kvm_debug_exit_arch {
		};

		/* for KVM_SET_GUEST_DEBUG */
		struct kvm_guest_debug_arch {
		};

		#endif /* __LINUX_KVM_POWERPC_H */

arch/powerpc/kvm/powerpc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -240,8 +240,8 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
		kvmppc_core_vcpu_put(vcpu);
		}

		int kvm_arch_vcpu_ioctl_debug_guest(struct kvm_vcpu *vcpu,
		struct kvm_debug_guest *dbg)
		int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
		struct kvm_guest_debug *dbg)
		{
		int i;

arch/s390/include/asm/kvm.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -42,4 +42,11 @@ struct kvm_fpu {
		__u64 fprs[16];
		};

		struct kvm_debug_exit_arch {
		};

		/* for KVM_SET_GUEST_DEBUG */
		struct kvm_guest_debug_arch {
		};

		#endif

Admin message