summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorMatthew Wilcox (Oracle) <willy@infradead.org>2022-09-02 20:46:43 +0100
committerAndrew Morton <akpm@linux-foundation.org>2022-10-03 14:02:53 -0700
commit9202d527b715f67bcdccbb9b712b65fe053f8109 (patch)
tree14324860c4931c6b545e4ace77faadd3b7c0aa11 /mm
parenta160e5377b55bc5c1925a7456b656aabfc07261f (diff)
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>
Diffstat (limited to 'mm')
-rw-r--r--mm/memcontrol.c6
-rw-r--r--mm/memory.c2
-rw-r--r--mm/swapfile.c2
-rw-r--r--mm/vmscan.c3
4 files changed, 6 insertions, 7 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 9863fb588972..632402001bca 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -7406,18 +7406,18 @@ long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg)
return nr_swap_pages;
}
-bool mem_cgroup_swap_full(struct page *page)
+bool mem_cgroup_swap_full(struct folio *folio)
{
struct mem_cgroup *memcg;
- VM_BUG_ON_PAGE(!PageLocked(page), page);
+ VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio);
if (vm_swap_full())
return true;
if (cgroup_memory_noswap || !cgroup_subsys_on_dfl(memory_cgrp_subsys))
return false;
- memcg = page_memcg(page);
+ memcg = folio_memcg(folio);
if (!memcg)
return false;
diff --git a/mm/memory.c b/mm/memory.c
index b8e4dae18ac1..2f1a6da7f1e6 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3647,7 +3647,7 @@ static inline bool should_try_to_free_swap(struct folio *folio,
{
if (!folio_test_swapcache(folio))
return false;
- if (mem_cgroup_swap_full(&folio->page) || (vma->vm_flags & VM_LOCKED) ||
+ if (mem_cgroup_swap_full(folio) || (vma->vm_flags & VM_LOCKED) ||
folio_test_mlocked(folio))
return true;
/*
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 3820b5ab64d9..4efcfe34e45b 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -148,7 +148,7 @@ static int __try_to_reclaim_swap(struct swap_info_struct *si,
if (folio_trylock(folio)) {
if ((flags & TTRS_ANYWAY) ||
((flags & TTRS_UNMAPPED) && !folio_mapped(folio)) ||
- ((flags & TTRS_FULL) && mem_cgroup_swap_full(&folio->page)))
+ ((flags & TTRS_FULL) && mem_cgroup_swap_full(folio)))
ret = folio_free_swap(folio);
folio_unlock(folio);
}
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 1707e3bfcfe4..c5a4bff11da6 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -2047,8 +2047,7 @@ activate_locked_split:
activate_locked:
/* Not a candidate for swapping, so reclaim swap space. */
if (folio_test_swapcache(folio) &&
- (mem_cgroup_swap_full(&folio->page) ||
- folio_test_mlocked(folio)))
+ (mem_cgroup_swap_full(folio) || folio_test_mlocked(folio)))
folio_free_swap(folio);
VM_BUG_ON_FOLIO(folio_test_active(folio), folio);
if (!folio_test_mlocked(folio)) {