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 93046C433ED for ; Fri, 9 Apr 2021 12:32:23 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1E99261181 for ; Fri, 9 Apr 2021 12:32:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1E99261181 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 B19416B0075; Fri, 9 Apr 2021 08:32:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AF03D6B0078; Fri, 9 Apr 2021 08:32:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 990F56B007B; Fri, 9 Apr 2021 08:32:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0059.hostedemail.com [216.40.44.59]) by kanga.kvack.org (Postfix) with ESMTP id 802AB6B0075 for ; Fri, 9 Apr 2021 08:32:22 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 3A3878248047 for ; Fri, 9 Apr 2021 12:32:22 +0000 (UTC) X-FDA: 78012766524.11.4E46E38 Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by imf16.hostedemail.com (Postfix) with ESMTP id 34B6F80192D5 for ; Fri, 9 Apr 2021 12:32:21 +0000 (UTC) Received: by mail-pg1-f174.google.com with SMTP id b17so3785967pgh.7 for ; Fri, 09 Apr 2021 05:32:21 -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=KboWzAA0Vo1Ky5mj5yxHhRMCFO2+9SMKFGuBaMmV7vg=; b=Fn+4FB9vLM9YrQj9Me1zs6sH/n4f8nrDEsuMRHxSCrQ4oIBF0ErYthEs5c5YPYxpgF OKP9kF0CU5WEWtQF55Lfa7A2AiYr2FAnylG5iCg0FVDLvSyBRJiAdrkXjOi7qKwZLiCe aqCJxtuDhVYDe3UoeTvHnA1CCFNNyp3Xv8/F4ZgVSJUM0t5ycK0XqOUJdFhkvZFex811 /HjG9IBdMBp04eWC3BbTJy4MY3Nx1j6QPO8EcC289R+SYh5YK7rPZXJzskFqDfb10MrF jfIAvegBXUAdMiiQww1pVjvG5AeexX/BoWkTeZ6HZkwU2XCmTjyLrtj5G15IX1t9uKdg qFHQ== 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=KboWzAA0Vo1Ky5mj5yxHhRMCFO2+9SMKFGuBaMmV7vg=; b=jgDlVNuDtONMjWlndnfdAQq45qrM7Ty6bsP2e6U1lIYkR1TvoqCyNgZX7es8vpVTQd gWaICiWvkL/qw1Q+aqkaFspOr7NLDAQGrgAuAvd+Na8lknIbHAh7ZDTvq8IiU6VxqlXC 0nKI7TpRuXom/2q7TLKe0YPmKMOJiHUf/+dmluwxb0t8qsVvrzHXT5fSHTOFnARwqho3 6IrFMiXuc+ok/KnBAMzd93Euw9bvzRFiFDgNyifABymetlHhJs9Y1OTkQ5dhNoEGWz79 nSJi/HNfh/lSTspvNKoDr2+yZkamCzXlVp2a1Hugr3K2Yv9HbvHpyAedfVgaOUcr9N1y SreQ== X-Gm-Message-State: AOAM533zJbCNSbNCFiHJnEn9MRUpLbVgC9jFWeg4OhL72GftvsYcvIyo XVHjxMaRzpIQH6Z7WMSf82ob3w== X-Google-Smtp-Source: ABdhPJy4EUwCPJplsg2FCY/PfNvR8+q2FxSz6X7rdJ98QKB0KOwEImFa1X8fqxQvMxKBXBCgykJIXQ== X-Received: by 2002:a63:1d1:: with SMTP id 200mr9444674pgb.375.1617971540915; Fri, 09 Apr 2021 05:32:20 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.243]) by smtp.gmail.com with ESMTPSA id t3sm2167785pfg.176.2021.04.09.05.32.15 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Apr 2021 05:32:20 -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, fam.zheng@bytedance.com, bsingharora@gmail.com, shy828301@gmail.com, alex.shi@linux.alibaba.com, Muchun Song Subject: [RFC PATCH v2 05/18] mm: memcontrol: simplify the logic of objcg pinning memcg Date: Fri, 9 Apr 2021 20:29:46 +0800 Message-Id: <20210409122959.82264-6-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210409122959.82264-1-songmuchun@bytedance.com> References: <20210409122959.82264-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 34B6F80192D5 X-Stat-Signature: 14ucsxreiuu51ap99oq4zc71d59jaojc X-Rspamd-Server: rspam02 Received-SPF: none (bytedance.com>: No applicable sender policy available) receiver=imf16; identity=mailfrom; envelope-from=""; helo=mail-pg1-f174.google.com; client-ip=209.85.215.174 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1617971541-61339 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 1f807448233e..90c1ac58c64c 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