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=-16.6 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 704D2C433DB for ; Tue, 30 Mar 2021 10:21:32 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CFC1361955 for ; Tue, 30 Mar 2021 10:21:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CFC1361955 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 588126B008A; Tue, 30 Mar 2021 06:21:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 544546B008C; Tue, 30 Mar 2021 06:21:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3B0C16B0092; Tue, 30 Mar 2021 06:21:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0159.hostedemail.com [216.40.44.159]) by kanga.kvack.org (Postfix) with ESMTP id 1A5176B008A for ; Tue, 30 Mar 2021 06:21:31 -0400 (EDT) Received: from smtpin32.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id DB5554DDC for ; Tue, 30 Mar 2021 10:21:30 +0000 (UTC) X-FDA: 77976148740.32.86B4F4A Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by imf17.hostedemail.com (Postfix) with ESMTP id A06B740002DE for ; Tue, 30 Mar 2021 10:21:27 +0000 (UTC) Received: by mail-pg1-f175.google.com with SMTP id i6so4220897pgs.1 for ; Tue, 30 Mar 2021 03:21: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=/XlrhlWJR5eNlgc0Go1Prosg77ePOmL9XygDOYDXK/A=; b=pvDGPRY/fpgSyM+8p66+cRR8V+TEw7yXpz6hylJ2TOHDCX/h1BX+s70mvfl1sceihz 6RybxuB3YVqzfFlaLjiRueifOx11usygHge7HKzTGG5ErzbPF5GcDt8ZlSYjOUALa1ya ElMNWMeE9F53ruq0CC4Ln9+e6lwyh+53D5JG6d/IoYzVZIO5iRG9pso6hY/ZqEner/ns Ilrhg2IwnGmhWJwgJDglkFzaAdNPpvh5KG9tvYt8tibfsNzjmD5zkmTVQd8GbxmG/SjO gtV6tu0RZfuawBgGSu832rWw0EaOj/jj/pHnR3bRi1XRIED5esFL/JCvvGVz1doZUKhd cu9Q== 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=/XlrhlWJR5eNlgc0Go1Prosg77ePOmL9XygDOYDXK/A=; b=gZPSFPMtevyNf4c8LQy8Sb+cVTbWp8Bq6qNBNz2nIpL34XZIMqtyuY+u2xklbZJmiJ k6up/OlR/9GyxTqK/dZa4hbqJ8rwESSgkJyIb7lDppS+6vXro5Xp5OU+H/8kGK79uX25 mjILxokq+vTEg9SZVKkTyMwsUFznYzBCMVx+wCvKghMnNGeeJj5h2c4QUM6kQLefljdJ DDS69+CVYvf1oelahbxSqclZqLOcCkD6sE18JXo/ccspUisSuCEBkmtbFifZ4FU3rzV8 VBoZTPP8dnQKOXcPuuWhaQ4PsECZhS50qmY1HJHy/vjkRtERq4sJ95gjPAxXZrB1ty5t BK7w== X-Gm-Message-State: AOAM533SFW1pvWZ900GB04K6lbWBeLQN97KOSPSuz6CepxZhCYhgCVwx 04ow53ifdqxx0tXhxGLUB0hSKw== X-Google-Smtp-Source: ABdhPJzWM4NKDxc668yTzYqUP3ZuqGSp3kSwjeplcYCLk4ruq3hI+7jSjTn6delF4WVuCuZwBohCgg== X-Received: by 2002:a63:fc58:: with SMTP id r24mr8111385pgk.368.1617099687301; Tue, 30 Mar 2021 03:21:27 -0700 (PDT) Received: from localhost.localdomain ([2408:8445:ad30:68d8:c87f:ca1b:dc00:4730]) by smtp.gmail.com with ESMTPSA id k10sm202259pfk.205.2021.03.30.03.21.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Mar 2021 03:21:27 -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: [RFC PATCH 05/15] mm: memcontrol: simplify the logic of objcg pinning memcg Date: Tue, 30 Mar 2021 18:15:21 +0800 Message-Id: <20210330101531.82752-6-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210330101531.82752-1-songmuchun@bytedance.com> References: <20210330101531.82752-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: A06B740002DE X-Stat-Signature: c5jjuuasr54mriqzmpd9jdt89q6pz7xy X-Rspamd-Server: rspam02 Received-SPF: none (bytedance.com>: No applicable sender policy available) receiver=imf17; identity=mailfrom; envelope-from=""; helo=mail-pg1-f175.google.com; client-ip=209.85.215.175 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1617099687-565190 Content-Transfer-Encoding: quoted-printable 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 --- mm/memcontrol.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 405c9642aac0..fdabe12e9df0 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -261,7 +261,6 @@ static void obj_cgroup_uncharge_pages(struct obj_cgro= up *objcg, static void obj_cgroup_release(struct percpu_ref *ref) { struct obj_cgroup *objcg =3D container_of(ref, struct obj_cgroup, refcn= t); - 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 *re= f) nr_pages =3D nr_bytes >> PAGE_SHIFT; =20 spin_lock_irqsave(&css_set_lock, flags); - memcg =3D 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); =20 percpu_ref_exit(ref); @@ -330,17 +327,14 @@ static void memcg_reparent_objcgs(struct mem_cgroup= *memcg, =20 spin_lock_irq(&css_set_lock); =20 - /* Move active objcg to the parent's list */ - xchg(&objcg->memcg, parent); - css_get(&parent->css); - list_add(&objcg->list, &parent->objcg_list); + /* 1) Ready to reparent active objcg. */ + list_add(&objcg->list, &memcg->objcg_list); =20 - /* 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); - } + /* 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); =20 spin_unlock_irq(&css_set_lock); --=20 2.11.0