Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751476AbaJPDgl (ORCPT ); Wed, 15 Oct 2014 23:36:41 -0400 Received: from [42.62.48.242] ([42.62.48.242]:7234 "EHLO manager.mioffice.cn" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751325AbaJPDgT (ORCPT ); Wed, 15 Oct 2014 23:36:19 -0400 From: Hui Zhu To: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , CC: , , , Hui Zhu Subject: [PATCH 4/4] (CMA_AGGRESSIVE) Update page alloc function Date: Thu, 16 Oct 2014 11:35:51 +0800 Message-ID: <1413430551-22392-5-git-send-email-zhuhui@xiaomi.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1413430551-22392-1-git-send-email-zhuhui@xiaomi.com> References: <1413430551-22392-1-git-send-email-zhuhui@xiaomi.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.27.14.101] X-ClientProxiedBy: CNCAS1.mioffice.cn (10.237.8.131) To cnbox4.mioffice.cn (10.237.8.144) X-EsetResult: clean, is OK X-EsetId: 587748382C4597170C3011 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If page alloc function __rmqueue try to get pages from MIGRATE_MOVABLE and conditions (cma_alloc_counter, cma_aggressive_free_min, cma_alloc_counter) allow, MIGRATE_CMA will be allocated as MIGRATE_MOVABLE first. Signed-off-by: Hui Zhu --- mm/page_alloc.c | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 736d8e1..87bc326 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -65,6 +65,10 @@ #include #include "internal.h" +#ifdef CONFIG_CMA_AGGRESSIVE +#include +#endif + /* prevent >1 _updater_ of zone percpu pageset ->high and ->batch fields */ static DEFINE_MUTEX(pcp_batch_high_lock); #define MIN_PERCPU_PAGELIST_FRACTION (8) @@ -1189,20 +1193,36 @@ static struct page *__rmqueue(struct zone *zone, unsigned int order, { struct page *page; -retry_reserve: +#ifdef CONFIG_CMA_AGGRESSIVE + if (cma_aggressive_switch + && migratetype == MIGRATE_MOVABLE + && atomic_read(&cma_alloc_counter) == 0 + && global_page_state(NR_FREE_CMA_PAGES) > cma_aggressive_free_min + + (1 << order)) + migratetype = MIGRATE_CMA; +#endif +retry: page = __rmqueue_smallest(zone, order, migratetype); - if (unlikely(!page) && migratetype != MIGRATE_RESERVE) { - page = __rmqueue_fallback(zone, order, migratetype); + if (unlikely(!page)) { +#ifdef CONFIG_CMA_AGGRESSIVE + if (migratetype == MIGRATE_CMA) { + migratetype = MIGRATE_MOVABLE; + goto retry; + } +#endif + if (migratetype != MIGRATE_RESERVE) { + page = __rmqueue_fallback(zone, order, migratetype); - /* - * Use MIGRATE_RESERVE rather than fail an allocation. goto - * is used because __rmqueue_smallest is an inline function - * and we want just one call site - */ - if (!page) { - migratetype = MIGRATE_RESERVE; - goto retry_reserve; + /* + * Use MIGRATE_RESERVE rather than fail an allocation. + * goto is used because __rmqueue_smallest is an inline + * function and we want just one call site + */ + if (!page) { + migratetype = MIGRATE_RESERVE; + goto retry; + } } } -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/