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
Cc: "Alex Shi (tencent)" <alexs@kernel.org>,
	Hugh Dickins <hughd@google.com>,
	Chris Wright <chrisw@sous-sol.org>
Subject: [PATCH v2 12/14] mm/ksm: return folio for chain series funcs
Date: Fri, 22 Mar 2024 16:36:59 +0800	[thread overview]
Message-ID: <20240322083703.232364-13-alexs@kernel.org> (raw)
In-Reply-To: <20240322083703.232364-1-alexs@kernel.org>

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

Since all caller changed to folios, change their return type to folio
too.

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 | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/mm/ksm.c b/mm/ksm.c
index afcf26510669..15a78a9bab59 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -1623,10 +1623,10 @@ bool is_page_sharing_candidate(struct ksm_stable_node *stable_node)
 	return __is_page_sharing_candidate(stable_node, 0);
 }
 
-static void *stable_node_dup(struct ksm_stable_node **_stable_node_dup,
-			     struct ksm_stable_node **_stable_node,
-			     struct rb_root *root,
-			     bool prune_stale_stable_nodes)
+static struct folio *stable_node_dup(struct ksm_stable_node **_stable_node_dup,
+				     struct ksm_stable_node **_stable_node,
+				     struct rb_root *root,
+				     bool prune_stale_stable_nodes)
 {
 	struct ksm_stable_node *dup, *found = NULL, *stable_node = *_stable_node;
 	struct hlist_node *hlist_safe;
@@ -1769,10 +1769,10 @@ static struct ksm_stable_node *stable_node_dup_any(struct ksm_stable_node *stabl
  * function and will be overwritten in all cases, the caller doesn't
  * need to initialize it.
  */
-static void *__stable_node_chain(struct ksm_stable_node **_stable_node_dup,
-					struct ksm_stable_node **_stable_node,
-					struct rb_root *root,
-					bool prune_stale_stable_nodes)
+static struct folio *__stable_node_chain(struct ksm_stable_node **_stable_node_dup,
+					 struct ksm_stable_node **_stable_node,
+					 struct rb_root *root,
+					 bool prune_stale_stable_nodes)
 {
 	struct ksm_stable_node *stable_node = *_stable_node;
 	if (!is_stable_node_chain(stable_node)) {
@@ -1791,16 +1791,16 @@ static void *__stable_node_chain(struct ksm_stable_node **_stable_node_dup,
 			       prune_stale_stable_nodes);
 }
 
-static __always_inline void *chain_prune(struct ksm_stable_node **s_n_d,
-						struct ksm_stable_node **s_n,
-						struct rb_root *root)
+static __always_inline struct folio *chain_prune(struct ksm_stable_node **s_n_d,
+						 struct ksm_stable_node **s_n,
+						 struct rb_root *root)
 {
 	return __stable_node_chain(s_n_d, s_n, root, true);
 }
 
-static __always_inline void *chain(struct ksm_stable_node **s_n_d,
-					  struct ksm_stable_node *s_n,
-					  struct rb_root *root)
+static __always_inline struct folio *chain(struct ksm_stable_node **s_n_d,
+					   struct ksm_stable_node *s_n,
+					   struct rb_root *root)
 {
 	struct ksm_stable_node *old_stable_node = s_n;
 	struct folio *tree_folio;
-- 
2.43.0



  parent reply	other threads:[~2024-03-22  8:35 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-22  8:36 [PATCH v2 00/14] transfer page to folio in KSM alexs
2024-03-22  8:36 ` [PATCH v2 01/14] mm/ksm: add ksm_get_folio alexs
2024-03-22  8:36 ` [PATCH v2 02/14] mm/ksm: use folio in remove_rmap_item_from_tree alexs
2024-03-22  8:36 ` [PATCH v2 03/14] mm/ksm: add folio_set_stable_node alexs
2024-03-22  8:36 ` [PATCH v2 04/14] mm/ksm: use folio in remove_stable_node alexs
2024-03-22  8:36 ` [PATCH v2 05/14] mm/ksm: use folio in stable_node_dup alexs
2024-03-22 15:57   ` Matthew Wilcox
2024-03-22 17:11     ` David Hildenbrand
2024-03-25 12:36       ` Alex Shi
2024-03-25 12:30     ` Alex Shi
2024-03-22  8:36 ` [PATCH v2 06/14] mm/ksm: use ksm_get_folio in scan_get_next_rmap_item alexs
2024-03-22  8:36 ` [PATCH v2 07/14] mm/ksm: use folio in write_protect_page alexs
2024-03-22  8:36 ` [PATCH v2 08/14] mm/ksm: Convert chain series funcs to use folio alexs
2024-03-22  8:36 ` [PATCH v2 09/14] mm/ksm: Convert stable_tree_insert " alexs
2024-03-22  8:36 ` [PATCH v2 10/14] mm/ksm: Convert stable_tree_search " alexs
2024-03-22  8:36 ` [PATCH v2 11/14] mm/ksm: remove get_ksm_page and related info alexs
2024-03-22  8:36 ` alexs [this message]
2024-03-22  8:37 ` [PATCH v2 13/14] mm/ksm: use folio_set_stable_node in try_to_merge_one_page alexs
2024-03-23  3:38   ` Matthew Wilcox
2024-03-25 12:40     ` Alex Shi
2024-03-22  8:37 ` [PATCH v2 14/14] mm/ksm: remove set_page_stable_node alexs

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=20240322083703.232364-13-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=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).