Commit df25569d authored by David Hildenbrand's avatar David Hildenbrand Committed by Andrew Morton
Browse files

mm: rename PAGE_MAPPING_* to FOLIO_MAPPING_* 

Now that the mapping flags are only used for folios, let's rename the
defines.

Link: https://lkml.kernel.org/r/20250704102524.326966-27-david@redhat.com


Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarZi Yan <ziy@nvidia.com>
Reviewed-by: default avatarLorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reviewed-by: default avatarHarry Yoo <harry.yoo@oracle.com>
Cc: Alistair Popple <apopple@nvidia.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Brendan Jackman <jackmanb@google.com>
Cc: Byungchul Park <byungchul@sk.com>
Cc: Chengming Zhou <chengming.zhou@linux.dev>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Eugenio Pé rez <eperezma@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Gregory Price <gourry@gourry.net>
Cc: "Huang, Ying" <ying.huang@linux.alibaba.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Jerrin Shaji George <jerrin.shaji-george@broadcom.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Joshua Hahn <joshua.hahnjy@gmail.com>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mathew Brost <matthew.brost@intel.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Naoya Horiguchi <nao.horiguchi@gmail.com>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Peter Xu <peterx@redhat.com>
Cc: Qi Zheng <zhengqi.arch@bytedance.com>
Cc: Rakie Kim <rakie.kim@sk.com>
Cc: Rik van Riel <riel@surriel.com>
Cc: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Shakeel Butt <shakeel.butt@linux.dev>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Cc: xu xin <xu.xin16@zte.com.cn>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 78cb1a13

fs/proc/page.c

+2 −2
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ u64 stable_page_flags(const struct page *page) 


	k = folio->flags;

	mapping = (unsigned long)folio->mapping;

	is_anon = mapping & PAGE_MAPPING_ANON;

	is_anon = mapping & FOLIO_MAPPING_ANON;



	/*

	 * pseudo flags for the well known (anonymous) memory mapped pages
@@ -158,7 +158,7 @@ u64 stable_page_flags(const struct page *page) 
		u |= 1 << KPF_MMAP;

	if (is_anon) {

		u |= 1 << KPF_ANON;

		if (mapping & PAGE_MAPPING_KSM)

		if (mapping & FOLIO_MAPPING_KSM)

			u |= 1 << KPF_KSM;

	}

include/linux/fs.h

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ struct address_space { 
	/*

	 * On most architectures that alignment is already the case; but

	 * must be enforced here for CRIS, to let the least significant bit

	 * of struct page's "mapping" pointer be used for PAGE_MAPPING_ANON.

	 * of struct folio's "mapping" pointer be used for FOLIO_MAPPING_ANON.

	 */



/* XArray tags, for tagging dirty and writeback pages in the pagecache. */

include/linux/mm_types.h

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ struct page { 
					unsigned int order;

				};

			};

			/* See page-flags.h for PAGE_MAPPING_FLAGS */

			struct address_space *mapping;

			union {

				pgoff_t __folio_index;		/* Our offset within mapping. */

include/linux/page-flags.h

+10 −10
Original line number Diff line number Diff line
@@ -695,10 +695,10 @@ PAGEFLAG_FALSE(VmemmapSelfHosted, vmemmap_self_hosted) 
/*

 * On an anonymous folio mapped into a user virtual memory area,

 * folio->mapping points to its anon_vma, not to a struct address_space;

 * with the PAGE_MAPPING_ANON bit set to distinguish it.  See rmap.h.

 * with the FOLIO_MAPPING_ANON bit set to distinguish it.  See rmap.h.

 *

 * On an anonymous folio in a VM_MERGEABLE area, if CONFIG_KSM is enabled,

 * the PAGE_MAPPING_ANON_KSM bit may be set along with the PAGE_MAPPING_ANON

 * the FOLIO_MAPPING_ANON_KSM bit may be set along with the FOLIO_MAPPING_ANON

 * bit; and then folio->mapping points, not to an anon_vma, but to a private

 * structure which KSM associates with that merged folio.  See ksm.h.

 *
@@ -713,21 +713,21 @@ PAGEFLAG_FALSE(VmemmapSelfHosted, vmemmap_self_hosted) 
 * false before calling the following functions (e.g., folio_test_anon).

 * See mm/slab.h.

 */

#define PAGE_MAPPING_ANON	0x1

#define PAGE_MAPPING_ANON_KSM	0x2

#define PAGE_MAPPING_KSM	(PAGE_MAPPING_ANON | PAGE_MAPPING_ANON_KSM)

#define PAGE_MAPPING_FLAGS	(PAGE_MAPPING_ANON | PAGE_MAPPING_ANON_KSM)

#define FOLIO_MAPPING_ANON	0x1

#define FOLIO_MAPPING_ANON_KSM	0x2

#define FOLIO_MAPPING_KSM	(FOLIO_MAPPING_ANON | FOLIO_MAPPING_ANON_KSM)

#define FOLIO_MAPPING_FLAGS	(FOLIO_MAPPING_ANON | FOLIO_MAPPING_ANON_KSM)



static __always_inline bool folio_test_anon(const struct folio *folio)

{

	return ((unsigned long)folio->mapping & PAGE_MAPPING_ANON) != 0;

	return ((unsigned long)folio->mapping & FOLIO_MAPPING_ANON) != 0;

}



static __always_inline bool PageAnonNotKsm(const struct page *page)

{

	unsigned long flags = (unsigned long)page_folio(page)->mapping;



	return (flags & PAGE_MAPPING_FLAGS) == PAGE_MAPPING_ANON;

	return (flags & FOLIO_MAPPING_FLAGS) == FOLIO_MAPPING_ANON;

}



static __always_inline bool PageAnon(const struct page *page)
@@ -743,8 +743,8 @@ static __always_inline bool PageAnon(const struct page *page) 
 */

static __always_inline bool folio_test_ksm(const struct folio *folio)

{

	return ((unsigned long)folio->mapping & PAGE_MAPPING_FLAGS) ==

				PAGE_MAPPING_KSM;

	return ((unsigned long)folio->mapping & FOLIO_MAPPING_FLAGS) ==

				FOLIO_MAPPING_KSM;

}

#else

FOLIO_TEST_FLAG_FALSE(ksm)

include/linux/pagemap.h

+1 −1
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ static inline pgoff_t mapping_align_index(struct address_space *mapping, 
static inline bool mapping_large_folio_support(struct address_space *mapping)

{

	/* AS_FOLIO_ORDER is only reasonable for pagecache folios */

	VM_WARN_ONCE((unsigned long)mapping & PAGE_MAPPING_ANON,

	VM_WARN_ONCE((unsigned long)mapping & FOLIO_MAPPING_ANON,

			"Anonymous mapping always supports large folio");



	return mapping_max_folio_order(mapping) > 0;