From patchwork Thu Feb 27 13:36:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 230348 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05A68C52D34 for ; Thu, 27 Feb 2020 14:22:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D116F24656 for ; Thu, 27 Feb 2020 14:22:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582813369; bh=j2T53C+XhosR0b6W3HCOPsfXuad/ruqDqPW93fkEP5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Pg7c0CLj7GEuyLgYlRZ5FCMVI9ezuP91UCn4VTBSfkhn+DkTLbyNntysYOLwN+cqa ROShhUduxtHVpomlIAsGbIbr6ZmEUE79ZUv56dh84ZlHHDzXjnuUfa/a++WQJOVFF0 J7hvFc+u9QwmeEIwSp23U0HOsJDr9+387sGFGFZw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388994AbgB0OPg (ORCPT ); Thu, 27 Feb 2020 09:15:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:55208 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389084AbgB0OPf (ORCPT ); Thu, 27 Feb 2020 09:15:35 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A490B20578; Thu, 27 Feb 2020 14:15:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582812935; bh=j2T53C+XhosR0b6W3HCOPsfXuad/ruqDqPW93fkEP5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eRCdr+GIEYhPlO2eJXgxUCdWapZYeEt+2Ngb5EmKRS2x5fbh0GbTAK+2ogCkOesZK drTp/ncGuO2axNXI+x/Rf024CVE6OsW3FoRa7NvecbWO/tHE569qcd1ab2/qJpzqfB XdIQBZUIsLDw7Uk9HJE4sU9w4rgCPGxlPZtBPKYg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vasily Averin , Kirill Tkhai , Michal Hocko , Roman Gushchin , Johannes Weiner , Vladimir Davydov , Andrew Morton , Linus Torvalds Subject: [PATCH 5.5 073/150] mm/memcontrol.c: lost css_put in memcg_expand_shrinker_maps() Date: Thu, 27 Feb 2020 14:36:50 +0100 Message-Id: <20200227132243.674420842@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227132232.815448360@linuxfoundation.org> References: <20200227132232.815448360@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vasily Averin commit 75866af62b439859d5146b7093ceb6b482852683 upstream. for_each_mem_cgroup() increases css reference counter for memory cgroup and requires to use mem_cgroup_iter_break() if the walk is cancelled. Link: http://lkml.kernel.org/r/c98414fb-7e1f-da0f-867a-9340ec4bd30b@virtuozzo.com Fixes: 0a4465d34028 ("mm, memcg: assign memcg-aware shrinkers bitmap to memcg") Signed-off-by: Vasily Averin Acked-by: Kirill Tkhai Acked-by: Michal Hocko Reviewed-by: Roman Gushchin Cc: Johannes Weiner Cc: Vladimir Davydov Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/memcontrol.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -409,8 +409,10 @@ int memcg_expand_shrinker_maps(int new_i if (mem_cgroup_is_root(memcg)) continue; ret = memcg_expand_one_shrinker_map(memcg, size, old_size); - if (ret) + if (ret) { + mem_cgroup_iter_break(NULL, memcg); goto unlock; + } } unlock: if (!ret)