mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-10-31 18:09:19 +00:00
mm: page_isolation: MIGRATE_CMA isolation functions added
This commit changes various functions that change pages and pageblocks migrate type between MIGRATE_ISOLATE and MIGRATE_MOVABLE in such a way as to allow to work with MIGRATE_CMA migrate type. Signed-off-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Tested-by: Rob Clark <rob.clark@linaro.org> Tested-by: Ohad Ben-Cohen <ohad@wizery.com> Tested-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Tested-by: Robert Nelson <robertcnelson@gmail.com> Tested-by: Barry Song <Baohua.Song@csr.com>
This commit is contained in:
parent
47118af076
commit
0815f3d81d
6 changed files with 34 additions and 27 deletions
|
@ -394,7 +394,8 @@ static inline bool pm_suspended_storage(void)
|
|||
#ifdef CONFIG_CMA
|
||||
|
||||
/* The below functions must be run on a range from a single zone. */
|
||||
extern int alloc_contig_range(unsigned long start, unsigned long end);
|
||||
extern int alloc_contig_range(unsigned long start, unsigned long end,
|
||||
unsigned migratetype);
|
||||
extern void free_contig_range(unsigned long pfn, unsigned nr_pages);
|
||||
|
||||
/* CMA stuff */
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
/*
|
||||
* Changes migrate type in [start_pfn, end_pfn) to be MIGRATE_ISOLATE.
|
||||
* If specified range includes migrate types other than MOVABLE,
|
||||
* If specified range includes migrate types other than MOVABLE or CMA,
|
||||
* this will fail with -EBUSY.
|
||||
*
|
||||
* For isolating all pages in the range finally, the caller have to
|
||||
|
@ -11,27 +11,27 @@
|
|||
* test it.
|
||||
*/
|
||||
extern int
|
||||
start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn);
|
||||
start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,
|
||||
unsigned migratetype);
|
||||
|
||||
/*
|
||||
* Changes MIGRATE_ISOLATE to MIGRATE_MOVABLE.
|
||||
* target range is [start_pfn, end_pfn)
|
||||
*/
|
||||
extern int
|
||||
undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn);
|
||||
undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,
|
||||
unsigned migratetype);
|
||||
|
||||
/*
|
||||
* test all pages in [start_pfn, end_pfn)are isolated or not.
|
||||
* Test all pages in [start_pfn, end_pfn) are isolated or not.
|
||||
*/
|
||||
extern int
|
||||
test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn);
|
||||
int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn);
|
||||
|
||||
/*
|
||||
* Internal funcs.Changes pageblock's migrate type.
|
||||
* Please use make_pagetype_isolated()/make_pagetype_movable().
|
||||
* Internal functions. Changes pageblock's migrate type.
|
||||
*/
|
||||
extern int set_migratetype_isolate(struct page *page);
|
||||
extern void unset_migratetype_isolate(struct page *page);
|
||||
extern void unset_migratetype_isolate(struct page *page, unsigned migratetype);
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1404,7 +1404,7 @@ static int get_any_page(struct page *p, unsigned long pfn, int flags)
|
|||
/* Not a free page */
|
||||
ret = 1;
|
||||
}
|
||||
unset_migratetype_isolate(p);
|
||||
unset_migratetype_isolate(p, MIGRATE_MOVABLE);
|
||||
unlock_memory_hotplug();
|
||||
return ret;
|
||||
}
|
||||
|
|
|
@ -891,7 +891,7 @@ static int __ref offline_pages(unsigned long start_pfn,
|
|||
nr_pages = end_pfn - start_pfn;
|
||||
|
||||
/* set above range as isolated */
|
||||
ret = start_isolate_page_range(start_pfn, end_pfn);
|
||||
ret = start_isolate_page_range(start_pfn, end_pfn, MIGRATE_MOVABLE);
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
|
@ -956,7 +956,7 @@ repeat:
|
|||
We cannot do rollback at this point. */
|
||||
offline_isolated_pages(start_pfn, end_pfn);
|
||||
/* reset pagetype flags and makes migrate type to be MOVABLE */
|
||||
undo_isolate_page_range(start_pfn, end_pfn);
|
||||
undo_isolate_page_range(start_pfn, end_pfn, MIGRATE_MOVABLE);
|
||||
/* removal success */
|
||||
zone->present_pages -= offlined_pages;
|
||||
zone->zone_pgdat->node_present_pages -= offlined_pages;
|
||||
|
@ -981,7 +981,7 @@ failed_removal:
|
|||
start_pfn, end_pfn);
|
||||
memory_notify(MEM_CANCEL_OFFLINE, &arg);
|
||||
/* pushback to free area */
|
||||
undo_isolate_page_range(start_pfn, end_pfn);
|
||||
undo_isolate_page_range(start_pfn, end_pfn, MIGRATE_MOVABLE);
|
||||
|
||||
out:
|
||||
unlock_memory_hotplug();
|
||||
|
|
|
@ -5582,7 +5582,7 @@ out:
|
|||
return ret;
|
||||
}
|
||||
|
||||
void unset_migratetype_isolate(struct page *page)
|
||||
void unset_migratetype_isolate(struct page *page, unsigned migratetype)
|
||||
{
|
||||
struct zone *zone;
|
||||
unsigned long flags;
|
||||
|
@ -5590,8 +5590,8 @@ void unset_migratetype_isolate(struct page *page)
|
|||
spin_lock_irqsave(&zone->lock, flags);
|
||||
if (get_pageblock_migratetype(page) != MIGRATE_ISOLATE)
|
||||
goto out;
|
||||
set_pageblock_migratetype(page, MIGRATE_MOVABLE);
|
||||
move_freepages_block(zone, page, MIGRATE_MOVABLE);
|
||||
set_pageblock_migratetype(page, migratetype);
|
||||
move_freepages_block(zone, page, migratetype);
|
||||
out:
|
||||
spin_unlock_irqrestore(&zone->lock, flags);
|
||||
}
|
||||
|
@ -5669,6 +5669,10 @@ static int __alloc_contig_migrate_range(unsigned long start, unsigned long end)
|
|||
* alloc_contig_range() -- tries to allocate given range of pages
|
||||
* @start: start PFN to allocate
|
||||
* @end: one-past-the-last PFN to allocate
|
||||
* @migratetype: migratetype of the underlaying pageblocks (either
|
||||
* #MIGRATE_MOVABLE or #MIGRATE_CMA). All pageblocks
|
||||
* in range must have the same migratetype and it must
|
||||
* be either of the two.
|
||||
*
|
||||
* The PFN range does not have to be pageblock or MAX_ORDER_NR_PAGES
|
||||
* aligned, however it's the caller's responsibility to guarantee that
|
||||
|
@ -5681,7 +5685,8 @@ static int __alloc_contig_migrate_range(unsigned long start, unsigned long end)
|
|||
* pages which PFN is in [start, end) are allocated for the caller and
|
||||
* need to be freed with free_contig_range().
|
||||
*/
|
||||
int alloc_contig_range(unsigned long start, unsigned long end)
|
||||
int alloc_contig_range(unsigned long start, unsigned long end,
|
||||
unsigned migratetype)
|
||||
{
|
||||
struct zone *zone = page_zone(pfn_to_page(start));
|
||||
unsigned long outer_start, outer_end;
|
||||
|
@ -5712,7 +5717,7 @@ int alloc_contig_range(unsigned long start, unsigned long end)
|
|||
*/
|
||||
|
||||
ret = start_isolate_page_range(pfn_max_align_down(start),
|
||||
pfn_max_align_up(end));
|
||||
pfn_max_align_up(end), migratetype);
|
||||
if (ret)
|
||||
goto done;
|
||||
|
||||
|
@ -5772,7 +5777,7 @@ int alloc_contig_range(unsigned long start, unsigned long end)
|
|||
|
||||
done:
|
||||
undo_isolate_page_range(pfn_max_align_down(start),
|
||||
pfn_max_align_up(end));
|
||||
pfn_max_align_up(end), migratetype);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
@ -24,6 +24,7 @@ __first_valid_page(unsigned long pfn, unsigned long nr_pages)
|
|||
* to be MIGRATE_ISOLATE.
|
||||
* @start_pfn: The lower PFN of the range to be isolated.
|
||||
* @end_pfn: The upper PFN of the range to be isolated.
|
||||
* @migratetype: migrate type to set in error recovery.
|
||||
*
|
||||
* Making page-allocation-type to be MIGRATE_ISOLATE means free pages in
|
||||
* the range will never be allocated. Any free pages and pages freed in the
|
||||
|
@ -32,8 +33,8 @@ __first_valid_page(unsigned long pfn, unsigned long nr_pages)
|
|||
* start_pfn/end_pfn must be aligned to pageblock_order.
|
||||
* Returns 0 on success and -EBUSY if any part of range cannot be isolated.
|
||||
*/
|
||||
int
|
||||
start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn)
|
||||
int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,
|
||||
unsigned migratetype)
|
||||
{
|
||||
unsigned long pfn;
|
||||
unsigned long undo_pfn;
|
||||
|
@ -56,7 +57,7 @@ undo:
|
|||
for (pfn = start_pfn;
|
||||
pfn < undo_pfn;
|
||||
pfn += pageblock_nr_pages)
|
||||
unset_migratetype_isolate(pfn_to_page(pfn));
|
||||
unset_migratetype_isolate(pfn_to_page(pfn), migratetype);
|
||||
|
||||
return -EBUSY;
|
||||
}
|
||||
|
@ -64,8 +65,8 @@ undo:
|
|||
/*
|
||||
* Make isolated pages available again.
|
||||
*/
|
||||
int
|
||||
undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn)
|
||||
int undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,
|
||||
unsigned migratetype)
|
||||
{
|
||||
unsigned long pfn;
|
||||
struct page *page;
|
||||
|
@ -77,7 +78,7 @@ undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn)
|
|||
page = __first_valid_page(pfn, pageblock_nr_pages);
|
||||
if (!page || get_pageblock_migratetype(page) != MIGRATE_ISOLATE)
|
||||
continue;
|
||||
unset_migratetype_isolate(page);
|
||||
unset_migratetype_isolate(page, migratetype);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
@ -86,7 +87,7 @@ undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn)
|
|||
* all pages in [start_pfn...end_pfn) must be in the same zone.
|
||||
* zone->lock must be held before call this.
|
||||
*
|
||||
* Returns 1 if all pages in the range is isolated.
|
||||
* Returns 1 if all pages in the range are isolated.
|
||||
*/
|
||||
static int
|
||||
__test_page_isolated_in_pageblock(unsigned long pfn, unsigned long end_pfn)
|
||||
|
|
Loading…
Reference in a new issue