All of lore.kernel.org
 help / color / mirror / Atom feed
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: jan.kiszka@siemens.com, dahi@linux.vnet.ibm.com,
	r65777@freescale.com, bp@suse.de,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Gleb Natapov" <gleb@kernel.org>,
	"Jonathan Corbet" <corbet@lwn.net>,
	"Russell King" <linux@arm.linux.org.uk>,
	linux-doc@vger.kernel.org (open list:DOCUMENTATION),
	linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v2 04/10] KVM: arm: guest debug, add stub KVM_SET_GUEST_DEBUG ioctl
Date: Tue, 31 Mar 2015 16:08:02 +0100	[thread overview]
Message-ID: <1427814488-28467-5-git-send-email-alex.bennee@linaro.org> (raw)
In-Reply-To: <1427814488-28467-1-git-send-email-alex.bennee@linaro.org>

This commit adds a stub function to support the KVM_SET_GUEST_DEBUG
ioctl. Currently any operation flag will return EINVAL. Actual
functionality will be added with further patches.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>.

---
v2
  - simplified form of the ioctl (stuff will go into setup_debug)

diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt
index b112efc..06c5064 100644
--- a/Documentation/virtual/kvm/api.txt
+++ b/Documentation/virtual/kvm/api.txt
@@ -2604,7 +2604,7 @@ handled.
 4.87 KVM_SET_GUEST_DEBUG
 
 Capability: KVM_CAP_SET_GUEST_DEBUG
-Architectures: x86, s390, ppc
+Architectures: x86, s390, ppc, arm64
 Type: vcpu ioctl
 Parameters: struct kvm_guest_debug (in)
 Returns: 0 on success; -1 on error
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index 5560f74..445933d 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -183,6 +183,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
 	case KVM_CAP_ARM_PSCI:
 	case KVM_CAP_ARM_PSCI_0_2:
 	case KVM_CAP_READONLY_MEM:
+	case KVM_CAP_SET_GUEST_DEBUG:
 		r = 1;
 		break;
 	case KVM_CAP_COALESCED_MMIO:
@@ -303,10 +304,21 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
 	kvm_arm_set_running_vcpu(NULL);
 }
 
+#define KVM_GUESTDBG_VALID (KVM_GUESTDBG_ENABLE)
+
 int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
 					struct kvm_guest_debug *dbg)
 {
-	return -EINVAL;
+	if (dbg->control & KVM_GUESTDBG_ENABLE) {
+		if (dbg->control & ~KVM_GUESTDBG_VALID)
+			return -EINVAL;
+
+		vcpu->guest_debug = dbg->control;
+	} else {
+		/* If not enabled clear all flags */
+		vcpu->guest_debug = 0;
+	}
+	return 0;
 }
 
 
-- 
2.3.4


WARNING: multiple messages have this Message-ID (diff)
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: Russell King <linux@arm.linux.org.uk>,
	Jonathan Corbet <corbet@lwn.net>, Gleb Natapov <gleb@kernel.org>,
	jan.kiszka@siemens.com,
	"open list:DOCUMENTATION" <linux-doc@vger.kernel.org>,
	open list <linux-kernel@vger.kernel.org>,
	dahi@linux.vnet.ibm.com, r65777@freescale.com, bp@suse.de
Subject: [PATCH v2 04/10] KVM: arm: guest debug, add stub KVM_SET_GUEST_DEBUG ioctl
Date: Tue, 31 Mar 2015 16:08:02 +0100	[thread overview]
Message-ID: <1427814488-28467-5-git-send-email-alex.bennee@linaro.org> (raw)
In-Reply-To: <1427814488-28467-1-git-send-email-alex.bennee@linaro.org>

This commit adds a stub function to support the KVM_SET_GUEST_DEBUG
ioctl. Currently any operation flag will return EINVAL. Actual
functionality will be added with further patches.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>.

---
v2
  - simplified form of the ioctl (stuff will go into setup_debug)

diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt
index b112efc..06c5064 100644
--- a/Documentation/virtual/kvm/api.txt
+++ b/Documentation/virtual/kvm/api.txt
@@ -2604,7 +2604,7 @@ handled.
 4.87 KVM_SET_GUEST_DEBUG
 
 Capability: KVM_CAP_SET_GUEST_DEBUG
-Architectures: x86, s390, ppc
+Architectures: x86, s390, ppc, arm64
 Type: vcpu ioctl
 Parameters: struct kvm_guest_debug (in)
 Returns: 0 on success; -1 on error
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index 5560f74..445933d 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -183,6 +183,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
 	case KVM_CAP_ARM_PSCI:
 	case KVM_CAP_ARM_PSCI_0_2:
 	case KVM_CAP_READONLY_MEM:
+	case KVM_CAP_SET_GUEST_DEBUG:
 		r = 1;
 		break;
 	case KVM_CAP_COALESCED_MMIO:
@@ -303,10 +304,21 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
 	kvm_arm_set_running_vcpu(NULL);
 }
 
+#define KVM_GUESTDBG_VALID (KVM_GUESTDBG_ENABLE)
+
 int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
 					struct kvm_guest_debug *dbg)
 {
-	return -EINVAL;
+	if (dbg->control & KVM_GUESTDBG_ENABLE) {
+		if (dbg->control & ~KVM_GUESTDBG_VALID)
+			return -EINVAL;
+
+		vcpu->guest_debug = dbg->control;
+	} else {
+		/* If not enabled clear all flags */
+		vcpu->guest_debug = 0;
+	}
+	return 0;
 }
 
 
-- 
2.3.4

_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

WARNING: multiple messages have this Message-ID (diff)
From: alex.bennee@linaro.org (Alex Bennée)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 04/10] KVM: arm: guest debug, add stub KVM_SET_GUEST_DEBUG ioctl
Date: Tue, 31 Mar 2015 16:08:02 +0100	[thread overview]
Message-ID: <1427814488-28467-5-git-send-email-alex.bennee@linaro.org> (raw)
In-Reply-To: <1427814488-28467-1-git-send-email-alex.bennee@linaro.org>

This commit adds a stub function to support the KVM_SET_GUEST_DEBUG
ioctl. Currently any operation flag will return EINVAL. Actual
functionality will be added with further patches.

Signed-off-by: Alex Benn?e <alex.bennee@linaro.org>.

---
v2
  - simplified form of the ioctl (stuff will go into setup_debug)

diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt
index b112efc..06c5064 100644
--- a/Documentation/virtual/kvm/api.txt
+++ b/Documentation/virtual/kvm/api.txt
@@ -2604,7 +2604,7 @@ handled.
 4.87 KVM_SET_GUEST_DEBUG
 
 Capability: KVM_CAP_SET_GUEST_DEBUG
-Architectures: x86, s390, ppc
+Architectures: x86, s390, ppc, arm64
 Type: vcpu ioctl
 Parameters: struct kvm_guest_debug (in)
 Returns: 0 on success; -1 on error
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index 5560f74..445933d 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -183,6 +183,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
 	case KVM_CAP_ARM_PSCI:
 	case KVM_CAP_ARM_PSCI_0_2:
 	case KVM_CAP_READONLY_MEM:
+	case KVM_CAP_SET_GUEST_DEBUG:
 		r = 1;
 		break;
 	case KVM_CAP_COALESCED_MMIO:
@@ -303,10 +304,21 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
 	kvm_arm_set_running_vcpu(NULL);
 }
 
+#define KVM_GUESTDBG_VALID (KVM_GUESTDBG_ENABLE)
+
 int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
 					struct kvm_guest_debug *dbg)
 {
-	return -EINVAL;
+	if (dbg->control & KVM_GUESTDBG_ENABLE) {
+		if (dbg->control & ~KVM_GUESTDBG_VALID)
+			return -EINVAL;
+
+		vcpu->guest_debug = dbg->control;
+	} else {
+		/* If not enabled clear all flags */
+		vcpu->guest_debug = 0;
+	}
+	return 0;
 }
 
 
-- 
2.3.4

  parent reply	other threads:[~2015-03-31 15:09 UTC|newest]

Thread overview: 199+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-31 15:07 [PATCH v2 00/10] KVM Guest Debug support for arm64 Alex Bennée
2015-03-31 15:07 ` Alex Bennée
2015-03-31 15:07 ` [PATCH v2 01/10] KVM: add commentary for kvm_debug_exit_arch struct Alex Bennée
2015-03-31 15:07   ` Alex Bennée
2015-03-31 15:07   ` Alex Bennée
2015-04-01 15:38   ` David Hildenbrand
2015-04-01 15:38     ` David Hildenbrand
2015-04-01 15:38     ` David Hildenbrand
2015-04-01 15:38     ` David Hildenbrand
2015-04-10 12:58   ` Andrew Jones
2015-04-10 12:58     ` Andrew Jones
2015-04-13 10:57   ` Christoffer Dall
2015-04-13 10:57     ` Christoffer Dall
2015-04-13 10:57     ` Christoffer Dall
2015-03-31 15:08 ` [PATCH v2 02/10] KVM: define common __KVM_GUESTDBG_USE_SW/HW_BP values Alex Bennée
2015-03-31 15:08   ` Alex Bennée
2015-03-31 15:08   ` Alex Bennée
2015-03-31 15:08   ` Alex Bennée
2015-04-10 12:59   ` Andrew Jones
2015-04-10 12:59     ` Andrew Jones
2015-04-10 12:59     ` Andrew Jones
2015-04-10 12:59     ` Andrew Jones
2015-04-13 11:55   ` Christoffer Dall
2015-04-13 11:55     ` Christoffer Dall
2015-04-13 11:55     ` Christoffer Dall
2015-04-13 11:55     ` Christoffer Dall
2015-04-13 14:51     ` Alex Bennée
2015-04-13 14:51       ` Alex Bennée
2015-04-13 14:51       ` Alex Bennée
2015-04-13 14:51       ` Alex Bennée
2015-04-13 15:07       ` Andrew Jones
2015-04-13 15:07         ` Andrew Jones
2015-04-13 15:07         ` Andrew Jones
2015-04-13 15:07         ` Andrew Jones
2015-04-14  8:24       ` Christoffer Dall
2015-04-14  8:24         ` Christoffer Dall
2015-04-14  8:24         ` Christoffer Dall
2015-04-14  8:24         ` Christoffer Dall
2015-04-14  8:24         ` Christoffer Dall
2015-03-31 15:08 ` [PATCH v2 03/10] KVM: arm: guest debug, define API headers Alex Bennée
2015-03-31 15:08   ` Alex Bennée
2015-03-31 15:08   ` Alex Bennée
2015-04-01 15:46   ` David Hildenbrand
2015-04-01 15:46     ` David Hildenbrand
2015-04-01 15:46     ` David Hildenbrand
2015-04-01 16:01     ` Alex Bennée
2015-04-01 16:01       ` Alex Bennée
2015-04-01 16:05       ` David Hildenbrand
2015-04-01 16:05         ` David Hildenbrand
2015-04-01 16:09       ` Peter Maydell
2015-04-01 16:09         ` Peter Maydell
2015-04-10 13:05   ` Andrew Jones
2015-04-10 13:05     ` Andrew Jones
2015-04-10 13:05     ` Andrew Jones
2015-04-13 12:08   ` Christoffer Dall
2015-04-13 12:08     ` Christoffer Dall
2015-04-23  9:54     ` Alex Bennée
2015-04-23  9:54       ` Alex Bennée
2015-04-23  9:54       ` Alex Bennée
2015-03-31 15:08 ` Alex Bennée [this message]
2015-03-31 15:08   ` [PATCH v2 04/10] KVM: arm: guest debug, add stub KVM_SET_GUEST_DEBUG ioctl Alex Bennée
2015-03-31 15:08   ` Alex Bennée
2015-04-01 15:55   ` David Hildenbrand
2015-04-01 15:55     ` David Hildenbrand
2015-04-01 15:55     ` David Hildenbrand
2015-04-09 12:28     ` Andrew Jones
2015-04-09 12:28       ` Andrew Jones
2015-04-09 12:28       ` Andrew Jones
2015-04-09 14:19       ` Alex Bennée
2015-04-09 14:19         ` Alex Bennée
2015-04-09 14:19         ` Alex Bennée
2015-04-13 12:12   ` Christoffer Dall
2015-04-13 12:12     ` Christoffer Dall
2015-04-13 12:12     ` Christoffer Dall
2015-04-14  6:31     ` David Hildenbrand
2015-04-14  6:31       ` David Hildenbrand
2015-04-14  6:31       ` David Hildenbrand
2015-04-14  8:03       ` Alex Bennée
2015-04-14  8:03         ` Alex Bennée
2015-04-14  8:03         ` Alex Bennée
2015-03-31 15:08 ` [PATCH v2 05/10] KVM: arm: introduce kvm_arch_setup/clear_debug() Alex Bennée
2015-03-31 15:08   ` Alex Bennée
2015-03-31 15:08   ` Alex Bennée
2015-04-01 16:28   ` David Hildenbrand
2015-04-01 16:28     ` David Hildenbrand
2015-04-01 16:28     ` David Hildenbrand
2015-04-09 12:56     ` Andrew Jones
2015-04-09 12:56       ` Andrew Jones
2015-04-09 12:56       ` Andrew Jones
2015-04-09 14:18       ` Alex Bennée
2015-04-09 14:18         ` Alex Bennée
2015-04-09 12:55   ` Andrew Jones
2015-04-09 12:55     ` Andrew Jones
2015-04-09 12:55     ` Andrew Jones
2015-04-13 14:36   ` Christoffer Dall
2015-04-13 14:36     ` Christoffer Dall
2015-04-13 14:48     ` Christoffer Dall
2015-04-13 14:48       ` Christoffer Dall
2015-04-13 14:48       ` Christoffer Dall
2015-04-13 15:29     ` Alex Bennée
2015-04-13 15:29       ` Alex Bennée
2015-04-13 15:29       ` Alex Bennée
2015-03-31 15:08 ` [PATCH v2 06/10] KVM: arm64: guest debug, add SW break point support Alex Bennée
2015-03-31 15:08   ` Alex Bennée
2015-03-31 15:08   ` Alex Bennée
2015-04-02 12:52   ` David Hildenbrand
2015-04-02 12:52     ` David Hildenbrand
2015-04-02 12:52     ` David Hildenbrand
2015-04-02 14:06     ` Alex Bennée
2015-04-02 14:06       ` Alex Bennée
2015-04-02 14:06       ` Alex Bennée
2015-04-10 13:09   ` Andrew Jones
2015-04-10 13:09     ` Andrew Jones
2015-04-10 13:09     ` Andrew Jones
2015-04-14  8:25   ` Christoffer Dall
2015-04-14  8:25     ` Christoffer Dall
2015-04-23 14:26     ` Alex Bennée
2015-04-23 14:26       ` Alex Bennée
2015-04-23 14:26       ` Alex Bennée
2015-04-27 20:04       ` Christoffer Dall
2015-04-27 20:04         ` Christoffer Dall
2015-04-27 21:57         ` Peter Maydell
2015-04-27 21:57           ` Peter Maydell
2015-04-28  8:42           ` Alex Bennée
2015-04-28  8:42             ` Alex Bennée
2015-04-28  8:42             ` Alex Bennée
2015-04-28  9:34             ` Peter Maydell
2015-04-28  9:34               ` Peter Maydell
2015-04-28 12:56               ` Christoffer Dall
2015-04-28 12:56                 ` Christoffer Dall
2015-04-28 14:37                 ` Alex Bennée
2015-04-28 14:37                   ` Alex Bennée
2015-04-28 14:37                   ` Alex Bennée
2015-04-29  8:10                   ` Christoffer Dall
2015-04-29  8:10                     ` Christoffer Dall
2015-04-29  9:18                     ` Alex Bennée
2015-04-29  9:18                       ` Alex Bennée
2015-04-29  9:18                       ` Alex Bennée
2015-04-29 10:38                       ` Christoffer Dall
2015-04-29 10:38                         ` Christoffer Dall
2015-04-29 15:08                         ` Alex Bennée
2015-04-29 15:08                           ` Alex Bennée
2015-04-29 15:08                           ` Alex Bennée
2015-04-29 19:20                           ` Christoffer Dall
2015-04-29 19:20                             ` Christoffer Dall
2015-04-21 14:42   ` Zhichao Huang
2015-04-22  9:46     ` Alex Bennée
2015-04-22  9:46       ` Alex Bennée
2015-04-22  9:46       ` Alex Bennée
2015-03-31 15:08 ` [PATCH v2 07/10] KVM: arm64: guest debug, add support for single-step Alex Bennée
2015-03-31 15:08   ` Alex Bennée
2015-03-31 15:08   ` Alex Bennée
2015-04-09 13:24   ` Andrew Jones
2015-04-09 13:24     ` Andrew Jones
2015-04-09 14:16     ` Alex Bennée
2015-04-09 14:16       ` Alex Bennée
2015-04-09 14:16       ` Alex Bennée
2015-04-14  8:27   ` Christoffer Dall
2015-04-14  8:27     ` Christoffer Dall
2015-04-14  8:27     ` Christoffer Dall
2015-03-31 15:08 ` [PATCH v2 08/10] KVM: arm64: guest debug, HW assisted debug support Alex Bennée
2015-03-31 15:08   ` Alex Bennée
2015-03-31 15:08   ` Alex Bennée
2015-04-10 12:25   ` Andrew Jones
2015-04-10 12:25     ` Andrew Jones
2015-04-10 12:25     ` Andrew Jones
2015-04-13  8:00     ` Alex Bennée
2015-04-13  8:00       ` Alex Bennée
2015-04-13  8:00       ` Alex Bennée
2015-04-14 10:23     ` Christoffer Dall
2015-04-14 10:23       ` Christoffer Dall
2015-04-14 10:17   ` Christoffer Dall
2015-04-14 10:17     ` Christoffer Dall
2015-04-14 10:17     ` Christoffer Dall
2015-03-31 15:08 ` [PATCH v2 09/10] KVM: arm64: trap nested debug register access Alex Bennée
2015-03-31 15:08   ` Alex Bennée
2015-03-31 15:08   ` Alex Bennée
2015-04-10 12:38   ` Andrew Jones
2015-04-10 12:38     ` Andrew Jones
2015-04-10 12:38     ` Andrew Jones
2015-04-13  7:59     ` Alex Bennée
2015-04-13  7:59       ` Alex Bennée
2015-04-13  7:59       ` Alex Bennée
2015-04-14 10:27       ` Christoffer Dall
2015-04-14 10:27         ` Christoffer Dall
2015-04-14 10:27         ` Christoffer Dall
2015-04-14 10:30   ` Christoffer Dall
2015-04-14 10:30     ` Christoffer Dall
2015-04-14 10:30     ` Christoffer Dall
2015-03-31 15:08 ` [PATCH v2 10/10] KVM: arm64: add trace points for guest_debug debug Alex Bennée
2015-03-31 15:08   ` Alex Bennée
2015-03-31 15:08   ` Alex Bennée
2015-04-10 12:54   ` Andrew Jones
2015-04-10 12:54     ` Andrew Jones
2015-04-13  7:57     ` Alex Bennée
2015-04-13  7:57       ` Alex Bennée
2015-04-14 10:32   ` Christoffer Dall
2015-04-14 10:32     ` Christoffer Dall
2015-04-14 10:32     ` Christoffer Dall

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=1427814488-28467-5-git-send-email-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=agraf@suse.de \
    --cc=bp@suse.de \
    --cc=christoffer.dall@linaro.org \
    --cc=corbet@lwn.net \
    --cc=dahi@linux.vnet.ibm.com \
    --cc=drjones@redhat.com \
    --cc=gleb@kernel.org \
    --cc=jan.kiszka@siemens.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=marc.zyngier@arm.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=r65777@freescale.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.