From: Julien Grall <julien.grall@arm.com>
To: xen-devel@lists.xen.org
Cc: proskurin@sec.in.tum.de, sstabellini@kernel.org,
wei.chen@linaro.org, steve.capper@arm.com
Subject: Re: [PATCH 16/22] xen/arm: p2m: Move the vttbr field from arch_domain to p2m_domain
Date: Wed, 27 Jul 2016 18:19:52 +0100 [thread overview]
Message-ID: <62eef7ea-0bc4-cb99-901c-d47abe957140@arm.com> (raw)
In-Reply-To: <1469031064-23344-17-git-send-email-julien.grall@arm.com>
Hi,
On 20/07/16 17:10, Julien Grall wrote:
> The field vttbr holds the base address of the translation table for
> guest. Its value will depends on how the p2m has been initialized and
> will only be used by the code code.
>
> So move the field from arch_domain to p2m_domain. This will also ease
> the implementation of altp2m.
I forgot to add my signed-off-by in this patch as well :/. I will add in
the next version.
Regards,
> ---
> xen/arch/arm/p2m.c | 11 +++++++----
> xen/arch/arm/traps.c | 2 +-
> xen/include/asm-arm/domain.h | 1 -
> xen/include/asm-arm/p2m.h | 3 +++
> 4 files changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
> index c407e6a..c52081a 100644
> --- a/xen/arch/arm/p2m.c
> +++ b/xen/arch/arm/p2m.c
> @@ -107,10 +107,14 @@ void dump_p2m_lookup(struct domain *d, paddr_t addr)
>
> static void p2m_load_VTTBR(struct domain *d)
> {
> + struct p2m_domain *p2m = &d->arch.p2m;
> +
> if ( is_idle_domain(d) )
> return;
> - BUG_ON(!d->arch.vttbr);
> - WRITE_SYSREG64(d->arch.vttbr, VTTBR_EL2);
> +
> + ASSERT(p2m->vttbr);
> +
> + WRITE_SYSREG64(p2m->vttbr, VTTBR_EL2);
> isb(); /* Ensure update is visible */
> }
>
> @@ -1298,8 +1302,7 @@ static int p2m_alloc_table(struct domain *d)
>
> p2m->root = page;
>
> - d->arch.vttbr = page_to_maddr(p2m->root)
> - | ((uint64_t)p2m->vmid&0xff)<<48;
> + p2m->vttbr = page_to_maddr(p2m->root) | ((uint64_t)p2m->vmid & 0xff) << 48;
>
> /*
> * Make sure that all TLBs corresponding to the new VMID are flushed
> diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
> index 06a8ee5..65c6fb4 100644
> --- a/xen/arch/arm/traps.c
> +++ b/xen/arch/arm/traps.c
> @@ -880,7 +880,7 @@ void vcpu_show_registers(const struct vcpu *v)
> ctxt.ifsr32_el2 = v->arch.ifsr;
> #endif
>
> - ctxt.vttbr_el2 = v->domain->arch.vttbr;
> + ctxt.vttbr_el2 = v->domain->arch.p2m.vttbr;
>
> _show_registers(&v->arch.cpu_info->guest_cpu_user_regs, &ctxt, 1, v);
> }
> diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h
> index 4e9d8bf..9452fcd 100644
> --- a/xen/include/asm-arm/domain.h
> +++ b/xen/include/asm-arm/domain.h
> @@ -48,7 +48,6 @@ struct arch_domain
>
> /* Virtual MMU */
> struct p2m_domain p2m;
> - uint64_t vttbr;
>
> struct hvm_domain hvm_domain;
> gfn_t *grant_table_gfn;
> diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h
> index ce28e8a..53c4d78 100644
> --- a/xen/include/asm-arm/p2m.h
> +++ b/xen/include/asm-arm/p2m.h
> @@ -32,6 +32,9 @@ struct p2m_domain {
> /* Current VMID in use */
> uint8_t vmid;
>
> + /* Current Translation Table Base Register for the p2m */
> + uint64_t vttbr;
> +
> /*
> * Highest guest frame that's ever been mapped in the p2m
> * Only takes into account ram and foreign mapping
>
--
Julien Grall
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-07-27 17:19 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-20 16:10 [PATCH 00/22] xen/arm: P2M clean-up and fixes Julien Grall
2016-07-20 16:10 ` [PATCH 01/22] xen/arm: system: Use the correct parameter name in local_irq_restore Julien Grall
2016-07-22 1:19 ` Stefano Stabellini
2016-07-20 16:10 ` [PATCH 02/22] xen/arm: p2m: Pass the vCPU in parameter to get_page_from_gva Julien Grall
2016-07-22 1:22 ` Stefano Stabellini
2016-07-20 16:10 ` [PATCH 03/22] xen/arm: p2m: Restrict usage of get_page_from_gva to the current vCPU Julien Grall
2016-07-22 1:25 ` Stefano Stabellini
2016-07-20 16:10 ` [PATCH 04/22] xen/arm: p2m: Fix multi-lines coding style comments Julien Grall
2016-07-22 1:26 ` Stefano Stabellini
2016-07-20 16:10 ` [PATCH 05/22] xen/arm: p2m: Clean-up mfn_to_p2m_entry Julien Grall
2016-07-26 22:24 ` Stefano Stabellini
2016-07-20 16:10 ` [PATCH 06/22] xen/arm: p2m: Use the typesafe MFN in mfn_to_p2m_entry Julien Grall
2016-07-26 22:28 ` Stefano Stabellini
2016-07-27 9:54 ` Julien Grall
2016-07-27 18:25 ` Stefano Stabellini
2016-07-27 20:14 ` Julien Grall
2016-07-20 16:10 ` [PATCH 07/22] xen/arm: p2m: Use p2m_is_foreign in get_page_from_gfn to avoid open coding Julien Grall
2016-07-26 22:33 ` Stefano Stabellini
2016-07-20 16:10 ` [PATCH 08/22] xen/arm: p2m: Simplify p2m type check by using bitmask Julien Grall
2016-07-26 22:36 ` Stefano Stabellini
2016-07-20 16:10 ` [PATCH 09/22] xen/arm: p2m: Use a whitelist rather than blacklist in get_page_from_gfn Julien Grall
2016-07-26 22:44 ` Stefano Stabellini
2016-07-27 9:59 ` Julien Grall
2016-07-27 17:56 ` Stefano Stabellini
2016-07-27 17:57 ` Julien Grall
2016-07-20 16:10 ` [PATCH 10/22] xen/arm: p2m: Differentiate cacheable vs non-cacheable MMIO Julien Grall
2016-07-26 22:47 ` Stefano Stabellini
2016-07-20 16:10 ` [PATCH 11/22] xen/arm: p2m: Find the memory attributes based on the p2m type Julien Grall
2016-07-27 0:41 ` Stefano Stabellini
2016-07-27 17:15 ` Julien Grall
2016-07-27 17:55 ` Stefano Stabellini
2016-07-27 20:15 ` Julien Grall
2016-07-20 16:10 ` [PATCH 12/22] xen/arm: p2m: Remove unnecessary locking Julien Grall
2016-07-27 0:47 ` Stefano Stabellini
2016-07-20 16:10 ` [PATCH 13/22] xen/arm: p2m: Introduce p2m_{read, write}_{, un}lock helpers Julien Grall
2016-07-27 0:50 ` Stefano Stabellini
2016-07-20 16:10 ` [PATCH 14/22] xen/arm: p2m: Switch the p2m lock from spinlock to rwlock Julien Grall
2016-07-27 0:51 ` Stefano Stabellini
2016-07-20 16:10 ` [PATCH 15/22] xen/arm: Don't call p2m_alloc_table from arch_domain_create Julien Grall
2016-07-22 8:32 ` Sergej Proskurin
2016-07-22 9:18 ` Julien Grall
2016-07-22 10:16 ` Sergej Proskurin
2016-07-22 10:26 ` Julien Grall
2016-07-22 10:39 ` Sergej Proskurin
2016-07-22 10:38 ` Julien Grall
2016-07-22 11:05 ` Sergej Proskurin
2016-07-22 13:00 ` Julien Grall
2016-07-23 17:59 ` Sergej Proskurin
2016-07-27 0:54 ` Stefano Stabellini
2016-07-20 16:10 ` [PATCH 16/22] xen/arm: p2m: Move the vttbr field from arch_domain to p2m_domain Julien Grall
2016-07-22 7:46 ` Sergej Proskurin
2016-07-22 9:23 ` Julien Grall
2016-07-27 0:57 ` Stefano Stabellini
2016-07-27 10:00 ` Julien Grall
2016-07-27 17:19 ` Julien Grall [this message]
2016-07-20 16:10 ` [PATCH 17/22] xen/arm: p2m: Don't need to restore the state for an idle vCPU Julien Grall
2016-07-22 7:37 ` Sergej Proskurin
2016-07-27 1:05 ` Stefano Stabellini
2016-07-20 16:11 ` [PATCH 18/22] xen/arm: p2m: Rework the context switch to another VTTBR in flush_tlb_domain Julien Grall
2016-07-22 7:51 ` Sergej Proskurin
2016-07-27 1:12 ` Stefano Stabellini
2016-07-27 10:22 ` Julien Grall
2016-07-20 16:11 ` [PATCH 19/22] xen/arm: p2m: Inline p2m_load_VTTBR into p2m_restore_state Julien Grall
2016-07-22 8:07 ` Sergej Proskurin
2016-07-22 9:29 ` Julien Grall
2016-07-27 1:13 ` Stefano Stabellini
2016-07-20 16:11 ` [PATCH 20/22] xen/arm: Don't export flush_tlb_domain Julien Grall
2016-07-22 8:54 ` Sergej Proskurin
2016-07-22 9:30 ` Julien Grall
2016-07-22 10:25 ` Sergej Proskurin
2016-07-22 10:34 ` Julien Grall
2016-07-22 10:46 ` Sergej Proskurin
2016-07-22 10:57 ` Julien Grall
2016-07-22 11:22 ` Sergej Proskurin
2016-07-27 1:14 ` Stefano Stabellini
2016-07-20 16:11 ` [PATCH 21/22] xen/arm: p2m: Replace flush_tlb_domain by p2m_flush_tlb Julien Grall
2016-07-27 1:15 ` Stefano Stabellini
2016-07-20 16:11 ` [PATCH 22/22] xen/arm: p2m: Pass the p2m in parameter rather the domain when it is possible Julien Grall
2016-07-27 1:15 ` Stefano Stabellini
2016-07-22 1:31 ` [PATCH 00/22] xen/arm: P2M clean-up and fixes Stefano Stabellini
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=62eef7ea-0bc4-cb99-901c-d47abe957140@arm.com \
--to=julien.grall@arm.com \
--cc=proskurin@sec.in.tum.de \
--cc=sstabellini@kernel.org \
--cc=steve.capper@arm.com \
--cc=wei.chen@linaro.org \
--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).