| Message ID | 1447754231-7772-3-git-send-email-shannon.zhao@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 2015/11/18 20:25, Julien Grall wrote: > Hi Shannon, > > On 17/11/15 09:57, shannon.zhao@linaro.org wrote: >> diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c >> index 62f591f..c084ba6 100644 >> --- a/drivers/xen/grant-table.c >> +++ b/drivers/xen/grant-table.c >> @@ -664,6 +664,55 @@ int gnttab_setup_auto_xlat_frames(phys_addr_t addr) >> } >> EXPORT_SYMBOL_GPL(gnttab_setup_auto_xlat_frames); >> >> +int __init xlated_setup_gnttab_pages(void) >> +{ >> + struct page **pages; >> + xen_pfn_t *pfns; >> + void *vaddr; >> + int rc; >> + unsigned int i; >> + unsigned long nr_grant_frames = gnttab_max_grant_frames(); >> + >> + BUG_ON(nr_grant_frames == 0); >> + pages = kcalloc(nr_grant_frames, sizeof(pages[0]), GFP_KERNEL); >> + if (!pages) >> + return -ENOMEM; >> + >> + pfns = kcalloc(nr_grant_frames, sizeof(pfns[0]), GFP_KERNEL); >> + if (!pfns) { >> + kfree(pages); >> + return -ENOMEM; >> + } >> + rc = alloc_xenballooned_pages(nr_grant_frames, pages, 0 /* lowmem */); > > Can you rebase your patch on top of linux/master? The 3rd parameters has > been dropped for alloc_xenballooned_pages. > Sure, I rebase this patchset on Linux 4.3 and will rebase on master at next version. >> + if (rc) { >> + pr_warn("%s Couldn't balloon alloc %ld pfns rc:%d\n", __func__, >> + nr_grant_frames, rc); >> + kfree(pages); >> + kfree(pfns); >> + return rc; >> + } >> + for (i = 0; i < nr_grant_frames; i++) >> + pfns[i] = page_to_pfn(pages[i]); > > This code needs to be adapt for 64KB page granularity. Please use > page_to_xen_pfn here. > Ok. >> + >> + vaddr = vmap(pages, nr_grant_frames, 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); >> + kfree(pages); >> + kfree(pfns); >> + return -ENOMEM; >> + } >> + kfree(pages); >> + >> + xen_auto_xlat_grant_frames.pfn = pfns; >> + xen_auto_xlat_grant_frames.count = nr_grant_frames; >> + xen_auto_xlat_grant_frames.vaddr = vaddr; >> + >> + return 0; >> +} >> +EXPORT_SYMBOL_GPL(xlated_setup_gnttab_pages); >> + >> void gnttab_free_auto_xlat_frames(void) >> { >> if (!xen_auto_xlat_grant_frames.count) >> diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h >> index 4478f4b..fa31e66 100644 >> --- a/include/xen/grant_table.h >> +++ b/include/xen/grant_table.h >> @@ -177,6 +177,7 @@ struct grant_frames { >> extern struct grant_frames xen_auto_xlat_grant_frames; >> unsigned int gnttab_max_grant_frames(void); >> int gnttab_setup_auto_xlat_frames(phys_addr_t addr); >> +int xlated_setup_gnttab_pages(void); >> void gnttab_free_auto_xlat_frames(void); >> >> #define gnttab_map_vaddr(map) ((void *)(map.host_virt_addr)) >> > > Regards, > > -- Shannon -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/xen/grant-table.c b/arch/x86/xen/grant-table.c index 1580e7a..2a99a9a 100644 --- a/arch/x86/xen/grant-table.c +++ b/arch/x86/xen/grant-table.c @@ -111,57 +111,6 @@ int arch_gnttab_init(unsigned long nr_shared) } #ifdef CONFIG_XEN_PVH -#include <xen/balloon.h> -#include <xen/events.h> -#include <linux/slab.h> -static int __init xlated_setup_gnttab_pages(void) -{ - struct page **pages; - xen_pfn_t *pfns; - void *vaddr; - int rc; - unsigned int i; - unsigned long nr_grant_frames = gnttab_max_grant_frames(); - - BUG_ON(nr_grant_frames == 0); - pages = kcalloc(nr_grant_frames, sizeof(pages[0]), GFP_KERNEL); - if (!pages) - return -ENOMEM; - - pfns = kcalloc(nr_grant_frames, sizeof(pfns[0]), GFP_KERNEL); - if (!pfns) { - kfree(pages); - return -ENOMEM; - } - rc = alloc_xenballooned_pages(nr_grant_frames, pages, 0 /* lowmem */); - if (rc) { - pr_warn("%s Couldn't balloon alloc %ld pfns rc:%d\n", __func__, - nr_grant_frames, 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); - 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); - kfree(pages); - kfree(pfns); - return -ENOMEM; - } - kfree(pages); - - xen_auto_xlat_grant_frames.pfn = pfns; - xen_auto_xlat_grant_frames.count = nr_grant_frames; - xen_auto_xlat_grant_frames.vaddr = vaddr; - - return 0; -} - static int __init xen_pvh_gnttab_setup(void) { if (!xen_pvh_domain()) diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 62f591f..c084ba6 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -664,6 +664,55 @@ int gnttab_setup_auto_xlat_frames(phys_addr_t addr) } EXPORT_SYMBOL_GPL(gnttab_setup_auto_xlat_frames); +int __init xlated_setup_gnttab_pages(void) +{ + struct page **pages; + xen_pfn_t *pfns; + void *vaddr; + int rc; + unsigned int i; + unsigned long nr_grant_frames = gnttab_max_grant_frames(); + + BUG_ON(nr_grant_frames == 0); + pages = kcalloc(nr_grant_frames, sizeof(pages[0]), GFP_KERNEL); + if (!pages) + return -ENOMEM; + + pfns = kcalloc(nr_grant_frames, sizeof(pfns[0]), GFP_KERNEL); + if (!pfns) { + kfree(pages); + return -ENOMEM; + } + rc = alloc_xenballooned_pages(nr_grant_frames, pages, 0 /* lowmem */); + if (rc) { + pr_warn("%s Couldn't balloon alloc %ld pfns rc:%d\n", __func__, + nr_grant_frames, 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); + 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); + kfree(pages); + kfree(pfns); + return -ENOMEM; + } + kfree(pages); + + xen_auto_xlat_grant_frames.pfn = pfns; + xen_auto_xlat_grant_frames.count = nr_grant_frames; + xen_auto_xlat_grant_frames.vaddr = vaddr; + + return 0; +} +EXPORT_SYMBOL_GPL(xlated_setup_gnttab_pages); + void gnttab_free_auto_xlat_frames(void) { if (!xen_auto_xlat_grant_frames.count) diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h index 4478f4b..fa31e66 100644 --- a/include/xen/grant_table.h +++ b/include/xen/grant_table.h @@ -177,6 +177,7 @@ struct grant_frames { extern struct grant_frames xen_auto_xlat_grant_frames; unsigned int gnttab_max_grant_frames(void); int gnttab_setup_auto_xlat_frames(phys_addr_t addr); +int xlated_setup_gnttab_pages(void); void gnttab_free_auto_xlat_frames(void); #define gnttab_map_vaddr(map) ((void *)(map.host_virt_addr))