From: Chengming Zhou <chengming.zhou@linux.dev>
To: Andrew Morton <akpm@linux-foundation.org>,
David Hildenbrand <david@redhat.com>,
Andrea Arcangeli <aarcange@redhat.com>,
Stefan Roesch <shr@devkernel.io>,
Hugh Dickins <hughd@google.com>
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
zhouchengming@bytedance.com,
Chengming Zhou <chengming.zhou@linux.dev>
Subject: [PATCH 2/2] mm/ksm: flush out migrated rmap_item to insert our rmap_item
Date: Wed, 08 May 2024 19:35:42 +0800 [thread overview]
Message-ID: <20240508-b4-ksm-unstable-insert-v1-2-631cdbc2b77f@linux.dev> (raw)
In-Reply-To: <20240508-b4-ksm-unstable-insert-v1-0-631cdbc2b77f@linux.dev>
From: Chengming Zhou <zhouchengming@bytedance.com>
If tree_page has been migrated to another NUMA node and across_nodes
disabled, flush it out immediately and it will be put in the right
unstable tree when next time.
The good point is that we can retry to insert our rmap_item successfully
to increase the merge possibility, and we don't need to bother to
memcmp_pages() in this case.
Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com>
---
mm/ksm.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/mm/ksm.c b/mm/ksm.c
index 66219983eb3a..b840fb55e1f4 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -2226,6 +2226,18 @@ struct ksm_rmap_item *unstable_tree_search_insert(struct ksm_rmap_item *rmap_ite
return NULL;
}
+ /*
+ * If tree_page has been migrated to another NUMA node and
+ * across_nodes disabled, flush it out here and it will be
+ * put in the right unstable tree next time. So we can retry
+ * to insert our rmap_item successfully.
+ */
+ if (!ksm_merge_across_nodes &&
+ page_to_nid(tree_page) != nid) {
+ remove_rmap_item_from_tree(tree_rmap_item);
+ goto again;
+ }
+
ret = memcmp_pages(page, tree_page);
parent = *new;
@@ -2235,15 +2247,6 @@ struct ksm_rmap_item *unstable_tree_search_insert(struct ksm_rmap_item *rmap_ite
} else if (ret > 0) {
put_page(tree_page);
new = &parent->rb_right;
- } else if (!ksm_merge_across_nodes &&
- page_to_nid(tree_page) != nid) {
- /*
- * If tree_page has been migrated to another NUMA node,
- * it will be flushed out and put in the right unstable
- * tree next time: only merge with it when across_nodes.
- */
- put_page(tree_page);
- return NULL;
} else {
*tree_pagep = tree_page;
return tree_rmap_item;
--
2.45.0
prev parent reply other threads:[~2024-05-08 11:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-08 11:35 [PATCH 0/2] mm/ksm: optimize unstable_tree_search_insert() Chengming Zhou
2024-05-08 11:35 ` [PATCH 1/2] mm/ksm: re-search unstable tree when tree_rmap_item is stale Chengming Zhou
2024-05-08 11:35 ` Chengming Zhou [this message]
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=20240508-b4-ksm-unstable-insert-v1-2-631cdbc2b77f@linux.dev \
--to=chengming.zhou@linux.dev \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=david@redhat.com \
--cc=hughd@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=shr@devkernel.io \
--cc=zhouchengming@bytedance.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 read-only IMAP folder(s) and NNTP newsgroup(s).