memcg: convert mem_cgroup_swap_full() to take a folio

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.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Matthew Wilcox (Oracle) and committed by

Andrew Morton 3 years ago 9202d527 a160e537

+8 -9

5 changed files

expand all

include

linux

swap.h

memcontrol.c

memory.c

swapfile.c

vmscan.c

+2 -2

include/linux/swap.h

··· 692 692 } 693 693 694 694 extern long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg); 695 - extern bool mem_cgroup_swap_full(struct page *page); 695 + extern bool mem_cgroup_swap_full(struct folio *folio); 696 696 #else 697 697 static inline void mem_cgroup_swapout(struct folio *folio, swp_entry_t entry) 698 698 { ··· 714 714 return get_nr_swap_pages(); 715 715 } 716 716 717 - static inline bool mem_cgroup_swap_full(struct page *page) 717 + static inline bool mem_cgroup_swap_full(struct folio *folio) 718 718 { 719 719 return vm_swap_full(); 720 720 }

+3 -3

mm/memcontrol.c

··· 7406 7406 return nr_swap_pages; 7407 7407 } 7408 7408 7409 - bool mem_cgroup_swap_full(struct page *page) 7409 + bool mem_cgroup_swap_full(struct folio *folio) 7410 7410 { 7411 7411 struct mem_cgroup *memcg; 7412 7412 7413 - VM_BUG_ON_PAGE(!PageLocked(page), page); 7413 + VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); 7414 7414 7415 7415 if (vm_swap_full()) 7416 7416 return true; 7417 7417 if (cgroup_memory_noswap || !cgroup_subsys_on_dfl(memory_cgrp_subsys)) 7418 7418 return false; 7419 7419 7420 - memcg = page_memcg(page); 7420 + memcg = folio_memcg(folio); 7421 7421 if (!memcg) 7422 7422 return false; 7423 7423

+1 -1

mm/memory.c

··· 3647 3647 { 3648 3648 if (!folio_test_swapcache(folio)) 3649 3649 return false; 3650 - if (mem_cgroup_swap_full(&folio->page) || (vma->vm_flags & VM_LOCKED) || 3650 + if (mem_cgroup_swap_full(folio) || (vma->vm_flags & VM_LOCKED) || 3651 3651 folio_test_mlocked(folio)) 3652 3652 return true; 3653 3653 /*

+1 -1

mm/swapfile.c

··· 148 148 if (folio_trylock(folio)) { 149 149 if ((flags & TTRS_ANYWAY) || 150 150 ((flags & TTRS_UNMAPPED) && !folio_mapped(folio)) || 151 - ((flags & TTRS_FULL) && mem_cgroup_swap_full(&folio->page))) 151 + ((flags & TTRS_FULL) && mem_cgroup_swap_full(folio))) 152 152 ret = folio_free_swap(folio); 153 153 folio_unlock(folio); 154 154 }

+1 -2

mm/vmscan.c

··· 2047 2047 activate_locked: 2048 2048 /* Not a candidate for swapping, so reclaim swap space. */ 2049 2049 if (folio_test_swapcache(folio) && 2050 - (mem_cgroup_swap_full(&folio->page) || 2051 - folio_test_mlocked(folio))) 2050 + (mem_cgroup_swap_full(folio) || folio_test_mlocked(folio))) 2052 2051 folio_free_swap(folio); 2053 2052 VM_BUG_ON_FOLIO(folio_test_active(folio), folio); 2054 2053 if (!folio_test_mlocked(folio)) {

Configure Feed

Configure Feed