From: Shannon Zhao <zhaoshenglong@huawei.com> To: linux-arm-kernel@lists.infradead.org, ard.biesheuvel@linaro.org, stefano.stabellini@citrix.com, david.vrabel@citrix.com Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, linux-efi@vger.kernel.org, ian.campbell@citrix.com, catalin.marinas@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, xen-devel@lists.xen.org, julien.grall@arm.com, shannon.zhao@linaro.org, peter.huangpeng@huawei.com Subject: [PATCH v6 03/17] Xen: xlate: Use page_to_xen_pfn instead of page_to_pfn Date: Thu, 17 Mar 2016 17:57:02 +0800 [thread overview] Message-ID: <1458208636-12960-4-git-send-email-zhaoshenglong@huawei.com> (raw) In-Reply-To: <1458208636-12960-1-git-send-email-zhaoshenglong@huawei.com> From: Shannon Zhao <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 | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/xen/xlate_mmu.c b/drivers/xen/xlate_mmu.c index 9692656..28f728b 100644 --- a/drivers/xen/xlate_mmu.c +++ b/drivers/xen/xlate_mmu.c @@ -207,9 +207,12 @@ int __init xen_xlate_map_ballooned_pages(xen_pfn_t **gfns, void **virt, void *vaddr; int rc; unsigned int i; + unsigned long nr_pages; + xen_pfn_t xen_pfn = 0; 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 +221,25 @@ 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]); + for (i = 0; i < nr_grant_frames; i++) { + if ((i % XEN_PFN_PER_PAGE) == 0) + xen_pfn = page_to_xen_pfn(pages[i / XEN_PFN_PER_PAGE]); + pfns[i] = pfn_to_gfn(xen_pfn++); + } - vaddr = vmap(pages, nr_grant_frames, 0, PAGE_KERNEL); + 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.0.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-03-17 9:57 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-03-17 9:56 [PATCH v6 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao 2016-03-17 9:57 ` [PATCH v6 01/17] Xen: ACPI: Hide UART used by Xen Shannon Zhao 2016-03-17 9:57 ` [PATCH v6 02/17] xen/grant-table: Move xlated_setup_gnttab_pages to common place Shannon Zhao 2016-03-17 9:57 ` Shannon Zhao [this message] 2016-03-17 9:57 ` [PATCH v6 04/17] arm/xen: Use xen_xlate_map_ballooned_pages to setup grant table Shannon Zhao 2016-03-17 9:57 ` [PATCH v6 05/17] xen: memory : Add new XENMAPSPACE type XENMAPSPACE_dev_mmio Shannon Zhao 2016-03-17 9:57 ` [PATCH v6 06/17] Xen: ARM: Add support for mapping platform device mmio Shannon Zhao 2016-03-17 9:57 ` [PATCH v6 07/17] Xen: ARM: Add support for mapping AMBA " Shannon Zhao 2016-03-17 9:57 ` [PATCH v6 08/17] Xen: public/hvm: sync changes of HVM_PARAM_CALLBACK_VIA ABI from Xen Shannon Zhao 2016-03-17 9:57 ` [PATCH v6 09/17] xen/hvm/params: Add a new delivery type for event-channel in HVM_PARAM_CALLBACK_IRQ Shannon Zhao 2016-03-17 9:57 ` [PATCH v6 10/17] arm/xen: Get event-channel irq through HVM_PARAM when booting with ACPI Shannon Zhao 2016-03-17 9:57 ` [PATCH v6 11/17] ARM: XEN: Move xen_early_init() before efi_init() Shannon Zhao 2016-03-17 9:57 ` [PATCH v6 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI Shannon Zhao 2016-03-17 9:57 ` [PATCH v6 13/17] ARM: Xen: Document UEFI support on Xen ARM virtual platforms Shannon Zhao 2016-03-17 9:57 ` [PATCH v6 14/17] XEN: EFI: Move x86 specific codes to architecture directory Shannon Zhao 2016-03-17 9:57 ` [PATCH v6 15/17] ARM64: XEN: Add a function to initialize Xen specific UEFI runtime services Shannon Zhao 2016-03-17 9:57 ` [PATCH v6 16/17] FDT: Add a helper to get the subnode by given name Shannon Zhao 2016-03-17 9:57 ` [PATCH v6 17/17] Xen: EFI: Parse DT parameters for Xen specific UEFI Shannon Zhao [not found] ` <1458208636-12960-2-git-send-email-zhaoshenglong@huawei.com> 2016-03-17 12:59 ` [PATCH v6 01/17] Xen: ACPI: Hide UART used by Xen Rafael J. Wysocki 2016-03-24 12:21 ` [PATCH v6 00/17] Add ACPI support for Xen Dom0 on ARM64 Stefano Stabellini
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=1458208636-12960-4-git-send-email-zhaoshenglong@huawei.com \ --to=zhaoshenglong@huawei.com \ --cc=ard.biesheuvel@linaro.org \ --cc=catalin.marinas@arm.com \ --cc=david.vrabel@citrix.com \ --cc=devicetree@vger.kernel.org \ --cc=ian.campbell@citrix.com \ --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=mark.rutland@arm.com \ --cc=peter.huangpeng@huawei.com \ --cc=shannon.zhao@linaro.org \ --cc=stefano.stabellini@citrix.com \ --cc=will.deacon@arm.com \ --cc=xen-devel@lists.xen.org \ --subject='Re: [PATCH v6 03/17] Xen: xlate: Use page_to_xen_pfn instead of page_to_pfn' \ /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
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).