openharmony/kernel_linux
1
0
Fork 0
mirror of https://gitee.com/openharmony/kernel_linux synced 2025-04-17 14:50:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mm, compaction: change migrate_async_suitable() to suitable_migration_source()

Browse Source 
Preparation for making the decisions more complex and depending on
compact_control flags.  No functional change.

Link: http://lkml.kernel.org/r/20170307131545.28577-6-vbabka@suse.cz
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Mel Gorman <mgorman@techsingularity.net>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Vlastimil Babka 2017-05-08 15:54:43 -07:00 committed by Linus Torvalds
parent 02aa0cdd72
commit b682debd97
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/mmzone.h
View File

@ -74,6 +74,11 @@ extern char * const migratetype_names[MIGRATE_TYPES];
# define is_migrate_cma_page(_page) false # define is_migrate_cma_page(_page) false
#endif #endif
static inline bool is_migrate_movable(int mt)
{
return is_migrate_cma(mt) || mt == MIGRATE_MOVABLE;
}
#define for_each_migratetype_order(order, type) \ #define for_each_migratetype_order(order, type) \
for (order = 0; order < MAX_ORDER; order++) \ for (order = 0; order < MAX_ORDER; order++) \
for (type = 0; type < MIGRATE_TYPES; type++) for (type = 0; type < MIGRATE_TYPES; type++)

19
mm/compaction.c
View File

@ -89,11 +89,6 @@ static void map_pages(struct list_head *list)
list_splice(&tmp_list, list); list_splice(&tmp_list, list);
} }
static inline bool migrate_async_suitable(int migratetype)
{
return is_migrate_cma(migratetype) || migratetype == MIGRATE_MOVABLE;
}
#ifdef CONFIG_COMPACTION #ifdef CONFIG_COMPACTION
int PageMovable(struct page *page) int PageMovable(struct page *page)
@ -988,6 +983,15 @@ isolate_migratepages_range(struct compact_control *cc, unsigned long start_pfn,
#endif /* CONFIG_COMPACTION || CONFIG_CMA */ #endif /* CONFIG_COMPACTION || CONFIG_CMA */
#ifdef CONFIG_COMPACTION #ifdef CONFIG_COMPACTION
static bool suitable_migration_source(struct compact_control *cc,
struct page *page)
{
if (cc->mode != MIGRATE_ASYNC)
return true;
return is_migrate_movable(get_pageblock_migratetype(page));
}
/* Returns true if the page is within a block suitable for migration to */ /* Returns true if the page is within a block suitable for migration to */
static bool suitable_migration_target(struct compact_control *cc, static bool suitable_migration_target(struct compact_control *cc,
struct page *page) struct page *page)
@ -1007,7 +1011,7 @@ static bool suitable_migration_target(struct compact_control *cc,
return true; return true;
/* If the block is MIGRATE_MOVABLE or MIGRATE_CMA, allow migration */ /* If the block is MIGRATE_MOVABLE or MIGRATE_CMA, allow migration */
if (migrate_async_suitable(get_pageblock_migratetype(page))) if (is_migrate_movable(get_pageblock_migratetype(page)))
return true; return true;
/* Otherwise skip the block */ /* Otherwise skip the block */
@ -1242,8 +1246,7 @@ static isolate_migrate_t isolate_migratepages(struct zone *zone,
* Async compaction is optimistic to see if the minimum amount * Async compaction is optimistic to see if the minimum amount
* of work satisfies the allocation. * of work satisfies the allocation.
*/ */
if (cc->mode == MIGRATE_ASYNC && if (!suitable_migration_source(cc, page))
!migrate_async_suitable(get_pageblock_migratetype(page)))
continue; continue;
/* Perform the isolation */ /* Perform the isolation */