From: Ian Campbell <ian.campbell@citrix.com>
To: xen-devel@lists.xen.org
Cc: Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH 03/21] arm: implement vcpu_show_execution_state
Date: Thu, 28 Jun 2012 14:47:51 +0000 [thread overview]
Message-ID: <1340894890-4369-3-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1340894890-4369-1-git-send-email-ian.campbell@citrix.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
xen/arch/arm/dummy.S | 1 -
xen/arch/arm/traps.c | 56 +++++++++++++++++++++++++++++++++++++++++++++----
2 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/xen/arch/arm/dummy.S b/xen/arch/arm/dummy.S
index 03f7489..cab9522 100644
--- a/xen/arch/arm/dummy.S
+++ b/xen/arch/arm/dummy.S
@@ -21,7 +21,6 @@ DUMMY(pirq_set_affinity);
DUMMY(arch_get_info_guest);
DUMMY(arch_vcpu_reset);
NOP(update_vcpu_system_time);
-DUMMY(vcpu_show_execution_state);
/* Page Reference & Type Maintenance */
DUMMY(get_page);
diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index d8eb5a9..f5f43da 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -170,7 +170,13 @@ void panic_PAR(uint64_t par, const char *when)
panic("Error during %s-to-physical address translation\n", when);
}
-void show_registers(struct cpu_user_regs *regs)
+struct reg_ctxt {
+ uint32_t sctlr;
+ uint32_t ttbr0, ttbr1, ttbcr;
+};
+static void _show_registers(struct cpu_user_regs *regs,
+ struct reg_ctxt *ctxt,
+ int guest_mode)
{
static const char *mode_strings[] = {
[PSR_MODE_USR] = "USR",
@@ -187,7 +193,7 @@ void show_registers(struct cpu_user_regs *regs)
print_xen_info();
printk("CPU: %d\n", smp_processor_id());
printk("PC: %08"PRIx32, regs->pc);
- if ( !guest_mode(regs) )
+ if ( !guest_mode )
print_symbol(" %s", regs->pc);
printk("\n");
printk("CPSR: %08"PRIx32" MODE:%s\n", regs->cpsr,
@@ -199,7 +205,7 @@ void show_registers(struct cpu_user_regs *regs)
printk(" R8: %08"PRIx32" R9: %08"PRIx32" R10:%08"PRIx32" R11:%08"PRIx32" R12:%08"PRIx32"\n",
regs->r8, regs->r9, regs->r10, regs->r11, regs->r12);
- if ( guest_mode(regs) )
+ if ( guest_mode )
{
printk("USR: SP: %08"PRIx32" LR: %08"PRIx32" CPSR:%08"PRIx32"\n",
regs->sp_usr, regs->lr_usr, regs->cpsr);
@@ -217,8 +223,8 @@ void show_registers(struct cpu_user_regs *regs)
regs->r8_fiq, regs->r9_fiq, regs->r10_fiq, regs->r11_fiq, regs->r11_fiq);
printk("\n");
printk("TTBR0 %08"PRIx32" TTBR1 %08"PRIx32" TTBCR %08"PRIx32"\n",
- READ_CP32(TTBR0), READ_CP32(TTBR1), READ_CP32(TTBCR));
- printk("SCTLR %08"PRIx32"\n", READ_CP32(SCTLR));
+ ctxt->ttbr0, ctxt->ttbr1, ctxt->ttbcr);
+ printk("SCTLR %08"PRIx32"\n", ctxt->sctlr);
printk("VTTBR %010"PRIx64"\n", READ_CP64(VTTBR));
printk("\n");
}
@@ -241,6 +247,26 @@ void show_registers(struct cpu_user_regs *regs)
printk("\n");
}
+void show_registers(struct cpu_user_regs *regs)
+{
+ struct reg_ctxt ctxt;
+ ctxt.sctlr = READ_CP32(SCTLR);
+ ctxt.ttbcr = READ_CP32(TTBCR);
+ ctxt.ttbr0 = READ_CP32(TTBR0);
+ ctxt.ttbr1 = READ_CP32(TTBR1);
+ _show_registers(regs, &ctxt, guest_mode(regs));
+}
+
+void vcpu_show_registers(const struct vcpu *v)
+{
+ struct reg_ctxt ctxt;
+ ctxt.sctlr = v->arch.sctlr;
+ ctxt.ttbcr = v->arch.ttbcr;
+ ctxt.ttbr0 = v->arch.ttbr0;
+ ctxt.ttbr1 = v->arch.ttbr1;
+ _show_registers(&v->arch.cpu_info->guest_cpu_user_regs, &ctxt, 1);
+}
+
static void show_guest_stack(struct cpu_user_regs *regs)
{
printk("GUEST STACK GOES HERE\n");
@@ -334,6 +360,26 @@ void show_execution_state(struct cpu_user_regs *regs)
show_stack(regs);
}
+void vcpu_show_execution_state(struct vcpu *v)
+{
+ printk("*** Dumping Dom%d vcpu#%d state: ***\n",
+ v->domain->domain_id, v->vcpu_id);
+
+ if ( v == current )
+ {
+ show_execution_state(guest_cpu_user_regs());
+ return;
+ }
+
+ vcpu_pause(v); /* acceptably dangerous */
+
+ vcpu_show_registers(v);
+ if ( !usr_mode(&v->arch.cpu_info->guest_cpu_user_regs) )
+ show_guest_stack(&v->arch.cpu_info->guest_cpu_user_regs);
+
+ vcpu_unpause(v);
+}
+
static void do_unexpected_trap(const char *msg, struct cpu_user_regs *regs)
{
printk("Unexpected Trap: %s\n", msg);
--
1.7.9.1
next prev parent reply other threads:[~2012-06-28 14:47 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-28 14:47 [PATCH 0/21 V3] arm: boot a dom1 to "Calibrating delay loop" then hang Ian Campbell
2012-06-28 14:47 ` [PATCH 01/21] arm: allow p2m to be created with specific MATTR Ian Campbell
2012-06-28 14:47 ` [PATCH 02/21] arm: implement vpl011 (UART) emulator Ian Campbell
2012-06-28 14:47 ` Ian Campbell [this message]
2012-06-28 14:47 ` [PATCH 04/21] arm: use correct attributes for mappings in copy_from_paddr() Ian Campbell
2012-06-28 14:47 ` [PATCH 05/21] arm: split pending SPIs (global) out from pending PPIs and SGIs (per CPU) Ian Campbell
2012-06-28 14:47 ` [PATCH 06/21] arm: make vgic lock safe for use in interrupt context Ian Campbell
2012-07-02 15:42 ` Stefano Stabellini
2012-06-28 14:47 ` [PATCH 07/21] arm: map GICV in all domains, not just dom0 Ian Campbell
2012-06-28 14:47 ` [PATCH 08/21] arm: enable data-cache at the same time as enabling the MMU, not before Ian Campbell
2012-06-28 14:47 ` [PATCH 09/21] arm: Upgrade guest barriers to Outer-Shareable. Enable Protected Table Walk Ian Campbell
2012-06-28 14:47 ` [PATCH 10/21] arm: gic.lock can be taken in interrupt context, so lock appropriately Ian Campbell
2012-06-28 14:47 ` [PATCH 11/21] arm: context switch virtual timer registers Ian Campbell
2012-06-28 14:48 ` [PATCH 12/21] arm: the hyp timer seems to work in newer model versions, default to using it Ian Campbell
2012-06-28 14:48 ` [PATCH 13/21] arm: unwind allocations etc on arch_domain_create_failure Ian Campbell
2012-06-28 14:48 ` [PATCH 14/21] arm: move PSR flag definitions into interface, for tools use Ian Campbell
2012-06-28 14:48 ` [PATCH 15/21] arm: fix typo s/approprately/appropriately/g Ian Campbell
2012-06-28 14:48 ` [PATCH 16/21] HACK: arm: initial XENMAPSPACE_gmfn_foreign Ian Campbell
2012-06-28 14:48 ` [PATCH 17/21] libxc: add ARM support to xc_dom (PV domain building) Ian Campbell
2012-06-28 14:48 ` [PATCH 18/21] arm: implement VGCF_online Ian Campbell
2012-06-28 14:48 ` [PATCH 19/21] HACK: add simple xcbuild Ian Campbell
2012-06-28 14:48 ` [PATCH 20/21] HACK: arm: disable hypercall continuations Ian Campbell
2012-06-28 14:48 ` [PATCH 21/21] xen: add assertion in default_vcpu0_location to protect against broken masks Ian Campbell
2012-07-03 10:07 ` [PATCH 0/21 V3] arm: boot a dom1 to "Calibrating delay loop" then hang Ian Campbell
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=1340894890-4369-3-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=xen-devel@lists.xen.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).