linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Miaohe Lin <linmiaohe@huawei.com>
To: <akpm@linux-foundation.org>
Cc: <vbabka@suse.cz>, <pintu@codeaurora.org>,
	<charante@codeaurora.org>, <linux-mm@kvack.org>,
	<linux-kernel@vger.kernel.org>, <linmiaohe@huawei.com>
Subject: [PATCH 06/12] mm: compaction: use COMPACT_CLUSTER_MAX in compaction.c
Date: Mon, 18 Apr 2022 22:12:47 +0800	[thread overview]
Message-ID: <20220418141253.24298-7-linmiaohe@huawei.com> (raw)
In-Reply-To: <20220418141253.24298-1-linmiaohe@huawei.com>

Always use COMPACT_CLUSTER_MAX here as we're doing the compaction.
Minor improvements in readability.

Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
 mm/compaction.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mm/compaction.c b/mm/compaction.c
index 97821b7d7a4f..1fc912ec3a98 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -573,7 +573,7 @@ static unsigned long isolate_freepages_block(struct compact_control *cc,
 		 * contention, to give chance to IRQs. Abort if fatal signal
 		 * pending.
 		 */
-		if (!(blockpfn % SWAP_CLUSTER_MAX)
+		if (!(blockpfn % COMPACT_CLUSTER_MAX)
 		    && compact_unlock_should_abort(&cc->zone->lock, flags,
 								&locked, cc))
 			break;
@@ -862,7 +862,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
 		 * contention, to give chance to IRQs. Abort completely if
 		 * a fatal signal is pending.
 		 */
-		if (!(low_pfn % SWAP_CLUSTER_MAX)) {
+		if (!(low_pfn % COMPACT_CLUSTER_MAX)) {
 			if (locked) {
 				unlock_page_lruvec_irqrestore(locked, flags);
 				locked = NULL;
@@ -1614,7 +1614,7 @@ static void isolate_freepages(struct compact_control *cc)
 		 * This can iterate a massively long zone without finding any
 		 * suitable migration targets, so periodically check resched.
 		 */
-		if (!(block_start_pfn % (SWAP_CLUSTER_MAX * pageblock_nr_pages)))
+		if (!(block_start_pfn % (COMPACT_CLUSTER_MAX * pageblock_nr_pages)))
 			cond_resched();
 
 		page = pageblock_pfn_to_page(block_start_pfn, block_end_pfn,
@@ -1921,7 +1921,7 @@ static isolate_migrate_t isolate_migratepages(struct compact_control *cc)
 		 * many pageblocks unsuitable, so periodically check if we
 		 * need to schedule.
 		 */
-		if (!(low_pfn % (SWAP_CLUSTER_MAX * pageblock_nr_pages)))
+		if (!(low_pfn % (COMPACT_CLUSTER_MAX * pageblock_nr_pages)))
 			cond_resched();
 
 		page = pageblock_pfn_to_page(block_start_pfn,
-- 
2.23.0



  parent reply	other threads:[~2022-04-18 14:12 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-18 14:12 [PATCH 00/12] A few cleanup and fixup patches for compaction Miaohe Lin
2022-04-18 14:12 ` [PATCH 01/12] mm: compaction: remove unneeded return value of kcompactd_run Miaohe Lin
2022-04-18 14:12 ` [PATCH 02/12] mm: compaction: remove unneeded pfn update Miaohe Lin
2022-04-18 14:12 ` [PATCH 03/12] mm: compaction: remove unneeded assignment to isolate_start_pfn Miaohe Lin
2022-04-18 14:12 ` [PATCH 04/12] mm: compaction: clean up comment for sched contention Miaohe Lin
2022-04-18 14:12 ` [PATCH 05/12] mm: compaction: clean up comment about suitable migration target recheck Miaohe Lin
2022-04-18 14:12 ` Miaohe Lin [this message]
2022-04-18 14:12 ` [PATCH 07/12] mm: compaction: use helper compound_nr in isolate_migratepages_block Miaohe Lin
2022-04-18 14:12 ` [PATCH 08/12] mm: compaction: clean up comment about async compaction in isolate_migratepages Miaohe Lin
2022-04-18 14:12 ` [PATCH 09/12] mm: compaction: avoid possible NULL pointer dereference in kcompactd_cpu_online Miaohe Lin
2022-04-19  3:55   ` Andrew Morton
2022-04-19  6:47     ` Miaohe Lin
2022-04-19  7:42       ` David Hildenbrand
2022-04-19 11:05         ` Miaohe Lin
2022-04-18 14:12 ` [PATCH 10/12] mm: compaction: make compaction_zonelist_suitable return false when COMPACT_SUCCESS Miaohe Lin
2022-04-18 14:12 ` [PATCH 11/12] mm: compaction: simplify the code in __compact_finished Miaohe Lin
2022-04-18 14:12 ` [PATCH 12/12] mm: compaction: make sure highest is above the min_pfn Miaohe Lin

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=20220418141253.24298-7-linmiaohe@huawei.com \
    --to=linmiaohe@huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=charante@codeaurora.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=pintu@codeaurora.org \
    --cc=vbabka@suse.cz \
    /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