|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH 28/38] arm: map GICV in all domains, not just dom0.
On Thu, 2012-06-07 at 10:51 +0100, Tim Deegan wrote:
> At 15:39 +0000 on 01 Jun (1338565197), Ian Campbell wrote:
> > diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
> > index a7fb227..e15c1e8 100644
> > --- a/xen/arch/arm/domain.c
> > +++ b/xen/arch/arm/domain.c
> > @@ -329,13 +329,17 @@ int arch_domain_create(struct domain *d, unsigned int
> > domcr_flags)
> >
> > if ( (rc = p2m_alloc_table(d)) != 0 )
> > goto fail;
> > - }
> >
> > - if ( (rc = domain_vgic_init(d)) != 0 )
> > - goto fail;
> > + if ( (rc = gicv_setup(d)) != 0 )
> > + goto fail;
> > +
> > + if ( (rc = domain_vgic_init(d)) != 0 )
> > + goto fail;
> > + }
> >
> > rc = 0;
> > fail:
> > + /*XXX unwind allocations etc */
>
> Ahem. :)
Indeed ;-)
I've added the following to the end of the series:
8<------------------------------------------------
>From 9b12490d654683b1c3c65eb41ab35e20cd7682db Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@xxxxxxxxxx>
Date: Thu, 7 Jun 2012 16:59:57 +0000
Subject: [PATCH] arm: unwind allocations etc on arch_domain_create_failure
This involves adding the necessary teardown/free functions for some modules.
Don't initialise full arch domain state for the idle domain, it's not needed.
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
xen/arch/arm/domain.c | 42 +++++++++++++++++++++++++-----------------
xen/arch/arm/gic.h | 3 +++
xen/arch/arm/p2m.c | 15 +++++++++++++++
xen/arch/arm/vgic.c | 6 ++++++
xen/arch/arm/vpl011.c | 5 +++++
xen/arch/arm/vpl011.h | 1 +
xen/include/asm-arm/p2m.h | 3 +++
7 files changed, 58 insertions(+), 17 deletions(-)
diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
index c16fa02..f61568b 100644
--- a/xen/arch/arm/domain.c
+++ b/xen/arch/arm/domain.c
@@ -317,37 +317,45 @@ int arch_domain_create(struct domain *d, unsigned int
domcr_flags)
{
int rc;
+ /* Idle domains do not need this setup */
+ if ( is_idle_domain(d) )
+ return 0;
+
rc = -ENOMEM;
if ( (rc = p2m_init(d)) != 0 )
goto fail;
- if ( !is_idle_domain(d) )
- {
- rc = -ENOMEM;
- if ( (d->shared_info = alloc_xenheap_pages(0, 0)) == NULL )
- goto fail;
+ if ( (d->shared_info = alloc_xenheap_pages(0, 0)) == NULL )
+ goto fail;
- clear_page(d->shared_info);
- share_xen_page_with_guest(
- virt_to_page(d->shared_info), d, XENSHARE_writable);
+ clear_page(d->shared_info);
+ share_xen_page_with_guest(
+ virt_to_page(d->shared_info), d, XENSHARE_writable);
- if ( (rc = p2m_alloc_table(d)) != 0 )
- goto fail;
+ if ( (rc = p2m_alloc_table(d)) != 0 )
+ goto fail;
- if ( (rc = gicv_setup(d)) != 0 )
- goto fail;
+ if ( (rc = gicv_setup(d)) != 0 )
+ goto fail;
- if ( (rc = domain_vgic_init(d)) != 0 )
- goto fail;
- }
+ if ( (rc = domain_vgic_init(d)) != 0 )
+ goto fail;
/* Domain 0 gets a real UART not an emulated one */
if ( d->domain_id && (rc = domain_uart0_init(d)) != 0 )
goto fail;
- rc = 0;
+ return 0;
+
fail:
- /*XXX unwind allocations etc */
+ d->is_dying = DOMDYING_dead;
+ free_xenheap_page(d->shared_info);
+
+ p2m_teardown(d);
+
+ domain_vgic_free(d);
+ domain_uart0_free(d);
+
return rc;
}
diff --git a/xen/arch/arm/gic.h b/xen/arch/arm/gic.h
index 018d820..e36d6ad 100644
--- a/xen/arch/arm/gic.h
+++ b/xen/arch/arm/gic.h
@@ -125,7 +125,10 @@
#define VGIC_IRQ_EVTCHN_CALLBACK 31
extern int domain_vgic_init(struct domain *d);
+extern void domain_vgic_free(struct domain *d);
+
extern int vcpu_vgic_init(struct vcpu *v);
+
extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq,int virtual);
extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq);
diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
index 67bfeba..073216b 100644
--- a/xen/arch/arm/p2m.c
+++ b/xen/arch/arm/p2m.c
@@ -288,6 +288,21 @@ int p2m_alloc_table(struct domain *d)
return 0;
}
+void p2m_teardown(struct domain *d)
+{
+ struct p2m_domain *p2m = &d->arch.p2m;
+ struct page_info *pg;
+
+ spin_lock(&p2m->lock);
+
+ while ( (pg = page_list_remove_head(&p2m->pages)) )
+ free_domheap_page(pg);
+
+ p2m->first_level = NULL;
+
+ spin_unlock(&p2m->lock);
+}
+
int p2m_init(struct domain *d)
{
struct p2m_domain *p2m = &d->arch.p2m;
diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
index 91d6166..06bbd0c 100644
--- a/xen/arch/arm/vgic.c
+++ b/xen/arch/arm/vgic.c
@@ -90,6 +90,12 @@ int domain_vgic_init(struct domain *d)
return 0;
}
+void domain_vgic_free(struct domain *d)
+{
+ xfree(d->arch.vgic.shared_irqs);
+ xfree(d->arch.vgic.pending_irqs);
+}
+
int vcpu_vgic_init(struct vcpu *v)
{
int i;
diff --git a/xen/arch/arm/vpl011.c b/xen/arch/arm/vpl011.c
index 5dc8b28..1522667 100644
--- a/xen/arch/arm/vpl011.c
+++ b/xen/arch/arm/vpl011.c
@@ -56,6 +56,11 @@ int domain_uart0_init(struct domain *d)
}
+void domain_uart0_free(struct domain *d)
+{
+ xfree(d->arch.uart0.buf);
+}
+
static void uart0_print_char(char c)
{
struct vpl011 *uart = ¤t->domain->arch.uart0;
diff --git a/xen/arch/arm/vpl011.h b/xen/arch/arm/vpl011.h
index 952d812..eabd99d 100644
--- a/xen/arch/arm/vpl011.h
+++ b/xen/arch/arm/vpl011.h
@@ -21,6 +21,7 @@
#define __ARCH_ARM_VPL011_H__
extern int domain_uart0_init(struct domain *d);
+extern void domain_uart0_free(struct domain *d);
#endif
diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h
index 666bb88..14e71bf 100644
--- a/xen/include/asm-arm/p2m.h
+++ b/xen/include/asm-arm/p2m.h
@@ -23,6 +23,9 @@ struct p2m_domain {
/* Init the datastructures for later use by the p2m code */
int p2m_init(struct domain *d);
+/* Return all the p2m resources to Xen. */
+void p2m_teardown(struct domain *d);
+
/* Allocate a new p2m table for a domain.
*
* Returns 0 for success or -errno.
--
1.7.9.1
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |