From mboxrd@z Thu Jan 1 00:00:00 1970 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.5 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS,T_DKIMWL_WL_MED, USER_AGENT_MUTT autolearn=ham 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 C628BC28CF6 for ; Wed, 1 Aug 2018 15:53:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 66CE5208A3 for ; Wed, 1 Aug 2018 15:53:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cmpxchg-org.20150623.gappssmtp.com header.i=@cmpxchg-org.20150623.gappssmtp.com header.b="MKganLey" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 66CE5208A3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cmpxchg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389938AbeHARjT (ORCPT ); Wed, 1 Aug 2018 13:39:19 -0400 Received: from mail-qt0-f195.google.com ([209.85.216.195]:46859 "EHLO mail-qt0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389698AbeHARjT (ORCPT ); Wed, 1 Aug 2018 13:39:19 -0400 Received: by mail-qt0-f195.google.com with SMTP id d4-v6so20401161qtn.13 for ; Wed, 01 Aug 2018 08:52:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=mclUiBiBMjGqRmLDCY4DkBrnidOyVpPFZwnbKnVDC28=; b=MKganLeyqIuHbAnkaSYRU5XrkkLw7y5UIgIOUc9k8Q50v682xFSf8eWtBAHL5tsqkL VgVupLRxpdckKaVggK/KT66+2R07TsJvniJ0w5rmSk/4RDa8pZsEk3KLG4Hi1tkaQH1m zyPbzt+8PDJwNyRqhM6JIMHw2oizTzqYwCYUU7sRS6DDLgOKThfSrZFldyKbnKJwgfqH jfAHiqX2D1nT47EBvA+LGavyGVjnMmyAzAs0h7bnEU55VGfU5EELgd67mzfzAi2IS8LM B8x55WqQrsbAzcMRPgBBp5Xdth4ZlvOpj5MhZwLQd1pbV7XLEVOdbtYZHB3SIYzn77Q0 7pWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=mclUiBiBMjGqRmLDCY4DkBrnidOyVpPFZwnbKnVDC28=; b=ZwwUorqNy0XNeqtaW2Pt23/cyg/maxqnTJTOz2kCBiaHXioQUBskarY8ssGmipFiI1 6frnLmVeskDHgtrKLdFXMX5h4ba8Rac1ffT30c+i/vj7BM9nKxdPRfZvJy2aW5Taue0Z M6VDsSCDzonj/COY2X7FKQycBrktLdg0ESiyjTrO6wybuC2sJ2rCA9OdCsXNdskDYLGh B7Mlh02dhR6fKkZ/i4yjsVMf54rUKDHfRWIRLIkxJjzM1A0Lq0jF+XuiPca9InBqkE0r +ouBOTwUgHfCH4/j71dfruvTNFteqDV+HcgbIP9Is3mP1wmyT45sXrKWJOtwnKxNtTO9 ghtQ== X-Gm-Message-State: AOUpUlHu54PrOcgxqukVAY5HEkYmedLP822y2+5SmKu9p+1IagfXqXmg 2l3xlZT0qktwC4l6qeCWN8RvlCy9OCs= X-Google-Smtp-Source: AAOMgpc2vJjJWgrR0Sby9dSWJcOoyIDIOlaaBFV0qxwujaA9cKc6UBB1Z9eh8L+M4XDY1xoWKDLk7g== X-Received: by 2002:a0c:e651:: with SMTP id c17-v6mr23667236qvn.170.1533138777938; Wed, 01 Aug 2018 08:52:57 -0700 (PDT) Received: from localhost (216.49.36.201.res-cmts.bus.ptd.net. [216.49.36.201]) by smtp.gmail.com with ESMTPSA id t127-v6sm6819704qkd.1.2018.08.01.08.52.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Aug 2018 08:52:56 -0700 (PDT) Date: Wed, 1 Aug 2018 11:55:52 -0400 From: Johannes Weiner To: Andrew Morton Cc: Vladimir Davydov , Michal Hocko , Kirill Tkhai , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] memcg: Remove memcg_cgroup::id from IDR on mem_cgroup_css_alloc() failure Message-ID: <20180801155552.GA8600@cmpxchg.org> References: <8a81c801-35c8-767d-54b0-df9f1ca0abc0@virtuozzo.com> <20180413115454.GL17484@dhcp22.suse.cz> <20180413121433.GM17484@dhcp22.suse.cz> <20180413125101.GO17484@dhcp22.suse.cz> <20180726162512.6056b5d7c1d2a5fbff6ce214@linux-foundation.org> <20180727193134.GA10996@cmpxchg.org> <20180729192621.py4znecoinw5mqcp@esperanza> <20180730153113.GB4567@cmpxchg.org> <20180731163908.603d7a27c6534341e1afa724@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180731163908.603d7a27c6534341e1afa724@linux-foundation.org> User-Agent: Mutt/1.10.0 (2018-05-17) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jul 31, 2018 at 04:39:08PM -0700, Andrew Morton wrote: > On Mon, 30 Jul 2018 11:31:13 -0400 Johannes Weiner wrote: > > > Subject: [PATCH] mm: memcontrol: simplify memcg idr allocation and error > > unwinding > > > > The memcg ID is allocated early in the multi-step memcg creation > > process, which needs 2-step ID allocation and IDR publishing, as well > > as two separate IDR cleanup/unwind sites on error. > > > > Defer the IDR allocation until the last second during onlining to > > eliminate all this complexity. There is no requirement to have the ID > > and IDR entry earlier than that. And the root reference to the ID is > > put in the offline path, so this matches nicely. > > This patch isn't aware of Kirill's later "mm, memcg: assign memcg-aware > shrinkers bitmap to memcg", which altered mem_cgroup_css_online(): > > @@ -4356,6 +4470,11 @@ static int mem_cgroup_css_online(struct > { > struct mem_cgroup *memcg = mem_cgroup_from_css(css); > > + if (memcg_alloc_shrinker_maps(memcg)) { > + mem_cgroup_id_remove(memcg); > + return -ENOMEM; > + } > + > /* Online state pins memcg ID, memcg ID pins CSS */ > atomic_set(&memcg->id.ref, 1); > css_get(css); > Hm, that looks out of place too. The bitmaps are allocated for the entire lifetime of the css, not just while it's online. Any objections to the following fixup to that patch? >From bbb785f1daca74024232aa34ba29a8a108556ace Mon Sep 17 00:00:00 2001 From: Johannes Weiner Date: Wed, 1 Aug 2018 11:42:55 -0400 Subject: [PATCH] mm, memcg: assign memcg-aware shrinkers bitmap to memcg fix The shrinker bitmap allocation is a bit out of place in the css onlining path. Allocate and free those bitmaps as part of the memcg alloc and free procedures. Signed-off-by: Johannes Weiner --- mm/memcontrol.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index c9098200326f..82eb40b715da 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4342,6 +4342,7 @@ static void __mem_cgroup_free(struct mem_cgroup *memcg) { int node; + memcg_free_shrinker_maps(memcg); for_each_node(node) free_mem_cgroup_per_node_info(memcg, node); free_percpu(memcg->stat_cpu); @@ -4381,6 +4382,9 @@ static struct mem_cgroup *mem_cgroup_alloc(void) if (alloc_mem_cgroup_per_node_info(memcg, node)) goto fail; + if (memcg_alloc_shrinker_maps(memcg)) + goto fail; + if (memcg_wb_domain_init(memcg, GFP_KERNEL)) goto fail; @@ -4470,11 +4474,6 @@ static int mem_cgroup_css_online(struct cgroup_subsys_state *css) { struct mem_cgroup *memcg = mem_cgroup_from_css(css); - if (memcg_alloc_shrinker_maps(memcg)) { - mem_cgroup_id_remove(memcg); - return -ENOMEM; - } - /* Online state pins memcg ID, memcg ID pins CSS */ atomic_set(&memcg->id.ref, 1); css_get(css); @@ -4527,7 +4526,6 @@ static void mem_cgroup_css_free(struct cgroup_subsys_state *css) vmpressure_cleanup(&memcg->vmpressure); cancel_work_sync(&memcg->high_work); mem_cgroup_remove_from_trees(memcg); - memcg_free_shrinker_maps(memcg); memcg_free_kmem(memcg); mem_cgroup_free(memcg); } -- 2.18.0