x86-xen-open-code-alloc_vm_area-in-arch_gnttab_valloc.patch removed from -mm tree
The patch titled
Subject: x86/xen: open code alloc_vm_area in arch_gnttab_valloc
has been removed from the -mm tree. Its filename was
x86-xen-open-code-alloc_vm_area-in-arch_gnttab_valloc.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Christoph Hellwig <[email protected]>
Subject: x86/xen: open code alloc_vm_area in arch_gnttab_valloc
Replace the last call to alloc_vm_area with an open coded version using an iterator in struct gnttab_vm_area instead of the triple indirection magic in alloc_vm_area.
Signed-off-by Christoph Hellwig <[email protected]>
Reviewed-by Boris Ostrovsky <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Jani Nikula <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Cc Juergen Gross <[email protected]>
Cc Matthew Auld <[email protected]>
Cc "Matthew Wilcox (Oracle)" <[email protected]>
Cc Minchan Kim <[email protected]>
Cc Nitin Gupta <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc Stefano Stabellini <[email protected]>
Cc Tvrtko Ursulin <[email protected]>
Cc Uladzislau Rezki (Sony) <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/x86/xen/grant-table.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
arch/x86/xen/grant-table.c renamed from arch/x86/xen/grant-table.c~x86-xen-open-code-alloc_vm_area-in-arch_gnttab_valloc +20 -7
@@ -25,6 +25,7 @@static struct gnttab_vm_area {struct vm_struct *area;pte_t **ptes; +int idx; } gnttab_shared_vm_area, gnttab_status_vm_area; int arch_gnttab_map_shared(unsigned long *frames, unsigned long nr_gframes,
@@ -90,19 +91,31 @@ void arch_gnttab_unmap(void *shared, uns } } +static int gnttab_apply (pte_t *pte,unsigned long addr,void *data) +{ +struct gnttab_vm_area *area = data; + + area->ptes[area->idx++] = pte; +return 0 ; +} +static int arch_gnttab_valloc (struct gnttab_vm_area *area,unsigned nr_frames) { area->ptes =kmalloc_array (nr_frames,sizeof (*area->ptes),GFP_KERNEL );if (area->ptes ==NULL )return -ENOMEM ; - - area->area =alloc_vm_area (PAGE_SIZE * nr_frames, area->ptes); -if (area->area ==NULL ) { -kfree (area->ptes); -return -ENOMEM ; - } - + area->area =get_vm_area (PAGE_SIZE * nr_frames,VM_IOREMAP ); +if (!area->area) + goto out_free_ptes; +if (apply_to_page_range (&init_mm, (unsigned long )area->area->addr, +PAGE_SIZE * nr_frames, gnttab_apply, area)) + goto out_free_vm_area;return 0 ; +out_free_vm_area: +free_vm_area (area->area); +out_free_ptes: +kfree (area->ptes); +return -ENOMEM ; }static void arch_gnttab_vfree (struct gnttab_vm_area *area)
_
Patches currently in -mm which might be from [email protected] are