From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932623AbbDJNBN (ORCPT ); Fri, 10 Apr 2015 09:01:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44705 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755309AbbDJNBL (ORCPT ); Fri, 10 Apr 2015 09:01:11 -0400 Date: Fri, 10 Apr 2015 14:59:58 +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, Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , "maintainer:X86 ARCHITECTURE..." , Gleb Natapov , Bharat Bhushan , Alexey Kardashevskiy , Mihai Caraman , Nadav Amit , "open list:LINUX FOR POWERPC..." , open list , "open list:ABI/API" Subject: Re: [PATCH v2 02/10] KVM: define common __KVM_GUESTDBG_USE_SW/HW_BP values Message-ID: <20150410125957.GE3227@hawk.usersys.redhat.com> References: <1427814488-28467-1-git-send-email-alex.bennee@linaro.org> <1427814488-28467-3-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-3-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:00PM +0100, Alex Bennée wrote: > Currently x86, powerpc and soon arm64 use the same two architecture > specific bits for guest debug support for software and hardware > breakpoints. This makes the shared values explicit while leaving the > gate open for another architecture to use some other value if they > really really want to. > > Signed-off-by: Alex Bennée > > diff --git a/arch/powerpc/include/uapi/asm/kvm.h b/arch/powerpc/include/uapi/asm/kvm.h > index ab4d473..1731569 100644 > --- a/arch/powerpc/include/uapi/asm/kvm.h > +++ b/arch/powerpc/include/uapi/asm/kvm.h > @@ -310,8 +310,8 @@ struct kvm_guest_debug_arch { > * and upper 16 bits are architecture specific. Architecture specific defines > * that ioctl is for setting hardware breakpoint or software breakpoint. > */ > -#define KVM_GUESTDBG_USE_SW_BP 0x00010000 > -#define KVM_GUESTDBG_USE_HW_BP 0x00020000 > +#define KVM_GUESTDBG_USE_SW_BP __KVM_GUESTDBG_USE_SW_BP > +#define KVM_GUESTDBG_USE_HW_BP __KVM_GUESTDBG_USE_HW_BP > > /* definition of registers in kvm_run */ > struct kvm_sync_regs { > diff --git a/arch/x86/include/uapi/asm/kvm.h b/arch/x86/include/uapi/asm/kvm.h > index d7dcef5..1438202 100644 > --- a/arch/x86/include/uapi/asm/kvm.h > +++ b/arch/x86/include/uapi/asm/kvm.h > @@ -250,8 +250,8 @@ struct kvm_debug_exit_arch { > __u64 dr7; > }; > > -#define KVM_GUESTDBG_USE_SW_BP 0x00010000 > -#define KVM_GUESTDBG_USE_HW_BP 0x00020000 > +#define KVM_GUESTDBG_USE_SW_BP __KVM_GUESTDBG_USE_SW_BP > +#define KVM_GUESTDBG_USE_HW_BP __KVM_GUESTDBG_USE_HW_BP > #define KVM_GUESTDBG_INJECT_DB 0x00040000 > #define KVM_GUESTDBG_INJECT_BP 0x00080000 > > diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h > index 5eedf84..ce2db14 100644 > --- a/include/uapi/linux/kvm.h > +++ b/include/uapi/linux/kvm.h > @@ -525,8 +525,16 @@ struct kvm_s390_irq { > > /* for KVM_SET_GUEST_DEBUG */ > > -#define KVM_GUESTDBG_ENABLE 0x00000001 > -#define KVM_GUESTDBG_SINGLESTEP 0x00000002 > +#define KVM_GUESTDBG_ENABLE (1 << 0) > +#define KVM_GUESTDBG_SINGLESTEP (1 << 1) > + > +/* > + * Architecture specific stuff uses the top 16 bits of the field, > + * however there is some shared commonality for the common cases > + */ > +#define __KVM_GUESTDBG_USE_SW_BP (1 << 16) > +#define __KVM_GUESTDBG_USE_HW_BP (1 << 17) > + > > struct kvm_guest_debug { > __u32 control; > -- > 2.3.4 > Reviewed-by: Andrew Jones From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Jones Subject: Re: [PATCH v2 02/10] KVM: define common __KVM_GUESTDBG_USE_SW/HW_BP values Date: Fri, 10 Apr 2015 14:59:58 +0200 Message-ID: <20150410125957.GE3227@hawk.usersys.redhat.com> References: <1427814488-28467-1-git-send-email-alex.bennee@linaro.org> <1427814488-28467-3-git-send-email-alex.bennee@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline In-Reply-To: <1427814488-28467-3-git-send-email-alex.bennee@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu To: Alex =?iso-8859-1?Q?Benn=E9e?= Cc: kvm@vger.kernel.org, Alexey Kardashevskiy , Benjamin Herrenschmidt , Paul Mackerras , "H. Peter Anvin" , kvmarm@lists.cs.columbia.edu, Nadav Amit , Michael Ellerman , "maintainer:X86 ARCHITECTURE..." , Gleb Natapov , Ingo Molnar , zhichao.huang@linaro.org, jan.kiszka@siemens.com, bp@suse.de, marc.zyngier@arm.com, r65777@freescale.com, Thomas Gleixner , linux-arm-kernel@lists.infradead.org, "open list:ABI/API" , open list , dahi@linux.vnet.ibm.com, pbonzini@redhat.com, "open list:LINUX FOR POWERPC..." List-Id: linux-api@vger.kernel.org On Tue, Mar 31, 2015 at 04:08:00PM +0100, Alex Benn=E9e wrote: > Currently x86, powerpc and soon arm64 use the same two architecture > specific bits for guest debug support for software and hardware > breakpoints. This makes the shared values explicit while leaving the > gate open for another architecture to use some other value if they > really really want to. > = > Signed-off-by: Alex Benn=E9e > = > diff --git a/arch/powerpc/include/uapi/asm/kvm.h b/arch/powerpc/include/u= api/asm/kvm.h > index ab4d473..1731569 100644 > --- a/arch/powerpc/include/uapi/asm/kvm.h > +++ b/arch/powerpc/include/uapi/asm/kvm.h > @@ -310,8 +310,8 @@ struct kvm_guest_debug_arch { > * and upper 16 bits are architecture specific. Architecture specific de= fines > * that ioctl is for setting hardware breakpoint or software breakpoint. > */ > -#define KVM_GUESTDBG_USE_SW_BP 0x00010000 > -#define KVM_GUESTDBG_USE_HW_BP 0x00020000 > +#define KVM_GUESTDBG_USE_SW_BP __KVM_GUESTDBG_USE_SW_BP > +#define KVM_GUESTDBG_USE_HW_BP __KVM_GUESTDBG_USE_HW_BP > = > /* definition of registers in kvm_run */ > struct kvm_sync_regs { > diff --git a/arch/x86/include/uapi/asm/kvm.h b/arch/x86/include/uapi/asm/= kvm.h > index d7dcef5..1438202 100644 > --- a/arch/x86/include/uapi/asm/kvm.h > +++ b/arch/x86/include/uapi/asm/kvm.h > @@ -250,8 +250,8 @@ struct kvm_debug_exit_arch { > __u64 dr7; > }; > = > -#define KVM_GUESTDBG_USE_SW_BP 0x00010000 > -#define KVM_GUESTDBG_USE_HW_BP 0x00020000 > +#define KVM_GUESTDBG_USE_SW_BP __KVM_GUESTDBG_USE_SW_BP > +#define KVM_GUESTDBG_USE_HW_BP __KVM_GUESTDBG_USE_HW_BP > #define KVM_GUESTDBG_INJECT_DB 0x00040000 > #define KVM_GUESTDBG_INJECT_BP 0x00080000 > = > diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h > index 5eedf84..ce2db14 100644 > --- a/include/uapi/linux/kvm.h > +++ b/include/uapi/linux/kvm.h > @@ -525,8 +525,16 @@ struct kvm_s390_irq { > = > /* for KVM_SET_GUEST_DEBUG */ > = > -#define KVM_GUESTDBG_ENABLE 0x00000001 > -#define KVM_GUESTDBG_SINGLESTEP 0x00000002 > +#define KVM_GUESTDBG_ENABLE (1 << 0) > +#define KVM_GUESTDBG_SINGLESTEP (1 << 1) > + > +/* > + * Architecture specific stuff uses the top 16 bits of the field, > + * however there is some shared commonality for the common cases > + */ > +#define __KVM_GUESTDBG_USE_SW_BP (1 << 16) > +#define __KVM_GUESTDBG_USE_HW_BP (1 << 17) > + > = > struct kvm_guest_debug { > __u32 control; > -- = > 2.3.4 > Reviewed-by: Andrew Jones = From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 66F1A1A03D6 for ; Fri, 10 Apr 2015 23:01:01 +1000 (AEST) Date: Fri, 10 Apr 2015 14:59:58 +0200 From: Andrew Jones To: Alex =?iso-8859-1?Q?Benn=E9e?= Subject: Re: [PATCH v2 02/10] KVM: define common __KVM_GUESTDBG_USE_SW/HW_BP values Message-ID: <20150410125957.GE3227@hawk.usersys.redhat.com> References: <1427814488-28467-1-git-send-email-alex.bennee@linaro.org> <1427814488-28467-3-git-send-email-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 In-Reply-To: <1427814488-28467-3-git-send-email-alex.bennee@linaro.org> Cc: peter.maydell@linaro.org, kvm@vger.kernel.org, Alexey Kardashevskiy , Bharat Bhushan , Paul Mackerras , "H. Peter Anvin" , kvmarm@lists.cs.columbia.edu, Nadav Amit , "maintainer:X86 ARCHITECTURE..." , agraf@suse.de, Gleb Natapov , Ingo Molnar , zhichao.huang@linaro.org, jan.kiszka@siemens.com, Mihai Caraman , bp@suse.de, marc.zyngier@arm.com, r65777@freescale.com, Thomas Gleixner , linux-arm-kernel@lists.infradead.org, "open list:ABI/API" , open list , dahi@linux.vnet.ibm.com, pbonzini@redhat.com, "open list:LINUX FOR POWERPC..." , christoffer.dall@linaro.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Tue, Mar 31, 2015 at 04:08:00PM +0100, Alex Bennée wrote: > Currently x86, powerpc and soon arm64 use the same two architecture > specific bits for guest debug support for software and hardware > breakpoints. This makes the shared values explicit while leaving the > gate open for another architecture to use some other value if they > really really want to. > > Signed-off-by: Alex Bennée > > diff --git a/arch/powerpc/include/uapi/asm/kvm.h b/arch/powerpc/include/uapi/asm/kvm.h > index ab4d473..1731569 100644 > --- a/arch/powerpc/include/uapi/asm/kvm.h > +++ b/arch/powerpc/include/uapi/asm/kvm.h > @@ -310,8 +310,8 @@ struct kvm_guest_debug_arch { > * and upper 16 bits are architecture specific. Architecture specific defines > * that ioctl is for setting hardware breakpoint or software breakpoint. > */ > -#define KVM_GUESTDBG_USE_SW_BP 0x00010000 > -#define KVM_GUESTDBG_USE_HW_BP 0x00020000 > +#define KVM_GUESTDBG_USE_SW_BP __KVM_GUESTDBG_USE_SW_BP > +#define KVM_GUESTDBG_USE_HW_BP __KVM_GUESTDBG_USE_HW_BP > > /* definition of registers in kvm_run */ > struct kvm_sync_regs { > diff --git a/arch/x86/include/uapi/asm/kvm.h b/arch/x86/include/uapi/asm/kvm.h > index d7dcef5..1438202 100644 > --- a/arch/x86/include/uapi/asm/kvm.h > +++ b/arch/x86/include/uapi/asm/kvm.h > @@ -250,8 +250,8 @@ struct kvm_debug_exit_arch { > __u64 dr7; > }; > > -#define KVM_GUESTDBG_USE_SW_BP 0x00010000 > -#define KVM_GUESTDBG_USE_HW_BP 0x00020000 > +#define KVM_GUESTDBG_USE_SW_BP __KVM_GUESTDBG_USE_SW_BP > +#define KVM_GUESTDBG_USE_HW_BP __KVM_GUESTDBG_USE_HW_BP > #define KVM_GUESTDBG_INJECT_DB 0x00040000 > #define KVM_GUESTDBG_INJECT_BP 0x00080000 > > diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h > index 5eedf84..ce2db14 100644 > --- a/include/uapi/linux/kvm.h > +++ b/include/uapi/linux/kvm.h > @@ -525,8 +525,16 @@ struct kvm_s390_irq { > > /* for KVM_SET_GUEST_DEBUG */ > > -#define KVM_GUESTDBG_ENABLE 0x00000001 > -#define KVM_GUESTDBG_SINGLESTEP 0x00000002 > +#define KVM_GUESTDBG_ENABLE (1 << 0) > +#define KVM_GUESTDBG_SINGLESTEP (1 << 1) > + > +/* > + * Architecture specific stuff uses the top 16 bits of the field, > + * however there is some shared commonality for the common cases > + */ > +#define __KVM_GUESTDBG_USE_SW_BP (1 << 16) > +#define __KVM_GUESTDBG_USE_HW_BP (1 << 17) > + > > struct kvm_guest_debug { > __u32 control; > -- > 2.3.4 > Reviewed-by: Andrew Jones From mboxrd@z Thu Jan 1 00:00:00 1970 From: drjones@redhat.com (Andrew Jones) Date: Fri, 10 Apr 2015 14:59:58 +0200 Subject: [PATCH v2 02/10] KVM: define common __KVM_GUESTDBG_USE_SW/HW_BP values In-Reply-To: <1427814488-28467-3-git-send-email-alex.bennee@linaro.org> References: <1427814488-28467-1-git-send-email-alex.bennee@linaro.org> <1427814488-28467-3-git-send-email-alex.bennee@linaro.org> Message-ID: <20150410125957.GE3227@hawk.usersys.redhat.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Mar 31, 2015 at 04:08:00PM +0100, Alex Benn?e wrote: > Currently x86, powerpc and soon arm64 use the same two architecture > specific bits for guest debug support for software and hardware > breakpoints. This makes the shared values explicit while leaving the > gate open for another architecture to use some other value if they > really really want to. > > Signed-off-by: Alex Benn?e > > diff --git a/arch/powerpc/include/uapi/asm/kvm.h b/arch/powerpc/include/uapi/asm/kvm.h > index ab4d473..1731569 100644 > --- a/arch/powerpc/include/uapi/asm/kvm.h > +++ b/arch/powerpc/include/uapi/asm/kvm.h > @@ -310,8 +310,8 @@ struct kvm_guest_debug_arch { > * and upper 16 bits are architecture specific. Architecture specific defines > * that ioctl is for setting hardware breakpoint or software breakpoint. > */ > -#define KVM_GUESTDBG_USE_SW_BP 0x00010000 > -#define KVM_GUESTDBG_USE_HW_BP 0x00020000 > +#define KVM_GUESTDBG_USE_SW_BP __KVM_GUESTDBG_USE_SW_BP > +#define KVM_GUESTDBG_USE_HW_BP __KVM_GUESTDBG_USE_HW_BP > > /* definition of registers in kvm_run */ > struct kvm_sync_regs { > diff --git a/arch/x86/include/uapi/asm/kvm.h b/arch/x86/include/uapi/asm/kvm.h > index d7dcef5..1438202 100644 > --- a/arch/x86/include/uapi/asm/kvm.h > +++ b/arch/x86/include/uapi/asm/kvm.h > @@ -250,8 +250,8 @@ struct kvm_debug_exit_arch { > __u64 dr7; > }; > > -#define KVM_GUESTDBG_USE_SW_BP 0x00010000 > -#define KVM_GUESTDBG_USE_HW_BP 0x00020000 > +#define KVM_GUESTDBG_USE_SW_BP __KVM_GUESTDBG_USE_SW_BP > +#define KVM_GUESTDBG_USE_HW_BP __KVM_GUESTDBG_USE_HW_BP > #define KVM_GUESTDBG_INJECT_DB 0x00040000 > #define KVM_GUESTDBG_INJECT_BP 0x00080000 > > diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h > index 5eedf84..ce2db14 100644 > --- a/include/uapi/linux/kvm.h > +++ b/include/uapi/linux/kvm.h > @@ -525,8 +525,16 @@ struct kvm_s390_irq { > > /* for KVM_SET_GUEST_DEBUG */ > > -#define KVM_GUESTDBG_ENABLE 0x00000001 > -#define KVM_GUESTDBG_SINGLESTEP 0x00000002 > +#define KVM_GUESTDBG_ENABLE (1 << 0) > +#define KVM_GUESTDBG_SINGLESTEP (1 << 1) > + > +/* > + * Architecture specific stuff uses the top 16 bits of the field, > + * however there is some shared commonality for the common cases > + */ > +#define __KVM_GUESTDBG_USE_SW_BP (1 << 16) > +#define __KVM_GUESTDBG_USE_HW_BP (1 << 17) > + > > struct kvm_guest_debug { > __u32 control; > -- > 2.3.4 > Reviewed-by: Andrew Jones