From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: <willy@infradead.org>, David Hildenbrand <david@redhat.com>,
Miaohe Lin <linmiaohe@huawei.com>,
Naoya Horiguchi <nao.horiguchi@gmail.com>,
Oscar Salvador <osalvador@suse.de>, Zi Yan <ziy@nvidia.com>,
Hugh Dickins <hughd@google.com>, Jonathan Corbet <corbet@lwn.net>,
<linux-mm@kvack.org>, Vishal Moola <vishal.moola@gmail.com>,
Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [PATCH v2 04/10] mm: compaction: try get reference before non-lru movable folio migration
Date: Thu, 25 Apr 2024 16:40:22 +0800 [thread overview]
Message-ID: <20240425084028.3888403-5-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20240425084028.3888403-1-wangkefeng.wang@huawei.com>
Non-lru movable folio migration will fail if !folio_get_nontail_page(),
see isolate_movable_page(), so does lru folio, so folio_get_nontail_page()
could be called firstly to unify the handling of non-lru movable/lru folios
migration a bit, this is also to prepare to convert isolate_movable_page()
to take a folio. Since the reference count of the non-lru movable folio is
increased, a folio_put() is needed whether the folio is isolated or not.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
mm/compaction.c | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/mm/compaction.c b/mm/compaction.c
index e731d45befc7..4fc5a19b06ad 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -1097,41 +1097,41 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
}
}
+ /*
+ * Be careful not to clear LRU flag until after we're
+ * sure the folio is not being freed elsewhere -- the
+ * folio release code relies on it.
+ */
+ folio = folio_get_nontail_page(page);
+ if (unlikely(!folio))
+ goto isolate_fail;
+
/*
* Check may be lockless but that's ok as we recheck later.
- * It's possible to migrate LRU and non-lru movable pages.
- * Skip any other type of page
+ * It's possible to migrate LRU and non-lru movable folios.
+ * Skip any other type of folio
*/
- if (!PageLRU(page)) {
+ if (!folio_test_lru(folio)) {
/*
- * __PageMovable can return false positive so we need
- * to verify it under page_lock.
+ * __folio_test_movable can return false positive so
+ * we need to verify it under folio lock.
*/
- if (unlikely(__PageMovable(page)) &&
- !PageIsolated(page)) {
+ if (unlikely(__folio_test_movable(folio)) &&
+ !folio_test_isolated(folio)) {
if (locked) {
unlock_page_lruvec_irqrestore(locked, flags);
locked = NULL;
}
- if (isolate_movable_page(page, mode)) {
- folio = page_folio(page);
+ if (isolate_movable_page(&folio->page, mode)) {
+ folio_put(folio);
goto isolate_success;
}
}
- goto isolate_fail;
+ goto isolate_fail_put;
}
- /*
- * Be careful not to clear PageLRU until after we're
- * sure the page is not being freed elsewhere -- the
- * page release code relies on it.
- */
- folio = folio_get_nontail_page(page);
- if (unlikely(!folio))
- goto isolate_fail;
-
/*
* Migration will fail if an anonymous page is pinned in memory,
* so avoid taking lru_lock and isolating it unnecessarily in an
--
2.27.0
next prev parent reply other threads:[~2024-04-25 8:41 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-25 8:40 [PATCH v2 00/10] mm: remove isolate_lru_page() and isolate_movable_page() Kefeng Wang
2024-04-25 8:40 ` [PATCH v2 01/10] mm: memory_hotplug: check hwpoisoned page firstly in do_migrate_range() Kefeng Wang
2024-04-27 3:57 ` kernel test robot
2024-04-28 0:49 ` Kefeng Wang
2024-04-27 5:40 ` kernel test robot
2024-04-27 7:23 ` kernel test robot
2024-04-25 8:40 ` [PATCH v2 02/10] mm: add isolate_folio_to_list() Kefeng Wang
2024-04-25 8:40 ` [PATCH v2 03/10] mm: memory_hotplug: unify Huge/LRU/non-LRU folio isolation Kefeng Wang
2024-04-25 8:40 ` Kefeng Wang [this message]
2024-04-25 8:40 ` [PATCH v2 05/10] mm: migrate: add folio_isolate_movable() Kefeng Wang
2024-04-25 8:40 ` [PATCH v2 06/10] mm: compaction: use folio_isolate_movable() Kefeng Wang
2024-04-25 8:40 ` [PATCH v2 07/10] mm: migrate: " Kefeng Wang
2024-04-25 8:40 ` [PATCH v2 08/10] mm: migrate: remove isolate_movable_page() Kefeng Wang
2024-04-25 8:40 ` [PATCH v2 09/10] mm: migrate_device: use more folio in migrate_device_unmap() Kefeng Wang
2024-04-25 9:31 ` David Hildenbrand
2024-04-25 11:05 ` Kefeng Wang
2024-04-25 8:40 ` [PATCH v2 10/10] mm: remove isolate_lru_page() Kefeng Wang
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=20240425084028.3888403-5-wangkefeng.wang@huawei.com \
--to=wangkefeng.wang@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=corbet@lwn.net \
--cc=david@redhat.com \
--cc=hughd@google.com \
--cc=linmiaohe@huawei.com \
--cc=linux-mm@kvack.org \
--cc=nao.horiguchi@gmail.com \
--cc=osalvador@suse.de \
--cc=vishal.moola@gmail.com \
--cc=willy@infradead.org \
--cc=ziy@nvidia.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.