From: Julien Grall <julien.grall@arm.com>
To: xen-devel@lists.xen.org
Cc: proskurin@sec.in.tum.de, Julien Grall <julien.grall@arm.com>,
sstabellini@kernel.org, steve.capper@arm.com,
wei.chen@linaro.org
Subject: [PATCH v2 01/15] xen/arm: p2m: Use the typesafe MFN in mfn_to_p2m_entry
Date: Thu, 28 Jul 2016 15:20:06 +0100 [thread overview]
Message-ID: <1469715620-4670-2-git-send-email-julien.grall@arm.com> (raw)
In-Reply-To: <1469715620-4670-1-git-send-email-julien.grall@arm.com>
Signed-off-by: Julien Grall <julien.grall@arm.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
---
Changes in v2:
- Compute the mfn at every loop rather than incrementing
- Add Stefano's reviewed-by
---
xen/arch/arm/p2m.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
index d82349c..851b110 100644
--- a/xen/arch/arm/p2m.c
+++ b/xen/arch/arm/p2m.c
@@ -324,7 +324,7 @@ static void p2m_set_permission(lpae_t *e, p2m_type_t t, p2m_access_t a)
}
}
-static lpae_t mfn_to_p2m_entry(unsigned long mfn, unsigned int mattr,
+static lpae_t mfn_to_p2m_entry(mfn_t mfn, unsigned int mattr,
p2m_type_t t, p2m_access_t a)
{
/*
@@ -358,9 +358,9 @@ static lpae_t mfn_to_p2m_entry(unsigned long mfn, unsigned int mattr,
p2m_set_permission(&e, t, a);
- ASSERT(!(pfn_to_paddr(mfn) & ~PADDR_MASK));
+ ASSERT(!(pfn_to_paddr(mfn_x(mfn)) & ~PADDR_MASK));
- e.p2m.base = mfn;
+ e.p2m.base = mfn_x(mfn);
return e;
}
@@ -411,7 +411,7 @@ static int p2m_create_table(struct domain *d, lpae_t *entry,
if ( splitting )
{
p2m_type_t t = entry->p2m.type;
- unsigned long base_pfn = entry->p2m.base;
+ mfn_t mfn = _mfn(entry->p2m.base);
int i;
/*
@@ -420,7 +420,7 @@ static int p2m_create_table(struct domain *d, lpae_t *entry,
*/
for ( i=0 ; i < LPAE_ENTRIES; i++ )
{
- pte = mfn_to_p2m_entry(base_pfn + (i<<(level_shift-LPAE_SHIFT)),
+ pte = mfn_to_p2m_entry(mfn_add(mfn, i << (level_shift - LPAE_SHIFT)),
MATTR_MEM, t, p2m->default_access);
/*
@@ -443,7 +443,7 @@ static int p2m_create_table(struct domain *d, lpae_t *entry,
unmap_domain_page(p);
- pte = mfn_to_p2m_entry(page_to_mfn(page), MATTR_MEM, p2m_invalid,
+ pte = mfn_to_p2m_entry(_mfn(page_to_mfn(page)), MATTR_MEM, p2m_invalid,
p2m->default_access);
p2m_write_pte(entry, pte, flush_cache);
@@ -693,7 +693,7 @@ static int apply_one_level(struct domain *d,
return rc;
/* New mapping is superpage aligned, make it */
- pte = mfn_to_p2m_entry(*maddr >> PAGE_SHIFT, mattr, t, a);
+ pte = mfn_to_p2m_entry(_mfn(*maddr >> PAGE_SHIFT), mattr, t, a);
if ( level < 3 )
pte.p2m.table = 0; /* Superpage entry */
--
1.9.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-07-28 14:20 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-28 14:20 [PATCH v2 00/15] xen/arm: P2M clean-up fixes Julien Grall
2016-07-28 14:20 ` Julien Grall [this message]
2016-07-28 14:20 ` [PATCH v2 02/15] xen/arm: p2m: Use a whitelist rather than blacklist in get_page_from_gfn Julien Grall
2016-07-29 0:38 ` Stefano Stabellini
2016-07-28 14:20 ` [PATCH v2 03/15] xen/arm: p2m: Differentiate cacheable vs non-cacheable MMIO Julien Grall
2016-07-28 14:20 ` [PATCH v2 04/15] xen/arm: p2m: Find the memory attributes based on the p2m type Julien Grall
2016-07-28 14:20 ` [PATCH v2 05/15] xen/arm: p2m: Remove unnecessary locking Julien Grall
2016-07-28 14:20 ` [PATCH v2 06/15] xen/arm: p2m: Introduce p2m_{read, write}_{, un}lock helpers Julien Grall
2016-07-28 14:20 ` [PATCH v2 07/15] xen/arm: p2m: Switch the p2m lock from spinlock to rwlock Julien Grall
2016-07-28 14:20 ` [PATCH v2 08/15] xen/arm: Don't call p2m_alloc_table from arch_domain_create Julien Grall
2016-07-28 14:20 ` [PATCH v2 09/15] xen/arm: p2m: Move the vttbr field from arch_domain to p2m_domain Julien Grall
2016-07-29 0:40 ` Stefano Stabellini
2016-07-28 14:20 ` [PATCH v2 10/15] xen/arm: p2m: Don't need to restore the state for an idle vCPU Julien Grall
2016-07-28 14:20 ` [PATCH v2 11/15] xen/arm: p2m: Rework the context switch to another VTTBR in flush_tlb_domain Julien Grall
2016-07-29 0:40 ` Stefano Stabellini
2016-07-28 14:20 ` [PATCH v2 12/15] xen/arm: p2m: Inline p2m_load_VTTBR into p2m_restore_state Julien Grall
2016-07-28 14:20 ` [PATCH v2 13/15] xen/arm: Don't export flush_tlb_domain Julien Grall
2016-07-28 14:20 ` [PATCH v2 14/15] xen/arm: p2m: Replace flush_tlb_domain by p2m_flush_tlb Julien Grall
2016-07-28 14:20 ` [PATCH v2 15/15] xen/arm: p2m: Pass the p2m in parameter rather the domain when it is possible Julien Grall
2016-07-29 0:47 ` [PATCH v2 00/15] xen/arm: P2M clean-up 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=1469715620-4670-2-git-send-email-julien.grall@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).