linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: alexs@kernel.org
To: Andrew Morton <akpm@linux-foundation.org>,
	linux-mm@kvack.org, linux-kernel@vger.kernel.org,
	zik.eidus@ravellosystems.com, willy@infradead.org,
	aarcange@redhat.com, hughd@google.com, chrisw@sous-sol.org,
	david@redhat.com
Cc: "Alex Shi (tencent)" <alexs@kernel.org>,
	Izik Eidus <izik.eidus@ravellosystems.com>
Subject: [PATCH v5 02/10] mm/ksm: use folio in remove_rmap_item_from_tree
Date: Thu, 11 Apr 2024 14:17:03 +0800	[thread overview]
Message-ID: <20240411061713.1847574-3-alexs@kernel.org> (raw)
In-Reply-To: <20240411061713.1847574-1-alexs@kernel.org>

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

To 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>
Reviewed-by: David Hildenbrand <david@redhat.com>
---
 mm/ksm.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mm/ksm.c b/mm/ksm.c
index ac126a4c245c..ef5c4b6d377c 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -1006,16 +1006,16 @@ static void remove_rmap_item_from_tree(struct ksm_rmap_item *rmap_item)
 {
 	if (rmap_item->address & STABLE_FLAG) {
 		struct ksm_stable_node *stable_node;
-		struct page *page;
+		struct folio *folio;
 
 		stable_node = rmap_item->head;
-		page = get_ksm_page(stable_node, GET_KSM_PAGE_LOCK);
-		if (!page)
+		folio = ksm_get_folio(stable_node, GET_KSM_PAGE_LOCK);
+		if (!folio)
 			goto out;
 
 		hlist_del(&rmap_item->hlist);
-		unlock_page(page);
-		put_page(page);
+		folio_unlock(folio);
+		folio_put(folio);
 
 		if (!hlist_empty(&stable_node->hlist))
 			ksm_pages_sharing--;
-- 
2.43.0



  parent reply	other threads:[~2024-04-11  6:14 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-11  6:17 [PATCH v5 0/10] transfer page to folio in KSM alexs
2024-04-11  6:17 ` [PATCH v5 01/10] mm/ksm: add ksm_get_folio alexs
2024-04-11  6:17 ` alexs [this message]
2024-04-11  6:17 ` [PATCH v5 03/10] mm/ksm: add folio_set_stable_node alexs
2024-04-11  6:17 ` [PATCH v5 04/10] mm/ksm: use folio in remove_stable_node alexs
2024-04-11  6:17 ` [PATCH v5 05/10] mm/ksm: use folio in stable_node_dup alexs
2024-04-11  6:17 ` [PATCH v5 06/10] mm/ksm: use ksm_get_folio in scan_get_next_rmap_item alexs
2024-04-11  6:17 ` [PATCH v5 07/10] mm/ksm: use folio in write_protect_page alexs
2024-04-11  6:17 ` [PATCH v5 08/10] mm/ksm: Convert chain series funcs and replace get_ksm_page alexs
     [not found]   ` <8a79bfbd-b01d-4425-8fd9-de2d3e6cd1af@redhat.com>
2024-04-11 11:38     ` Alex Shi
2024-04-11  6:17 ` [PATCH v5 09/10] mm/ksm: rename get_ksm_page_flags() to ksm_get_folio_flags alexs
     [not found]   ` <192aaa5c-3ff3-40c1-b12a-b674518bf5de@redhat.com>
2024-04-11 11:42     ` Alex Shi
     [not found]       ` <47686d5e-efd3-4431-b72c-620f749faeaa@redhat.com>
2024-04-11 20:42         ` Andrew Morton
2024-04-12  1:57           ` Alex Shi
2024-04-11  6:17 ` [PATCH v5 10/10] mm/ksm: replace set_page_stable_node by folio_set_stable_node alexs
2024-04-11  7:55 ` [PATCH v5 0/10] transfer page to folio in KSM David Hildenbrand
2024-04-11 11:45   ` 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=20240411061713.1847574-3-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 \
    --cc=zik.eidus@ravellosystems.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