The patch titled Subject: mm-vmscan-dont-mess-with-pgdat-flags-in-memcg-reclaim-v3 has been added to the -mm tree. Its filename is mm-vmscan-dont-mess-with-pgdat-flags-in-memcg-reclaim-v3.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-vmscan-dont-mess-with-pgdat-flags-in-memcg-reclaim-v3.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-vmscan-dont-mess-with-pgdat-flags-in-memcg-reclaim-v3.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx> Subject: mm-vmscan-dont-mess-with-pgdat-flags-in-memcg-reclaim-v3 - Make congestion state per-cgroup-per-node instead of just per-cgroup. (Shakeel) - Changelog update. (Shakeel) Link: http://lkml.kernel.org/r/20180406180254.8970-2-aryabinin@xxxxxxxxxxxxx Signed-off-by: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx> Acked-by: Johannes Weiner <hannes@xxxxxxxxxxx> Reviewed-by: Shakeel Butt <shakeelb@xxxxxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/vmscan.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff -puN mm/vmscan.c~mm-vmscan-dont-mess-with-pgdat-flags-in-memcg-reclaim-v3 mm/vmscan.c --- a/mm/vmscan.c~mm-vmscan-dont-mess-with-pgdat-flags-in-memcg-reclaim-v3 +++ a/mm/vmscan.c @@ -205,22 +205,22 @@ static void set_memcg_congestion(pg_data struct mem_cgroup *memcg, bool congested) { - struct mem_cgroup_per_node *mz; + struct mem_cgroup_per_node *mn; if (!memcg) return; - mz = mem_cgroup_nodeinfo(memcg, pgdat->node_id); - WRITE_ONCE(mz->congested, congested); + mn = mem_cgroup_nodeinfo(memcg, pgdat->node_id); + WRITE_ONCE(mn->congested, congested); } static bool memcg_congested(pg_data_t *pgdat, struct mem_cgroup *memcg) { - struct mem_cgroup_per_node *mz; + struct mem_cgroup_per_node *mn; - mz = mem_cgroup_nodeinfo(memcg, pgdat->node_id); - return READ_ONCE(mz->congested); + mn = mem_cgroup_nodeinfo(memcg, pgdat->node_id); + return READ_ONCE(mn->congested); } #else @@ -2615,8 +2615,7 @@ static bool shrink_node(pg_data_t *pgdat * immediate reclaim and stall if any are encountered * in the nr_immediate check below. */ - if (sc->nr.writeback && - sc->nr.writeback == sc->nr.file_taken) + if (sc->nr.writeback && sc->nr.writeback == sc->nr.taken) set_bit(PGDAT_WRITEBACK, &pgdat->flags); /* _ Patches currently in -mm which might be from aryabinin@xxxxxxxxxxxxx are mm-vmscan-update-stale-comments.patch mm-vmscan-remove-redundant-current_may_throttle-check.patch mm-vmscan-dont-change-pgdat-state-on-base-of-a-single-lru-list-state-v2.patch mm-vmscan-dont-change-pgdat-state-on-base-of-a-single-lru-list-state-v3.patch mm-vmscan-dont-mess-with-pgdat-flags-in-memcg-reclaim-v2.patch mm-vmscan-dont-mess-with-pgdat-flags-in-memcg-reclaim-v2-fix.patch mm-vmscan-dont-mess-with-pgdat-flags-in-memcg-reclaim-v3.patch mm-kasan-dont-vfree-nonexistent-vm_area.patch -- 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