diff options
author | Minchan Kim <minchan@kernel.org> | 2012-10-08 19:33:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-09 03:23:00 -0400 |
commit | e46a28790e594c0876d1a84270926abf75460f61 (patch) | |
tree | febfaa6c20dab69490308190729f1d898e4df930 /mm/compaction.c | |
parent | 7a71932d5676b7410ab64d149bad8bde6b0d8632 (diff) |
CMA: migrate mlocked pages
Presently CMA cannot migrate mlocked pages so it ends up failing to allocate
contiguous memory space.
This patch makes mlocked pages be migrated out. Of course, it can affect
realtime processes but in CMA usecase, contiguous memory allocation failing
is far worse than access latency to an mlocked page being variable while
CMA is running. If someone wants to make the system realtime, he shouldn't
enable CMA because stalls can still happen at random times.
[akpm@linux-foundation.org: tweak comment text, per Mel]
Signed-off-by: Minchan Kim <minchan@kernel.org>
Acked-by: Mel Gorman <mgorman@suse.de>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/compaction.c')
-rw-r--r-- | mm/compaction.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mm/compaction.c b/mm/compaction.c index d8187f9cabbf..2c4ce17651d8 100644 --- a/mm/compaction.c +++ b/mm/compaction.c | |||
@@ -461,6 +461,7 @@ static bool too_many_isolated(struct zone *zone) | |||
461 | * @cc: Compaction control structure. | 461 | * @cc: Compaction control structure. |
462 | * @low_pfn: The first PFN of the range. | 462 | * @low_pfn: The first PFN of the range. |
463 | * @end_pfn: The one-past-the-last PFN of the range. | 463 | * @end_pfn: The one-past-the-last PFN of the range. |
464 | * @unevictable: true if it allows to isolate unevictable pages | ||
464 | * | 465 | * |
465 | * Isolate all pages that can be migrated from the range specified by | 466 | * Isolate all pages that can be migrated from the range specified by |
466 | * [low_pfn, end_pfn). Returns zero if there is a fatal signal | 467 | * [low_pfn, end_pfn). Returns zero if there is a fatal signal |
@@ -476,7 +477,7 @@ static bool too_many_isolated(struct zone *zone) | |||
476 | */ | 477 | */ |
477 | unsigned long | 478 | unsigned long |
478 | isolate_migratepages_range(struct zone *zone, struct compact_control *cc, | 479 | isolate_migratepages_range(struct zone *zone, struct compact_control *cc, |
479 | unsigned long low_pfn, unsigned long end_pfn) | 480 | unsigned long low_pfn, unsigned long end_pfn, bool unevictable) |
480 | { | 481 | { |
481 | unsigned long last_pageblock_nr = 0, pageblock_nr; | 482 | unsigned long last_pageblock_nr = 0, pageblock_nr; |
482 | unsigned long nr_scanned = 0, nr_isolated = 0; | 483 | unsigned long nr_scanned = 0, nr_isolated = 0; |
@@ -602,6 +603,9 @@ isolate_migratepages_range(struct zone *zone, struct compact_control *cc, | |||
602 | if (!cc->sync) | 603 | if (!cc->sync) |
603 | mode |= ISOLATE_ASYNC_MIGRATE; | 604 | mode |= ISOLATE_ASYNC_MIGRATE; |
604 | 605 | ||
606 | if (unevictable) | ||
607 | mode |= ISOLATE_UNEVICTABLE; | ||
608 | |||
605 | lruvec = mem_cgroup_page_lruvec(page, zone); | 609 | lruvec = mem_cgroup_page_lruvec(page, zone); |
606 | 610 | ||
607 | /* Try isolate the page */ | 611 | /* Try isolate the page */ |
@@ -807,7 +811,7 @@ static isolate_migrate_t isolate_migratepages(struct zone *zone, | |||
807 | } | 811 | } |
808 | 812 | ||
809 | /* Perform the isolation */ | 813 | /* Perform the isolation */ |
810 | low_pfn = isolate_migratepages_range(zone, cc, low_pfn, end_pfn); | 814 | low_pfn = isolate_migratepages_range(zone, cc, low_pfn, end_pfn, false); |
811 | if (!low_pfn || cc->contended) | 815 | if (!low_pfn || cc->contended) |
812 | return ISOLATE_ABORT; | 816 | return ISOLATE_ABORT; |
813 | 817 | ||