From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753565AbdK1QUH (ORCPT ); Tue, 28 Nov 2017 11:20:07 -0500 Received: from mail-io0-f196.google.com ([209.85.223.196]:35762 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752241AbdK1QUE (ORCPT ); Tue, 28 Nov 2017 11:20:04 -0500 X-Google-Smtp-Source: AGs4zMaf0R9H725+BxFEh7k9C0gC4bpRzjqa24vrr+mSW8D0BZsTqeeLLB/2rhb+qcciHYN8iWCwcg== From: Shakeel Butt To: Huang Ying , Vladimir Davydov , Michal Hocko , Greg Thelen , Johannes Weiner , Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, Shakeel Butt , stable@vger.kernel.org Subject: [PATCH] mm, memcg: fix mem_cgroup_swapout() for THPs Date: Tue, 28 Nov 2017 08:19:41 -0800 Message-Id: <20171128161941.20931-1-shakeelb@google.com> X-Mailer: git-send-email 2.15.0.417.g466bffb3ac-goog Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The commit d6810d730022 ("memcg, THP, swap: make mem_cgroup_swapout() support THP") changed mem_cgroup_swapout() to support transparent huge page (THP). However the patch missed one location which should be changed for correctly handling THPs. The resulting bug will cause the memory cgroups whose THPs were swapped out to become zombies on deletion. Fixes: d6810d730022 ("memcg, THP, swap: make mem_cgroup_swapout() support THP") Signed-off-by: Shakeel Butt Cc: stable@vger.kernel.org --- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 50e6906314f8..ac2ffd5e02b9 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -6044,7 +6044,7 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry) memcg_check_events(memcg, page); if (!mem_cgroup_is_root(memcg)) - css_put(&memcg->css); + css_put_many(&memcg->css, nr_entries); } /** -- 2.15.0.417.g466bffb3ac-goog