From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752479AbbDAQBm (ORCPT ); Wed, 1 Apr 2015 12:01:42 -0400 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:58516 "EHLO socrates.bennee.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751113AbbDAQBk (ORCPT ); Wed, 1 Apr 2015 12:01:40 -0400 References: <1427814488-28467-1-git-send-email-alex.bennee@linaro.org> <1427814488-28467-4-git-send-email-alex.bennee@linaro.org> <20150401174646.74f695bd@thinkpad-w530> From: Alex =?utf-8?Q?Benn=C3=A9e?= To: David Hildenbrand Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, marc.zyngier@arm.com, peter.maydell@linaro.org, agraf@suse.de, drjones@redhat.com, pbonzini@redhat.com, zhichao.huang@linaro.org, jan.kiszka@siemens.com, r65777@freescale.com, bp@suse.de, Catalin Marinas , Will Deacon , open list Subject: Re: [PATCH v2 03/10] KVM: arm: guest debug, define API headers In-reply-to: <20150401174646.74f695bd@thinkpad-w530> Date: Wed, 01 Apr 2015 17:01:26 +0100 Message-ID: <87h9szyh0p.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: alex.bennee@linaro.org X-SA-Exim-Scanned: No (on socrates.bennee.com); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org David Hildenbrand 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 >> >> --- >> 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: alex.bennee@linaro.org (Alex =?utf-8?Q?Benn=C3=A9e?=) Date: Wed, 01 Apr 2015 17:01:26 +0100 Subject: [PATCH v2 03/10] KVM: arm: guest debug, define API headers In-Reply-To: <20150401174646.74f695bd@thinkpad-w530> References: <1427814488-28467-1-git-send-email-alex.bennee@linaro.org> <1427814488-28467-4-git-send-email-alex.bennee@linaro.org> <20150401174646.74f695bd@thinkpad-w530> Message-ID: <87h9szyh0p.fsf@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org David Hildenbrand 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 >> >> --- >> 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