The patch titled
Subject: mm: workingset: don't drop refault information prematurely fix
has been removed from the -mm tree. Its filename was
mm-workingset-dont-drop-refault-information-prematurely-fix.patch
This patch was dropped because it was folded into mm-workingset-dont-drop-refault-information-prematurely.patch
------------------------------------------------------
From: Johannes Weiner <hannes@xxxxxxxxxxx>
Subject: mm: workingset: don't drop refault information prematurely fix
The shadow shrinker is invoked per NUMA node, but the shadow limit
enforced for cgroups is based on the page counter, which isn't NUMA aware.
Instead of shrinking shadow pages to desired_size, we end up with
desired_size * nr_online_nodes.
Switch to NUMA-aware lru and slab counters to approximate cgroup size.
Link: http://lkml.kernel.org/r/20181009184732.762-2-hannes@xxxxxxxxxxx
Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Reviewed-by: Rik van Riel <riel@xxxxxxxxxxx>
Acked-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Cc: Daniel Drake <drake@xxxxxxxxxxxx>
Cc: Suren Baghdasaryan <surenb@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: Vinayak Menon <vinmenon@xxxxxxxxxxxxxx>
Cc: Christopher Lameter <cl@xxxxxxxxx>
Cc: Peter Enderborg <peter.enderborg@xxxxxxxx>
Cc: Shakeel Butt <shakeelb@xxxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
--- a/mm/workingset.c~mm-workingset-dont-drop-refault-information-prematurely-fix
+++ a/mm/workingset.c
@@ -391,9 +391,15 @@ static unsigned long count_shadow_nodes(
* PAGE_SIZE / radix_tree_nodes / node_entries * 8 / PAGE_SIZE
*/
#ifdef CONFIG_MEMCG
- if (sc->memcg)
- pages = page_counter_read(&sc->memcg->memory);
- else
+ if (sc->memcg) {
+ struct lruvec *lruvec;
+
+ pages = mem_cgroup_node_nr_lru_pages(sc->memcg, sc->nid,
+ LRU_ALL);
+ lruvec = mem_cgroup_lruvec(NODE_DATA(sc->nid), sc->memcg);
+ pages += lruvec_page_state(lruvec, NR_SLAB_RECLAIMABLE);
+ pages += lruvec_page_state(lruvec, NR_SLAB_UNRECLAIMABLE);
+ } else
#endif
pages = node_present_pages(sc->nid);
_
Patches currently in -mm which might be from hannes@xxxxxxxxxxx are
mm-workingset-dont-drop-refault-information-prematurely.patch
mm-workingset-tell-cache-transitions-from-workingset-thrashing.patch
delayacct-track-delays-from-thrashing-cache-pages.patch
sched-loadavg-consolidate-load_int-load_frac-calc_load.patch
sched-loadavg-make-calc_load_n-public.patch
sched-schedh-make-rq-locking-and-clock-functions-available-in-statsh.patch
sched-introduce-this_rq_lock_irq.patch
psi-pressure-stall-information-for-cpu-memory-and-io.patch
psi-pressure-stall-information-for-cpu-memory-and-io-fix.patch
psi-pressure-stall-information-for-cpu-memory-and-io-fix-2.patch
psi-pressure-stall-information-for-cpu-memory-and-io-fix-3.patch
psi-pressure-stall-information-for-cpu-memory-and-io-fix-4.patch
psi-cgroup-support.patch
mm-workingset-use-cheaper-__inc_lruvec_state-in-irqsafe-node-reclaim.patch
mm-workingset-add-vmstat-counter-for-shadow-nodes.patch
mm-zero-seek-shrinkers.patch
mm-memcontrol-fix-memorystat-item-ordering.patch
