From: Ian Campbell <ian.campbell@citrix.com>
To: xen-devel@lists.xen.org
Cc: julien.grall@linaro.org, tim@xen.org,
Ian Campbell <ian.campbell@citrix.com>,
stefano.stabellini@eu.citrix.com
Subject: [PATCH v2 5/8] xen: arm: handle superpage mappings in p2m_lookup
Date: Wed, 11 Jun 2014 17:40:01 +0100 [thread overview]
Message-ID: <1402504804-29173-5-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1402504640.16332.50.camel@kazak.uk.xensource.com>
Currently none are actually created, but they will be shortly.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Julien Grall <julien.grall@linaro.org>
---
xen/arch/arm/p2m.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
index ea05b6d..8a6d295 100644
--- a/xen/arch/arm/p2m.c
+++ b/xen/arch/arm/p2m.c
@@ -123,6 +123,7 @@ paddr_t p2m_lookup(struct domain *d, paddr_t paddr, p2m_type_t *t)
struct p2m_domain *p2m = &d->arch.p2m;
lpae_t pte, *first = NULL, *second = NULL, *third = NULL;
paddr_t maddr = INVALID_PADDR;
+ paddr_t mask;
p2m_type_t _t;
/* Allow t to be NULL */
@@ -136,15 +137,21 @@ paddr_t p2m_lookup(struct domain *d, paddr_t paddr, p2m_type_t *t)
if ( !first )
goto err;
+ mask = FIRST_MASK;
pte = first[first_table_offset(paddr)];
if ( !pte.p2m.valid || !pte.p2m.table )
goto done;
+ mask = SECOND_MASK;
second = map_domain_page(pte.p2m.base);
pte = second[second_table_offset(paddr)];
if ( !pte.p2m.valid || !pte.p2m.table )
goto done;
+ mask = THIRD_MASK;
+
+ BUILD_BUG_ON(THIRD_MASK != PAGE_MASK);
+
third = map_domain_page(pte.p2m.base);
pte = third[third_table_offset(paddr)];
@@ -156,7 +163,7 @@ done:
if ( pte.p2m.valid )
{
ASSERT(pte.p2m.type != p2m_invalid);
- maddr = (pte.bits & PADDR_MASK & PAGE_MASK) | (paddr & ~PAGE_MASK);
+ maddr = (pte.bits & PADDR_MASK & mask) | (paddr & ~mask);
*t = pte.p2m.type;
}
--
1.7.10.4
next prev parent reply other threads:[~2014-06-11 16:40 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-11 16:37 [PATCH v2 0/8] xen: arm: Use super pages in p2m Ian Campbell
2014-06-11 16:39 ` [PATCH v2 1/8] xen: arm: dump vcpu gic info in arch_dump_vcpu_info Ian Campbell
2014-06-11 16:39 ` [PATCH v2 2/8] tools/libxc: pull min/max_t into xc_private.h Ian Campbell
2014-06-11 21:14 ` Julien Grall
2014-06-11 16:39 ` [PATCH v2 3/8] tools: arm: allocate large pages to guests Ian Campbell
2014-06-11 21:26 ` Julien Grall
2014-06-12 7:19 ` Ian Campbell
2014-06-12 8:47 ` Julien Grall
2014-06-11 16:40 ` [PATCH v2 4/8] xen: arm: only put_page for p2m operations which require it Ian Campbell
2014-06-11 21:31 ` Julien Grall
2014-06-12 7:27 ` Ian Campbell
2014-06-11 16:40 ` Ian Campbell [this message]
2014-06-11 16:40 ` [PATCH v2 6/8] xen: arm: add some helpers for assessing p2m pte Ian Campbell
2014-06-11 21:39 ` Julien Grall
2014-06-12 7:27 ` Ian Campbell
2014-06-11 16:40 ` [PATCH v2 7/8] xen: arm: use superpages in p2m when pages are suitably aligned Ian Campbell
2014-06-11 22:19 ` Julien Grall
2014-06-12 7:30 ` Ian Campbell
2014-06-12 9:00 ` Julien Grall
2014-06-13 14:08 ` Ian Campbell
2014-06-13 17:45 ` Julien Grall
2014-06-16 8:26 ` Jan Beulich
2014-06-16 9:53 ` Ian Campbell
2014-06-12 13:57 ` Stefano Stabellini
2014-06-13 14:15 ` Ian Campbell
2014-06-11 16:40 ` [PATCH v2 8/8] xen: arm: allocate more than one bank for 1:1 domain 0 if needed Ian Campbell
2014-06-11 22:47 ` Julien Grall
2014-06-12 7:31 ` Ian Campbell
2014-06-17 17:58 ` Julien Grall
2014-06-18 8:27 ` Ian Campbell
2014-06-18 9:10 ` Julien Grall
2014-06-18 9:36 ` Ian Campbell
2014-06-12 7:20 ` [PATCH v2 0/8] xen: arm: Use super pages in p2m 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=1402504804-29173-5-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=julien.grall@linaro.org \
--cc=stefano.stabellini@eu.citrix.com \
--cc=tim@xen.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.