Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp2037603ybt; Thu, 2 Jul 2020 22:13:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyfi74zw5v3/fP1Ej6gXcfYLHJvqFPek17arXxYScNFgEg8NeUsa53CI135Gz7K0bLWQdw4 X-Received: by 2002:a05:6402:22d5:: with SMTP id dm21mr13978145edb.26.1593753208215; Thu, 02 Jul 2020 22:13:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593753208; cv=none; d=google.com; s=arc-20160816; b=ouiWy8X6x55LBa+Vg+A8tYMy7TouUM/R3RoGkrRbbEapKKrmgjvq1SbitiPwviV/4b JISABSn6E8iiSpmin94ziEZqpfyksVjHhLPTg1M/cx0//PvWiPdajgRcn4T2tn1iZ78e ik/LvCJPVBDpN6Hy92qnRTnpmjqyF0d4tAd3j7ZGL8J65i1JsTG3yaFzN1TH6Ru5i9WA /LrOlDWuMzZyMhoRpjVxqBgW9Ac0vLS8rJCcg5k2EyajbqRMBs2JnwOyTXSx+luz1+1R Y2UiBBRWcLr+rnnZNotJKba2ZcUCHilxigS27oz062Xvnp48G5BJnjdJ5ksWxUAL4WhK RZYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:to:from; bh=jdvFCGFJw4d+/GkJOrSxjAc3YkcL/cQQla4c2tsYPN4=; b=q9rEXnwfXeeAxo1JuQYxzBKqTAtjrCjYGN5aQqJ1XKdQrhp6OFH0+HpXPhZjXXdfAi NL3aBZxyzoVxLYhN5vdCapI/TKe4dP1/m1cFwdQuM3M38vs6UtcIqhXOroNLXhpBKlJv 4PGFjGPGSumYTfQ3w41kvvdr0ElszDP3FzJDlqNvIy5lzLQzsiQeUi0bUdDssTJ9Dv5D f2qOjwWCDwwD1RN7AQNoXyr/4H8wNasWxHOwlzbsEMtntS2latJXO91pxKwGYKOVnOdl DhkNqT7GGDWU/X8LruSRjQ7Vj+y+N+453Lk88DfQcr9wSov9fYQF4K6q33ED6jdMVDFe em6Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o9si7363371edr.292.2020.07.02.22.13.05; Thu, 02 Jul 2020 22:13:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726819AbgGCFJy (ORCPT + 99 others); Fri, 3 Jul 2020 01:09:54 -0400 Received: from out30-131.freemail.mail.aliyun.com ([115.124.30.131]:52234 "EHLO out30-131.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725915AbgGCFIl (ORCPT ); Fri, 3 Jul 2020 01:08:41 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R181e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e01422;MF=alex.shi@linux.alibaba.com;NM=1;PH=DS;RN=16;SR=0;TI=SMTPD_---0U1Y4LGX_1593752912; Received: from alexshi-test.localdomain(mailfrom:alex.shi@linux.alibaba.com fp:SMTPD_---0U1Y4LGX_1593752912) by smtp.aliyun-inc.com(127.0.0.1); Fri, 03 Jul 2020 13:08:35 +0800 From: Alex Shi To: akpm@linux-foundation.org, mgorman@techsingularity.net, tj@kernel.org, hughd@google.com, khlebnikov@yandex-team.ru, daniel.m.jordan@oracle.com, yang.shi@linux.alibaba.com, willy@infradead.org, hannes@cmpxchg.org, lkp@intel.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, shakeelb@google.com, iamjoonsoo.kim@lge.com, richard.weiyang@gmail.com Subject: [PATCH v14 04/20] mm/compaction: rename compact_deferred as compact_should_defer Date: Fri, 3 Jul 2020 13:07:37 +0800 Message-Id: <1593752873-4493-5-git-send-email-alex.shi@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1593752873-4493-1-git-send-email-alex.shi@linux.alibaba.com> References: <1593752873-4493-1-git-send-email-alex.shi@linux.alibaba.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The compact_deferred is a defer suggestion check, deferring action does in defer_compaction not here. so, better rename it to avoid confusing. Signed-off-by: Alex Shi Cc: Steven Rostedt Cc: Ingo Molnar Cc: Andrew Morton Cc: Vlastimil Babka Cc: Mike Kravetz Cc: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org --- include/linux/compaction.h | 4 ++-- include/trace/events/compaction.h | 2 +- mm/compaction.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/compaction.h b/include/linux/compaction.h index 6fa0eea3f530..be9ed7437a38 100644 --- a/include/linux/compaction.h +++ b/include/linux/compaction.h @@ -100,7 +100,7 @@ extern enum compact_result compaction_suitable(struct zone *zone, int order, unsigned int alloc_flags, int highest_zoneidx); extern void defer_compaction(struct zone *zone, int order); -extern bool compaction_deferred(struct zone *zone, int order); +extern bool compaction_should_defer(struct zone *zone, int order); extern void compaction_defer_reset(struct zone *zone, int order, bool alloc_success); extern bool compaction_restarting(struct zone *zone, int order); @@ -199,7 +199,7 @@ static inline void defer_compaction(struct zone *zone, int order) { } -static inline bool compaction_deferred(struct zone *zone, int order) +static inline bool compaction_should_defer(struct zone *zone, int order) { return true; } diff --git a/include/trace/events/compaction.h b/include/trace/events/compaction.h index 54e5bf081171..33633c71df04 100644 --- a/include/trace/events/compaction.h +++ b/include/trace/events/compaction.h @@ -274,7 +274,7 @@ 1UL << __entry->defer_shift) ); -DEFINE_EVENT(mm_compaction_defer_template, mm_compaction_deferred, +DEFINE_EVENT(mm_compaction_defer_template, mm_compaction_should_defer, TP_PROTO(struct zone *zone, int order), diff --git a/mm/compaction.c b/mm/compaction.c index cd1ef9e5e638..f14780fc296a 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -154,7 +154,7 @@ void defer_compaction(struct zone *zone, int order) } /* Returns true if compaction should be skipped this time */ -bool compaction_deferred(struct zone *zone, int order) +bool compaction_should_defer(struct zone *zone, int order) { unsigned long defer_limit = 1UL << zone->compact_defer_shift; @@ -168,7 +168,7 @@ bool compaction_deferred(struct zone *zone, int order) if (zone->compact_considered >= defer_limit) return false; - trace_mm_compaction_deferred(zone, order); + trace_mm_compaction_should_defer(zone, order); return true; } @@ -2377,7 +2377,7 @@ enum compact_result try_to_compact_pages(gfp_t gfp_mask, unsigned int order, enum compact_result status; if (prio > MIN_COMPACT_PRIORITY - && compaction_deferred(zone, order)) { + && compaction_should_defer(zone, order)) { rc = max_t(enum compact_result, COMPACT_DEFERRED, rc); continue; } @@ -2561,7 +2561,7 @@ static void kcompactd_do_work(pg_data_t *pgdat) if (!populated_zone(zone)) continue; - if (compaction_deferred(zone, cc.order)) + if (compaction_should_defer(zone, cc.order)) continue; if (compaction_suitable(zone, cc.order, 0, zoneid) != -- 1.8.3.1