linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: alexs@kernel.org
To: Matthew Wilcox <willy@infradead.org>,
	Andrea Arcangeli <aarcange@redhat.com>,
	Izik Eidus <izik.eidus@ravellosystems.com>,
	david@redhat.com, Andrew Morton <akpm@linux-foundation.org>,
	linux-mm@kvack.org, linux-kernel@vger.kernel.org,
	ryncsn@gmail.com
Cc: "Alex Shi (tencent)" <alexs@kernel.org>,
	Hugh Dickins <hughd@google.com>,
	Chris Wright <chrisw@sous-sol.org>
Subject: [PATCH v3 05/14] mm/ksm: use folio in stable_node_dup
Date: Mon, 25 Mar 2024 20:48:52 +0800	[thread overview]
Message-ID: <20240325124904.398913-6-alexs@kernel.org> (raw)
In-Reply-To: <20240325124904.398913-1-alexs@kernel.org>

From: "Alex Shi (tencent)" <alexs@kernel.org>

Use ksm_get_folio() and save 2 compound_head calls.

Signed-off-by: Alex Shi (tencent) <alexs@kernel.org>
Cc: Izik Eidus <izik.eidus@ravellosystems.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Chris Wright <chrisw@sous-sol.org>
---
 mm/ksm.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mm/ksm.c b/mm/ksm.c
index b6ee2bc7646f..aa80fbf3a8e0 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -1638,7 +1638,7 @@ static struct page *stable_node_dup(struct ksm_stable_node **_stable_node_dup,
 {
 	struct ksm_stable_node *dup, *found = NULL, *stable_node = *_stable_node;
 	struct hlist_node *hlist_safe;
-	struct page *_tree_page, *tree_page = NULL;
+	struct folio *folio, *tree_folio = NULL;
 	int nr = 0;
 	int found_rmap_hlist_len;
 
@@ -1663,18 +1663,18 @@ static struct page *stable_node_dup(struct ksm_stable_node **_stable_node_dup,
 		 * stable_node parameter itself will be freed from
 		 * under us if it returns NULL.
 		 */
-		_tree_page = get_ksm_page(dup, GET_KSM_PAGE_NOLOCK);
-		if (!_tree_page)
+		folio = ksm_get_folio(dup, GET_KSM_PAGE_NOLOCK);
+		if (!folio)
 			continue;
 		nr += 1;
 		if (is_page_sharing_candidate(dup)) {
 			if (!found ||
 			    dup->rmap_hlist_len > found_rmap_hlist_len) {
 				if (found)
-					put_page(tree_page);
+					folio_put(tree_folio);
 				found = dup;
 				found_rmap_hlist_len = found->rmap_hlist_len;
-				tree_page = _tree_page;
+				tree_folio = folio;
 
 				/* skip put_page for found dup */
 				if (!prune_stale_stable_nodes)
@@ -1682,7 +1682,7 @@ static struct page *stable_node_dup(struct ksm_stable_node **_stable_node_dup,
 				continue;
 			}
 		}
-		put_page(_tree_page);
+		folio_put(folio);
 	}
 
 	if (found) {
@@ -1747,7 +1747,7 @@ static struct page *stable_node_dup(struct ksm_stable_node **_stable_node_dup,
 	}
 
 	*_stable_node_dup = found;
-	return tree_page;
+	return &tree_folio->page;
 }
 
 static struct ksm_stable_node *stable_node_dup_any(struct ksm_stable_node *stable_node,
-- 
2.43.0



  parent reply	other threads:[~2024-03-25 12:46 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-25 12:48 [PATCH v2 00/14] transfer page to folio in KSM alexs
2024-03-25 12:47 ` David Hildenbrand
2024-03-25 12:48 ` [PATCH v3 01/14] mm/ksm: add ksm_get_folio alexs
2024-04-05  7:23   ` David Hildenbrand
2024-03-25 12:48 ` [PATCH v3 02/14] mm/ksm: use folio in remove_rmap_item_from_tree alexs
2024-03-25 12:48 ` [PATCH v3 03/14] mm/ksm: add folio_set_stable_node alexs
2024-03-25 12:48 ` [PATCH v3 04/14] mm/ksm: use folio in remove_stable_node alexs
2024-03-25 12:48 ` alexs [this message]
2024-03-25 12:48 ` [PATCH v3 06/14] mm/ksm: use ksm_get_folio in scan_get_next_rmap_item alexs
2024-04-05  7:28   ` David Hildenbrand
2024-03-25 12:48 ` [PATCH v3 07/14] mm/ksm: use folio in write_protect_page alexs
     [not found]   ` <e16806b0-7c17-4356-8b47-30f624756e85@redhat.com>
2024-04-08  6:58     ` Alex Shi
2024-03-25 12:48 ` [PATCH v3 08/14] mm/ksm: Convert chain series funcs to use folio alexs
2024-04-05  7:36   ` David Hildenbrand
2024-03-25 12:48 ` [PATCH v3 09/14] mm/ksm: Convert stable_tree_insert " alexs
2024-03-25 12:48 ` [PATCH v3 10/14] mm/ksm: Convert stable_tree_search " alexs
2024-03-25 12:48 ` [PATCH v3 11/14] mm/ksm: remove get_ksm_page and related info alexs
     [not found]   ` <15080b4f-ac9f-4f5f-9a27-d1773d015fdc@redhat.com>
2024-04-08  6:59     ` Alex Shi
2024-03-25 12:48 ` [PATCH v3 12/14] mm/ksm: return folio for chain series funcs alexs
2024-03-25 12:49 ` [PATCH v3 13/14] mm/ksm: use folio_set_stable_node in try_to_merge_one_page alexs
2024-04-05  9:06   ` David Hildenbrand
2024-03-25 12:49 ` [PATCH v3 14/14] mm/ksm: remove set_page_stable_node alexs
2024-04-05  7:32   ` David Hildenbrand
2024-04-08  7:00     ` Alex Shi
2024-04-05  9:07   ` David Hildenbrand
2024-04-08  7:01     ` 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=20240325124904.398913-6-alexs@kernel.org \
    --to=alexs@kernel.org \
    --cc=aarcange@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=chrisw@sous-sol.org \
    --cc=david@redhat.com \
    --cc=hughd@google.com \
    --cc=izik.eidus@ravellosystems.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=ryncsn@gmail.com \
    --cc=willy@infradead.org \
    /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).