From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gum.cmpxchg.org ([85.214.110.215]:43476 "EHLO gum.cmpxchg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753553AbdDCO7l (ORCPT ); Mon, 3 Apr 2017 10:59:41 -0400 Date: Mon, 3 Apr 2017 10:59:24 -0400 From: Johannes Weiner To: gregkh@linuxfoundation.org Cc: akpm@linux-foundation.org, mhocko@suse.com, stable@vger.kernel.org, torvalds@linux-foundation.org, vdavydov@tarantool.org Subject: [PATCH linux-4.9.y] mm: workingset: fix premature shadow node shrinking with cgroups Message-ID: <20170403145924.GA12798@cmpxchg.org> References: <149122583378250@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <149122583378250@kroah.com> Sender: stable-owner@vger.kernel.org List-ID: commit 0cefabdaf757a6455d75f00cb76874e62703ed18 upstream. Commit 0a6b76dd23fa ("mm: workingset: make shadow node shrinker memcg aware") enabled cgroup-awareness in the shadow node shrinker, but forgot to also enable cgroup-awareness in the list_lru the shadow nodes sit on. Consequently, all shadow nodes are sitting on a global (per-NUMA node) list, while the shrinker applies the limits according to the amount of cache in the cgroup its shrinking. The result is excessive pressure on the shadow nodes from cgroups that have very little cache. Enable memcg-mode on the shadow node LRUs, such that per-cgroup limits are applied to per-cgroup lists. Fixes: 0a6b76dd23fa ("mm: workingset: make shadow node shrinker memcg aware") Link: http://lkml.kernel.org/r/20170322005320.8165-1-hannes@cmpxchg.org Signed-off-by: Johannes Weiner Acked-by: Vladimir Davydov Cc: Michal Hocko Cc: [4.6+] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- mm/workingset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/workingset.c b/mm/workingset.c index 33f6f4db32fd..4c4f05655e6e 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -492,7 +492,7 @@ static int __init workingset_init(void) pr_info("workingset: timestamp_bits=%d max_order=%d bucket_order=%u\n", timestamp_bits, max_order, bucket_order); - ret = list_lru_init_key(&workingset_shadow_nodes, &shadow_nodes_key); + ret = __list_lru_init(&workingset_shadow_nodes, true, &shadow_nodes_key); if (ret) goto err; ret = register_shrinker(&workingset_shadow_shrinker); -- 2.12.1