From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f171.google.com (mail-pd0-f171.google.com [209.85.192.171]) by kanga.kvack.org (Postfix) with ESMTP id 229E16B0039 for ; Thu, 9 Jan 2014 02:04:36 -0500 (EST) Received: by mail-pd0-f171.google.com with SMTP id z10so2788159pdj.30 for ; Wed, 08 Jan 2014 23:04:35 -0800 (PST) Received: from LGEMRELSE7Q.lge.com (LGEMRELSE7Q.lge.com. [156.147.1.151]) by mx.google.com with ESMTP id sj5si2938579pab.342.2014.01.08.23.04.33 for ; Wed, 08 Jan 2014 23:04:34 -0800 (PST) From: Joonsoo Kim Subject: [PATCH 3/7] mm/page_alloc: move set_freepage_migratetype() to better place Date: Thu, 9 Jan 2014 16:04:43 +0900 Message-Id: <1389251087-10224-4-git-send-email-iamjoonsoo.kim@lge.com> In-Reply-To: <1389251087-10224-1-git-send-email-iamjoonsoo.kim@lge.com> References: <1389251087-10224-1-git-send-email-iamjoonsoo.kim@lge.com> Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton Cc: "Kirill A. Shutemov" , Rik van Riel , Jiang Liu , Mel Gorman , Cody P Schafer , Johannes Weiner , Michal Hocko , Minchan Kim , Michal Nazarewicz , Andi Kleen , Wei Yongjun , Tang Chen , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Joonsoo Kim , Joonsoo Kim set_freepage_migratetype() inform us of the buddy freelist where the page should be linked when it goes to buddy freelist. Now, it has done in rmqueue_bulk() so that we should call get_pageblock_migratetype() to know it's migratetype exactly if CONFIG_CMA is enabled. That function has some overhead so that removing it is preferable. To remove it, we move set_freepage_migratetype() to __rmqueue_fallback() and __rmqueue_smallest(). In those functions, we can know migratetype easily so that we don't need to call get_pageblock_migratetype(). Removing is_migrate_isolate() is safe since what we want to ensure is that the page from cma will not go to other migratetype freelist. Signed-off-by: Joonsoo Kim diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 1489c301..4913829 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -903,6 +903,7 @@ struct page *__rmqueue_smallest(struct zone *zone, unsigned int order, rmv_page_order(page); area->nr_free--; expand(zone, page, order, current_order, area, migratetype); + set_freepage_migratetype(page, migratetype); return page; } @@ -1093,8 +1094,12 @@ __rmqueue_fallback(struct zone *zone, int order, int start_migratetype) /* CMA pages cannot be stolen */ if (is_migrate_cma(migratetype)) { + set_freepage_migratetype(page, migratetype); __mod_zone_page_state(zone, NR_FREE_CMA_PAGES, -(1 << order)); + } else { + set_freepage_migratetype(page, + start_migratetype); } /* Remove the page from the freelists */ @@ -1153,7 +1158,7 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order, unsigned long count, struct list_head *list, int migratetype, int cold) { - int mt = migratetype, i; + int i; spin_lock(&zone->lock); for (i = 0; i < count; ++i) { @@ -1174,12 +1179,6 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order, list_add(&page->lru, list); else list_add_tail(&page->lru, list); - if (IS_ENABLED(CONFIG_CMA)) { - mt = get_pageblock_migratetype(page); - if (!is_migrate_cma(mt) && !is_migrate_isolate(mt)) - mt = migratetype; - } - set_freepage_migratetype(page, mt); list = &page->lru; } __mod_zone_page_state(zone, NR_FREE_PAGES, -(i << order)); -- 1.7.9.5 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org