From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932773AbbDJNGa (ORCPT ); Fri, 10 Apr 2015 09:06:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46541 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755859AbbDJNG2 (ORCPT ); Fri, 10 Apr 2015 09:06:28 -0400 Date: Fri, 10 Apr 2015 15:05:36 +0200 From: Andrew Jones To: Alex =?iso-8859-1?Q?Benn=E9e?= 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, pbonzini@redhat.com, zhichao.huang@linaro.org, jan.kiszka@siemens.com, dahi@linux.vnet.ibm.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 Message-ID: <20150410130535.GF3227@hawk.usersys.redhat.com> 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=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1427814488-28467-4-git-send-email-alex.bennee@linaro.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Mar 31, 2015 at 04:08:01PM +0100, Alex Bennée wrote: > 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 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 > + * > + * 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. ^ of the > + */ > +#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__ */ > -- > 2.3.4 > couple typo nits, otherwise Reviewed-by: Andrew Jones