From: Julien Grall <julien.grall@arm.com>
To: xen-devel@lists.xen.org
Cc: Julien Grall <julien.grall@arm.com>,
sstabellini@kernel.org, wei.chen@linaro.org
Subject: [PATCH v4 13/16] xen/arm: Use the typesafes mfn and gfn in map_regions_rw_cache ...
Date: Mon, 27 Jun 2016 17:54:09 +0100 [thread overview]
Message-ID: <1467046452-1261-14-git-send-email-julien.grall@arm.com> (raw)
In-Reply-To: <1467046452-1261-1-git-send-email-julien.grall@arm.com>
to avoid mixing machine frame with guest frame. Also rename the
parameters of the function and drop pointless PAGE_MASK in the caller.
Signed-off-by: Julien Grall <julien.grall@arm.com>
---
Changes in v4:
- Patch added
---
xen/arch/arm/domain_build.c | 8 ++++----
xen/arch/arm/p2m.c | 20 ++++++++++----------
xen/include/asm-arm/p2m.h | 12 ++++++------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 923f48a..60db9e4 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -1522,9 +1522,9 @@ static void acpi_map_other_tables(struct domain *d)
addr = acpi_gbl_root_table_list.tables[i].address;
size = acpi_gbl_root_table_list.tables[i].length;
res = map_regions_rw_cache(d,
- paddr_to_pfn(addr & PAGE_MASK),
+ _gfn(paddr_to_pfn(addr)),
DIV_ROUND_UP(size, PAGE_SIZE),
- paddr_to_pfn(addr & PAGE_MASK));
+ _mfn(paddr_to_pfn(addr)));
if ( res )
{
panic(XENLOG_ERR "Unable to map ACPI region 0x%"PRIx64
@@ -1878,9 +1878,9 @@ static int prepare_acpi(struct domain *d, struct kernel_info *kinfo)
/* Map the EFI and ACPI tables to Dom0 */
rc = map_regions_rw_cache(d,
- paddr_to_pfn(d->arch.efi_acpi_gpa),
+ _gfn(paddr_to_pfn(d->arch.efi_acpi_gpa)),
PFN_UP(d->arch.efi_acpi_len),
- paddr_to_pfn(virt_to_maddr(d->arch.efi_acpi_table)));
+ _mfn(paddr_to_pfn(virt_to_maddr(d->arch.efi_acpi_table))));
if ( rc != 0 )
{
printk(XENLOG_ERR "Unable to map EFI/ACPI table 0x%"PRIx64
diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
index faadebf..36ee0fe 100644
--- a/xen/arch/arm/p2m.c
+++ b/xen/arch/arm/p2m.c
@@ -1159,27 +1159,27 @@ out:
}
int map_regions_rw_cache(struct domain *d,
- unsigned long start_gfn,
+ gfn_t gfn,
unsigned long nr,
- unsigned long mfn)
+ mfn_t mfn)
{
return apply_p2m_changes(d, INSERT,
- pfn_to_paddr(start_gfn),
- pfn_to_paddr(start_gfn + nr),
- pfn_to_paddr(mfn),
+ pfn_to_paddr(gfn_x(gfn)),
+ pfn_to_paddr(gfn_x(gfn) + nr),
+ pfn_to_paddr(mfn_x(mfn)),
MATTR_MEM, 0, p2m_mmio_direct,
d->arch.p2m.default_access);
}
int unmap_regions_rw_cache(struct domain *d,
- unsigned long start_gfn,
+ gfn_t gfn,
unsigned long nr,
- unsigned long mfn)
+ mfn_t mfn)
{
return apply_p2m_changes(d, REMOVE,
- pfn_to_paddr(start_gfn),
- pfn_to_paddr(start_gfn + nr),
- pfn_to_paddr(mfn),
+ pfn_to_paddr(gfn_x(gfn)),
+ pfn_to_paddr(gfn_x(gfn) + nr),
+ pfn_to_paddr(mfn_x(mfn)),
MATTR_MEM, 0, p2m_invalid,
d->arch.p2m.default_access);
}
diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h
index 8d29eda..6e258b9 100644
--- a/xen/include/asm-arm/p2m.h
+++ b/xen/include/asm-arm/p2m.h
@@ -142,14 +142,14 @@ mfn_t p2m_lookup(struct domain *d, gfn_t gfn, p2m_type_t *t);
int p2m_cache_flush(struct domain *d, gfn_t start, unsigned long nr);
int map_regions_rw_cache(struct domain *d,
- unsigned long start_gfn,
- unsigned long nr_mfns,
- unsigned long mfn);
+ gfn_t gfn,
+ unsigned long nr,
+ mfn_t mfn);
int unmap_regions_rw_cache(struct domain *d,
- unsigned long start_gfn,
- unsigned long nr_mfns,
- unsigned long mfn);
+ gfn_t gfn,
+ unsigned long nr,
+ mfn_t mfn);
int map_dev_mmio_region(struct domain *d,
gfn_t gfn,
--
1.9.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-06-27 16:54 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-27 16:53 [PATCH v4 00/16] xen/arm: Use the typesafes gfn and mfn Julien Grall
2016-06-27 16:53 ` [PATCH v4 01/16] xen: Use typesafe gfn/mfn in guest_physmap_* helpers Julien Grall
2016-06-27 16:53 ` [PATCH v4 02/16] xen: Use typesafe gfn in xenmem_add_to_physmap_one Julien Grall
2016-06-27 16:53 ` [PATCH v4 03/16] xen/arm: Rename grant_table_gfpn into grant_table_gfn and use the typesafe gfn Julien Grall
2016-06-27 16:54 ` [PATCH v4 04/16] xen: Use the typesafe mfn and gfn in map_mmio_regions Julien Grall
2016-06-27 16:54 ` [PATCH v4 05/16] xen/mm: Introduce INVALID_GFN_T and INVALID_MFN_T Julien Grall
2016-06-28 7:16 ` Jan Beulich
2016-06-28 7:29 ` Andrew Cooper
2016-06-28 7:54 ` Jan Beulich
2016-06-27 16:54 ` [PATCH v4 06/16] xen/arm: Rework the interface of p2m_lookup and use typesafe gfn and mfn Julien Grall
2016-06-27 16:54 ` [PATCH v4 07/16] xen/arm: Rework the interface of p2m_cache_flush and use typesafe gfn Julien Grall
2016-06-27 16:54 ` [PATCH v4 08/16] xen: Replace _mfn(INVALID_MFN) with MFN_INVALID_T Julien Grall
2016-06-28 7:19 ` Jan Beulich
2016-06-28 12:18 ` Julien Grall
2016-06-27 16:54 ` [PATCH v4 09/16] xen/arm: map_regions_rw_cache: Map the region with p2m->default_access Julien Grall
2016-06-27 16:54 ` [PATCH v4 10/16] xen/arm: dom0_build: Remove dead code in allocate_memory Julien Grall
2016-06-27 16:54 ` [PATCH v4 11/16] xen/arm: p2m: Remove unused operation ALLOCATE Julien Grall
2016-06-27 16:54 ` [PATCH v4 12/16] xen/arm: Use the typesafes mfn and gfn in map_dev_mmio_region Julien Grall
2016-06-27 16:54 ` Julien Grall [this message]
2016-06-27 16:54 ` [PATCH v4 14/16] xen/arm: p2m: Introduce helpers to insert and remove mapping Julien Grall
2016-06-27 16:54 ` [PATCH v4 15/16] xen/arm: p2m: Use typesafe gfn for {max, lowest}_mapped_gfn Julien Grall
2016-06-27 16:54 ` [PATCH v4 16/16] xen/arm: p2m: Rework the interface of apply_p2m_changes and use typesafe Julien Grall
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=1467046452-1261-14-git-send-email-julien.grall@arm.com \
--to=julien.grall@arm.com \
--cc=sstabellini@kernel.org \
--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).