From: Shannon Zhao <shannon.zhao@linaro.org>
To: Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
Shannon Zhao <zhaoshenglong@huawei.com>
Cc: linux-arm-kernel@lists.infradead.org, ard.biesheuvel@linaro.org,
stefano.stabellini@citrix.com, david.vrabel@citrix.com,
mark.rutland@arm.com, devicetree@vger.kernel.org,
linux-efi@vger.kernel.org, catalin.marinas@arm.com,
will.deacon@arm.com, linux-kernel@vger.kernel.org,
xen-devel@lists.xen.org, julien.grall@citrix.com,
peter.huangpeng@huawei.com
Subject: Re: [Xen-devel] [PATCH v2 03/16] Xen: xlate: Use page_to_xen_pfn instead of page_to_pfn
Date: Tue, 19 Jan 2016 23:10:12 +0800 [thread overview]
Message-ID: <569E51D4.9020209@linaro.org> (raw)
In-Reply-To: <alpine.DEB.2.02.1601191456370.9400@kaball.uk.xensource.com>
On 2016/1/19 22:59, Stefano Stabellini wrote:
> On Mon, 18 Jan 2016, Shannon Zhao wrote:
>> On 2016/1/16 1:08, Stefano Stabellini wrote:
>>> On Fri, 15 Jan 2016, Shannon Zhao wrote:
>>>> From: Shannon Zhao <shannon.zhao@linaro.org>
>>>>
>>>> Use page_to_xen_pfn in case of 64KB page.
>>>>
>>>> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
>>>> ---
>>>> drivers/xen/xlate_mmu.c | 2 +-
>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/drivers/xen/xlate_mmu.c b/drivers/xen/xlate_mmu.c
>>>> index 9692656..b9fcc2c 100644
>>>> --- a/drivers/xen/xlate_mmu.c
>>>> +++ b/drivers/xen/xlate_mmu.c
>>>> @@ -227,7 +227,7 @@ int __init xen_xlate_map_ballooned_pages(xen_pfn_t **gfns, void **virt,
>>>> return rc;
>>>> }
>>>> for (i = 0; i < nr_grant_frames; i++)
>>>> - pfns[i] = page_to_pfn(pages[i]);
>>>> + pfns[i] = page_to_xen_pfn(pages[i]);
>>>
>>> Shannon, thanks for the patch.
>>>
>>> Keeping in mind that in the 64K case, kernel pages are 64K but xen pages
>>> are still 4K, I think you also need to allocate
>>> (nr_grant_frames/XEN_PFN_PER_PAGE) kernel pages (assuming that they are
>>> allocated contiguously): nr_grant_frames refers to 4K pages, while
>>> xen_xlate_map_ballooned_pages is allocating pages on a 64K granularity
>>> (sizeof(pages[0]) == 64K).
>>>
>>> Be careful that alloc_xenballooned_pages deals with 64K pages (because
>>> it deals with kernel pages), while xen_pfn_t is always 4K based (because
>>> it deals with Xen pfns).
>>>
>>> Please test it with and without CONFIG_ARM64_64K_PAGES. Thanks!
>>>
>> Stefano, thanks for your explanation. How about below patch?
>
> Good work, it looks like you covered all bases, I think it should work,
> but I haven't tested it myself. Just one note below.
>
>
>> diff --git a/drivers/xen/xlate_mmu.c b/drivers/xen/xlate_mmu.c
>> index 9692656..e1f7c95 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] = xen_pfn++;
>> + }
>
> We might want to:
>
> pfns[i] = pfn_to_gfn(xen_pfn++);
>
> for consistency, even though for autotranslate guests pfn_to_gfn always
> returns pfn.
>
Ok, will add. Thanks.
>
>> - 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;
>>
>> --
>> Shannon
>>
--
Shannon
next prev parent reply other threads:[~2016-01-19 15:10 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-15 6:55 [PATCH v2 00/16] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 01/16] Xen: ACPI: Hide UART used by Xen Shannon Zhao
2016-01-15 15:39 ` Stefano Stabellini
2016-01-18 10:32 ` Mark Rutland
2016-01-18 11:38 ` Stefano Stabellini
2016-01-15 6:55 ` [PATCH v2 02/16] xen/grant-table: Move xlated_setup_gnttab_pages to common place Shannon Zhao
2016-01-15 15:53 ` [Xen-devel] " Stefano Stabellini
2016-01-15 6:55 ` [PATCH v2 03/16] Xen: xlate: Use page_to_xen_pfn instead of page_to_pfn Shannon Zhao
2016-01-15 17:08 ` [Xen-devel] " Stefano Stabellini
2016-01-18 5:08 ` Shannon Zhao
2016-01-19 14:59 ` Stefano Stabellini
2016-01-19 15:10 ` Shannon Zhao [this message]
2016-01-15 6:55 ` [PATCH v2 04/16] arm/xen: Use xen_xlate_map_ballooned_pages to setup grant table Shannon Zhao
2016-01-15 17:21 ` Stefano Stabellini
2016-01-15 6:55 ` [PATCH v2 05/16] xen: memory : Add new XENMAPSPACE type XENMAPSPACE_dev_mmio Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 06/16] Xen: ARM: Add support for mapping platform device mmio Shannon Zhao
2016-01-15 17:39 ` [Xen-devel] " Stefano Stabellini
2016-01-15 6:55 ` [PATCH v2 07/16] Xen: ARM: Add support for mapping AMBA " Shannon Zhao
2016-01-18 11:58 ` [Xen-devel] " Stefano Stabellini
2016-01-15 6:55 ` [PATCH v2 08/16] xen/hvm/params: Add a new delivery type for event-channel in HVM_PARAM_CALLBACK_IRQ Shannon Zhao
2016-01-18 12:38 ` [Xen-devel] " Stefano Stabellini
2016-01-18 12:42 ` Andrew Cooper
2016-01-18 12:46 ` Stefano Stabellini
2016-01-18 12:52 ` Andrew Cooper
2016-01-20 6:33 ` Shannon Zhao
2016-01-20 8:39 ` Andrew Cooper
2016-01-20 8:45 ` Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 09/16] arm/xen: Get event-channel irq through HVM_PARAM when booting with ACPI Shannon Zhao
2016-01-18 14:38 ` [Xen-devel] " Stefano Stabellini
2016-01-19 8:21 ` Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 10/16] ARM: XEN: Move xen_early_init() before efi_init() Shannon Zhao
2016-01-18 14:59 ` [Xen-devel] " Stefano Stabellini
2016-01-19 8:36 ` Shannon Zhao
2016-01-19 12:14 ` Stefano Stabellini
2016-01-15 6:55 ` [PATCH v2 11/16] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI Shannon Zhao
2016-01-18 10:41 ` Mark Rutland
2016-01-18 15:07 ` Stefano Stabellini
2016-01-19 8:41 ` Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 12/16] ARM: Xen: Document UEFI support on Xen ARM virtual platforms Shannon Zhao
2016-01-17 3:43 ` Rob Herring
2016-01-18 10:51 ` Mark Rutland
2016-01-18 17:34 ` Stefano Stabellini
2016-01-19 10:25 ` Shannon Zhao
2016-01-19 10:47 ` Mark Rutland
2016-01-19 12:23 ` Stefano Stabellini
2016-01-19 13:13 ` Mark Rutland
2016-01-19 13:18 ` Ard Biesheuvel
2016-01-19 13:43 ` Shannon Zhao
2016-01-19 14:11 ` Stefano Stabellini
2016-01-21 11:50 ` Mark Rutland
2016-01-15 6:55 ` [PATCH v2 13/16] ARM: XEN: Set EFI_PARAVIRT if Xen supports EFI Shannon Zhao
2016-01-18 10:57 ` Mark Rutland
2016-01-15 6:55 ` [PATCH v2 14/16] Xen: EFI: Parse DT parameters for Xen specific UEFI Shannon Zhao
2016-01-18 11:03 ` Mark Rutland
2016-01-18 15:41 ` [Xen-devel] " Stefano Stabellini
2016-01-19 13:19 ` Shannon Zhao
2016-01-19 13:43 ` Mark Rutland
2016-01-19 13:46 ` Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 15/16] XEN: EFI: Move x86 specific codes to architecture directory Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 16/16] ARM64: XEN: Initialize Xen specific UEFI runtime services Shannon Zhao
2016-01-18 11:08 ` Mark Rutland
2016-01-18 17:45 ` Stefano Stabellini
2016-01-18 18:27 ` Mark Rutland
2016-01-19 12:03 ` Stefano Stabellini
2016-01-19 13:03 ` Mark Rutland
2016-01-19 13:31 ` Shannon Zhao
2016-01-19 14:20 ` Stefano Stabellini
2016-01-18 17:03 ` [Xen-devel] " Stefano Stabellini
2016-01-19 13:12 ` Shannon Zhao
2016-01-19 14:24 ` Stefano Stabellini
2016-01-22 3:58 ` Shannon Zhao
2016-01-22 10:57 ` 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=569E51D4.9020209@linaro.org \
--to=shannon.zhao@linaro.org \
--cc=ard.biesheuvel@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=david.vrabel@citrix.com \
--cc=devicetree@vger.kernel.org \
--cc=julien.grall@citrix.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=stefano.stabellini@citrix.com \
--cc=stefano.stabellini@eu.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).