From patchwork Thu May 27 06:21:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 12283397 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=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 99081C47089 for ; Thu, 27 May 2021 06:24:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 79966613D4 for ; Thu, 27 May 2021 06:24:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234618AbhE0G0D (ORCPT ); Thu, 27 May 2021 02:26:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234624AbhE0G0C (ORCPT ); Thu, 27 May 2021 02:26:02 -0400 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D83BC061760 for ; Wed, 26 May 2021 23:24:29 -0700 (PDT) Received: by mail-pf1-x42d.google.com with SMTP id f22so2888827pfn.0 for ; Wed, 26 May 2021 23:24:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q7vJMAr6kcKAU4X210/nbOxFkuInBwsFSpIer8aaFUI=; b=MJSyMYT7SXXVY5RKfMgD9gPHEWPZfFgJ4hyxtY+uBDRdgQ5e7Oit1Zx3N5s4m0xdRY jCfKSSNkrcdj4bSRih64lYEPhpVfJ8HvTeZpPvnpy2xV0P99YtQdGo/K8pndCpAFNasx BNf2rQQzAIJ7upbjmJzl+74rmrW+Xc0nOiWprLlOVWCUBpLYVyR/sHGux9KprYmeuEZN 1EV6dB1bpOPrIWrVk+bseaN9DWHVOP4BrUdVSLwsaxxx4+tfRwrKQfnLKPEmAciAVwOa IBmHlybm2A/ZVmivR0R/FIl07T1NMscahzhc1EBy2pbgolJGn8qGnKVAd0epw0ZzjuEI zgPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q7vJMAr6kcKAU4X210/nbOxFkuInBwsFSpIer8aaFUI=; b=s7qmUjZ3HRIZG4BA+x4tcM0ytEwFLU+bOQOu4GxMGGBpicy4hcxPOLfLbHQX8Uzuvs kWkxNaU7Artb+bRMy6sq69re17WULPUFpr1rNLc/Eje8+dFKNMphPFQo9J5TznF5BEnP +lgiV0q4o6a4ltrcq0QtOB/GsFC/hv7ISOmswy6xKZdOTgggk4aJLrGhcNhs9jxb78Jl dOViw9GMcflMGpvu7UIsr4cGvHcVP5aBU+PxorictWsW6b27EmBsl3B4U/G0u262OIOz ox4mhA3NCFLjCaJ9iC0+h++yx2to5dTu++NF29yqFhvhf4m1IJMCmj/6HdygyTB4YVpA KznQ== X-Gm-Message-State: AOAM533vpS5NuH+V2etSDqK7z/VeoXtp0XStZhVGb1GY4A9WFeHh+AG7 badwGRhVJTGIEEgkC/BJo8FWFw== X-Google-Smtp-Source: ABdhPJy8Bw2nz9uQDINiomY4QIvSyT7wuAqcIJ8o4jUTbLhRRcBzsCGLwm+NacVvN/K7nNkk9DkQ/Q== X-Received: by 2002:aa7:8491:0:b029:2dc:b1cc:5532 with SMTP id u17-20020aa784910000b02902dcb1cc5532mr1862562pfn.3.1622096668689; Wed, 26 May 2021 23:24:28 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.254]) by smtp.gmail.com with ESMTPSA id m5sm882971pgl.75.2021.05.26.23.24.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 May 2021 23:24:28 -0700 (PDT) From: Muchun Song To: willy@infradead.org, akpm@linux-foundation.org, hannes@cmpxchg.org, mhocko@kernel.org, vdavydov.dev@gmail.com, shakeelb@google.com, guro@fb.com, shy828301@gmail.com, alexs@kernel.org, richard.weiyang@gmail.com, david@fromorbit.com, trond.myklebust@hammerspace.com, anna.schumaker@netapp.com Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-nfs@vger.kernel.org, zhengqi.arch@bytedance.com, duanxiongchun@bytedance.com, fam.zheng@bytedance.com, Muchun Song Subject: [PATCH v2 02/21] mm: memcontrol: remove kmemcg_id reparenting Date: Thu, 27 May 2021 14:21:29 +0800 Message-Id: <20210527062148.9361-3-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210527062148.9361-1-songmuchun@bytedance.com> References: <20210527062148.9361-1-songmuchun@bytedance.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Since slab objects and kmem pages are charged to object cgroup instead of memory cgroup, memcg_reparent_objcgs() will reparent this cgroup and all its descendants to the parent cgroup. This already makes further list_lru_add()'s add elements to the parent's list. So we do not need to change kmemcg_id of an offline cgroup to its parent's id. It is just waste CPU cycles. Just remove those redundant code. Signed-off-by: Muchun Song --- mm/memcontrol.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index db29b96f7311..9add859f69d7 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3654,8 +3654,7 @@ static int memcg_online_kmem(struct mem_cgroup *memcg) static void memcg_offline_kmem(struct mem_cgroup *memcg) { - struct cgroup_subsys_state *css; - struct mem_cgroup *parent, *child; + struct mem_cgroup *parent; int kmemcg_id; if (memcg->kmem_state != KMEM_ONLINE) @@ -3672,22 +3671,7 @@ static void memcg_offline_kmem(struct mem_cgroup *memcg) kmemcg_id = memcg->kmemcg_id; BUG_ON(kmemcg_id < 0); - /* - * Change kmemcg_id of this cgroup and all its descendants to the - * parent's id, and then move all entries from this cgroup's list_lrus - * to ones of the parent. After we have finished, all list_lrus - * corresponding to this cgroup are guaranteed to remain empty. The - * ordering is imposed by list_lru_node->lock taken by - * memcg_drain_all_list_lrus(). - */ - rcu_read_lock(); /* can be called from css_free w/o cgroup_mutex */ - css_for_each_descendant_pre(css, &memcg->css) { - child = mem_cgroup_from_css(css); - BUG_ON(child->kmemcg_id != kmemcg_id); - child->kmemcg_id = parent->kmemcg_id; - } - rcu_read_unlock(); - + /* memcg_reparent_objcgs() must be called before this. */ memcg_drain_all_list_lrus(kmemcg_id, parent); memcg_free_cache_id(kmemcg_id);