From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752821AbbIPMPZ (ORCPT ); Wed, 16 Sep 2015 08:15:25 -0400 Received: from m12-13.163.com ([220.181.12.13]:52333 "EHLO m12-13.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752074AbbIPMPX (ORCPT ); Wed, 16 Sep 2015 08:15:23 -0400 From: Yaowei Bai To: akpm@linux-foundation.org, mgorman@suse.de, mhocko@kernel.org, rientjes@google.com, hannes@cmpxchg.org, vdavydov@parallels.com, oleg@redhat.com, vbabka@suse.cz, iamjoonsoo.kim@lge.com, zhangyanfei@cn.fujitsu.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] mm/compaction: add an is_via_compact_memory helper function Date: Wed, 16 Sep 2015 20:00:00 +0800 Message-Id: <1442404800-4051-3-git-send-email-bywxiaobai@163.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1442404800-4051-1-git-send-email-bywxiaobai@163.com> References: <1442404800-4051-1-git-send-email-bywxiaobai@163.com> X-CM-TRANSID: DcCowABXp0M5WvlVpoCUCA--.22811S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7KF43ZFW3CF15XF13ZF1UZFb_yoW8tw4kpF y8Zwn7Ja1vq3W3CryxKF1vv3WYqr4xKFyUAF92kwn7X3Wak3WIvwn7tFyrAryUX3sakrWj qa1qg3WUK3srA3JanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jfMa8UUUUU= X-Originating-IP: [114.216.27.255] X-CM-SenderInfo: xe1z5x5dretxi6rwjhhfrp/1tbisB53T1UL3J-CqAAAsh Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce is_via_compact_memory helper function indicating compacting via /proc/sys/vm/compact_memory to improve readability. To catch this situation in __compaction_suitable, use order as parameter directly instead of using struct compact_control. This patch has no functional changes. Signed-off-by: Yaowei Bai --- mm/compaction.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index c5c627a..a8e6593 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1197,6 +1197,15 @@ static isolate_migrate_t isolate_migratepages(struct zone *zone, return cc->nr_migratepages ? ISOLATE_SUCCESS : ISOLATE_NONE; } +/* + * order == -1 is expected when compacting via + * /proc/sys/vm/compact_memory + */ +static inline bool is_via_compact_memory(int order) +{ + return order == -1; +} + static int __compact_finished(struct zone *zone, struct compact_control *cc, const int migratetype) { @@ -1223,11 +1232,7 @@ static int __compact_finished(struct zone *zone, struct compact_control *cc, return COMPACT_COMPLETE; } - /* - * order == -1 is expected when compacting via - * /proc/sys/vm/compact_memory - */ - if (cc->order == -1) + if (is_via_compact_memory(cc->order)) return COMPACT_CONTINUE; /* Compaction run is not finished if the watermark is not met */ @@ -1290,11 +1295,7 @@ static unsigned long __compaction_suitable(struct zone *zone, int order, int fragindex; unsigned long watermark; - /* - * order == -1 is expected when compacting via - * /proc/sys/vm/compact_memory - */ - if (order == -1) + if (is_via_compact_memory(order)) return COMPACT_CONTINUE; watermark = low_wmark_pages(zone); @@ -1658,10 +1659,11 @@ static void __compact_pgdat(pg_data_t *pgdat, struct compact_control *cc) * this makes sure we compact the whole zone regardless of * cached scanner positions. */ - if (cc->order == -1) + if (is_via_compact_memory(cc->order)) __reset_isolation_suitable(zone); - if (cc->order == -1 || !compaction_deferred(zone, cc->order)) + if (is_via_compact_memory(cc->order) || + !compaction_deferred(zone, cc->order)) compact_zone(zone, cc); if (cc->order > 0) { -- 1.9.1