mm/ksm: replace set_page_stable_node by folio_set_stable_node
authorAlex Shi (tencent) <alexs@kernel.org>
Thu, 11 Apr 2024 06:17:11 +0000 (14:17 +0800)
committerAndrew Morton <akpm@linux-foundation.org>
Mon, 6 May 2024 00:53:34 +0000 (17:53 -0700)
Only single page could be reached where we set stable node after write
protect, so use folio converted func to replace page's.  And remove the
unused func set_page_stable_node().

Link: https://lkml.kernel.org/r/20240411061713.1847574-11-alexs@kernel.org
Signed-off-by: Alex Shi (tencent) <alexs@kernel.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/ksm.c

index 662fdaaf3ea3395f8557d1a16722e37e0f246840..486c9974f8e203fca10078442b9f86429c9c4cc3 100644 (file)
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -1094,17 +1094,11 @@ static inline struct ksm_stable_node *page_stable_node(struct page *page)
        return folio_stable_node(page_folio(page));
 }
 
-static inline void set_page_stable_node(struct page *page,
-                                       struct ksm_stable_node *stable_node)
-{
-       VM_BUG_ON_PAGE(PageAnon(page) && PageAnonExclusive(page), page);
-       page->mapping = (void *)((unsigned long)stable_node | PAGE_MAPPING_KSM);
-}
-
 static inline void folio_set_stable_node(struct folio *folio,
                                         struct ksm_stable_node *stable_node)
 {
-       set_page_stable_node(&folio->page, stable_node);
+       VM_WARN_ON_FOLIO(folio_test_anon(folio) && PageAnonExclusive(&folio->page), folio);
+       folio->mapping = (void *)((unsigned long)stable_node | PAGE_MAPPING_KSM);
 }
 
 #ifdef CONFIG_SYSFS
@@ -1519,7 +1513,7 @@ static int try_to_merge_one_page(struct vm_area_struct *vma,
                         * PageAnon+anon_vma to PageKsm+NULL stable_node:
                         * stable_tree_insert() will update stable_node.
                         */
-                       set_page_stable_node(page, NULL);
+                       folio_set_stable_node(page_folio(page), NULL);
                        mark_page_accessed(page);
                        /*
                         * Page reclaim just frees a clean page with no dirty