Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp1065188ybg; Wed, 10 Jun 2020 23:20:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJywUY3VvHd7BmxPvSbSDxJvn6Bs7aOix7rZx1li2NrMUauSzoY2oPdhliBh1vE0Fn9rSgrJ X-Received: by 2002:a17:906:1d5b:: with SMTP id o27mr6838000ejh.344.1591856411153; Wed, 10 Jun 2020 23:20:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591856411; cv=none; d=google.com; s=arc-20160816; b=J6lDGjVbpFqlDnS+v7J2uaWZCuT+1qqECvFuEs+wmyxW1re/GtNDP3GAgUgrZ6D/3V Mqan0PncoFL+EBf9rHyNs9hjMr9NffvROlVS4RktlBV3yPvZ5bpWlMaHNo0cDKx4LCNh exlEZw2N3qIRJGf0zzkMHgGJIi1UrSQGUMzD/ApAuMiYOUNTEwODn82VSRtzccO9fb1G Sh57bQEp7+TFar02OPzbHcfkL1dh6rEBj+WyRKguTTiVsJR1scFXrBO9MtVhRNmw3FxP EcB+KkD7e2ANzQ9kxnumlvyh0I1HQ99bFv9DB6I8fsVItS7yaCsFCsVwctiTtTQgDIry 7bwA== 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:cc:to:from; bh=eGsOwvVT4axiTdhYg87/deEV0fV2VgKNbFoxp/CDJk8=; b=YBVoD6sU2rHJOGRAYL7e1VN1t0HxKzx3GmODR0njxdWc5OAv3EqUksPytcRDod9mA6 FxWtT1SQQZmfNcaWewTQUWzjyqVHagd9KSnztH6MEHt7qLxyziZwonyOIfe4hmGq/NWX lTUrau12kmTM3TGH7SVrycotAgLiwPj3PbstrNaiHBrdjKZn28ccJ0LHfuAc8IcL/NYi V1if8DJZR5vLL4lRfWCE8HM+pVGJnAB3ZVc366emph5hsMVawYxpb2lQXn10XuPf3A7x f9MLmKF3k44xvLLi5UocoxJ19hnLBQtIYePIELaA/+ppSTMmgg7TJn1cyB1bK+AFJyZ+ zRTA== 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 bf13si1142372edb.64.2020.06.10.23.19.48; Wed, 10 Jun 2020 23:20:11 -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 S1726684AbgFKGRR (ORCPT + 99 others); Thu, 11 Jun 2020 02:17:17 -0400 Received: from out30-132.freemail.mail.aliyun.com ([115.124.30.132]:51499 "EHLO out30-132.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726653AbgFKGRP (ORCPT ); Thu, 11 Jun 2020 02:17:15 -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=e01e07488;MF=alex.shi@linux.alibaba.com;NM=1;PH=DS;RN=20;SR=0;TI=SMTPD_---0U.EnD9y_1591856226; Received: from localhost(mailfrom:alex.shi@linux.alibaba.com fp:SMTPD_---0U.EnD9y_1591856226) by smtp.aliyun-inc.com(127.0.0.1); Thu, 11 Jun 2020 14:17:06 +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 Cc: Steven Rostedt , Ingo Molnar , Vlastimil Babka , Mike Kravetz Subject: [PATCH v12 04/16] mm/compaction: rename compact_deferred as compact_should_defer Date: Thu, 11 Jun 2020 14:16:37 +0800 Message-Id: <1591856209-166869-5-git-send-email-alex.shi@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1591856209-166869-1-git-send-email-alex.shi@linux.alibaba.com> References: <1591856209-166869-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 48114f98e362..5d59e77cd424 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; } @@ -2366,7 +2366,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; } @@ -2550,7 +2550,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