From: Julien Grall <julien.grall@citrix.com>
To: <xen-devel@lists.xenproject.org>
Cc: <linux-arm-kernel@lists.infradead.org>, <ian.campbell@citrix.com>,
<stefano.stabellini@eu.citrix.com>,
<linux-kernel@vger.kernel.org>,
"Julien Grall" <julien.grall@citrix.com>,
Russell King <linux@arm.linux.org.uk>
Subject: [PATCH v2 20/20] arm/xen: Add support for 64KB page granularity
Date: Thu, 9 Jul 2015 21:42:32 +0100 [thread overview]
Message-ID: <1436474552-31789-21-git-send-email-julien.grall@citrix.com> (raw)
In-Reply-To: <1436474552-31789-1-git-send-email-julien.grall@citrix.com>
The hypercall interface is always using 4KB page granularity. This is
requiring to use xen page definition macro when we deal with hypercall.
Note that pfn_to_mfn is working with a Xen pfn (i.e 4KB). We may want to
rename pfn_mfn to make this explicit.
We also allocate a 64KB page for the shared page even though only the
first 4KB is used. I don't think this is really important for now as it
helps to have the pointer 4KB aligned (XENMEM_add_to_physmap is taking a
Xen PFN).
Signed-off-by: Julien Grall <julien.grall@citrix.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Russell King <linux@arm.linux.org.uk>
---
Changes in v2
- Add Stefano's reviewed-by
---
arch/arm/include/asm/xen/page.h | 12 ++++++------
arch/arm/xen/enlighten.c | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/include/asm/xen/page.h b/arch/arm/include/asm/xen/page.h
index 1bee8ca..ab6eb9a 100644
--- a/arch/arm/include/asm/xen/page.h
+++ b/arch/arm/include/asm/xen/page.h
@@ -56,19 +56,19 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn)
static inline xmaddr_t phys_to_machine(xpaddr_t phys)
{
- unsigned offset = phys.paddr & ~PAGE_MASK;
- return XMADDR(PFN_PHYS(pfn_to_mfn(PFN_DOWN(phys.paddr))) | offset);
+ unsigned offset = phys.paddr & ~XEN_PAGE_MASK;
+ return XMADDR(XEN_PFN_PHYS(pfn_to_mfn(XEN_PFN_DOWN(phys.paddr))) | offset);
}
static inline xpaddr_t machine_to_phys(xmaddr_t machine)
{
- unsigned offset = machine.maddr & ~PAGE_MASK;
- return XPADDR(PFN_PHYS(mfn_to_pfn(PFN_DOWN(machine.maddr))) | offset);
+ unsigned offset = machine.maddr & ~XEN_PAGE_MASK;
+ return XPADDR(XEN_PFN_PHYS(mfn_to_pfn(XEN_PFN_DOWN(machine.maddr))) | offset);
}
/* VIRT <-> MACHINE conversion */
#define virt_to_machine(v) (phys_to_machine(XPADDR(__pa(v))))
-#define virt_to_mfn(v) (pfn_to_mfn(virt_to_pfn(v)))
-#define mfn_to_virt(m) (__va(mfn_to_pfn(m) << PAGE_SHIFT))
+#define virt_to_mfn(v) (pfn_to_mfn(virt_to_phys(v) >> XEN_PAGE_SHIFT))
+#define mfn_to_virt(m) (__va(mfn_to_pfn(m) << XEN_PAGE_SHIFT))
static inline xmaddr_t arbitrary_virt_to_machine(void *vaddr)
{
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 6c09cc4..c7d32af 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -96,8 +96,8 @@ static void xen_percpu_init(void)
pr_info("Xen: initializing cpu%d\n", cpu);
vcpup = per_cpu_ptr(xen_vcpu_info, cpu);
- info.mfn = __pa(vcpup) >> PAGE_SHIFT;
- info.offset = offset_in_page(vcpup);
+ info.mfn = __pa(vcpup) >> XEN_PAGE_SHIFT;
+ info.offset = xen_offset_in_page(vcpup);
err = HYPERVISOR_vcpu_op(VCPUOP_register_vcpu_info, cpu, &info);
BUG_ON(err);
@@ -220,7 +220,7 @@ static int __init xen_guest_init(void)
xatp.domid = DOMID_SELF;
xatp.idx = 0;
xatp.space = XENMAPSPACE_shared_info;
- xatp.gpfn = __pa(shared_info_page) >> PAGE_SHIFT;
+ xatp.gpfn = __pa(shared_info_page) >> XEN_PAGE_SHIFT;
if (HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp))
BUG();
--
2.1.4
next prev parent reply other threads:[~2015-07-09 20:45 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-09 20:42 [PATCH v2 00/20] xen/arm64: Add support for 64KB page Julien Grall
2015-07-09 20:42 ` [PATCH v2 01/20] xen: Add Xen specific page definition Julien Grall
2015-07-16 14:19 ` Stefano Stabellini
2015-07-16 14:52 ` Julien Grall
2015-07-24 9:28 ` [Xen-devel] " David Vrabel
2015-07-24 9:39 ` Julien Grall
2015-07-24 9:48 ` David Vrabel
2015-07-24 9:51 ` Julien Grall
2015-07-24 10:34 ` David Vrabel
2015-07-24 10:43 ` Ian Campbell
2015-07-24 13:03 ` Julien Grall
2015-07-09 20:42 ` [PATCH v2 02/20] xen: Introduce a function to split a Linux page into Xen page Julien Grall
2015-07-16 14:23 ` Stefano Stabellini
2015-07-16 14:54 ` [Xen-devel] " Julien Grall
2015-07-24 9:31 ` David Vrabel
2015-07-24 9:54 ` Julien Grall
2015-07-24 10:10 ` David Vrabel
2015-07-24 10:20 ` Julien Grall
2015-08-05 14:30 ` Julien Grall
2015-08-05 15:50 ` David Vrabel
2015-08-05 16:06 ` Julien Grall
2015-07-09 20:42 ` [PATCH v2 03/20] xen/grant: Introduce helpers to split a page into grant Julien Grall
2015-07-16 15:01 ` Stefano Stabellini
2015-07-16 16:07 ` Julien Grall
2015-07-17 13:10 ` [Xen-devel] " Julien Grall
2015-07-09 20:42 ` [PATCH v2 04/20] xen/grant: Add helper gnttab_page_grant_foreign_access_ref Julien Grall
2015-07-16 15:05 ` Stefano Stabellini
2015-07-16 16:12 ` [Xen-devel] " Julien Grall
2015-07-24 9:35 ` David Vrabel
2015-07-09 20:42 ` [PATCH v2 05/20] block/xen-blkfront: Split blkif_queue_request in 2 Julien Grall
2015-07-21 9:54 ` Roger Pau Monné
2015-07-21 11:12 ` [Xen-devel] " Julien Grall
2015-07-09 20:42 ` [PATCH v2 06/20] block/xen-blkfront: Store a page rather a pfn in the grant structure Julien Grall
2015-07-16 15:11 ` Stefano Stabellini
2015-07-23 17:18 ` Julien Grall
2015-07-21 10:16 ` Roger Pau Monné
2015-07-21 11:19 ` [Xen-devel] " Julien Grall
2015-07-09 20:42 ` [PATCH v2 07/20] block/xen-blkfront: split get_grant in 2 Julien Grall
2015-07-21 10:30 ` Roger Pau Monné
2015-07-21 13:03 ` [Xen-devel] " Julien Grall
2015-07-09 20:42 ` [PATCH v2 08/20] net/xen-netback: xenvif_gop_frag_copy: move GSO check out of the loop Julien Grall
2015-07-09 20:42 ` [PATCH v2 09/20] xen/biomerge: Don't allow biovec to be merge when Linux is not using 4KB page Julien Grall
2015-07-10 19:12 ` Konrad Rzeszutek Wilk
2015-07-15 8:56 ` [Xen-devel] " Julien Grall
2015-07-16 15:33 ` Stefano Stabellini
2015-07-16 16:15 ` [Xen-devel] " Julien Grall
2015-07-16 18:30 ` Konrad Rzeszutek Wilk
2015-07-17 13:20 ` Stefano Stabellini
2015-07-17 14:44 ` Julien Grall
2015-07-17 14:45 ` Stefano Stabellini
2015-07-17 14:46 ` Julien Grall
2015-07-09 20:42 ` [PATCH v2 10/20] xen/xenbus: Use Xen page definition Julien Grall
2015-07-16 15:35 ` Stefano Stabellini
2015-07-24 9:49 ` David Vrabel
2015-07-09 20:42 ` [PATCH v2 11/20] tty/hvc: xen: Use xen " Julien Grall
2015-07-16 15:36 ` Stefano Stabellini
2015-07-24 9:52 ` David Vrabel
2015-07-09 20:42 ` [PATCH v2 12/20] xen/balloon: Don't rely on the page granularity is the same for Xen and Linux Julien Grall
2015-07-17 14:03 ` Stefano Stabellini
2015-07-17 14:32 ` Julien Grall
2015-07-09 20:42 ` [PATCH v2 13/20] xen/events: fifo: Make it running on 64KB granularity Julien Grall
2015-07-16 15:43 ` Stefano Stabellini
2015-07-16 16:18 ` [Xen-devel] " Julien Grall
2015-07-17 13:06 ` Stefano Stabellini
2015-07-24 10:36 ` David Vrabel
2015-08-06 15:43 ` [Xen-devel] " Julien Grall
2015-07-09 20:42 ` [PATCH v2 14/20] xen/grant-table: " Julien Grall
2015-07-16 15:47 ` Stefano Stabellini
2015-07-16 16:23 ` [Xen-devel] " Julien Grall
2015-07-17 13:37 ` Stefano Stabellini
2015-07-09 20:42 ` [PATCH v2 15/20] block/xen-blkfront: Make it running on 64KB page granularity Julien Grall
2015-07-21 11:06 ` Roger Pau Monné
2015-07-21 13:07 ` [Xen-devel] " Julien Grall
2015-07-09 20:42 ` [PATCH v2 16/20] block/xen-blkback: " Julien Grall
2015-07-09 20:42 ` [PATCH v2 17/20] net/xen-netfront: " Julien Grall
2015-07-20 17:26 ` [Xen-devel] " Julien Grall
2015-07-09 20:42 ` [PATCH v2 18/20] net/xen-netback: " Julien Grall
2015-07-09 20:42 ` [PATCH v2 19/20] xen/privcmd: Add support for Linux " Julien Grall
2015-07-13 20:13 ` Boris Ostrovsky
2015-07-13 22:05 ` Julien Grall
2015-07-14 15:28 ` Boris Ostrovsky
2015-07-14 15:37 ` Julien Grall
2015-07-16 17:12 ` Stefano Stabellini
2015-07-16 17:16 ` Stefano Stabellini
2015-07-17 12:50 ` [Xen-devel] " Julien Grall
2015-07-09 20:42 ` Julien Grall [this message]
2015-07-20 17:54 ` [Xen-devel] [PATCH v2 00/20] xen/arm64: Add support for 64KB page 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=1436474552-31789-21-git-send-email-julien.grall@citrix.com \
--to=julien.grall@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=stefano.stabellini@eu.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: 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).