Skip to content

Commit 1b00ab4

Browse files
Matthew Wilcox (Oracle)akpm00
authored andcommitted
ksm: use a folio inside cmp_and_merge_page()
This removes the last call to page_stable_node(), so delete the wrapper. It also removes a call to trylock_page() and saves a call to compound_head(), as well as removing a reference to folio->page. Link: https://lkml.kernel.org/r/20250916181219.2400258-1-willy@infradead.org Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Reviewed-by: Chengming Zhou <chengming.zhou@linux.dev> Acked-by: David Hildenbrand <david@redhat.com> Cc: Longlong Xia <xialonglong@kylinos.cn> Cc: xu xin <xu.xin16@zte.com.cn> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 19c5fb8 commit 1b00ab4

1 file changed

Lines changed: 6 additions & 9 deletions

File tree

mm/ksm.c

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,11 +1061,6 @@ struct ksm_stable_node *folio_stable_node(const struct folio *folio)
10611061
return folio_test_ksm(folio) ? folio_raw_mapping(folio) : NULL;
10621062
}
10631063

1064-
static inline struct ksm_stable_node *page_stable_node(struct page *page)
1065-
{
1066-
return folio_stable_node(page_folio(page));
1067-
}
1068-
10691064
static inline void folio_set_stable_node(struct folio *folio,
10701065
struct ksm_stable_node *stable_node)
10711066
{
@@ -2225,6 +2220,7 @@ static void stable_tree_append(struct ksm_rmap_item *rmap_item,
22252220
*/
22262221
static void cmp_and_merge_page(struct page *page, struct ksm_rmap_item *rmap_item)
22272222
{
2223+
struct folio *folio = page_folio(page);
22282224
struct ksm_rmap_item *tree_rmap_item;
22292225
struct page *tree_page = NULL;
22302226
struct ksm_stable_node *stable_node;
@@ -2233,7 +2229,7 @@ static void cmp_and_merge_page(struct page *page, struct ksm_rmap_item *rmap_ite
22332229
int err;
22342230
bool max_page_sharing_bypass = false;
22352231

2236-
stable_node = page_stable_node(page);
2232+
stable_node = folio_stable_node(folio);
22372233
if (stable_node) {
22382234
if (stable_node->head != &migrate_nodes &&
22392235
get_kpfn_nid(READ_ONCE(stable_node->kpfn)) !=
@@ -2272,7 +2268,7 @@ static void cmp_and_merge_page(struct page *page, struct ksm_rmap_item *rmap_ite
22722268

22732269
/* Start by searching for the folio in the stable tree */
22742270
kfolio = stable_tree_search(page);
2275-
if (&kfolio->page == page && rmap_item->head == stable_node) {
2271+
if (kfolio == folio && rmap_item->head == stable_node) {
22762272
folio_put(kfolio);
22772273
return;
22782274
}
@@ -2353,10 +2349,11 @@ static void cmp_and_merge_page(struct page *page, struct ksm_rmap_item *rmap_ite
23532349
* the page is locked, it is better to skip it and
23542350
* perhaps try again later.
23552351
*/
2356-
if (!trylock_page(page))
2352+
if (!folio_trylock(folio))
23572353
return;
23582354
split_huge_page(page);
2359-
unlock_page(page);
2355+
folio = page_folio(page);
2356+
folio_unlock(folio);
23602357
}
23612358
}
23622359
}

0 commit comments

Comments
 (0)