qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm/rmap: Constify the rmap_walk_control argument 

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2083861
Tested: by me with multiple test suites
Conflicts: context due missing 1a0cf26323

commit 84fbbe21894bb9be8e16df408cbfbb9466fe396d
Author: Matthew Wilcox (Oracle) <willy@infradead.org>
Date:   Sat Jan 29 16:16:54 2022 -0500

    mm/rmap: Constify the rmap_walk_control argument

    The rmap walking functions do not modify the rmap_walk_control, and
    page_idle_clear_pte_refs() takes advantage of that to move construction
    of the rmap_walk_control to compile time.  This lets us remove an
    unclean cast.

    Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

Signed-off-by: Aristeu Rozanski <arozansk@redhat.com>
This commit is contained in:
Aristeu Rozanski 2022-07-10 10:44:06 -04:00
parent ca19554894
commit 9c82671a22
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/ksm.h
View File

@ -51,7 +51,7 @@ static inline void ksm_exit(struct mm_struct *mm)
struct page *ksm_might_need_to_copy(struct page *page,
struct vm_area_struct *vma, unsigned long address);
void rmap_walk_ksm(struct folio *folio, struct rmap_walk_control *rwc);
void rmap_walk_ksm(struct folio *folio, const struct rmap_walk_control *rwc);
void folio_migrate_ksm(struct folio *newfolio, struct folio *folio);
bool reuse_ksm_page(struct page *page,
struct vm_area_struct *vma, unsigned long address);
@ -81,7 +81,7 @@ static inline struct page *ksm_might_need_to_copy(struct page *page,
}
static inline void rmap_walk_ksm(struct folio *folio,
struct rmap_walk_control *rwc)
const struct rmap_walk_control *rwc)
{
}

4
include/linux/rmap.h
View File

@ -292,8 +292,8 @@ struct rmap_walk_control {
bool (*invalid_vma)(struct vm_area_struct *vma, void *arg);
};
void rmap_walk(struct folio *folio, struct rmap_walk_control *rwc);
void rmap_walk_locked(struct folio *folio, struct rmap_walk_control *rwc);
void rmap_walk(struct folio *folio, const struct rmap_walk_control *rwc);
void rmap_walk_locked(struct folio *folio, const struct rmap_walk_control *rwc);
#else /* !CONFIG_MMU */

2
mm/ksm.c
View File

@ -2589,7 +2589,7 @@ struct page *ksm_might_need_to_copy(struct page *page,
return new_page;
}
void rmap_walk_ksm(struct folio *folio, struct rmap_walk_control *rwc)
void rmap_walk_ksm(struct folio *folio, const struct rmap_walk_control *rwc)
{
struct stable_node *stable_node;
struct rmap_item *rmap_item;

2
mm/page_idle.c
View File

@ -103,7 +103,7 @@ static void page_idle_clear_pte_refs(struct page *page)
if (need_lock && !folio_trylock(folio))
return;
rmap_walk(folio, (struct rmap_walk_control *)&rwc);
rmap_walk(folio, &rwc);
if (need_lock)
folio_unlock(folio);

14
mm/rmap.c
View File

@ -2166,7 +2166,7 @@ void __put_anon_vma(struct anon_vma *anon_vma)
}
static struct anon_vma *rmap_walk_anon_lock(struct folio *folio,
struct rmap_walk_control *rwc)
const struct rmap_walk_control *rwc)
{
struct anon_vma *anon_vma;
@ -2196,8 +2196,8 @@ static struct anon_vma *rmap_walk_anon_lock(struct folio *folio,
* Find all the mappings of a page using the mapping pointer and the vma chains
* contained in the anon_vma struct it points to.
*/
static void rmap_walk_anon(struct folio *folio, struct rmap_walk_control *rwc,
bool locked)
static void rmap_walk_anon(struct folio *folio,
const struct rmap_walk_control *rwc, bool locked)
{
struct anon_vma *anon_vma;
pgoff_t pgoff_start, pgoff_end;
@ -2244,8 +2244,8 @@ static void rmap_walk_anon(struct folio *folio, struct rmap_walk_control *rwc,
* Find all the mappings of a page using the mapping pointer and the vma chains
* contained in the address_space struct it points to.
*/
static void rmap_walk_file(struct folio *folio, struct rmap_walk_control *rwc,
bool locked)
static void rmap_walk_file(struct folio *folio,
const struct rmap_walk_control *rwc, bool locked)
{
struct address_space *mapping = folio_mapping(folio);
pgoff_t pgoff_start, pgoff_end;
@ -2287,7 +2287,7 @@ done:
i_mmap_unlock_read(mapping);
}
void rmap_walk(struct folio *folio, struct rmap_walk_control *rwc)
void rmap_walk(struct folio *folio, const struct rmap_walk_control *rwc)
{
if (unlikely(folio_test_ksm(folio)))
rmap_walk_ksm(folio, rwc);
@ -2298,7 +2298,7 @@ void rmap_walk(struct folio *folio, struct rmap_walk_control *rwc)
}
/* Like rmap_walk, but caller holds relevant rmap lock */
void rmap_walk_locked(struct folio *folio, struct rmap_walk_control *rwc)
void rmap_walk_locked(struct folio *folio, const struct rmap_walk_control *rwc)
{
/* no ksm support for now */
VM_BUG_ON_FOLIO(folio_test_ksm(folio), folio);