Commits · 19672a9e4a75252871cba319f4e3b859b8fdf671 · Kirill Smelkov / linux

03 Oct, 2022 40 commits

mm: convert lock_page_or_retry() to folio_lock_or_retry() · 19672a9e

Matthew Wilcox (Oracle) authored Sep 02, 2022

Remove a call to compound_head() in each of the two callers.

Link: https://lkml.kernel.org/r/20220902194653.1739778-58-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

19672a9e

uprobes: use new_folio in __replace_page() · 82e66bf7

Matthew Wilcox (Oracle) authored Sep 02, 2022

Saves several calls to compound_head().

Link: https://lkml.kernel.org/r/20220902194653.1739778-57-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

82e66bf7

rmap: remove page_unlock_anon_vma_read() · 0c826c0b

Matthew Wilcox (Oracle) authored Sep 02, 2022

This was simply an alias for anon_vma_unlock_read() since 2011.

Link: https://lkml.kernel.org/r/20220902194653.1739778-56-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

0c826c0b

mm: convert page_get_anon_vma() to folio_get_anon_vma() · 29eea9b5

Matthew Wilcox (Oracle) authored Sep 02, 2022

With all callers now passing in a folio, rename the function and convert
all callers. Removes a couple of calls to compound_head() and a reference
to page->mapping.

Link: https://lkml.kernel.org/r/20220902194653.1739778-55-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

29eea9b5

huge_memory: convert unmap_page() to unmap_folio() · 684555aa

Matthew Wilcox (Oracle) authored Sep 02, 2022

Remove a folio->page->folio conversion.

Link: https://lkml.kernel.org/r/20220902194653.1739778-54-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

684555aa

huge_memory: convert split_huge_page_to_list() to use a folio · 3e9a13da

Matthew Wilcox (Oracle) authored Sep 02, 2022

Saves many calls to compound_head().

Link: https://lkml.kernel.org/r/20220902194653.1739778-53-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

3e9a13da

migrate: convert unmap_and_move_huge_page() to use folios · c33db292

Matthew Wilcox (Oracle) authored Sep 02, 2022

Saves several calls to compound_head() and removes a couple of uses of
page->lru.

Link: https://lkml.kernel.org/r/20220902194653.1739778-52-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

c33db292

migrate: convert __unmap_and_move() to use folios · 682a71a1

Matthew Wilcox (Oracle) authored Sep 02, 2022

Removes a lot of calls to compound_head(). Also remove a VM_BUG_ON that
can never trigger as the PageAnon bit is the bottom bit of page->mapping.

Link: https://lkml.kernel.org/r/20220902194653.1739778-51-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

682a71a1

rmap: convert page_move_anon_rmap() to use a folio · 595af4c9

Matthew Wilcox (Oracle) authored Sep 02, 2022

Removes one call to compound_head() and a reference to page->mapping.

Link: https://lkml.kernel.org/r/20220902194653.1739778-50-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

595af4c9

mm: remove try_to_free_swap() · 3b344157

Matthew Wilcox (Oracle) authored Sep 02, 2022

All callers have now been converted to folio_free_swap() and we can remove
this wrapper.

Link: https://lkml.kernel.org/r/20220902194653.1739778-49-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

3b344157

memcg: convert mem_cgroup_swap_full() to take a folio · 9202d527

Matthew Wilcox (Oracle) authored Sep 02, 2022

All callers now have a folio, so convert the function to take a folio.
Saves a couple of calls to compound_head().

Link: https://lkml.kernel.org/r/20220902194653.1739778-48-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

9202d527

mm: convert do_swap_page() to use folio_free_swap() · a160e537

Matthew Wilcox (Oracle) authored Sep 02, 2022

Also convert should_try_to_free_swap() to use a folio. This removes a few
calls to compound_head().

Link: https://lkml.kernel.org/r/20220902194653.1739778-47-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

a160e537

ksm: use a folio in replace_page() · b4e6f66e

Matthew Wilcox (Oracle) authored Sep 02, 2022

Replace three calls to compound_head() with one.

Link: https://lkml.kernel.org/r/20220902194653.1739778-46-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

b4e6f66e

uprobes: use folios more widely in __replace_page() · 5fcd079a

Matthew Wilcox (Oracle) authored Sep 02, 2022

Remove a few hidden calls to compound_head().

Link: https://lkml.kernel.org/r/20220902194653.1739778-45-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

5fcd079a

madvise: convert madvise_free_pte_range() to use a folio · 98b211d6

Matthew Wilcox (Oracle) authored Sep 02, 2022

Saves a lot of calls to compound_head().

Link: https://lkml.kernel.org/r/20220902194653.1739778-44-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

98b211d6

huge_memory: convert do_huge_pmd_wp_page() to use a folio · 2fad3d14

Matthew Wilcox (Oracle) authored Sep 02, 2022

Removes many calls to compound_head(). Does not remove the assumption
that a folio may not be larger than a PMD.

Link: https://lkml.kernel.org/r/20220902194653.1739778-43-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

2fad3d14

mm: convert do_wp_page() to use a folio · e4a2ed94

Matthew Wilcox (Oracle) authored Sep 02, 2022

Saves many calls to compound_head().

Link: https://lkml.kernel.org/r/20220902194653.1739778-42-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

e4a2ed94

swap: convert swap_writepage() to use a folio · 71fa1a53

Matthew Wilcox (Oracle) authored Sep 02, 2022

Removes many calls to compound_head().

Link: https://lkml.kernel.org/r/20220902194653.1739778-41-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

71fa1a53

swap_state: convert free_swap_cache() to use a folio · aedd74d4

Matthew Wilcox (Oracle) authored Sep 02, 2022

Saves several calls to compound_head().

Link: https://lkml.kernel.org/r/20220902194653.1739778-40-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

aedd74d4

mm: remove lookup_swap_cache() · cb691e2f

Matthew Wilcox (Oracle) authored Sep 02, 2022

All callers have now been converted to swap_cache_get_folio(), so we can
remove this wrapper.

Link: https://lkml.kernel.org/r/20220902194653.1739778-39-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

cb691e2f

mm: convert do_swap_page() to use swap_cache_get_folio() · 5a423081

Matthew Wilcox (Oracle) authored Sep 02, 2022

Saves a folio->page->folio conversion.

Link: https://lkml.kernel.org/r/20220902194653.1739778-38-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

5a423081

swapfile: convert unuse_pte_range() to use a folio · f102cd8b

Matthew Wilcox (Oracle) authored Sep 02, 2022

Delay fetching the precise page from the folio until we're in unuse_pte().
Saves many calls to compound_head().

Link: https://lkml.kernel.org/r/20220902194653.1739778-37-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

f102cd8b

swapfile: convert __try_to_reclaim_swap() to use a folio · 2c3f6194

Matthew Wilcox (Oracle) authored Sep 02, 2022

Saves five calls to compound_head().

Link: https://lkml.kernel.org/r/20220902194653.1739778-36-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

2c3f6194

swapfile: convert try_to_unuse() to use a folio · 000085b9

Matthew Wilcox (Oracle) authored Sep 02, 2022

Saves five calls to compound_head().

Link: https://lkml.kernel.org/r/20220902194653.1739778-35-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

000085b9

shmem: remove shmem_getpage() · 923e2f0e

Matthew Wilcox (Oracle) authored Sep 02, 2022

With all callers removed, remove this wrapper function. The flags are now
mysteriously called SGP, but I think we can live with that.

Link: https://lkml.kernel.org/r/20220902194653.1739778-34-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

923e2f0e

userfaultfd: convert mcontinue_atomic_pte() to use a folio · 12acf4fb

Matthew Wilcox (Oracle) authored Sep 02, 2022

shmem_getpage() is being replaced by shmem_get_folio() so use a folio
throughout this function. Saves several calls to compound_head().

Link: https://lkml.kernel.org/r/20220902194653.1739778-33-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

12acf4fb

khugepaged: call shmem_get_folio() · 7459c149

Matthew Wilcox (Oracle) authored Sep 02, 2022

shmem_getpage() is being removed, so call its replacement and find the
precise page ourselves.

Link: https://lkml.kernel.org/r/20220902194653.1739778-32-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

7459c149

shmem: convert shmem_get_link() to use a folio · e4b57722

Matthew Wilcox (Oracle) authored Sep 02, 2022

Symlinks will never use a large folio, but using the folio API removes a
lot of unnecessary folio->page->folio conversions.

Link: https://lkml.kernel.org/r/20220902194653.1739778-31-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

e4b57722

shmem: convert shmem_symlink() to use a folio · 7ad0414b

Matthew Wilcox (Oracle) authored Sep 02, 2022

While symlinks will always be < PAGE_SIZE, using the folio APIs gets rid
of unnecessary calls to compound_head().

Link: https://lkml.kernel.org/r/20220902194653.1739778-30-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

7ad0414b

shmem: convert shmem_fallocate() to use a folio · b0802b22

Matthew Wilcox (Oracle) authored Sep 02, 2022

Call shmem_get_folio() and use the folio APIs instead of the page APIs.
Saves several calls to compound_head() and removes assumptions about the
size of a large folio.

Link: https://lkml.kernel.org/r/20220902194653.1739778-29-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

b0802b22

shmem: convert shmem_file_read_iter() to use shmem_get_folio() · 4601e2fc

Matthew Wilcox (Oracle) authored Sep 02, 2022

Use a folio throughout, saving five calls to compound_head().

Link: https://lkml.kernel.org/r/20220902194653.1739778-28-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

4601e2fc

shmem: convert shmem_write_begin() to use shmem_get_folio() · eff1f906

Matthew Wilcox (Oracle) authored Sep 02, 2022

Use a folio throughout this function, saving a couple of calls to
compound_head().

Link: https://lkml.kernel.org/r/20220902194653.1739778-27-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

eff1f906

shmem: convert shmem_get_partial_folio() to use shmem_get_folio() · a7f5862c

Matthew Wilcox (Oracle) authored Sep 02, 2022

Get rid of an unnecessary folio->page->folio conversion.

Link: https://lkml.kernel.org/r/20220902194653.1739778-26-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

a7f5862c

shmem: add shmem_get_folio() · 4e1fc793

Matthew Wilcox (Oracle) authored Sep 02, 2022

With no remaining callers of shmem_getpage_gfp(), add shmem_get_folio()
and reimplement shmem_getpage() as a call to shmem_get_folio().

Link: https://lkml.kernel.org/r/20220902194653.1739778-25-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

4e1fc793

shmem: convert shmem_read_mapping_page_gfp() to use shmem_get_folio_gfp() · a3a9c397

Matthew Wilcox (Oracle) authored Sep 02, 2022

Saves a couple of calls to compound_head().

Link: https://lkml.kernel.org/r/20220902194653.1739778-24-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

a3a9c397

shmem: convert shmem_fault() to use shmem_get_folio_gfp() · 68a54100

Matthew Wilcox (Oracle) authored Sep 02, 2022

No particular advantage for this function, but necessary to remove
shmem_getpage_gfp().

[hughd@google.com: fix crash]
  Link: https://lkml.kernel.org/r/7693a84-bdc2-27b5-2695-d0fe8566571f@google.com
Link: https://lkml.kernel.org/r/20220902194653.1739778-23-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

68a54100

shmem: convert shmem_getpage_gfp() to shmem_get_folio_gfp() · fc26babb

Matthew Wilcox (Oracle) authored Sep 02, 2022

Add a shmem_getpage_gfp() wrapper for compatibility with current users.

Link: https://lkml.kernel.org/r/20220902194653.1739778-22-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

fc26babb

shmem: eliminate struct page from shmem_swapin_folio() · 5739a81c

Matthew Wilcox (Oracle) authored Sep 02, 2022

Convert shmem_swapin() to return a folio and use swap_cache_get_folio(),
removing all uses of struct page in this function.

Link: https://lkml.kernel.org/r/20220902194653.1739778-21-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

5739a81c

swap: add swap_cache_get_folio() · c9edc242

Matthew Wilcox (Oracle) authored Sep 02, 2022

Convert lookup_swap_cache() into swap_cache_get_folio() and add a
lookup_swap_cache() wrapper around it.

[akpm@linux-foundation.org: add CONFIG_SWAP=n stub for swap_cache_get_folio()]
Link: https://lkml.kernel.org/r/20220902194653.1739778-20-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

c9edc242

shmem: convert shmem_replace_page() to shmem_replace_folio() · 0d698e25

Matthew Wilcox (Oracle) authored Sep 02, 2022

The caller has a folio, so convert the calling convention and rename the
function.

Link: https://lkml.kernel.org/r/20220902194653.1739778-19-willy@infradead.orgSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

0d698e25