The patch titled
Subject: mm: vmscan: do not scan anon pages if memcg swap limit is hit
has been removed from the -mm tree. Its filename was
mm-vmscan-do-not-scan-anon-pages-if-memcg-swap-limit-is-hit.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx>
Subject: mm: vmscan: do not scan anon pages if memcg swap limit is hit
We don't scan anonymous memory if we ran out of swap, neither should we do
it in case memcg swap limit is hit, because swap out is impossible anyway.
Signed-off-by: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx>
Acked-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/swap.h | 6 ++++++
mm/memcontrol.c | 13 +++++++++++++
mm/vmscan.c | 2 +-
3 files changed, 20 insertions(+), 1 deletion(-)
diff -puN include/linux/swap.h~mm-vmscan-do-not-scan-anon-pages-if-memcg-swap-limit-is-hit include/linux/swap.h
--- a/include/linux/swap.h~mm-vmscan-do-not-scan-anon-pages-if-memcg-swap-limit-is-hit
+++ a/include/linux/swap.h
@@ -551,6 +551,7 @@ static inline int mem_cgroup_swappiness(
extern void mem_cgroup_swapout(struct page *page, swp_entry_t entry);
extern int mem_cgroup_try_charge_swap(struct page *page, swp_entry_t entry);
extern void mem_cgroup_uncharge_swap(swp_entry_t entry);
+extern long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg);
#else
static inline void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
{
@@ -565,6 +566,11 @@ static inline int mem_cgroup_try_charge_
static inline void mem_cgroup_uncharge_swap(swp_entry_t entry)
{
}
+
+static inline long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg)
+{
+ return get_nr_swap_pages();
+}
#endif
#endif /* __KERNEL__*/
diff -puN mm/memcontrol.c~mm-vmscan-do-not-scan-anon-pages-if-memcg-swap-limit-is-hit mm/memcontrol.c
--- a/mm/memcontrol.c~mm-vmscan-do-not-scan-anon-pages-if-memcg-swap-limit-is-hit
+++ a/mm/memcontrol.c
@@ -5748,6 +5748,19 @@ void mem_cgroup_uncharge_swap(swp_entry_
rcu_read_unlock();
}
+long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg)
+{
+ long nr_swap_pages = get_nr_swap_pages();
+
+ if (!do_swap_account || !cgroup_subsys_on_dfl(memory_cgrp_subsys))
+ return nr_swap_pages;
+ for (; memcg != root_mem_cgroup; memcg = parent_mem_cgroup(memcg))
+ nr_swap_pages = min_t(long, nr_swap_pages,
+ READ_ONCE(memcg->swap.limit) -
+ page_counter_read(&memcg->swap));
+ return nr_swap_pages;
+}
+
/* for remember boot option*/
#ifdef CONFIG_MEMCG_SWAP_ENABLED
static int really_do_swap_account __initdata = 1;
diff -puN mm/vmscan.c~mm-vmscan-do-not-scan-anon-pages-if-memcg-swap-limit-is-hit mm/vmscan.c
--- a/mm/vmscan.c~mm-vmscan-do-not-scan-anon-pages-if-memcg-swap-limit-is-hit
+++ a/mm/vmscan.c
@@ -2004,7 +2004,7 @@ static void get_scan_count(struct lruvec
force_scan = true;
/* If we have no swap space, do not bother scanning anon pages. */
- if (!sc->may_swap || (get_nr_swap_pages() <= 0)) {
+ if (!sc->may_swap || mem_cgroup_get_nr_swap_pages(memcg) <= 0) {
scan_balance = SCAN_FILE;
goto out;
}
_
Patches currently in -mm which might be from vdavydov@xxxxxxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
