From 281c892e3bdb0a56cfd8ab6516cd1a33c095c857 Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Thu, 23 Oct 2014 17:18:52 +0100 Subject: [PATCH] xen/arm: dump guest stack even if not the current VCPU If show_guest_stack was called from Xen context (for instance hitting '0' key on Xen console) get_page_from_gva was not able to get the page returning NULL. Detecting different domain and changing VTTBR register make get_page_from_gva works for different domains. Signed-off-by: Frediano Ziglio Acked-by: Ian Campbell --- xen/arch/arm/p2m.c | 24 ++++++++++++++++++++---- xen/arch/arm/traps.c | 2 +- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 7b08f16d03..8809f5a297 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1157,13 +1157,29 @@ struct page_info *get_page_from_gva(struct domain *d, vaddr_t va, { struct p2m_domain *p2m = &d->arch.p2m; struct page_info *page = NULL; - paddr_t maddr; - - ASSERT(d == current->domain); + paddr_t maddr = 0; + int rc; spin_lock(&p2m->lock); - if ( gvirt_to_maddr(va, &maddr, flags) ) + if ( unlikely(d != current->domain) ) + { + unsigned long irq_flags; + + local_irq_save(irq_flags); + p2m_load_VTTBR(d); + + rc = gvirt_to_maddr(va, &maddr, flags); + + p2m_load_VTTBR(current->domain); + local_irq_restore(irq_flags); + } + else + { + rc = gvirt_to_maddr(va, &maddr, flags); + } + + if ( rc ) goto err; if ( !mfn_valid(maddr >> PAGE_SHIFT) ) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index f6fc8f8e1e..4c932503a7 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -892,7 +892,7 @@ static void show_guest_stack(struct vcpu *v, struct cpu_user_regs *regs) return; } - page = get_page_from_gva(current->domain, sp, GV2M_READ); + page = get_page_from_gva(v->domain, sp, GV2M_READ); if ( page == NULL ) { printk("Failed to convert stack to physical address\n"); -- 2.39.5