From: "Alex Bennée" <alex.bennee@linaro.org>
To: 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
Cc: Tony Krowiak <akrowiak@linux.vnet.ibm.com>,
Alexey Kardashevskiy <aik@ozlabs.ru>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Paul Mackerras <paulus@samba.org>,
"H. Peter Anvin" <hpa@zytor.com>,
"open list:S390" <linux-s390@vger.kernel.org>,
Michael Mueller <mimu@linux.vnet.ibm.com>,
Nadav Amit <namit@cs.technion.ac.il>,
Michael Ellerman <mpe@ellerman.id.au>,
"maintainer:X86 ARCHITECTURE..." <x86@kernel.org>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Ingo Molnar <mingo@redhat.com>,
"Jason J. Herne" <jjherne@linux.vnet.ibm.com>,
jan.kiszka@siemens.com, bp@suse.de,
Gleb Natapov <gleb@kernel.org>,
r65777@freescale.com, Cornelia Huck <cornelia.huck@de.ibm.com>,
Thomas Gleixner <tglx@linutronix.de>,
Eric Farman <farman@linux.vnet.ibm.com>,
"open list:ABI/API" <linux-api@vger.kernel.org>,
open list <linux-kernel@vger.k
Subject: [PATCH v4 02/12] KVM: define common KVM_GUESTDBG_USE_SW/HW_BP bits
Date: Fri, 15 May 2015 15:27:05 +0100 [thread overview]
Message-ID: <1431700035-23479-3-git-send-email-alex.bennee@linaro.org> (raw)
In-Reply-To: <1431700035-23479-1-git-send-email-alex.bennee@linaro.org>
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.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Andrew Jones <drjones@redhat.com>
-
v4
- claim more bits for the common functionality
v5
- don't use __ mechanism to move values common
diff --git a/arch/powerpc/include/uapi/asm/kvm.h b/arch/powerpc/include/uapi/asm/kvm.h
index ab4d473..6ea24a5 100644
--- a/arch/powerpc/include/uapi/asm/kvm.h
+++ b/arch/powerpc/include/uapi/asm/kvm.h
@@ -307,11 +307,9 @@ struct kvm_guest_debug_arch {
/* Debug related defines */
/*
* kvm_guest_debug->control is a 32 bit field. The lower 16 bits are generic
- * and upper 16 bits are architecture specific. Architecture specific defines
+ * and upper 14 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
/* definition of registers in kvm_run */
struct kvm_sync_regs {
diff --git a/arch/s390/include/uapi/asm/kvm.h b/arch/s390/include/uapi/asm/kvm.h
index ef1a5fc..aca4f86 100644
--- a/arch/s390/include/uapi/asm/kvm.h
+++ b/arch/s390/include/uapi/asm/kvm.h
@@ -114,8 +114,6 @@ struct kvm_fpu {
__u64 fprs[16];
};
-#define KVM_GUESTDBG_USE_HW_BP 0x00010000
-
#define KVM_HW_BP 1
#define KVM_HW_WP_WRITE 2
#define KVM_SINGLESTEP 4
diff --git a/arch/x86/include/uapi/asm/kvm.h b/arch/x86/include/uapi/asm/kvm.h
index d7dcef5..ca51d4c 100644
--- a/arch/x86/include/uapi/asm/kvm.h
+++ b/arch/x86/include/uapi/asm/kvm.h
@@ -250,8 +250,6 @@ struct kvm_debug_exit_arch {
__u64 dr7;
};
-#define KVM_GUESTDBG_USE_SW_BP 0x00010000
-#define KVM_GUESTDBG_USE_HW_BP 0x00020000
#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 70ac641..7c5dd11 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -570,8 +570,10 @@ struct kvm_s390_irq_state {
/* 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)
+#define KVM_GUESTDBG_USE_SW_BP (1 << 16)
+#define KVM_GUESTDBG_USE_HW_BP (1 << 17)
struct kvm_guest_debug {
__u32 control;
--
2.3.5
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply other threads:[~2015-05-15 14:27 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-15 14:27 [PATCH v4 00/12] KVM Guest Debug support for arm64 Alex Bennée
2015-05-15 14:27 ` [PATCH v4 01/12] KVM: add comments for kvm_debug_exit_arch struct Alex Bennée
2015-05-15 14:27 ` Alex Bennée [this message]
2015-05-15 15:42 ` [PATCH v4 02/12] KVM: define common KVM_GUESTDBG_USE_SW/HW_BP bits Christian Borntraeger
[not found] ` <555613F2.9060204-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org>
2015-05-15 17:33 ` David Hildenbrand
2015-05-15 17:46 ` Jan Kiszka
2015-05-15 15:58 ` Christian Borntraeger
2015-05-15 14:27 ` [PATCH v4 03/12] KVM: arm64: guest debug, define API headers Alex Bennée
2015-05-15 14:44 ` Mark Rutland
2015-05-15 15:14 ` Alex Bennée
2015-05-15 15:17 ` Peter Maydell
2015-05-15 15:43 ` Alex Bennée
2015-05-15 15:43 ` Mark Rutland
2015-05-15 16:19 ` Alex Bennée
2015-05-15 14:27 ` [PATCH v4 04/12] KVM: arm: guest debug, add stub KVM_SET_GUEST_DEBUG ioctl Alex Bennée
2015-05-15 14:27 ` [PATCH v4 05/12] KVM: arm: introduce kvm_arm_init/setup/clear_debug Alex Bennée
2015-05-15 14:27 ` [PATCH v4 06/12] KVM: arm64: guest debug, add SW break point support Alex Bennée
2015-05-20 9:17 ` Will Deacon
2015-05-20 12:33 ` Alex Bennée
2015-05-15 14:27 ` [PATCH v4 07/12] KVM: arm64: guest debug, add support for single-step Alex Bennée
2015-05-15 14:27 ` [PATCH v4 08/12] KVM: arm64: re-factor hyp.S debug register code Alex Bennée
2015-05-15 14:27 ` [PATCH v4 09/12] KVM: arm64: introduce vcpu->arch.debug_ptr Alex Bennée
2015-05-15 14:27 ` [PATCH v4 10/12] KVM: arm64: guest debug, HW assisted debug support Alex Bennée
[not found] ` <1431700035-23479-11-git-send-email-alex.bennee-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2015-05-15 15:23 ` Mark Rutland
2015-05-15 16:16 ` Alex Bennée
2015-05-15 17:01 ` Mark Rutland
2015-05-15 17:09 ` Peter Maydell
2015-05-15 14:27 ` [PATCH v4 11/12] KVM: arm64: enable KVM_CAP_SET_GUEST_DEBUG Alex Bennée
2015-05-15 14:27 ` [PATCH v4 12/12] KVM: arm64: add trace points for guest_debug debug Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1431700035-23479-3-git-send-email-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=agraf@suse.de \
--cc=aik@ozlabs.ru \
--cc=akrowiak@linux.vnet.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=borntraeger@de.ibm.com \
--cc=bp@suse.de \
--cc=christoffer.dall@linaro.org \
--cc=cornelia.huck@de.ibm.com \
--cc=drjones@redhat.com \
--cc=farman@linux.vnet.ibm.com \
--cc=gleb@kernel.org \
--cc=heiko.carstens@de.ibm.com \
--cc=hpa@zytor.com \
--cc=jan.kiszka@siemens.com \
--cc=jjherne@linux.vnet.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-api@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.k \
--cc=linux-s390@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=mimu@linux.vnet.ibm.com \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=namit@cs.technion.ac.il \
--cc=paulus@samba.org \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=r65777@freescale.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=zhichao.huang@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).