|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v3 02/14] xen/x86: Use mfn_to_gfn rather than mfn_to_gmfn
mfn_to_gfn and mfn_to_gmfn are doing exactly the same except the former
is using mfn_t and gfn_t (return type).
Furthermore, the naming of the former is more consistent with the
current naming scheme (GFN/MFN). So replace mfn_to_gmfn with
mfn_to_gfn in x86 code.
Take the opportunity to convert some of the callers to use typesafe GFN and
format the message correctly.
No functional changes.
Signed-off-by: Julien Grall <julien.grall@xxxxxxx>
Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
--
Changes in v3:
- The hunk in x86/mm.c is not necessary anymore
- Update printk message to use GFN rather than frame when suitable
- Update commit message with some NITs
- Add Jan's reviewed-by
Changes in v2:
- mfn_to_gfn now returns a gfn_t
- Use %pd and PRI_gfn when possible in the message
- Don't split format string to help grep/ack.
---
xen/arch/x86/domain.c | 34 +++++++++++++++++++---------------
xen/arch/x86/pv/emul-priv-op.c | 4 ++--
xen/drivers/passthrough/x86/iommu.c | 16 +++++++++-------
3 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index 9485a17ddd..6553adc5c0 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -700,7 +700,7 @@ int arch_domain_soft_reset(struct domain *d)
int ret = 0;
struct domain *owner;
mfn_t mfn;
- unsigned long gfn;
+ gfn_t gfn;
p2m_type_t p2mt;
unsigned int i;
@@ -734,19 +734,20 @@ int arch_domain_soft_reset(struct domain *d)
ASSERT( owner == d );
mfn = page_to_mfn(page);
- gfn = mfn_to_gmfn(d, mfn_x(mfn));
+ gfn = mfn_to_gfn(d, mfn);
/*
* gfn == INVALID_GFN indicates that the shared_info page was never mapped
* to the domain's address space and there is nothing to replace.
*/
- if ( gfn == gfn_x(INVALID_GFN) )
+ if ( gfn_eq(gfn, INVALID_GFN) )
goto exit_put_page;
- if ( !mfn_eq(get_gfn_query(d, gfn, &p2mt), mfn) )
+ if ( !mfn_eq(get_gfn_query(d, gfn_x(gfn), &p2mt), mfn) )
{
- printk(XENLOG_G_ERR "Failed to get Dom%d's shared_info GFN (%lx)\n",
- d->domain_id, gfn);
+ printk(XENLOG_G_ERR
+ "Failed to get %pd's shared_info GFN (%"PRI_gfn")\n",
+ d, gfn_x(gfn));
ret = -EINVAL;
goto exit_put_gfn;
}
@@ -754,31 +755,34 @@ int arch_domain_soft_reset(struct domain *d)
new_page = alloc_domheap_page(d, 0);
if ( !new_page )
{
- printk(XENLOG_G_ERR "Failed to alloc a page to replace"
- " Dom%d's shared_info frame %lx\n", d->domain_id, gfn);
+ printk(XENLOG_G_ERR
+ "Failed to alloc a page to replace %pd's shared_info GFN
%"PRI_gfn"\n",
+ d, gfn_x(gfn));
ret = -ENOMEM;
goto exit_put_gfn;
}
- ret = guest_physmap_remove_page(d, _gfn(gfn), mfn, PAGE_ORDER_4K);
+ ret = guest_physmap_remove_page(d, gfn, mfn, PAGE_ORDER_4K);
if ( ret )
{
- printk(XENLOG_G_ERR "Failed to remove Dom%d's shared_info frame %lx\n",
- d->domain_id, gfn);
+ printk(XENLOG_G_ERR
+ "Failed to remove %pd's shared_info GFN %"PRI_gfn"\n",
+ d, gfn_x(gfn));
free_domheap_page(new_page);
goto exit_put_gfn;
}
- ret = guest_physmap_add_page(d, _gfn(gfn), page_to_mfn(new_page),
+ ret = guest_physmap_add_page(d, gfn, page_to_mfn(new_page),
PAGE_ORDER_4K);
if ( ret )
{
- printk(XENLOG_G_ERR "Failed to add a page to replace"
- " Dom%d's shared_info frame %lx\n", d->domain_id, gfn);
+ printk(XENLOG_G_ERR
+ "Failed to add a page to replace %pd's shared_info frame
%"PRI_gfn"\n",
+ d, gfn_x(gfn));
free_domheap_page(new_page);
}
exit_put_gfn:
- put_gfn(d, gfn);
+ put_gfn(d, gfn_x(gfn));
exit_put_page:
put_page(page);
diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c
index b20d79c7a3..ab4c8a7ec4 100644
--- a/xen/arch/x86/pv/emul-priv-op.c
+++ b/xen/arch/x86/pv/emul-priv-op.c
@@ -712,7 +712,7 @@ static int read_cr(unsigned int reg, unsigned long *val,
if ( !is_pv_32bit_domain(currd) )
{
mfn = pagetable_get_mfn(curr->arch.guest_table);
- *val = xen_pfn_to_cr3(mfn_to_gmfn(currd, mfn_x(mfn)));
+ *val = xen_pfn_to_cr3(gfn_x(mfn_to_gfn(currd, mfn)));
}
else
{
@@ -721,7 +721,7 @@ static int read_cr(unsigned int reg, unsigned long *val,
mfn = l4e_get_mfn(*pl4e);
unmap_domain_page(pl4e);
- *val = compat_pfn_to_cr3(mfn_to_gmfn(currd, mfn_x(mfn)));
+ *val = compat_pfn_to_cr3(gfn_x(mfn_to_gfn(currd, mfn)));
}
/* PTs should not be shared */
BUG_ON(page_get_owner(mfn_to_page(mfn)) == dom_cow);
diff --git a/xen/drivers/passthrough/x86/iommu.c
b/xen/drivers/passthrough/x86/iommu.c
index 0fa6dcc3fd..35c2b3297c 100644
--- a/xen/drivers/passthrough/x86/iommu.c
+++ b/xen/drivers/passthrough/x86/iommu.c
@@ -90,15 +90,17 @@ int arch_iommu_populate_page_table(struct domain *d)
if ( is_hvm_domain(d) ||
(page->u.inuse.type_info & PGT_type_mask) == PGT_writable_page )
{
- unsigned long mfn = mfn_x(page_to_mfn(page));
- unsigned long gfn = mfn_to_gmfn(d, mfn);
+ mfn_t mfn = page_to_mfn(page);
+ gfn_t gfn = mfn_to_gfn(d, mfn);
unsigned int flush_flags = 0;
- if ( gfn != gfn_x(INVALID_GFN) )
+ if ( !gfn_eq(gfn, INVALID_GFN) )
{
- ASSERT(!(gfn >> DEFAULT_DOMAIN_ADDRESS_WIDTH));
- BUG_ON(SHARED_M2P(gfn));
- rc = iommu_map(d, _dfn(gfn), _mfn(mfn), PAGE_ORDER_4K,
+ dfn_t dfn = _dfn(gfn_x(gfn));
+
+ ASSERT(!(gfn_x(gfn) >> DEFAULT_DOMAIN_ADDRESS_WIDTH));
+ BUG_ON(SHARED_M2P(gfn_x(gfn)));
+ rc = iommu_map(d, dfn, mfn, PAGE_ORDER_4K,
IOMMUF_readable | IOMMUF_writable,
&flush_flags);
@@ -116,7 +118,7 @@ int arch_iommu_populate_page_table(struct domain *d)
((page->u.inuse.type_info & PGT_type_mask) !=
PGT_writable_page) )
{
- rc = iommu_unmap(d, _dfn(gfn), PAGE_ORDER_4K,
&flush_flags);
+ rc = iommu_unmap(d, dfn, PAGE_ORDER_4K, &flush_flags);
/* If the type changed yet again, simply force a retry. */
if ( !rc && ((page->u.inuse.type_info & PGT_type_mask) ==
PGT_writable_page) )
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |