From patchwork Tue Jun 21 13:20:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 70561 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp2016010qgy; Tue, 21 Jun 2016 06:23:05 -0700 (PDT) X-Received: by 10.107.155.207 with SMTP id d198mr34913072ioe.62.1466515382435; Tue, 21 Jun 2016 06:23:02 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id z138si38039930iof.34.2016.06.21.06.23.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2016 06:23:02 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFLbz-0004VX-MG; Tue, 21 Jun 2016 13:21:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFLby-0004UF-5w for xen-devel@lists.xen.org; Tue, 21 Jun 2016 13:21:02 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 3E/6D-07320-D3F39675; Tue, 21 Jun 2016 13:21:01 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRWlGSWpSXmKPExsVysyfVTdfGPjP cYNkaLYslHxezODB6HN39mymAMYo1My8pvyKBNePrig1MBatiK/Yfa2BtYLxt38XIySEksIlR onO9ThcjF5B9mlFiwbZXLCAJNgFNiTufPzGB2CIC0hLXPl9mBLGZBS4xSXycwgtiCwsESPQcm A5WwyKgKrHoxHEwm1fARWLFubXsILaEgJzEyWOTWUFsTgFXiY0Xu5ggFrtITD76hWUCI/cCRo ZVjBrFqUVlqUW6RkZ6SUWZ6RkluYmZObqGBqZ6uanFxYnpqTmJScV6yfm5mxiB/q1nYGDcwbi n3e8QoyQHk5IoL7NyRrgQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCd7TVpnhQoJFqempFWmZOcBA g0lLcPAoifDyWAOleYsLEnOLM9MhUqcYdTlWLbixlkmIJS8/L1VKnPcAyAwBkKKM0jy4EbCgv 8QoKyXMy8jAwCDEU5BalJtZgir/ilGcg1FJmJcPZBVPZl4J3KZXQEcwAR2xrD8d5IiSRISUVA OjtYKc2ZQDN37LzlhwasfzvhOLN4VOs3wVuMyx84zr4t8c7ObrqqtsJnr/t93eG3dU8HlLfrz 98WPt1cE5V8+01v56aG08U/ui9Zczwbo/PuzOazZ+YaibKTv3YIf8y3St//8jjENctnXwtc5O +r0p+l7r1LoHZQqXon6fZ/jeUecgXSK5ZuJnJZbijERDLeai4kQAEFylinUCAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1466515259!46054483!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28983 invoked from network); 21 Jun 2016 13:21:00 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-9.tower-206.messagelabs.com with SMTP; 21 Jun 2016 13:21:00 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CDC7595D; Tue, 21 Jun 2016 06:21:45 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.215.28]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 124E93F246; Tue, 21 Jun 2016 06:20:57 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Tue, 21 Jun 2016 14:20:41 +0100 Message-Id: <1466515243-27264-7-git-send-email-julien.grall@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466515243-27264-1-git-send-email-julien.grall@arm.com> References: <1466515243-27264-1-git-send-email-julien.grall@arm.com> Cc: sstabellini@kernel.org, Wei Liu , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Julien Grall , Jan Beulich Subject: [Xen-devel] [PATCH v3 6/8] xen: Use the typesafe mfn and gfn in map_mmio_regions... X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" to avoid mixing machine frame with guest frame. Signed-off-by: Julien Grall Acked-by: Jan Beulich --- Cc: Stefano Stabellini Cc: Jan Beulich Cc: Andrew Cooper Cc: George Dunlap Cc: Ian Jackson Cc: Konrad Rzeszutek Wilk Cc: Tim Deegan Cc: Wei Liu Changes in v3: - Use mfn_add when it is possible - Add Jan's acked-by --- xen/arch/arm/domain_build.c | 4 ++-- xen/arch/arm/gic-v2.c | 4 ++-- xen/arch/arm/p2m.c | 22 +++++++++++----------- xen/arch/arm/platforms/exynos5.c | 8 ++++---- xen/arch/arm/platforms/omap5.c | 16 ++++++++-------- xen/arch/arm/vgic-v2.c | 4 ++-- xen/arch/x86/mm/p2m.c | 18 ++++++++++-------- xen/common/domctl.c | 4 ++-- xen/include/xen/p2m-common.h | 8 ++++---- 9 files changed, 45 insertions(+), 43 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 9035486..49185f0 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1036,9 +1036,9 @@ static int map_range_to_domain(const struct dt_device_node *dev, if ( need_mapping ) { res = map_mmio_regions(d, - paddr_to_pfn(addr), + _gfn(paddr_to_pfn(addr)), DIV_ROUND_UP(len, PAGE_SIZE), - paddr_to_pfn(addr)); + _mfn(paddr_to_pfn(addr))); if ( res < 0 ) { printk(XENLOG_ERR "Unable to map 0x%"PRIx64 diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 4e2f4c7..3893ece 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -601,9 +601,9 @@ 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, paddr_to_pfn(v2m_data->addr), + ret = map_mmio_regions(d, _gfn(paddr_to_pfn(v2m_data->addr)), DIV_ROUND_UP(v2m_data->size, PAGE_SIZE), - paddr_to_pfn(v2m_data->addr)); + _mfn(paddr_to_pfn(v2m_data->addr))); 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 aa4e774..47cb383 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1245,27 +1245,27 @@ int unmap_regions_rw_cache(struct domain *d, } int map_mmio_regions(struct domain *d, - unsigned long start_gfn, + gfn_t start_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(start_gfn)), + pfn_to_paddr(gfn_x(start_gfn) + nr), + pfn_to_paddr(mfn_x(mfn)), MATTR_DEV, 0, p2m_mmio_direct, d->arch.p2m.default_access); } int unmap_mmio_regions(struct domain *d, - unsigned long start_gfn, + gfn_t start_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(start_gfn)), + pfn_to_paddr(gfn_x(start_gfn) + nr), + pfn_to_paddr(mfn_x(mfn)), MATTR_DEV, 0, p2m_invalid, d->arch.p2m.default_access); } @@ -1280,7 +1280,7 @@ int map_dev_mmio_region(struct domain *d, if ( !(nr && iomem_access_permitted(d, start_gfn, start_gfn + nr - 1)) ) return 0; - res = map_mmio_regions(d, start_gfn, nr, mfn); + res = map_mmio_regions(d, _gfn(start_gfn), nr, _mfn(mfn)); if ( res < 0 ) { printk(XENLOG_G_ERR "Unable to map [%#lx - %#lx] in Dom%d\n", diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c index bf4964d..c43934f 100644 --- a/xen/arch/arm/platforms/exynos5.c +++ b/xen/arch/arm/platforms/exynos5.c @@ -83,12 +83,12 @@ static int exynos5_init_time(void) static int exynos5250_specific_mapping(struct domain *d) { /* Map the chip ID */ - map_mmio_regions(d, paddr_to_pfn(EXYNOS5_PA_CHIPID), 1, - paddr_to_pfn(EXYNOS5_PA_CHIPID)); + map_mmio_regions(d, _gfn(paddr_to_pfn(EXYNOS5_PA_CHIPID)), 1, + _mfn(paddr_to_pfn(EXYNOS5_PA_CHIPID))); /* Map the PWM region */ - map_mmio_regions(d, paddr_to_pfn(EXYNOS5_PA_TIMER), 2, - paddr_to_pfn(EXYNOS5_PA_TIMER)); + map_mmio_regions(d, _gfn(paddr_to_pfn(EXYNOS5_PA_TIMER)), 2, + _mfn(paddr_to_pfn(EXYNOS5_PA_TIMER))); return 0; } diff --git a/xen/arch/arm/platforms/omap5.c b/xen/arch/arm/platforms/omap5.c index a49ba62..539588e 100644 --- a/xen/arch/arm/platforms/omap5.c +++ b/xen/arch/arm/platforms/omap5.c @@ -102,20 +102,20 @@ static int omap5_init_time(void) static int omap5_specific_mapping(struct domain *d) { /* Map the PRM module */ - map_mmio_regions(d, paddr_to_pfn(OMAP5_PRM_BASE), 2, - paddr_to_pfn(OMAP5_PRM_BASE)); + map_mmio_regions(d, _gfn(paddr_to_pfn(OMAP5_PRM_BASE)), 2, + _mfn(paddr_to_pfn(OMAP5_PRM_BASE))); /* Map the PRM_MPU */ - map_mmio_regions(d, paddr_to_pfn(OMAP5_PRCM_MPU_BASE), 1, - paddr_to_pfn(OMAP5_PRCM_MPU_BASE)); + map_mmio_regions(d, _gfn(paddr_to_pfn(OMAP5_PRCM_MPU_BASE)), 1, + _mfn(paddr_to_pfn(OMAP5_PRCM_MPU_BASE))); /* Map the Wakeup Gen */ - map_mmio_regions(d, paddr_to_pfn(OMAP5_WKUPGEN_BASE), 1, - paddr_to_pfn(OMAP5_WKUPGEN_BASE)); + map_mmio_regions(d, _gfn(paddr_to_pfn(OMAP5_WKUPGEN_BASE)), 1, + _mfn(paddr_to_pfn(OMAP5_WKUPGEN_BASE))); /* Map the on-chip SRAM */ - map_mmio_regions(d, paddr_to_pfn(OMAP5_SRAM_PA), 32, - paddr_to_pfn(OMAP5_SRAM_PA)); + map_mmio_regions(d, _gfn(paddr_to_pfn(OMAP5_SRAM_PA)), 32, + _mfn(paddr_to_pfn(OMAP5_SRAM_PA))); return 0; } diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 9adb4a9..cbe61cf 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -688,8 +688,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, paddr_to_pfn(cbase), csize / PAGE_SIZE, - paddr_to_pfn(vbase)); + ret = map_mmio_regions(d, _gfn(paddr_to_pfn(cbase)), csize / PAGE_SIZE, + _mfn(paddr_to_pfn(vbase))); if ( ret ) return ret; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 16733a4..6258a5b 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -2214,9 +2214,9 @@ static unsigned int mmio_order(const struct domain *d, #define MAP_MMIO_MAX_ITER 64 /* pretty arbitrary */ int map_mmio_regions(struct domain *d, - unsigned long start_gfn, + gfn_t start_gfn, unsigned long nr, - unsigned long mfn) + mfn_t mfn) { int ret = 0; unsigned long i; @@ -2229,10 +2229,11 @@ int map_mmio_regions(struct domain *d, i += 1UL << order, ++iter ) { /* OR'ing gfn and mfn values will return an order suitable to both. */ - for ( order = mmio_order(d, (start_gfn + i) | (mfn + i), nr - i); ; + for ( order = mmio_order(d, (gfn_x(start_gfn) + i) | (mfn_x(mfn) + i), nr - i); ; order = ret - 1 ) { - ret = set_mmio_p2m_entry(d, start_gfn + i, _mfn(mfn + i), order, + ret = set_mmio_p2m_entry(d, gfn_x(start_gfn) + i, + mfn_add(mfn, i), order, p2m_get_hostp2m(d)->default_access); if ( ret <= 0 ) break; @@ -2246,9 +2247,9 @@ int map_mmio_regions(struct domain *d, } int unmap_mmio_regions(struct domain *d, - unsigned long start_gfn, + gfn_t start_gfn, unsigned long nr, - unsigned long mfn) + mfn_t mfn) { int ret = 0; unsigned long i; @@ -2261,10 +2262,11 @@ int unmap_mmio_regions(struct domain *d, i += 1UL << order, ++iter ) { /* OR'ing gfn and mfn values will return an order suitable to both. */ - for ( order = mmio_order(d, (start_gfn + i) | (mfn + i), nr - i); ; + for ( order = mmio_order(d, (gfn_x(start_gfn) + i) | (mfn_x(mfn) + i), nr - i); ; order = ret - 1 ) { - ret = clear_mmio_p2m_entry(d, start_gfn + i, _mfn(mfn + i), order); + ret = clear_mmio_p2m_entry(d, gfn_x(start_gfn) + i, + mfn_add(mfn, i), order); if ( ret <= 0 ) break; ASSERT(ret <= order); diff --git a/xen/common/domctl.c b/xen/common/domctl.c index e43904e..b784e6c 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -1074,7 +1074,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, nr_mfns, mfn); + ret = map_mmio_regions(d, _gfn(gfn), nr_mfns, _mfn(mfn)); if ( ret < 0 ) printk(XENLOG_G_WARNING "memory_map:fail: dom%d gfn=%lx mfn=%lx nr=%lx ret:%ld\n", @@ -1086,7 +1086,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, nr_mfns, mfn); + ret = unmap_mmio_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/include/xen/p2m-common.h b/xen/include/xen/p2m-common.h index 6374a5b..b4f9077 100644 --- a/xen/include/xen/p2m-common.h +++ b/xen/include/xen/p2m-common.h @@ -37,13 +37,13 @@ typedef enum { * * the guest physical address space to map, starting from the machine * * frame number mfn. */ int map_mmio_regions(struct domain *d, - unsigned long start_gfn, + gfn_t start_gfn, unsigned long nr, - unsigned long mfn); + mfn_t mfn); int unmap_mmio_regions(struct domain *d, - unsigned long start_gfn, + gfn_t start_gfn, unsigned long nr, - unsigned long mfn); + mfn_t mfn); /* * Set access type for a region of gfns.