From patchwork Sat Apr 17 04:35:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 12209533 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.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 A62B1C433B4 for ; Sat, 17 Apr 2021 04:38:33 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 53F0B611AB for ; Sat, 17 Apr 2021 04:38:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 53F0B611AB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id E755F6B0074; Sat, 17 Apr 2021 00:38:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E4BAC6B0075; Sat, 17 Apr 2021 00:38:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CECDD6B0078; Sat, 17 Apr 2021 00:38:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0228.hostedemail.com [216.40.44.228]) by kanga.kvack.org (Postfix) with ESMTP id B37B96B0074 for ; Sat, 17 Apr 2021 00:38:32 -0400 (EDT) Received: from smtpin36.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 6B50B180177F5 for ; Sat, 17 Apr 2021 04:38:32 +0000 (UTC) X-FDA: 78040602864.36.31FEF76 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by imf26.hostedemail.com (Postfix) with ESMTP id 109D640002C2 for ; Sat, 17 Apr 2021 04:38:26 +0000 (UTC) Received: by mail-pj1-f48.google.com with SMTP id j21-20020a17090ae615b02901505b998b45so2157953pjy.0 for ; Fri, 16 Apr 2021 21:38:31 -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=j8wWJIpwyMTu3hxIlWXzmIud8VzdA+zaDtz12NM5n5U=; b=gOlDpI9W4hNk8OJOLpqJsXe7e3d8XW3uIRecNncUmDast0FIsNwEoukqsd92tIuXYS 4S9+Hg1qJokG2rU5GBwTlujrn6cb7eUE/O5soU6MDUsB6ZnMlldD6aeX97Vf0sjZUH6J rOOyszSYismDKyNKucJHCd9d7lB3hROGCDbpF57945bR5Lh/+0wSFO9LnmJaZJKqIX4N oL/XuAorQSZlwsgaDUvjvU5w6A/dZh3lZuzTzXKZyR0Fj/+TGjI4tbqSUScR4IvQig6O Mfwui3WpKH1vmNkVObxYjB9OtobnsE1qegYgcKfLd2VCr0pxUCUoGNJCfvboZYFIVTQH V7tg== 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=j8wWJIpwyMTu3hxIlWXzmIud8VzdA+zaDtz12NM5n5U=; b=AMRcA1zhNVZmyrgCRQJEa0b2OkjhiPi4uqeTeNSbzQ1vmEKegbOcuxLDTPZnj0DzIY aSzGeMmRnEdW+9MrYeQpXPUOZ+2aPo/2Qpc+q2u8+1i6/VSt9my/bCqQNkwk3mrrLi8p WZu1pp9GRcEAocSXJTtWUlm8Ljg7p92X8KDuG9JhpNaeMP0hbZOVxd2A1PA9D9tJ9rBo PaIV1EOZPkcqYNts6OJ/1Hj75BpjhoAGUB5a7mMIJDAI/Vbys98DI1N/en1aVCoKn4cK 42xqeqnB3D9uFvoyKYyaDFGnN34sb3nkwQ0PhaCVKkAKFmcrvHcDxuOl1a8oxMYDQ98b WLag== X-Gm-Message-State: AOAM531fdemUZeEzU68vM/3IaEfyJj2vMzulqHTqbfeWi+tYNgoXmC8/ GGuWBk3th5JfctHWFoEV/98QTQ== X-Google-Smtp-Source: ABdhPJyjWUSSWRy9zIYjqf2tg/9AOXpV4Sq7NMnXrLiBovzHs2ttyWQ1tvrW4y8CSIsagtmxFg5dTQ== X-Received: by 2002:a17:902:501:b029:eb:7a1b:c96c with SMTP id 1-20020a1709020501b02900eb7a1bc96cmr11483702plf.76.1618634311277; Fri, 16 Apr 2021 21:38:31 -0700 (PDT) Received: from localhost.bytedance.net ([139.177.225.228]) by smtp.gmail.com with ESMTPSA id w21sm7064775pjy.21.2021.04.16.21.38.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Apr 2021 21:38:31 -0700 (PDT) From: Muchun Song To: guro@fb.com, hannes@cmpxchg.org, mhocko@kernel.org, akpm@linux-foundation.org, shakeelb@google.com, vdavydov.dev@gmail.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, duanxiongchun@bytedance.com, Muchun Song Subject: [PATCH v3 6/8] mm: memcontrol: simplify the logic of objcg pinning memcg Date: Sat, 17 Apr 2021 12:35:36 +0800 Message-Id: <20210417043538.9793-7-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210417043538.9793-1-songmuchun@bytedance.com> References: <20210417043538.9793-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 109D640002C2 X-Stat-Signature: yz4q56frcat4gq9or4dub5zs315bkit7 Received-SPF: none (bytedance.com>: No applicable sender policy available) receiver=imf26; identity=mailfrom; envelope-from=""; helo=mail-pj1-f48.google.com; client-ip=209.85.216.48 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618634306-930859 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The obj_cgroup_release() and memcg_reparent_objcgs() are serialized by the css_set_lock. We do not need to care about objcg->memcg being released in the process of obj_cgroup_release(). So there is no need to pin memcg before releasing objcg. Remove those pinning logic to simplfy the code. There are only two places that modifies the objcg->memcg. One is the initialization to objcg->memcg in the memcg_online_kmem(), another is objcgs reparenting in the memcg_reparent_objcgs(). It is also impossible for the two to run in parallel. So xchg() is unnecessary and it is enough to use WRITE_ONCE(). Signed-off-by: Muchun Song Acked-by: Johannes Weiner Reviewed-by: Shakeel Butt Acked-by: Roman Gushchin --- mm/memcontrol.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index caf193088beb..c4eebe2a2914 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -261,7 +261,6 @@ static void obj_cgroup_uncharge_pages(struct obj_cgroup *objcg, static void obj_cgroup_release(struct percpu_ref *ref) { struct obj_cgroup *objcg = container_of(ref, struct obj_cgroup, refcnt); - struct mem_cgroup *memcg; unsigned int nr_bytes; unsigned int nr_pages; unsigned long flags; @@ -291,11 +290,9 @@ static void obj_cgroup_release(struct percpu_ref *ref) nr_pages = nr_bytes >> PAGE_SHIFT; spin_lock_irqsave(&css_set_lock, flags); - memcg = obj_cgroup_memcg(objcg); if (nr_pages) obj_cgroup_uncharge_pages(objcg, nr_pages); list_del(&objcg->list); - mem_cgroup_put(memcg); spin_unlock_irqrestore(&css_set_lock, flags); percpu_ref_exit(ref); @@ -330,17 +327,12 @@ static void memcg_reparent_objcgs(struct mem_cgroup *memcg, spin_lock_irq(&css_set_lock); - /* Move active objcg to the parent's list */ - xchg(&objcg->memcg, parent); - css_get(&parent->css); - list_add(&objcg->list, &parent->objcg_list); - - /* Move already reparented objcgs to the parent's list */ - list_for_each_entry(iter, &memcg->objcg_list, list) { - css_get(&parent->css); - xchg(&iter->memcg, parent); - css_put(&memcg->css); - } + /* 1) Ready to reparent active objcg. */ + list_add(&objcg->list, &memcg->objcg_list); + /* 2) Reparent active objcg and already reparented objcgs to parent. */ + list_for_each_entry(iter, &memcg->objcg_list, list) + WRITE_ONCE(iter->memcg, parent); + /* 3) Move already reparented objcgs to the parent's list */ list_splice(&memcg->objcg_list, &parent->objcg_list); spin_unlock_irq(&css_set_lock);