Commit b9a25635 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton
Browse files

mm: remove PageKsm() 

All callers have been converted to use folio_test_ksm() or
PageAnonNotKsm(), so we can remove this wrapper.

Link: https://lkml.kernel.org/r/20241002152533.1350629-6-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Alex Shi <alexs@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent b33cc96c

include/linux/page-flags.h

+1 −6
Original line number Diff line number Diff line
@@ -725,13 +725,8 @@ static __always_inline bool folio_test_ksm(const struct folio *folio) 
	return ((unsigned long)folio->mapping & PAGE_MAPPING_FLAGS) ==

				PAGE_MAPPING_KSM;

}



static __always_inline bool PageKsm(const struct page *page)

{

	return folio_test_ksm(page_folio(page));

}

#else

TESTPAGEFLAG_FALSE(Ksm, ksm)

FOLIO_TEST_FLAG_FALSE(ksm)

#endif



u64 stable_page_flags(const struct page *page);

mm/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -1356,7 +1356,7 @@ static inline bool gup_must_unshare(struct vm_area_struct *vma, 
		smp_rmb();



	/*

	 * Note that PageKsm() pages cannot be exclusive, and consequently,

	 * Note that KSM pages cannot be exclusive, and consequently,

	 * cannot get pinned.

	 */

	return !PageAnonExclusive(page);

mm/ksm.c

+2 −2
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ static int break_ksm(struct vm_area_struct *vma, unsigned long addr, bool lock_v 
	 *

	 * VM_FAULT_SIGBUS could occur if we race with truncation of the

	 * backing file, which also invalidates anonymous pages: that's

	 * okay, that truncation will have unmapped the PageKsm for us.

	 * okay, that truncation will have unmapped the KSM page for us.

	 *

	 * VM_FAULT_OOM: at the time of writing (late July 2009), setting

	 * aside mem_cgroup limits, VM_FAULT_OOM would only be set if the
@@ -1434,7 +1434,7 @@ static int replace_page(struct vm_area_struct *vma, struct page *page, 
 * try_to_merge_one_page - take two pages and merge them into one

 * @vma: the vma that holds the pte pointing to page

 * @page: the PageAnon page that we want to replace with kpage

 * @kpage: the PageKsm page that we want to map instead of page,

 * @kpage: the KSM page that we want to map instead of page,

 *         or NULL the first time when we want to use page as kpage.

 *

 * This function returns 0 if the pages were merged, -EFAULT otherwise.