[v2,02/10] xen: rename un/map_mmio_regions to un/map_regions

Message ID	1556658172-8824-2-git-send-email-sstabellini@kernel.org (mailing list archive)
State	Superseded
Headers	show Return-Path: <xen-devel-bounces@lists.xenproject.org> From: Stefano Stabellini <sstabellini@kernel.org> To: xen-devel@lists.xenproject.org Date: Tue, 30 Apr 2019 14:02:44 -0700 Message-Id: <1556658172-8824-2-git-send-email-sstabellini@kernel.org> In-Reply-To: <alpine.DEB.2.10.1904301358560.13269@sstabellini-ThinkPad-X260> References: <alpine.DEB.2.10.1904301358560.13269@sstabellini-ThinkPad-X260> Subject: [Xen-devel] [PATCH v2 02/10] xen: rename un/map_mmio_regions to un/map_regions Precedence: list Cc: Stefano Stabellini <stefanos@xilinx.com>, julien.grall@arm.com, sstabellini@kernel.org, JBeulich@suse.com, andrew.cooper3@citrix.com MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" <xen-devel-bounces@lists.xenproject.org>
Series	[v2,01/10] xen: add a p2mt parameter to map_mmio_regions \| expand [v2,01/10] xen: add a p2mt parameter to map_mmio_regions [v2,02/10] xen: rename un/map_mmio_regions to un/map_regions [v2,03/10] xen: extend XEN_DOMCTL_memory_mapping to handle memory policy [v2,04/10] libxc: introduce xc_domain_mem_map_policy [v2,05/10] libxl/xl: add memory policy option to iomem [v2,06/10] xen/arm: extend device_tree_for_each_node [v2,07/10] xen/arm: make process_memory_node a device_tree_node_func [v2,08/10] xen/arm: keep track of reserved-memory regions [v2,09/10] xen/arm: map reserved-memory regions as normal memory in dom0 [v2,10/10] xen/arm: add reserved-memory regions to the dom0 memory node

diff --git a/xen/arch/arm/acpi/domain_build.c b/xen/arch/arm/acpi/domain_build.c index f4ac91c..f107f5a 100644 --- a/xen/arch/arm/acpi/domain_build.c +++ b/xen/arch/arm/acpi/domain_build.c @@ -193,11 +193,11 @@ static void __init 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_mmio_regions(d, - gaddr_to_gfn(addr), - PFN_UP(size), - maddr_to_mfn(addr), - p2m_mmio_direct_c); + res = map_regions(d, + gaddr_to_gfn(addr), + PFN_UP(size), + maddr_to_mfn(addr), + p2m_mmio_direct_c); if ( res ) { panic(XENLOG_ERR "Unable to map ACPI region 0x%"PRIx64 @@ -547,11 +547,11 @@ int __init prepare_acpi(struct domain *d, struct kernel_info *kinfo) acpi_create_efi_mmap_table(d, &kinfo->mem, tbl_add); /* Map the EFI and ACPI tables to Dom0 */ - rc = map_mmio_regions(d, - gaddr_to_gfn(d->arch.efi_acpi_gpa), - PFN_UP(d->arch.efi_acpi_len), - virt_to_mfn(d->arch.efi_acpi_table), - p2m_mmio_direct_c); + rc = map_regions(d, + gaddr_to_gfn(d->arch.efi_acpi_gpa), + PFN_UP(d->arch.efi_acpi_len), + virt_to_mfn(d->arch.efi_acpi_table), + p2m_mmio_direct_c); if ( rc != 0 ) { printk(XENLOG_ERR "Unable to map EFI/ACPI table 0x%"PRIx64 diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 1f808b2..5e7f94c 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1171,11 +1171,11 @@ static int __init map_range_to_domain(const struct dt_device_node *dev, if ( need_mapping ) { - res = map_mmio_regions(d, - gaddr_to_gfn(addr), - PFN_UP(len), - maddr_to_mfn(addr), - mr_data->p2mt); + res = map_regions(d, + gaddr_to_gfn(addr), + PFN_UP(len), + maddr_to_mfn(addr), + mr_data->p2mt); if ( res < 0 ) { diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index d2ef361..ad2b368 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -699,10 +699,10 @@ static int gicv2_map_hwdown_extra_mappings(struct domain *d) d->domain_id, v2m_data->addr, v2m_data->size, v2m_data->spi_start, v2m_data->nr_spis); - ret = map_mmio_regions(d, gaddr_to_gfn(v2m_data->addr), - PFN_UP(v2m_data->size), - maddr_to_mfn(v2m_data->addr), - p2m_mmio_direct_dev); + ret = map_regions(d, gaddr_to_gfn(v2m_data->addr), + PFN_UP(v2m_data->size), + maddr_to_mfn(v2m_data->addr), + p2m_mmio_direct_dev); if ( ret ) { printk(XENLOG_ERR "GICv2: Map v2m frame to d%d failed.\n", diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index e44c932..d6529ca 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1331,19 +1331,19 @@ static inline int p2m_remove_mapping(struct domain *d, return rc; } -int map_mmio_regions(struct domain *d, - gfn_t gfn, - unsigned long nr, - mfn_t mfn, - p2m_type_t p2mt) +int map_regions(struct domain *d, + gfn_t gfn, + unsigned long nr, + mfn_t mfn, + p2m_type_t p2mt) { return p2m_insert_mapping(d, gfn, nr, mfn, p2mt); } -int unmap_mmio_regions(struct domain *d, - gfn_t start_gfn, - unsigned long nr, - mfn_t mfn) +int unmap_regions(struct domain *d, + gfn_t start_gfn, + unsigned long nr, + mfn_t mfn) { return p2m_remove_mapping(d, start_gfn, nr, mfn); } diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c index 97cd080..261526e 100644 --- a/xen/arch/arm/platforms/exynos5.c +++ b/xen/arch/arm/platforms/exynos5.c @@ -82,14 +82,14 @@ static int exynos5_init_time(void) static int exynos5250_specific_mapping(struct domain *d) { /* Map the chip ID */ - map_mmio_regions(d, gaddr_to_gfn(EXYNOS5_PA_CHIPID), 1, - maddr_to_mfn(EXYNOS5_PA_CHIPID), - p2m_mmio_direct_dev); + map_regions(d, gaddr_to_gfn(EXYNOS5_PA_CHIPID), 1, + maddr_to_mfn(EXYNOS5_PA_CHIPID), + p2m_mmio_direct_dev); /* Map the PWM region */ - map_mmio_regions(d, gaddr_to_gfn(EXYNOS5_PA_TIMER), 2, - maddr_to_mfn(EXYNOS5_PA_TIMER), - p2m_mmio_direct_dev); + map_regions(d, gaddr_to_gfn(EXYNOS5_PA_TIMER), 2, + maddr_to_mfn(EXYNOS5_PA_TIMER), + p2m_mmio_direct_dev); return 0; } diff --git a/xen/arch/arm/platforms/omap5.c b/xen/arch/arm/platforms/omap5.c index c5701df..3575f6c 100644 --- a/xen/arch/arm/platforms/omap5.c +++ b/xen/arch/arm/platforms/omap5.c @@ -98,24 +98,24 @@ static int omap5_init_time(void) static int omap5_specific_mapping(struct domain *d) { /* Map the PRM module */ - map_mmio_regions(d, gaddr_to_gfn(OMAP5_PRM_BASE), 2, - maddr_to_mfn(OMAP5_PRM_BASE), - p2m_mmio_direct_dev); + map_regions(d, gaddr_to_gfn(OMAP5_PRM_BASE), 2, + maddr_to_mfn(OMAP5_PRM_BASE), + p2m_mmio_direct_dev); /* Map the PRM_MPU */ - map_mmio_regions(d, gaddr_to_gfn(OMAP5_PRCM_MPU_BASE), 1, - maddr_to_mfn(OMAP5_PRCM_MPU_BASE), - p2m_mmio_direct_dev); + map_regions(d, gaddr_to_gfn(OMAP5_PRCM_MPU_BASE), 1, + maddr_to_mfn(OMAP5_PRCM_MPU_BASE), + p2m_mmio_direct_dev); /* Map the Wakeup Gen */ - map_mmio_regions(d, gaddr_to_gfn(OMAP5_WKUPGEN_BASE), 1, - maddr_to_mfn(OMAP5_WKUPGEN_BASE), - p2m_mmio_direct_dev); + map_regions(d, gaddr_to_gfn(OMAP5_WKUPGEN_BASE), 1, + maddr_to_mfn(OMAP5_WKUPGEN_BASE), + p2m_mmio_direct_dev); /* Map the on-chip SRAM */ - map_mmio_regions(d, gaddr_to_gfn(OMAP5_SRAM_PA), 32, - maddr_to_mfn(OMAP5_SRAM_PA), - p2m_mmio_direct_dev); + map_regions(d, gaddr_to_gfn(OMAP5_SRAM_PA), 32, + maddr_to_mfn(OMAP5_SRAM_PA), + p2m_mmio_direct_dev); return 0; } diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index afae5a1..fee5517 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1887,7 +1887,7 @@ static bool try_map_mmio(gfn_t gfn) if ( !iomem_access_permitted(d, mfn_x(mfn), mfn_x(mfn) + 1) ) return false; - return !map_mmio_regions(d, gfn, 1, mfn, p2m_mmio_direct_c); + return !map_regions(d, gfn, 1, mfn, p2m_mmio_direct_c); } static void do_trap_stage2_abort_guest(struct cpu_user_regs *regs, diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 1543625..f33c56a 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -690,8 +690,8 @@ static int vgic_v2_domain_init(struct domain *d) * Map the gic virtual cpu interface in the gic cpu interface * region of the guest. */ - ret = map_mmio_regions(d, gaddr_to_gfn(cbase), csize / PAGE_SIZE, - maddr_to_mfn(vbase), p2m_mmio_direct_dev); + ret = map_regions(d, gaddr_to_gfn(cbase), csize / PAGE_SIZE, + maddr_to_mfn(vbase), p2m_mmio_direct_dev); if ( ret ) return ret; diff --git a/xen/arch/arm/vgic/vgic-v2.c b/xen/arch/arm/vgic/vgic-v2.c index 04f34dd..b03af84 100644 --- a/xen/arch/arm/vgic/vgic-v2.c +++ b/xen/arch/arm/vgic/vgic-v2.c @@ -308,8 +308,8 @@ int vgic_v2_map_resources(struct domain *d) * Map the gic virtual cpu interface in the gic cpu interface * region of the guest. */ - ret = map_mmio_regions(d, gaddr_to_gfn(cbase), csize / PAGE_SIZE, - maddr_to_mfn(vbase), p2m_mmio_direct_dev); + ret = map_regions(d, gaddr_to_gfn(cbase), csize / PAGE_SIZE, + maddr_to_mfn(vbase), p2m_mmio_direct_dev); if ( ret ) { gdprintk(XENLOG_ERR, "Unable to remap VGIC CPU to VCPU\n"); diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c index 84776fc..800faaa 100644 --- a/xen/arch/x86/hvm/dom0_build.c +++ b/xen/arch/x86/hvm/dom0_build.c @@ -80,10 +80,10 @@ static int __init modify_identity_mmio(struct domain *d, unsigned long pfn, for ( ; ; ) { if ( map ) - rc = map_mmio_regions(d, _gfn(pfn), nr_pages, _mfn(pfn), - p2m_mmio_direct); + rc = map_regions(d, _gfn(pfn), nr_pages, _mfn(pfn), + p2m_mmio_direct); else - rc = unmap_mmio_regions(d, _gfn(pfn), nr_pages, _mfn(pfn)); + rc = unmap_regions(d, _gfn(pfn), nr_pages, _mfn(pfn)); if ( rc == 0 ) break; if ( rc < 0 ) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index a72f012..d976ce9 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -2261,11 +2261,11 @@ static unsigned int mmio_order(const struct domain *d, #define MAP_MMIO_MAX_ITER 64 /* pretty arbitrary */ -int map_mmio_regions(struct domain *d, - gfn_t start_gfn, - unsigned long nr, - mfn_t mfn, - p2m_type_t p2mt) +int map_regions(struct domain *d, + gfn_t start_gfn, + unsigned long nr, + mfn_t mfn, + p2m_type_t p2mt) { int ret = 0; unsigned long i; @@ -2298,10 +2298,10 @@ int map_mmio_regions(struct domain *d, return i == nr ? 0 : i ?: ret; } -int unmap_mmio_regions(struct domain *d, - gfn_t start_gfn, - unsigned long nr, - mfn_t mfn) +int unmap_regions(struct domain *d, + gfn_t start_gfn, + unsigned long nr, + mfn_t mfn) { int ret = 0; unsigned long i; diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 18a0f8f..140f979 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -961,7 +961,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) "memory_map:add: dom%d gfn=%lx mfn=%lx nr=%lx\n", d->domain_id, gfn, mfn, nr_mfns); - ret = map_mmio_regions(d, _gfn(gfn), nr_mfns, _mfn(mfn), p2mt); + ret = map_regions(d, _gfn(gfn), nr_mfns, _mfn(mfn), p2mt); if ( ret < 0 ) printk(XENLOG_G_WARNING "memory_map:fail: dom%d gfn=%lx mfn=%lx nr=%lx ret:%ld\n", @@ -973,7 +973,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) "memory_map:remove: dom%d gfn=%lx mfn=%lx nr=%lx\n", d->domain_id, gfn, mfn, nr_mfns); - ret = unmap_mmio_regions(d, _gfn(gfn), nr_mfns, _mfn(mfn)); + ret = unmap_regions(d, _gfn(gfn), nr_mfns, _mfn(mfn)); if ( ret < 0 && is_hardware_domain(current->domain) ) printk(XENLOG_ERR "memory_map: error %ld removing dom%d access to [%lx,%lx]\n", diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index 6adfa55..7b25acc 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -46,15 +46,15 @@ static int map_range(unsigned long s, unsigned long e, void *data, /* * ARM TODOs: * - On ARM whether the memory is prefetchable or not should be passed - * to map_mmio_regions in order to decide which memory attributes + * to map_regions in order to decide which memory attributes * should be used. * - * - {un}map_mmio_regions doesn't support preemption. + * - {un}map_regions doesn't support preemption. */ - rc = map->map ? map_mmio_regions(map->d, _gfn(s), size, _mfn(s), + rc = map->map ? map_regions(map->d, _gfn(s), size, _mfn(s), p2m_mmio_direct) - : unmap_mmio_regions(map->d, _gfn(s), size, _mfn(s)); + : unmap_regions(map->d, _gfn(s), size, _mfn(s)); if ( rc == 0 ) { *c += size; diff --git a/xen/include/xen/p2m-common.h b/xen/include/xen/p2m-common.h index 69c82cc..728c9a4 100644 --- a/xen/include/xen/p2m-common.h +++ b/xen/include/xen/p2m-common.h @@ -8,18 +8,20 @@ int __must_check guest_physmap_remove_page(struct domain *d, gfn_t gfn, mfn_t mfn, unsigned int page_order); -/* Map MMIO regions in the p2m: start_gfn and nr describe the range in - * * the guest physical address space to map, starting from the machine - * * frame number mfn. */ -int map_mmio_regions(struct domain *d, - gfn_t start_gfn, - unsigned long nr, - mfn_t mfn, - p2m_type_t p2mt); -int unmap_mmio_regions(struct domain *d, - gfn_t start_gfn, - unsigned long nr, - mfn_t mfn); +/* + * Map memory regions in the p2m: start_gfn and nr describe the range in + * the guest physical address space to map, starting from the machine + * frame number mfn. + */ +int map_regions(struct domain *d, + gfn_t start_gfn, + unsigned long nr, + mfn_t mfn, + p2m_type_t p2mt); +int unmap_regions(struct domain *d, + gfn_t start_gfn, + unsigned long nr, + mfn_t mfn); /* * Populate-on-Demand

[v2,02/10] xen: rename un/map_mmio_regions to un/map_regions

Commit Message

Comments

Patch