From: Julien Grall <julien.grall@arm.com> To: xen-devel@lists.xenproject.org Cc: "Stefano Stabellini" <sstabellini@kernel.org>, "Wei Liu" <wei.liu2@citrix.com>, "Andrew Cooper" <andrew.cooper3@citrix.com>, "Julien Grall" <julien.grall@arm.com>, "Jan Beulich" <jbeulich@suse.com>, "Roger Pau Monné" <roger.pau@citrix.com> Subject: [PATCH 10/14] xen: Remove mfn_to_gmfn macro Date: Tue, 7 May 2019 16:14:54 +0100 [thread overview] Message-ID: <20190507151458.29350-11-julien.grall@arm.com> (raw) In-Reply-To: <20190507151458.29350-1-julien.grall@arm.com> On x86, mfn_to_gmfn can be replaced with mfn_to_gfn. On Arm, there are no more call to mfn_to_gmfn, so the helper can be dropped. At the same time rework a comment in Arm code that does not make sense. Signed-off-by: Julien Grall <julien.grall@arm.com> Acked-by: Jan Beulich <jbeulich@suse.com> Acked-by: Stefano Stabellini <sstabellini@kernel.org> --- Changes in v2: - Add Jan's and Stefano's acked-by --- xen/drivers/passthrough/iommu.c | 7 +++---- xen/include/asm-arm/mm.h | 4 +--- xen/include/asm-x86/mm.h | 5 ----- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index dbb64b13bc..054f71b919 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -195,8 +195,8 @@ void __hwdom_init iommu_hwdom_init(struct domain *d) page_list_for_each ( page, &d->page_list ) { - unsigned long mfn = mfn_x(page_to_mfn(page)); - unsigned long dfn = mfn_to_gmfn(d, mfn); + mfn_t mfn = page_to_mfn(page); + dfn_t dfn = _dfn(gfn_x(mfn_to_gfn(d, mfn))); unsigned int mapping = IOMMUF_readable; int ret; @@ -205,8 +205,7 @@ void __hwdom_init iommu_hwdom_init(struct domain *d) == PGT_writable_page) ) mapping |= IOMMUF_writable; - ret = iommu_map(d, _dfn(dfn), _mfn(mfn), 0, mapping, - &flush_flags); + ret = iommu_map(d, dfn, mfn, 0, mapping, &flush_flags); if ( !rc ) rc = ret; diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index a9c8352b94..a9cb98a6c7 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -321,10 +321,8 @@ struct page_info *get_page_from_gva(struct vcpu *v, vaddr_t va, #define SHARED_M2P_ENTRY (~0UL - 1UL) #define SHARED_M2P(_e) ((_e) == SHARED_M2P_ENTRY) -/* Xen always owns P2M on ARM */ +/* We don't have a M2P on Arm */ #define set_gpfn_from_mfn(mfn, pfn) do { (void) (mfn), (void)(pfn); } while (0) -#define mfn_to_gmfn(_d, mfn) (mfn) - /* Arch-specific portion of memory_op hypercall. */ long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg); diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index 6f76f004ab..717378730b 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -506,11 +506,6 @@ extern struct rangeset *mmio_ro_ranges; #define get_gpfn_from_mfn(mfn) (machine_to_phys_mapping[(mfn)]) -#define mfn_to_gmfn(_d, mfn) \ - ( (paging_mode_translate(_d)) \ - ? get_gpfn_from_mfn(mfn) \ - : (mfn) ) - #define compat_pfn_to_cr3(pfn) (((unsigned)(pfn) << 12) | ((unsigned)(pfn) >> 20)) #define compat_cr3_to_pfn(cr3) (((unsigned)(cr3) >> 12) | ((unsigned)(cr3) << 20)) -- 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
WARNING: multiple messages have this Message-ID (diff)
From: Julien Grall <julien.grall@arm.com> To: xen-devel@lists.xenproject.org Cc: "Stefano Stabellini" <sstabellini@kernel.org>, "Wei Liu" <wei.liu2@citrix.com>, "Andrew Cooper" <andrew.cooper3@citrix.com>, "Julien Grall" <julien.grall@arm.com>, "Jan Beulich" <jbeulich@suse.com>, "Roger Pau Monné" <roger.pau@citrix.com> Subject: [Xen-devel] [PATCH 10/14] xen: Remove mfn_to_gmfn macro Date: Tue, 7 May 2019 16:14:54 +0100 [thread overview] Message-ID: <20190507151458.29350-11-julien.grall@arm.com> (raw) Message-ID: <20190507151454.i2PWiYEDtGMnjTWMivwqHcc0RJXgMERwWnk0rdl9S6M@z> (raw) In-Reply-To: <20190507151458.29350-1-julien.grall@arm.com> On x86, mfn_to_gmfn can be replaced with mfn_to_gfn. On Arm, there are no more call to mfn_to_gmfn, so the helper can be dropped. At the same time rework a comment in Arm code that does not make sense. Signed-off-by: Julien Grall <julien.grall@arm.com> Acked-by: Jan Beulich <jbeulich@suse.com> Acked-by: Stefano Stabellini <sstabellini@kernel.org> --- Changes in v2: - Add Jan's and Stefano's acked-by --- xen/drivers/passthrough/iommu.c | 7 +++---- xen/include/asm-arm/mm.h | 4 +--- xen/include/asm-x86/mm.h | 5 ----- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index dbb64b13bc..054f71b919 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -195,8 +195,8 @@ void __hwdom_init iommu_hwdom_init(struct domain *d) page_list_for_each ( page, &d->page_list ) { - unsigned long mfn = mfn_x(page_to_mfn(page)); - unsigned long dfn = mfn_to_gmfn(d, mfn); + mfn_t mfn = page_to_mfn(page); + dfn_t dfn = _dfn(gfn_x(mfn_to_gfn(d, mfn))); unsigned int mapping = IOMMUF_readable; int ret; @@ -205,8 +205,7 @@ void __hwdom_init iommu_hwdom_init(struct domain *d) == PGT_writable_page) ) mapping |= IOMMUF_writable; - ret = iommu_map(d, _dfn(dfn), _mfn(mfn), 0, mapping, - &flush_flags); + ret = iommu_map(d, dfn, mfn, 0, mapping, &flush_flags); if ( !rc ) rc = ret; diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index a9c8352b94..a9cb98a6c7 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -321,10 +321,8 @@ struct page_info *get_page_from_gva(struct vcpu *v, vaddr_t va, #define SHARED_M2P_ENTRY (~0UL - 1UL) #define SHARED_M2P(_e) ((_e) == SHARED_M2P_ENTRY) -/* Xen always owns P2M on ARM */ +/* We don't have a M2P on Arm */ #define set_gpfn_from_mfn(mfn, pfn) do { (void) (mfn), (void)(pfn); } while (0) -#define mfn_to_gmfn(_d, mfn) (mfn) - /* Arch-specific portion of memory_op hypercall. */ long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg); diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index 6f76f004ab..717378730b 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -506,11 +506,6 @@ extern struct rangeset *mmio_ro_ranges; #define get_gpfn_from_mfn(mfn) (machine_to_phys_mapping[(mfn)]) -#define mfn_to_gmfn(_d, mfn) \ - ( (paging_mode_translate(_d)) \ - ? get_gpfn_from_mfn(mfn) \ - : (mfn) ) - #define compat_pfn_to_cr3(pfn) (((unsigned)(pfn) << 12) | ((unsigned)(pfn) >> 20)) #define compat_cr3_to_pfn(cr3) (((unsigned)(cr3) >> 12) | ((unsigned)(cr3) << 20)) -- 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-05-07 15:15 UTC|newest] Thread overview: 154+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-07 15:14 [PATCH 00/14] xen/arm: Properly disable M2P on Arm Julien Grall 2019-05-07 15:14 ` [Xen-devel] " Julien Grall 2019-05-07 15:14 ` [PATCH 01/14] xen/arm: Use mfn_to_pdx instead of pfn_to_pdx when possible Julien Grall 2019-05-07 15:14 ` [Xen-devel] " Julien Grall 2019-05-09 17:50 ` Stefano Stabellini 2019-05-09 17:50 ` [Xen-devel] " Stefano Stabellini 2019-05-07 15:14 ` [PATCH 02/14] xen/x86: Constify the parameter "d" in mfn_to_gfn Julien Grall 2019-05-07 15:14 ` [Xen-devel] " Julien Grall 2019-05-07 15:14 ` [PATCH 03/14] xen/x86: Make mfn_to_gfn typesafe Julien Grall 2019-05-07 15:14 ` [Xen-devel] " Julien Grall 2019-05-10 11:35 ` Jan Beulich 2019-05-10 11:35 ` [Xen-devel] " Jan Beulich 2019-05-10 13:02 ` Julien Grall 2019-05-10 13:02 ` [Xen-devel] " Julien Grall 2019-05-10 13:24 ` Jan Beulich 2019-05-10 13:24 ` [Xen-devel] " Jan Beulich 2019-05-10 13:25 ` Julien Grall 2019-05-10 13:25 ` [Xen-devel] " Julien Grall 2019-05-20 15:13 ` Julien Grall 2019-05-20 15:13 ` [Xen-devel] " Julien Grall 2019-05-28 17:29 ` George Dunlap 2019-05-28 17:29 ` [Xen-devel] " George Dunlap 2019-05-29 11:39 ` Julien Grall 2019-05-29 11:39 ` [Xen-devel] " Julien Grall 2019-05-07 15:14 ` [PATCH 04/14] xen/x86: Use mfn_to_gfn rather than mfn_to_gmfn Julien Grall 2019-05-07 15:14 ` [Xen-devel] " Julien Grall 2019-05-10 12:15 ` Jan Beulich 2019-05-10 12:15 ` [Xen-devel] " Jan Beulich 2019-05-10 13:07 ` Julien Grall 2019-05-10 13:07 ` [Xen-devel] " Julien Grall 2019-05-07 15:14 ` [PATCH 05/14] xen/grant-table: Make arch specific macros typesafe Julien Grall 2019-05-07 15:14 ` [Xen-devel] " Julien Grall 2019-05-09 17:54 ` Stefano Stabellini 2019-05-09 17:54 ` [Xen-devel] " Stefano Stabellini 2019-05-07 15:14 ` [PATCH 06/14] xen: Convert hotplug page function to use typesafe MFN Julien Grall 2019-05-07 15:14 ` [Xen-devel] " Julien Grall 2019-05-09 18:01 ` Stefano Stabellini 2019-05-09 18:01 ` [Xen-devel] " Stefano Stabellini 2019-05-09 18:10 ` Julien Grall 2019-05-09 18:10 ` [Xen-devel] " Julien Grall 2019-05-07 15:14 ` [PATCH 07/14] xen: Convert is_xen_fixed_mfn " Julien Grall 2019-05-07 15:14 ` [Xen-devel] " Julien Grall 2019-05-24 15:16 ` George Dunlap 2019-05-24 15:16 ` [Xen-devel] " George Dunlap 2019-05-07 15:14 ` [PATCH 08/14] xen: Convert is_xen_heap_mfn " Julien Grall 2019-05-07 15:14 ` [Xen-devel] " Julien Grall 2019-05-24 15:15 ` George Dunlap 2019-05-24 15:15 ` [Xen-devel] " George Dunlap 2019-05-07 15:14 ` [PATCH 09/14] xen: Introduce HAS_M2P config and use to protect mfn_to_gmfn call Julien Grall 2019-05-07 15:14 ` [Xen-devel] " Julien Grall 2019-05-09 18:06 ` Stefano Stabellini 2019-05-09 18:06 ` [Xen-devel] " Stefano Stabellini 2019-05-09 18:12 ` Julien Grall 2019-05-09 18:12 ` [Xen-devel] " Julien Grall 2019-05-09 18:16 ` Stefano Stabellini 2019-05-09 18:16 ` [Xen-devel] " Stefano Stabellini 2019-05-09 18:29 ` Julien Grall 2019-05-09 18:29 ` [Xen-devel] " Julien Grall 2019-05-09 19:49 ` Stefano Stabellini 2019-05-09 19:49 ` [Xen-devel] " Stefano Stabellini 2019-05-10 12:31 ` Jan Beulich 2019-05-10 12:31 ` [Xen-devel] " Jan Beulich 2019-05-10 13:22 ` Julien Grall 2019-05-10 13:22 ` [Xen-devel] " Julien Grall 2019-05-10 13:32 ` Jan Beulich 2019-05-10 13:32 ` [Xen-devel] " Jan Beulich 2019-05-10 13:41 ` Julien Grall 2019-05-10 13:41 ` [Xen-devel] " Julien Grall 2019-05-10 13:45 ` Jan Beulich 2019-05-10 13:45 ` [Xen-devel] " Jan Beulich 2019-05-10 14:04 ` Julien Grall 2019-05-10 14:04 ` [Xen-devel] " Julien Grall 2019-05-10 14:19 ` Jan Beulich 2019-05-10 14:19 ` [Xen-devel] " Jan Beulich 2019-05-10 14:34 ` Julien Grall 2019-05-10 14:34 ` [Xen-devel] " Julien Grall 2019-05-22 16:03 ` Julien Grall 2019-05-22 16:03 ` [Xen-devel] " Julien Grall 2019-05-07 15:14 ` Julien Grall [this message] 2019-05-07 15:14 ` [Xen-devel] [PATCH 10/14] xen: Remove mfn_to_gmfn macro Julien Grall 2019-05-07 15:14 ` [PATCH 11/14] xen/x86: mm: Re-implement set_gpfn_from_mfn() as a static inline function Julien Grall 2019-05-07 15:14 ` [Xen-devel] " Julien Grall 2019-05-10 12:43 ` Jan Beulich 2019-05-10 12:43 ` [Xen-devel] " Jan Beulich 2019-05-10 13:27 ` Julien Grall 2019-05-10 13:27 ` [Xen-devel] " Julien Grall 2019-05-10 13:35 ` Jan Beulich 2019-05-10 13:35 ` [Xen-devel] " Jan Beulich 2019-05-10 13:41 ` Julien Grall 2019-05-10 13:41 ` [Xen-devel] " Julien Grall 2019-05-10 13:48 ` Jan Beulich 2019-05-10 13:48 ` [Xen-devel] " Jan Beulich 2019-05-10 14:05 ` Julien Grall 2019-05-10 14:05 ` [Xen-devel] " Julien Grall 2019-05-10 14:21 ` Jan Beulich 2019-05-10 14:21 ` [Xen-devel] " Jan Beulich 2019-05-10 14:48 ` Julien Grall 2019-05-10 14:48 ` [Xen-devel] " Julien Grall 2019-05-07 15:14 ` [PATCH 12/14] xen/x86: pv: Convert update_intpte() to use typesafe MFN Julien Grall 2019-05-07 15:14 ` [Xen-devel] " Julien Grall 2019-05-10 12:54 ` Jan Beulich 2019-05-10 12:54 ` [Xen-devel] " Jan Beulich 2019-05-10 13:28 ` Julien Grall 2019-05-10 13:28 ` [Xen-devel] " Julien Grall 2019-05-07 15:14 ` [PATCH 13/14] xen/mm: Convert {s, g}et_gpfn_from_mfn() " Julien Grall 2019-05-07 15:14 ` [Xen-devel] " Julien Grall 2019-05-07 20:27 ` Tamas K Lengyel 2019-05-07 20:27 ` [Xen-devel] " Tamas K Lengyel 2019-05-09 18:19 ` Stefano Stabellini 2019-05-09 18:19 ` [Xen-devel] " Stefano Stabellini 2019-05-10 13:21 ` Jan Beulich 2019-05-10 13:21 ` [Xen-devel] " Jan Beulich 2019-05-10 13:27 ` Andrew Cooper 2019-05-10 13:27 ` [Xen-devel] " Andrew Cooper 2019-05-10 13:34 ` Julien Grall 2019-05-10 13:34 ` [Xen-devel] " Julien Grall 2019-05-10 13:41 ` Jan Beulich 2019-05-10 13:41 ` [Xen-devel] " Jan Beulich 2019-05-10 13:46 ` Julien Grall 2019-05-10 13:46 ` [Xen-devel] " Julien Grall 2019-05-10 14:02 ` Jan Beulich 2019-05-10 14:02 ` [Xen-devel] " Jan Beulich 2019-05-10 14:05 ` Andrew Cooper 2019-05-10 14:05 ` [Xen-devel] " Andrew Cooper 2019-05-10 14:08 ` Julien Grall 2019-05-10 14:08 ` [Xen-devel] " Julien Grall 2019-05-10 14:09 ` Andrew Cooper 2019-05-10 14:09 ` [Xen-devel] " Andrew Cooper 2019-05-10 14:14 ` Jan Beulich 2019-05-10 14:14 ` [Xen-devel] " Jan Beulich 2019-05-10 14:27 ` Andrew Cooper 2019-05-10 14:27 ` [Xen-devel] " Andrew Cooper 2019-05-24 16:24 ` George Dunlap 2019-05-24 16:24 ` [Xen-devel] " George Dunlap 2019-05-29 16:27 ` Julien Grall 2019-05-29 16:27 ` [Xen-devel] " Julien Grall 2019-05-29 16:29 ` George Dunlap 2019-05-29 16:29 ` [Xen-devel] " George Dunlap 2019-05-24 16:35 ` George Dunlap 2019-05-24 16:35 ` [Xen-devel] " George Dunlap 2019-05-07 15:14 ` [PATCH 14/14] xen/mm: Provide dummy M2P-related helpers when !CONFIG_HAVE_M2P Julien Grall 2019-05-07 15:14 ` [Xen-devel] " Julien Grall 2019-05-09 18:20 ` Stefano Stabellini 2019-05-09 18:20 ` [Xen-devel] " Stefano Stabellini 2019-05-10 13:28 ` Jan Beulich 2019-05-10 13:28 ` [Xen-devel] " Jan Beulich 2019-05-10 13:29 ` Julien Grall 2019-05-10 13:29 ` [Xen-devel] " Julien Grall 2019-05-10 13:37 ` Jan Beulich 2019-05-10 13:37 ` [Xen-devel] " Jan Beulich 2019-05-10 13:38 ` Julien Grall 2019-05-10 13:38 ` [Xen-devel] " Julien Grall 2019-05-24 16:51 ` George Dunlap 2019-05-24 16:51 ` [Xen-devel] " George Dunlap
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=20190507151458.29350-11-julien.grall@arm.com \ --to=julien.grall@arm.com \ --cc=andrew.cooper3@citrix.com \ --cc=jbeulich@suse.com \ --cc=roger.pau@citrix.com \ --cc=sstabellini@kernel.org \ --cc=wei.liu2@citrix.com \ --cc=xen-devel@lists.xenproject.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.