From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752923AbbDAPrE (ORCPT ); Wed, 1 Apr 2015 11:47:04 -0400 Received: from e06smtp15.uk.ibm.com ([195.75.94.111]:50725 "EHLO e06smtp15.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752874AbbDAPqz convert rfc822-to-8bit (ORCPT ); Wed, 1 Apr 2015 11:46:55 -0400 Date: Wed, 1 Apr 2015 17:46:46 +0200 From: David Hildenbrand To: Alex =?UTF-8?B?QmVubsOpZQ==?= 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 , linux-kernel@vger.kernel.org (open list) Subject: Re: [PATCH v2 03/10] KVM: arm: guest debug, define API headers Message-ID: <20150401174646.74f695bd@thinkpad-w530> In-Reply-To: <1427814488-28467-4-git-send-email-alex.bennee@linaro.org> References: <1427814488-28467-1-git-send-email-alex.bennee@linaro.org> <1427814488-28467-4-git-send-email-alex.bennee@linaro.org> Organization: IBM Deutschland GmbH X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.27; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15040115-0021-0000-0000-000003718E16 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > 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/ > 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 > + * > + * 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! David From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Hildenbrand Subject: Re: [PATCH v2 03/10] KVM: arm: guest debug, define API headers Date: Wed, 1 Apr 2015 17:46:46 +0200 Message-ID: <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> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1427814488-28467-4-git-send-email-alex.bennee@linaro.org> Sender: kvm-owner@vger.kernel.org To: Alex =?UTF-8?B?QmVubsOpZQ==?= 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 List-Id: kvmarm@lists.cs.columbia.edu > This commit defines the API headers for guest debugging. There are tw= o > architecture specific debug structures: >=20 > - kvm_guest_debug_arch, allows us to pass in HW debug registers > - kvm_debug_exit_arch, signals the exact debug exit and pc >=20 > The type of debugging being used is control by the architecture speci= fic s/control/controlled/ > control bits of the kvm_guest_debug->control flags in the ioctl > structure. >=20 > Signed-off-by: Alex Benn=C3=A9e >=20 > --- > v2 > - expose hsr and pc directly to user-space >=20 > diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/u= api/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 { > }; >=20 > +/* > + * See ARM ARM D7.3: Debug Registers Maybe drop one ARM > + * > + * The control registers are architecturally defined as 32 bits but = are > + * stored as 64 bit values along side the value registers and aligne= d > + * 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]; > }; >=20 > struct kvm_debug_exit_arch { > + __u64 pc; > + __u32 hsr; > }; >=20 > struct kvm_sync_regs { > @@ -207,4 +221,11 @@ struct kvm_arch_memory_slot { >=20 > #endif >=20 > +/* > + * 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! David From mboxrd@z Thu Jan 1 00:00:00 1970 From: dahi@linux.vnet.ibm.com (David Hildenbrand) Date: Wed, 1 Apr 2015 17:46:46 +0200 Subject: [PATCH v2 03/10] KVM: arm: guest debug, define API headers In-Reply-To: <1427814488-28467-4-git-send-email-alex.bennee@linaro.org> References: <1427814488-28467-1-git-send-email-alex.bennee@linaro.org> <1427814488-28467-4-git-send-email-alex.bennee@linaro.org> Message-ID: <20150401174646.74f695bd@thinkpad-w530> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org > 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/ > 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 > + * > + * 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! David