mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
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: David Hildenbrand <david@redhat.com> Reviewed-by: Zi Yan <ziy@nvidia.com> Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Reviewed-by: Harry 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: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
parent
78cb1a13c4
commit
df25569d40
@ -149,7 +149,7 @@ u64 stable_page_flags(const struct page *page)
|
|||||||
|
|
||||||
k = folio->flags;
|
k = folio->flags;
|
||||||
mapping = (unsigned long)folio->mapping;
|
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
|
* 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;
|
u |= 1 << KPF_MMAP;
|
||||||
if (is_anon) {
|
if (is_anon) {
|
||||||
u |= 1 << KPF_ANON;
|
u |= 1 << KPF_ANON;
|
||||||
if (mapping & PAGE_MAPPING_KSM)
|
if (mapping & FOLIO_MAPPING_KSM)
|
||||||
u |= 1 << KPF_KSM;
|
u |= 1 << KPF_KSM;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -526,7 +526,7 @@ struct address_space {
|
|||||||
/*
|
/*
|
||||||
* On most architectures that alignment is already the case; but
|
* On most architectures that alignment is already the case; but
|
||||||
* must be enforced here for CRIS, to let the least significant bit
|
* 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. */
|
/* XArray tags, for tagging dirty and writeback pages in the pagecache. */
|
||||||
|
@ -105,7 +105,6 @@ struct page {
|
|||||||
unsigned int order;
|
unsigned int order;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
/* See page-flags.h for PAGE_MAPPING_FLAGS */
|
|
||||||
struct address_space *mapping;
|
struct address_space *mapping;
|
||||||
union {
|
union {
|
||||||
pgoff_t __folio_index; /* Our offset within mapping. */
|
pgoff_t __folio_index; /* Our offset within mapping. */
|
||||||
|
@ -695,10 +695,10 @@ PAGEFLAG_FALSE(VmemmapSelfHosted, vmemmap_self_hosted)
|
|||||||
/*
|
/*
|
||||||
* On an anonymous folio mapped into a user virtual memory area,
|
* On an anonymous folio mapped into a user virtual memory area,
|
||||||
* folio->mapping points to its anon_vma, not to a struct address_space;
|
* 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,
|
* 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
|
* 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.
|
* 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).
|
* false before calling the following functions (e.g., folio_test_anon).
|
||||||
* See mm/slab.h.
|
* See mm/slab.h.
|
||||||
*/
|
*/
|
||||||
#define PAGE_MAPPING_ANON 0x1
|
#define FOLIO_MAPPING_ANON 0x1
|
||||||
#define PAGE_MAPPING_ANON_KSM 0x2
|
#define FOLIO_MAPPING_ANON_KSM 0x2
|
||||||
#define PAGE_MAPPING_KSM (PAGE_MAPPING_ANON | PAGE_MAPPING_ANON_KSM)
|
#define FOLIO_MAPPING_KSM (FOLIO_MAPPING_ANON | FOLIO_MAPPING_ANON_KSM)
|
||||||
#define PAGE_MAPPING_FLAGS (PAGE_MAPPING_ANON | PAGE_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)
|
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)
|
static __always_inline bool PageAnonNotKsm(const struct page *page)
|
||||||
{
|
{
|
||||||
unsigned long flags = (unsigned long)page_folio(page)->mapping;
|
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)
|
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)
|
static __always_inline bool folio_test_ksm(const struct folio *folio)
|
||||||
{
|
{
|
||||||
return ((unsigned long)folio->mapping & PAGE_MAPPING_FLAGS) ==
|
return ((unsigned long)folio->mapping & FOLIO_MAPPING_FLAGS) ==
|
||||||
PAGE_MAPPING_KSM;
|
FOLIO_MAPPING_KSM;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
FOLIO_TEST_FLAG_FALSE(ksm)
|
FOLIO_TEST_FLAG_FALSE(ksm)
|
||||||
|
@ -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)
|
static inline bool mapping_large_folio_support(struct address_space *mapping)
|
||||||
{
|
{
|
||||||
/* AS_FOLIO_ORDER is only reasonable for pagecache folios */
|
/* 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");
|
"Anonymous mapping always supports large folio");
|
||||||
|
|
||||||
return mapping_max_folio_order(mapping) > 0;
|
return mapping_max_folio_order(mapping) > 0;
|
||||||
|
4
mm/gup.c
4
mm/gup.c
@ -2804,9 +2804,9 @@ static bool gup_fast_folio_allowed(struct folio *folio, unsigned int flags)
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
/* Anonymous folios pose no problem. */
|
/* Anonymous folios pose no problem. */
|
||||||
mapping_flags = (unsigned long)mapping & PAGE_MAPPING_FLAGS;
|
mapping_flags = (unsigned long)mapping & FOLIO_MAPPING_FLAGS;
|
||||||
if (mapping_flags)
|
if (mapping_flags)
|
||||||
return mapping_flags & PAGE_MAPPING_ANON;
|
return mapping_flags & FOLIO_MAPPING_ANON;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* At this point, we know the mapping is non-null and points to an
|
* At this point, we know the mapping is non-null and points to an
|
||||||
|
@ -149,7 +149,7 @@ static inline void *folio_raw_mapping(const struct folio *folio)
|
|||||||
{
|
{
|
||||||
unsigned long mapping = (unsigned long)folio->mapping;
|
unsigned long mapping = (unsigned long)folio->mapping;
|
||||||
|
|
||||||
return (void *)(mapping & ~PAGE_MAPPING_FLAGS);
|
return (void *)(mapping & ~FOLIO_MAPPING_FLAGS);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
4
mm/ksm.c
4
mm/ksm.c
@ -893,7 +893,7 @@ static struct folio *ksm_get_folio(struct ksm_stable_node *stable_node,
|
|||||||
unsigned long kpfn;
|
unsigned long kpfn;
|
||||||
|
|
||||||
expected_mapping = (void *)((unsigned long)stable_node |
|
expected_mapping = (void *)((unsigned long)stable_node |
|
||||||
PAGE_MAPPING_KSM);
|
FOLIO_MAPPING_KSM);
|
||||||
again:
|
again:
|
||||||
kpfn = READ_ONCE(stable_node->kpfn); /* Address dependency. */
|
kpfn = READ_ONCE(stable_node->kpfn); /* Address dependency. */
|
||||||
folio = pfn_folio(kpfn);
|
folio = pfn_folio(kpfn);
|
||||||
@ -1070,7 +1070,7 @@ static inline void folio_set_stable_node(struct folio *folio,
|
|||||||
struct ksm_stable_node *stable_node)
|
struct ksm_stable_node *stable_node)
|
||||||
{
|
{
|
||||||
VM_WARN_ON_FOLIO(folio_test_anon(folio) && PageAnonExclusive(&folio->page), folio);
|
VM_WARN_ON_FOLIO(folio_test_anon(folio) && PageAnonExclusive(&folio->page), folio);
|
||||||
folio->mapping = (void *)((unsigned long)stable_node | PAGE_MAPPING_KSM);
|
folio->mapping = (void *)((unsigned long)stable_node | FOLIO_MAPPING_KSM);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_SYSFS
|
#ifdef CONFIG_SYSFS
|
||||||
|
16
mm/rmap.c
16
mm/rmap.c
@ -503,12 +503,12 @@ struct anon_vma *folio_get_anon_vma(const struct folio *folio)
|
|||||||
|
|
||||||
rcu_read_lock();
|
rcu_read_lock();
|
||||||
anon_mapping = (unsigned long)READ_ONCE(folio->mapping);
|
anon_mapping = (unsigned long)READ_ONCE(folio->mapping);
|
||||||
if ((anon_mapping & PAGE_MAPPING_FLAGS) != PAGE_MAPPING_ANON)
|
if ((anon_mapping & FOLIO_MAPPING_FLAGS) != FOLIO_MAPPING_ANON)
|
||||||
goto out;
|
goto out;
|
||||||
if (!folio_mapped(folio))
|
if (!folio_mapped(folio))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
anon_vma = (struct anon_vma *) (anon_mapping - PAGE_MAPPING_ANON);
|
anon_vma = (struct anon_vma *) (anon_mapping - FOLIO_MAPPING_ANON);
|
||||||
if (!atomic_inc_not_zero(&anon_vma->refcount)) {
|
if (!atomic_inc_not_zero(&anon_vma->refcount)) {
|
||||||
anon_vma = NULL;
|
anon_vma = NULL;
|
||||||
goto out;
|
goto out;
|
||||||
@ -550,12 +550,12 @@ struct anon_vma *folio_lock_anon_vma_read(const struct folio *folio,
|
|||||||
retry:
|
retry:
|
||||||
rcu_read_lock();
|
rcu_read_lock();
|
||||||
anon_mapping = (unsigned long)READ_ONCE(folio->mapping);
|
anon_mapping = (unsigned long)READ_ONCE(folio->mapping);
|
||||||
if ((anon_mapping & PAGE_MAPPING_FLAGS) != PAGE_MAPPING_ANON)
|
if ((anon_mapping & FOLIO_MAPPING_FLAGS) != FOLIO_MAPPING_ANON)
|
||||||
goto out;
|
goto out;
|
||||||
if (!folio_mapped(folio))
|
if (!folio_mapped(folio))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
anon_vma = (struct anon_vma *) (anon_mapping - PAGE_MAPPING_ANON);
|
anon_vma = (struct anon_vma *) (anon_mapping - FOLIO_MAPPING_ANON);
|
||||||
root_anon_vma = READ_ONCE(anon_vma->root);
|
root_anon_vma = READ_ONCE(anon_vma->root);
|
||||||
if (down_read_trylock(&root_anon_vma->rwsem)) {
|
if (down_read_trylock(&root_anon_vma->rwsem)) {
|
||||||
/*
|
/*
|
||||||
@ -1334,9 +1334,9 @@ void folio_move_anon_rmap(struct folio *folio, struct vm_area_struct *vma)
|
|||||||
VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio);
|
VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio);
|
||||||
VM_BUG_ON_VMA(!anon_vma, vma);
|
VM_BUG_ON_VMA(!anon_vma, vma);
|
||||||
|
|
||||||
anon_vma += PAGE_MAPPING_ANON;
|
anon_vma += FOLIO_MAPPING_ANON;
|
||||||
/*
|
/*
|
||||||
* Ensure that anon_vma and the PAGE_MAPPING_ANON bit are written
|
* Ensure that anon_vma and the FOLIO_MAPPING_ANON bit are written
|
||||||
* simultaneously, so a concurrent reader (eg folio_referenced()'s
|
* simultaneously, so a concurrent reader (eg folio_referenced()'s
|
||||||
* folio_test_anon()) will not see one without the other.
|
* folio_test_anon()) will not see one without the other.
|
||||||
*/
|
*/
|
||||||
@ -1367,10 +1367,10 @@ static void __folio_set_anon(struct folio *folio, struct vm_area_struct *vma,
|
|||||||
/*
|
/*
|
||||||
* page_idle does a lockless/optimistic rmap scan on folio->mapping.
|
* page_idle does a lockless/optimistic rmap scan on folio->mapping.
|
||||||
* Make sure the compiler doesn't split the stores of anon_vma and
|
* Make sure the compiler doesn't split the stores of anon_vma and
|
||||||
* the PAGE_MAPPING_ANON type identifier, otherwise the rmap code
|
* the FOLIO_MAPPING_ANON type identifier, otherwise the rmap code
|
||||||
* could mistake the mapping for a struct address_space and crash.
|
* could mistake the mapping for a struct address_space and crash.
|
||||||
*/
|
*/
|
||||||
anon_vma = (void *) anon_vma + PAGE_MAPPING_ANON;
|
anon_vma = (void *) anon_vma + FOLIO_MAPPING_ANON;
|
||||||
WRITE_ONCE(folio->mapping, (struct address_space *) anon_vma);
|
WRITE_ONCE(folio->mapping, (struct address_space *) anon_vma);
|
||||||
folio->index = linear_page_index(vma, address);
|
folio->index = linear_page_index(vma, address);
|
||||||
}
|
}
|
||||||
|
@ -670,9 +670,9 @@ struct anon_vma *folio_anon_vma(const struct folio *folio)
|
|||||||
{
|
{
|
||||||
unsigned long mapping = (unsigned long)folio->mapping;
|
unsigned long mapping = (unsigned long)folio->mapping;
|
||||||
|
|
||||||
if ((mapping & PAGE_MAPPING_FLAGS) != PAGE_MAPPING_ANON)
|
if ((mapping & FOLIO_MAPPING_FLAGS) != FOLIO_MAPPING_ANON)
|
||||||
return NULL;
|
return NULL;
|
||||||
return (void *)(mapping - PAGE_MAPPING_ANON);
|
return (void *)(mapping - FOLIO_MAPPING_ANON);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -699,7 +699,7 @@ struct address_space *folio_mapping(struct folio *folio)
|
|||||||
return swap_address_space(folio->swap);
|
return swap_address_space(folio->swap);
|
||||||
|
|
||||||
mapping = folio->mapping;
|
mapping = folio->mapping;
|
||||||
if ((unsigned long)mapping & PAGE_MAPPING_FLAGS)
|
if ((unsigned long)mapping & FOLIO_MAPPING_FLAGS)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
return mapping;
|
return mapping;
|
||||||
|
Loading…
Reference in New Issue
Block a user