From patchwork Tue Jun 16 19:57:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 224302 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=-2.1 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,URIBL_BLACK autolearn=no 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 9B260C433E0 for ; Tue, 16 Jun 2020 19:57:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 67CDF2098B for ; Tue, 16 Jun 2020 19:57:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592337435; bh=RUKd9upVzYt+NC9ZHr121oKHj9v/yQndOsSsv1GZRu0=; h=Date:From:To:Subject:List-ID:From; b=ChVEEveyyhXqTgDRQyKVCtMJaenMCR/QgzyiZiu0s87fy+gesvZfD0SAdcNT6FUql SFxeAXDjRNdAJJBgQ8D8T3ZMFH8hr0uFPJEyEaSYPHUQ2EiOrJfn9MbLRybZUz+/7U ON3LAzHJqYhX/cEr6zHaKPudu4V0qY8EKCAEmtM4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731325AbgFPT5O (ORCPT ); Tue, 16 Jun 2020 15:57:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:48904 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730183AbgFPT5O (ORCPT ); Tue, 16 Jun 2020 15:57:14 -0400 Received: from X1 (nat-ab2241.sltdut.senawave.net [162.218.216.4]) (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 95395207C4; Tue, 16 Jun 2020 19:57:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592337433; bh=RUKd9upVzYt+NC9ZHr121oKHj9v/yQndOsSsv1GZRu0=; h=Date:From:To:Subject:From; b=Uk9YdjYMm+Xx5i/0C2MX/DMByDrQrUq61vxlcklOx8q5NUiFDVo6+lMy3ue2T9rvP h7b1YT80Js42HUdBcdfqUSechiXPdmljmFTRa8G2Y3uWB9erWiiexqcu3lnXctAekZ 8pVSsP6ihpLfITXfiDx1AonbE9oaEXYXpxFsxUFU= Date: Tue, 16 Jun 2020 12:57:13 -0700 From: akpm@linux-foundation.org To: mm-commits@vger.kernel.org, vdavydov.dev@gmail.com, stable@vger.kernel.org, mhocko@suse.com, hannes@cmpxchg.org, guro@fb.com, cai@lca.pw, songmuchun@bytedance.com Subject: + mm-memcontrol-fix-do-not-put-the-css-reference.patch added to -mm tree Message-ID: <20200616195713.UahlG%akpm@linux-foundation.org> User-Agent: s-nail v14.9.10 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch titled Subject: mm/memcontrol.c: add missed css_put() has been added to the -mm tree. Its filename is mm-memcontrol-fix-do-not-put-the-css-reference.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-memcontrol-fix-do-not-put-the-css-reference.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-memcontrol-fix-do-not-put-the-css-reference.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: Muchun Song Subject: mm/memcontrol.c: add missed css_put() We should put the css reference when memory allocation failed. Link: http://lkml.kernel.org/r/20200614122653.98829-1-songmuchun@bytedance.com Fixes: f0a3a24b532d ("mm: memcg/slab: rework non-root kmem_cache lifecycle management") Signed-off-by: Muchun Song Acked-by: Roman Gushchin Acked-by: Michal Hocko Cc: Johannes Weiner Cc: Vladimir Davydov Cc: Qian Cai Cc: Signed-off-by: Andrew Morton --- mm/memcontrol.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/mm/memcontrol.c~mm-memcontrol-fix-do-not-put-the-css-reference +++ a/mm/memcontrol.c @@ -2772,8 +2772,10 @@ static void memcg_schedule_kmem_cache_cr return; cw = kmalloc(sizeof(*cw), GFP_NOWAIT | __GFP_NOWARN); - if (!cw) + if (!cw) { + css_put(&memcg->css); return; + } cw->memcg = memcg; cw->cachep = cachep;