From: Shannon Zhao <shannon.zhao@linaro.org>
To: linux-arm-kernel@lists.infradead.org, stefano.stabellini@citrix.com
Cc: david.vrabel@citrix.com, devicetree@vger.kernel.org,
linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org,
catalin.marinas@arm.com, will.deacon@arm.com,
julien.grall@arm.com, peter.huangpeng@huawei.com,
xen-devel@lists.xen.org, zhaoshenglong@huawei.com,
shannon.zhao@linaro.org
Subject: [PATCH v10 03/17] Xen: xlate: Use page_to_xen_pfn instead of page_to_pfn
Date: Fri, 1 Apr 2016 23:49:01 +0800 [thread overview]
Message-ID: <1459525755-36968-4-git-send-email-shannon.zhao@linaro.org> (raw)
In-Reply-To: <1459525755-36968-1-git-send-email-shannon.zhao@linaro.org>
Make xen_xlate_map_ballooned_pages work with 64K pages. In that case
Kernel pages are 64K in size but Xen pages remain 4K in size. Xen pfns
refer to 4K pages.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
drivers/xen/xlate_mmu.c | 38 +++++++++++++++++++++++++++-----------
1 file changed, 27 insertions(+), 11 deletions(-)
diff --git a/drivers/xen/xlate_mmu.c b/drivers/xen/xlate_mmu.c
index 9692656..23f1387 100644
--- a/drivers/xen/xlate_mmu.c
+++ b/drivers/xen/xlate_mmu.c
@@ -189,6 +189,18 @@ int xen_xlate_unmap_gfn_range(struct vm_area_struct *vma,
}
EXPORT_SYMBOL_GPL(xen_xlate_unmap_gfn_range);
+struct map_balloon_pages {
+ xen_pfn_t *pfns;
+ unsigned int idx;
+};
+
+static void setup_balloon_gfn(unsigned long gfn, void *data)
+{
+ struct map_balloon_pages *info = data;
+
+ info->pfns[info->idx++] = gfn;
+}
+
/**
* xen_xlate_map_ballooned_pages - map a new set of ballooned pages
* @gfns: returns the array of corresponding GFNs
@@ -205,11 +217,13 @@ int __init xen_xlate_map_ballooned_pages(xen_pfn_t **gfns, void **virt,
struct page **pages;
xen_pfn_t *pfns;
void *vaddr;
+ struct map_balloon_pages data;
int rc;
- unsigned int i;
+ unsigned long nr_pages;
BUG_ON(nr_grant_frames == 0);
- pages = kcalloc(nr_grant_frames, sizeof(pages[0]), GFP_KERNEL);
+ nr_pages = DIV_ROUND_UP(nr_grant_frames, XEN_PFN_PER_PAGE);
+ pages = kcalloc(nr_pages, sizeof(pages[0]), GFP_KERNEL);
if (!pages)
return -ENOMEM;
@@ -218,22 +232,24 @@ int __init xen_xlate_map_ballooned_pages(xen_pfn_t **gfns, void **virt,
kfree(pages);
return -ENOMEM;
}
- rc = alloc_xenballooned_pages(nr_grant_frames, pages);
+ rc = alloc_xenballooned_pages(nr_pages, pages);
if (rc) {
- pr_warn("%s Couldn't balloon alloc %ld pfns rc:%d\n", __func__,
- nr_grant_frames, rc);
+ pr_warn("%s Couldn't balloon alloc %ld pages rc:%d\n", __func__,
+ nr_pages, rc);
kfree(pages);
kfree(pfns);
return rc;
}
- for (i = 0; i < nr_grant_frames; i++)
- pfns[i] = page_to_pfn(pages[i]);
- vaddr = vmap(pages, nr_grant_frames, 0, PAGE_KERNEL);
+ data.pfns = pfns;
+ data.idx = 0;
+ xen_for_each_gfn(pages, nr_grant_frames, setup_balloon_gfn, &data);
+
+ vaddr = vmap(pages, nr_pages, 0, PAGE_KERNEL);
if (!vaddr) {
- pr_warn("%s Couldn't map %ld pfns rc:%d\n", __func__,
- nr_grant_frames, rc);
- free_xenballooned_pages(nr_grant_frames, pages);
+ pr_warn("%s Couldn't map %ld pages rc:%d\n", __func__,
+ nr_pages, rc);
+ free_xenballooned_pages(nr_pages, pages);
kfree(pages);
kfree(pfns);
return -ENOMEM;
--
2.1.4
next prev parent reply other threads:[~2016-04-01 15:50 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-01 15:48 [PATCH v10 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
2016-04-01 15:48 ` [PATCH v10 01/17] Xen: ACPI: Hide UART used by Xen Shannon Zhao
2016-04-01 19:21 ` Rafael J. Wysocki
2016-04-01 15:49 ` [PATCH v10 02/17] xen/grant-table: Move xlated_setup_gnttab_pages to common place Shannon Zhao
2016-04-06 11:40 ` Julien Grall
2016-04-01 15:49 ` Shannon Zhao [this message]
2016-04-06 11:42 ` [PATCH v10 03/17] Xen: xlate: Use page_to_xen_pfn instead of page_to_pfn Julien Grall
2016-04-01 15:49 ` [PATCH v10 04/17] arm/xen: Use xen_xlate_map_ballooned_pages to setup grant table Shannon Zhao
2016-04-06 11:43 ` Julien Grall
2016-04-01 15:49 ` [PATCH v10 05/17] xen: memory : Add new XENMAPSPACE type XENMAPSPACE_dev_mmio Shannon Zhao
2016-04-06 11:44 ` Julien Grall
2016-04-01 15:49 ` [PATCH v10 06/17] Xen: ARM: Add support for mapping platform device mmio Shannon Zhao
2016-04-06 12:16 ` Julien Grall
2016-04-07 1:37 ` Shannon Zhao
2016-04-07 10:32 ` Julien Grall
2016-04-07 11:25 ` Shannon Zhao
2016-04-01 15:49 ` [PATCH v10 07/17] Xen: ARM: Add support for mapping AMBA " Shannon Zhao
2016-04-06 12:26 ` Julien Grall
2016-04-01 15:49 ` [PATCH v10 08/17] Xen: public/hvm: sync changes of HVM_PARAM_CALLBACK_VIA ABI from Xen Shannon Zhao
2016-04-01 15:49 ` [PATCH v10 09/17] xen/hvm/params: Add a new delivery type for event-channel in HVM_PARAM_CALLBACK_IRQ Shannon Zhao
2016-04-06 12:29 ` Julien Grall
2016-04-01 15:49 ` [PATCH v10 10/17] arm/xen: Get event-channel irq through HVM_PARAM when booting with ACPI Shannon Zhao
2016-04-06 12:31 ` Julien Grall
2016-04-01 15:49 ` [PATCH v10 11/17] ARM: XEN: Move xen_early_init() before efi_init() Shannon Zhao
2016-04-06 12:35 ` Julien Grall
2016-04-01 15:49 ` [PATCH v10 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI Shannon Zhao
2016-04-01 15:49 ` [PATCH v10 13/17] ARM: Xen: Document UEFI support on Xen ARM virtual platforms Shannon Zhao
2016-04-01 15:49 ` [PATCH v10 14/17] XEN: EFI: Move x86 specific codes to architecture directory Shannon Zhao
2016-04-01 15:49 ` [PATCH v10 15/17] ARM64: XEN: Add a function to initialize Xen specific UEFI runtime services Shannon Zhao
2016-04-01 15:49 ` [PATCH v10 16/17] FDT: Add a helper to get the subnode by given name Shannon Zhao
2016-04-01 15:49 ` [PATCH v10 17/17] Xen: EFI: Parse DT parameters for Xen specific UEFI Shannon Zhao
2016-04-06 11:32 ` [PATCH v10 00/17] Add ACPI support for Xen Dom0 on ARM64 Julien Grall
2016-04-07 1:39 ` Shannon Zhao
2016-04-07 10:34 ` 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=1459525755-36968-4-git-send-email-shannon.zhao@linaro.org \
--to=shannon.zhao@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=david.vrabel@citrix.com \
--cc=devicetree@vger.kernel.org \
--cc=julien.grall@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peter.huangpeng@huawei.com \
--cc=stefano.stabellini@citrix.com \
--cc=will.deacon@arm.com \
--cc=xen-devel@lists.xen.org \
--cc=zhaoshenglong@huawei.com \
/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).