From: Alex Shi <alex.shi@linux.alibaba.com>
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 <rostedt@goodmis.org>,
Ingo Molnar <mingo@redhat.com>, Vlastimil Babka <vbabka@suse.cz>,
Mike Kravetz <mike.kravetz@oracle.com>
Subject: [PATCH v12 04/16] mm/compaction: rename compact_deferred as compact_should_defer
Date: Thu, 11 Jun 2020 14:16:37 +0800 [thread overview]
Message-ID: <1591856209-166869-5-git-send-email-alex.shi@linux.alibaba.com> (raw)
In-Reply-To: <1591856209-166869-1-git-send-email-alex.shi@linux.alibaba.com>
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 <alex.shi@linux.alibaba.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
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
next prev parent reply other threads:[~2020-06-11 6:17 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-11 6:16 [PATCH v12 00/16] per memcg lru lock Alex Shi
2020-06-11 6:16 ` [PATCH v12 01/16] mm/vmscan: remove unnecessary lruvec adding Alex Shi
2020-06-11 6:16 ` [PATCH v12 02/16] mm/page_idle: no unlikely double check for idle page counting Alex Shi
2020-06-11 6:16 ` [PATCH v12 03/16] mm/compaction: correct the comments of compact_defer_shift Alex Shi
2020-06-11 6:16 ` Alex Shi [this message]
2020-06-11 6:16 ` [PATCH v12 05/16] mm/thp: move lru_add_page_tail func to huge_memory.c Alex Shi
2020-06-11 6:16 ` [PATCH v12 06/16] mm/thp: clean up lru_add_page_tail Alex Shi
2020-06-11 6:16 ` [PATCH v12 07/16] mm/thp: narrow lru locking Alex Shi
2020-06-11 6:16 ` [PATCH v12 08/16] mm/memcg: add debug checking in lock_page_memcg Alex Shi
2020-06-11 6:16 ` [PATCH v12 09/16] mm/lru: introduce TestClearPageLRU Alex Shi
2020-06-11 6:16 ` [PATCH v12 10/16] mm/compaction: do page isolation first in compaction Alex Shi
2020-06-12 10:26 ` Alex Shi
2020-06-11 6:16 ` [PATCH v12 11/16] mm/mlock: reorder isolation sequence during munlock Alex Shi
2020-06-11 6:16 ` [PATCH v12 12/16] mm/lru: replace pgdat lru_lock with lruvec lock Alex Shi
2020-06-12 10:28 ` Alex Shi
2020-06-11 6:16 ` [PATCH v12 13/16] mm/lru: introduce the relock_page_lruvec function Alex Shi
2020-06-11 6:16 ` [PATCH v12 14/16] mm/vmscan: use relock for move_pages_to_lru Alex Shi
2020-06-11 6:16 ` [PATCH v12 15/16] mm/pgdat: remove pgdat lru_lock Alex Shi
2020-06-11 6:16 ` [PATCH v12 16/16] mm/lru: revise the comments of lru_lock Alex Shi
2020-06-11 22:26 ` [PATCH v12 00/16] per memcg lru lock Hugh Dickins
2020-06-12 3:09 ` Alex Shi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1591856209-166869-5-git-send-email-alex.shi@linux.alibaba.com \
--to=alex.shi@linux.alibaba.com \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=daniel.m.jordan@oracle.com \
--cc=hannes@cmpxchg.org \
--cc=hughd@google.com \
--cc=iamjoonsoo.kim@lge.com \
--cc=khlebnikov@yandex-team.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lkp@intel.com \
--cc=mgorman@techsingularity.net \
--cc=mike.kravetz@oracle.com \
--cc=mingo@redhat.com \
--cc=richard.weiyang@gmail.com \
--cc=rostedt@goodmis.org \
--cc=shakeelb@google.com \
--cc=tj@kernel.org \
--cc=vbabka@suse.cz \
--cc=willy@infradead.org \
--cc=yang.shi@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).