From bd6b0d88edf367f41751401d283d746d18ffa082 Mon Sep 17 00:00:00 2001 From: Liam Mark Date: Fri, 4 Jan 2013 09:40:11 -0800 Subject: [PATCH] android/lowmemorykiller: Selectively count free CMA pages In certain memory configurations there can be a large number of CMA pages which are not suitable to satisfy certain memory requests. This large number of unsuitable pages can cause the lowmemorykiller to not kill any tasks because the lowmemorykiller counts all free pages. In order to ensure the lowmemorykiller properly evaluates the free memory only count the free CMA pages if they are suitable for satisfying the memory request. Change-Id: I7f06d53e2d8cfe7439e5561fe6e5209ce73b1c90 CRs-fixed: 437016 Signed-off-by: Liam Mark --- drivers/staging/android/lowmemorykiller.c | 87 +++++++++++++++++++---- include/linux/mmzone.h | 8 +++ mm/page_alloc.c | 5 ++ 3 files changed, 86 insertions(+), 14 deletions(-) diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c index 676c1fd9221..517208961d2 100644 --- a/drivers/staging/android/lowmemorykiller.c +++ b/drivers/staging/android/lowmemorykiller.c @@ -80,16 +80,47 @@ static int test_task_flag(struct task_struct *p, int flag) return 0; } +int can_use_cma_pages(gfp_t gfp_mask) +{ + int can_use = 0; + int mtype = allocflags_to_migratetype(gfp_mask); + int i = 0; + int *mtype_fallbacks = get_migratetype_fallbacks(mtype); + + if (is_migrate_cma(mtype)) { + can_use = 1; + } else { + for (i = 0;; i++) { + int fallbacktype = mtype_fallbacks[i]; + + if (is_migrate_cma(fallbacktype)) { + can_use = 1; + break; + } + + if (fallbacktype == MIGRATE_RESERVE) + break; + } + } + return can_use; +} + + void tune_lmk_zone_param(struct zonelist *zonelist, int classzone_idx, - int *other_free, int *other_file) + int *other_free, int *other_file, + int use_cma_pages) { struct zone *zone; struct zoneref *zoneref; int zone_idx; for_each_zone_zonelist(zone, zoneref, zonelist, MAX_NR_ZONES) { - if ((zone_idx = zonelist_zone_idx(zoneref)) == ZONE_MOVABLE) + if ((zone_idx = zonelist_zone_idx(zoneref)) == ZONE_MOVABLE) { + if (!use_cma_pages) + *other_free -= + zone_page_state(zone, NR_FREE_CMA_PAGES); continue; + } if (zone_idx > classzone_idx) { if (other_free != NULL) @@ -100,12 +131,22 @@ void tune_lmk_zone_param(struct zonelist *zonelist, int classzone_idx, NR_FILE_PAGES) - zone_page_state(zone, NR_SHMEM); } else if (zone_idx < classzone_idx) { - if (zone_watermark_ok(zone, 0, 0, classzone_idx, 0)) + if (zone_watermark_ok(zone, 0, 0, classzone_idx, 0)) { + if (!use_cma_pages) { + *other_free -= min( + zone->lowmem_reserve[classzone_idx] + + zone_page_state( + zone, NR_FREE_CMA_PAGES), + zone_page_state( + zone, NR_FREE_PAGES)); + } else { + *other_free -= + zone->lowmem_reserve[classzone_idx]; + } + } else { *other_free -= - zone->lowmem_reserve[classzone_idx]; - else - *other_free -= - zone_page_state(zone, NR_FREE_PAGES); + zone_page_state(zone, NR_FREE_PAGES); + } } } } @@ -117,12 +158,14 @@ void tune_lmk_param(int *other_free, int *other_file, struct shrink_control *sc) struct zonelist *zonelist; enum zone_type high_zoneidx, classzone_idx; unsigned long balance_gap; + int use_cma_pages; gfp_mask = sc->gfp_mask; zonelist = node_zonelist(0, gfp_mask); high_zoneidx = gfp_zone(gfp_mask); first_zones_zonelist(zonelist, high_zoneidx, NULL, &preferred_zone); classzone_idx = zone_idx(preferred_zone); + use_cma_pages = can_use_cma_pages(gfp_mask); balance_gap = min(low_wmark_pages(preferred_zone), (preferred_zone->present_pages + @@ -134,22 +177,38 @@ void tune_lmk_param(int *other_free, int *other_file, struct shrink_control *sc) balance_gap, 0, 0))) { if (lmk_fast_run) tune_lmk_zone_param(zonelist, classzone_idx, other_free, - other_file); + other_file, use_cma_pages); else tune_lmk_zone_param(zonelist, classzone_idx, other_free, - NULL); + NULL, use_cma_pages); - if (zone_watermark_ok(preferred_zone, 0, 0, ZONE_HIGHMEM, 0)) - *other_free -= - preferred_zone->lowmem_reserve[ZONE_HIGHMEM]; - else + if (zone_watermark_ok(preferred_zone, 0, 0, ZONE_HIGHMEM, 0)) { + if (!use_cma_pages) { + *other_free -= min( + preferred_zone->lowmem_reserve[ZONE_HIGHMEM] + + zone_page_state( + preferred_zone, NR_FREE_CMA_PAGES), + zone_page_state( + preferred_zone, NR_FREE_PAGES)); + } else { + *other_free -= + preferred_zone->lowmem_reserve[ZONE_HIGHMEM]; + } + } else { *other_free -= zone_page_state(preferred_zone, NR_FREE_PAGES); + } + lowmem_print(4, "lowmem_shrink of kswapd tunning for highmem " "ofree %d, %d\n", *other_free, *other_file); } else { tune_lmk_zone_param(zonelist, classzone_idx, other_free, - other_file); + other_file, use_cma_pages); + + if (!use_cma_pages) { + *other_free -= + zone_page_state(preferred_zone, NR_FREE_CMA_PAGES); + } lowmem_print(4, "lowmem_shrink tunning for others ofree %d, " "%d\n", *other_free, *other_file); diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 5eb9f412158..defbfec051d 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -61,6 +61,14 @@ enum { MIGRATE_TYPES }; +/* + * Returns a list which contains the migrate types on to which + * an allocation falls back when the free list for the migrate + * type mtype is depleted. + * The end of the list is delimited by the type MIGRATE_RESERVE. + */ +extern int *get_migratetype_fallbacks(int mtype); + #ifdef CONFIG_CMA bool is_cma_pageblock(struct page *page); # define is_migrate_cma(migratetype) unlikely((migratetype) == MIGRATE_CMA) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 30fd6b14f02..7dc95afb723 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -926,6 +926,11 @@ static int fallbacks[MIGRATE_TYPES][4] = { [MIGRATE_ISOLATE] = { MIGRATE_RESERVE }, /* Never used */ }; +int *get_migratetype_fallbacks(int mtype) +{ + return fallbacks[mtype]; +} + /* * Move the free pages in a range to the free lists of the requested type. * Note that start_page and end_pages are not aligned on a pageblock