Re: [PATCH 15/22] xen/arm: Don't call p2m_alloc_table from arch_domain_create

[Stefano Stabellini <sstabellini@kernel.org>]

On Wed, 20 Jul 2016, Julien Grall wrote:
> The p2m root table does not need to be allocate separately.
> 
> Also remove unnecessary fields initialization as the structure is already
> memset to 0 and the fields will be override by p2m_alloc_table.
                                      ^ overridden


> Signed-off-by: Julien Grall <julien.grall@arm.com>

Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>


>  xen/arch/arm/domain.c     | 3 ---
>  xen/arch/arm/p2m.c        | 8 +++-----
>  xen/include/asm-arm/p2m.h | 7 -------
>  3 files changed, 3 insertions(+), 15 deletions(-)
> 
> diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
> index 61fc08e..688adec 100644
> --- a/xen/arch/arm/domain.c
> +++ b/xen/arch/arm/domain.c
> @@ -572,9 +572,6 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags,
>      if ( (rc = domain_io_init(d)) != 0 )
>          goto fail;
>  
> -    if ( (rc = p2m_alloc_table(d)) != 0 )
> -        goto fail;
> -
>      switch ( config->gic_version )
>      {
>      case XEN_DOMCTL_CONFIG_GIC_NATIVE:
> diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
> index 6136767..c407e6a 100644
> --- a/xen/arch/arm/p2m.c
> +++ b/xen/arch/arm/p2m.c
> @@ -1282,7 +1282,7 @@ void guest_physmap_remove_page(struct domain *d,
>      p2m_remove_mapping(d, gfn, (1 << page_order), mfn);
>  }
>  
> -int p2m_alloc_table(struct domain *d)
> +static int p2m_alloc_table(struct domain *d)
>  {
>      struct p2m_domain *p2m = &d->arch.p2m;
>      struct page_info *page;
> @@ -1398,10 +1398,6 @@ int p2m_init(struct domain *d)
>      if ( rc != 0 )
>          return rc;
>  
> -    d->arch.vttbr = 0;
> -
> -    p2m->root = NULL;
> -
>      p2m->max_mapped_gfn = _gfn(0);
>      p2m->lowest_mapped_gfn = _gfn(ULONG_MAX);
>  
> @@ -1409,6 +1405,8 @@ int p2m_init(struct domain *d)
>      p2m->mem_access_enabled = false;
>      radix_tree_init(&p2m->mem_access_settings);
>  
> +    rc = p2m_alloc_table(d);
> +
>      return rc;
>  }
>  
> diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h
> index abda70c..ce28e8a 100644
> --- a/xen/include/asm-arm/p2m.h
> +++ b/xen/include/asm-arm/p2m.h
> @@ -149,13 +149,6 @@ void p2m_teardown(struct domain *d);
>   */
>  int relinquish_p2m_mapping(struct domain *d);
>  
> -/*
> - * Allocate a new p2m table for a domain.
> - *
> - * Returns 0 for success or -errno.
> - */
> -int p2m_alloc_table(struct domain *d);
> -
>  /* Context switch */
>  void p2m_save_state(struct vcpu *p);
>  void p2m_restore_state(struct vcpu *n);
> -- 
> 1.9.1
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel