From patchwork Mon Oct 16 22:18:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Gushchin X-Patchwork-Id: 153786 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3755989vqb; Mon, 16 Oct 2023 15:19:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGIWP4Q5HMjqKi5pqeTT1nmcsB886hm4qdjhDV+xdd+szkVNHAYaj1Uk4uP0gvhTMF8SgOi X-Received: by 2002:a05:6a20:9741:b0:163:ab09:196d with SMTP id hs1-20020a056a20974100b00163ab09196dmr377000pzc.1.1697494783580; Mon, 16 Oct 2023 15:19:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697494783; cv=none; d=google.com; s=arc-20160816; b=I8zxBF7NJWiRcsWoSmKVk3BkTg0ljn8CfJKH27ry4bAWYhFcK9qxI/RgEuY6hj6cgs rZ2e+FTOUvvS8flAQxmeDkJuQdRHN6p64QfV4y6VpMk2qp+zTLc1dXa98+otvEY8m5KO KL/U/Vx+RFm+0Ovdd9Zl24lG0lYWGjlm+oOKI1n6axjxvrVjxbjaDOgZk9uaNd70Goxt uVm0X/bzs6eu/H6OZqsK7+snDo0jmm7SuRRlZ3n5zRBV0PexbuU8+cPhgWf/C8j4zM+z jsJ00ozXviIWEThFcCdsCDtLlaOSEZtSFhyyHEnfoJUd1A1xDHzxt4QQxVznj73KXEsb oLfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=8nbWMqlQbup8L2PuI3o6aZR+b1Gh4bcn04UHgRGHul4=; fh=TyPg14X/GXePfX2HFCpC8BoYIRT/2UqYFN7bT1+n50k=; b=RJ/DLebRtJPKxO5/TZHKO0UPWhPjaSVjjacnnysll/MFSHNDSaKh3S5EUeVyoIQJfY AHqRumMw2xS8gB6XpNkClGKxTibA5eI7LdliUD2mbbD2EgFP39i2BHchu83okCs/tSfh iRsR5VKRsW/0pZjVuLDvSY0jikUn68JiuXB+xz6H00Atv6gORyNtNdxpDEpJyoNFAUy+ TKx9D8RxgOgIAKM9d12FYLFoqMHJpUu5jKW+bTIAU/vyW6m9Xd9RvmTDzii/kJ8eZoe8 BYX13sQS8C/TxkTQ7Jl1BnarqHewc/JTGGmntO0UlzxJxHvnyQNvqyOJopBrT8vvF7cY NFvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linux.dev header.s=key1 header.b=GVxjccE0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id p11-20020a170902a40b00b001b9ffda162csi247701plq.441.2023.10.16.15.19.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 15:19:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=fail header.i=@linux.dev header.s=key1 header.b=GVxjccE0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id D0F148026DC6; Mon, 16 Oct 2023 15:19:42 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234281AbjJPWTh (ORCPT + 18 others); Mon, 16 Oct 2023 18:19:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234261AbjJPWTf (ORCPT ); Mon, 16 Oct 2023 18:19:35 -0400 Received: from out-205.mta1.migadu.com (out-205.mta1.migadu.com [IPv6:2001:41d0:203:375::cd]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BD34EE for ; Mon, 16 Oct 2023 15:19:31 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1697494769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8nbWMqlQbup8L2PuI3o6aZR+b1Gh4bcn04UHgRGHul4=; b=GVxjccE0wRDPf3xmRq5yp+EZpFthfbOTdOcitturXfYEyCKxOFwUAdjvcbfQaAHmjoiYHf XchZu3Jj3LIkIaTLAvXdaMbdYfKBOOd4vnoDv+0zus1yi0xwVi2DEtoTht+7fcm4V0ms/G FLHpSoYdp6Gpzdvw2ssI9g/dgNewT7w= From: Roman Gushchin To: Andrew Morton Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, Johannes Weiner , Michal Hocko , Shakeel@vger.kernel.org, Butt@vger.kernel.org, shakeelb@google.com, Muchun Song , Dennis Zhou , David Rientjes , Vlastimil Babka , Naresh Kamboju , Roman Gushchin Subject: [PATCH v3 3/5] mm: kmem: make memcg keep a reference to the original objcg Date: Mon, 16 Oct 2023 15:18:58 -0700 Message-ID: <20231016221900.4031141-4-roman.gushchin@linux.dev> In-Reply-To: <20231016221900.4031141-1-roman.gushchin@linux.dev> References: <20231016221900.4031141-1-roman.gushchin@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 16 Oct 2023 15:19:42 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779952290270149281 X-GMAIL-MSGID: 1779952290270149281 Keep a reference to the original objcg object for the entire life of a memcg structure. This allows to simplify the synchronization on the kernel memory allocation paths: pinning a (live) memcg will also pin the corresponding objcg. The memory overhead of this change is minimal because object cgroups usually outlive their corresponding memory cgroups even without this change, so it's only an additional pointer per memcg. Signed-off-by: Roman Gushchin (Cruise) Tested-by: Naresh Kamboju Acked-by: Shakeel Butt Reviewed-by: Vlastimil Babka --- include/linux/memcontrol.h | 8 +++++++- mm/memcontrol.c | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index ab94ad4597d0..277690af383d 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -299,7 +299,13 @@ struct mem_cgroup { #ifdef CONFIG_MEMCG_KMEM int kmemcg_id; - struct obj_cgroup __rcu *objcg; + /* + * memcg->objcg is wiped out as a part of the objcg repaprenting + * process. memcg->orig_objcg preserves a pointer (and a reference) + * to the original objcg until the end of live of memcg. + */ + struct obj_cgroup __rcu *objcg; + struct obj_cgroup *orig_objcg; /* list of inherited objcgs, protected by objcg_lock */ struct list_head objcg_list; #endif diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 0605e45bd4a2..d90cc19e4113 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3808,6 +3808,8 @@ static int memcg_online_kmem(struct mem_cgroup *memcg) objcg->memcg = memcg; rcu_assign_pointer(memcg->objcg, objcg); + obj_cgroup_get(objcg); + memcg->orig_objcg = objcg; static_branch_enable(&memcg_kmem_online_key); @@ -5302,6 +5304,9 @@ static void __mem_cgroup_free(struct mem_cgroup *memcg) { int node; + if (memcg->orig_objcg) + obj_cgroup_put(memcg->orig_objcg); + for_each_node(node) free_mem_cgroup_per_node_info(memcg, node); kfree(memcg->vmstats);