David Hildenbrand <dahi@xxxxxxxxxxxxxxxxxx> writes: >> This commit defines the API headers for guest debugging. There are two >> architecture specific debug structures: >> >> - kvm_guest_debug_arch, allows us to pass in HW debug registers >> - kvm_debug_exit_arch, signals the exact debug exit and pc >> >> The type of debugging being used is control by the architecture specific > > s/control/controlled/ good catch > >> control bits of the kvm_guest_debug->control flags in the ioctl >> structure. >> >> Signed-off-by: Alex Bennée <alex.bennee@xxxxxxxxxx> >> >> --- >> v2 >> - expose hsr and pc directly to user-space >> >> diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h >> index 3ef77a4..6ee70a0 100644 >> --- a/arch/arm64/include/uapi/asm/kvm.h >> +++ b/arch/arm64/include/uapi/asm/kvm.h >> @@ -100,10 +100,24 @@ struct kvm_sregs { >> struct kvm_fpu { >> }; >> >> +/* >> + * See ARM ARM D7.3: Debug Registers > > Maybe drop one ARM Well technically it is the ARM Architecture Reference Manual but that's quite long winded. > >> + * >> + * The control registers are architecturally defined as 32 bits but are >> + * stored as 64 bit values along side the value registers and aligned >> + * with the rest 64 bit registers in the normal CPU context. >> + */ >> +#define KVM_ARM_NDBG_REGS 16 >> struct kvm_guest_debug_arch { >> + __u64 dbg_bcr[KVM_ARM_NDBG_REGS]; >> + __u64 dbg_bvr[KVM_ARM_NDBG_REGS]; >> + __u64 dbg_wcr[KVM_ARM_NDBG_REGS]; >> + __u64 dbg_wvr[KVM_ARM_NDBG_REGS]; >> }; >> >> struct kvm_debug_exit_arch { >> + __u64 pc; >> + __u32 hsr; >> }; >> >> struct kvm_sync_regs { >> @@ -207,4 +221,11 @@ struct kvm_arch_memory_slot { >> >> #endif >> >> +/* >> + * Architecture related debug defines - upper 16 bits of >> + * kvm_guest_debug->control >> + */ >> +#define KVM_GUESTDBG_USE_SW_BP __KVM_GUESTDBG_USE_SW_BP >> +#define KVM_GUESTDBG_USE_HW_BP __KVM_GUESTDBG_USE_HW_BP >> + >> #endif /* __ARM_KVM_H__ */ > > Looks good to me! Is that a Reviewed-by? > > David -- Alex Bennée -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html