Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp5241605iob; Mon, 9 May 2022 11:44:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyE7n9/nOUctRzGieDlOPMHTyGYxv+MLn4G0QflomoVTy5oZ/34j77CawVbJJWO21BqBZRI X-Received: by 2002:a17:902:f1cc:b0:15e:f63f:2347 with SMTP id e12-20020a170902f1cc00b0015ef63f2347mr13334691plc.61.1652121868821; Mon, 09 May 2022 11:44:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652121868; cv=none; d=google.com; s=arc-20160816; b=VEQqv7q21zBo1iwsb5F1dgSkRxGltZs3wQstP7uTSHikdZhKjtSOyi9FeecgVTGXeT po1rVzNfV3QcGJMMuuL8LRWTOUcys6U6pDZHJ+prKAHSK9wQqld82s4J5eGAzOx46SOc rMznsmXP0HITDZ65u5YCttkfeLNOr/XAbVvk3Y1HaYepw4fiGy1fkaeSdr5hKpP2yOe9 s0d8HkspQLm97+Lp5owTTg3B1gJuqjmebIx6qia9tdbQN+osA2TXSeqtNK14Ivk9WPKX mWaJLbPk21PiPkbBu6PBAhGeZy5n4iLlUQc5Guh5Hp6pAdvvqNg7WXb3BMTLM8DDkgc2 d/lA== 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=E7yqlEFZDQsrcQFeTz8EFzx9rgYk0i5CEIpAH0i4ulA=; b=dZ+fdeNCDSM+Js7doED2mSi+i48lE+WjZng1WGnmdpqr2gzMTlrDV+dgRa6hq2jBar 1QtMJQ1F1VU4SIZtzo94Qe0CJStpaqu4Im9EawohnH39kD7A7tWU9tPjJfnKUw7xYedI 3yf+9nj/b3Z10sxagDRYGCJeJh7h7b3I1gXNiPvcmOc8w10UqP8ICk3OXgOuc0O6eK7g qAsZXwfx1rS/KWFHZxGDOXyTonCAPytJ+oDSVTjqNlKsGyHTtjuWhHRaqDAjoXoim9sq LDTiRF4HPoR/uV3grs8/1JQWZSKPaE1/Pr0+QCOafkIWegY2HXvAWR4v04VQkt2y95W6 qRTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b="xl/szZ3A"; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id d10-20020a170902ceca00b00153b2d165e8si500305plg.496.2022.05.09.11.44.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 11:44:28 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b="xl/szZ3A"; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A66A8260874; Mon, 9 May 2022 11:38:46 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240250AbiEISma (ORCPT + 99 others); Mon, 9 May 2022 14:42:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240192AbiEISm1 (ORCPT ); Mon, 9 May 2022 14:42:27 -0400 Received: from out0.migadu.com (out0.migadu.com [IPv6:2001:41d0:2:267::]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3F4D26084D for ; Mon, 9 May 2022 11:38:32 -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=1652121511; 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=E7yqlEFZDQsrcQFeTz8EFzx9rgYk0i5CEIpAH0i4ulA=; b=xl/szZ3Ak9hLsVXMZIyVLhsP7L6EdVYibFE1x6wt/+BDQrOlFwGeFlXbNuS8zeDDqZaNO9 JTCF9fGQGAUFA6fms/EFouu/UD2j1FYFlaP7xNjt773pfH2P2sonCkG9i3+Kd0NxDcjz71 tWqMIBNy1sQ1DVBhaeW2qXhI9AZACRs= From: Roman Gushchin To: Andrew Morton , linux-mm@kvack.org Cc: Dave Chinner , linux-kernel@vger.kernel.org, Kent Overstreet , Hillf Danton , Christophe JAILLET , Roman Gushchin Subject: [PATCH v3 1/6] mm: memcontrol: introduce mem_cgroup_ino() and mem_cgroup_get_from_ino() Date: Mon, 9 May 2022 11:38:15 -0700 Message-Id: <20220509183820.573666-2-roman.gushchin@linux.dev> In-Reply-To: <20220509183820.573666-1-roman.gushchin@linux.dev> References: <20220509183820.573666-1-roman.gushchin@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: linux.dev X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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 Shrinker debugfs requires a way to represent memory cgroups without using full paths, both for displaying information and getting input from a user. Cgroup inode number is a perfect way, already used by bpf. This commit adds a couple of helper functions which will be used to handle memcg-aware shrinkers. Signed-off-by: Roman Gushchin --- include/linux/memcontrol.h | 21 +++++++++++++++++++++ mm/memcontrol.c | 23 +++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index fe580cb96683..a6de9e5c1549 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -831,6 +831,15 @@ static inline unsigned short mem_cgroup_id(struct mem_cgroup *memcg) } struct mem_cgroup *mem_cgroup_from_id(unsigned short id); +#ifdef CONFIG_SHRINKER_DEBUG +static inline unsigned long mem_cgroup_ino(struct mem_cgroup *memcg) +{ + return memcg ? cgroup_ino(memcg->css.cgroup) : 0; +} + +struct mem_cgroup *mem_cgroup_get_from_ino(unsigned long ino); +#endif + static inline struct mem_cgroup *mem_cgroup_from_seq(struct seq_file *m) { return mem_cgroup_from_css(seq_css(m)); @@ -1324,6 +1333,18 @@ static inline struct mem_cgroup *mem_cgroup_from_id(unsigned short id) return NULL; } +#ifdef CONFIG_SHRINKER_DEBUG +static inline unsigned long mem_cgroup_ino(struct mem_cgroup *memcg) +{ + return 0; +} + +static inline struct mem_cgroup *mem_cgroup_get_from_ino(unsigned long ino) +{ + return NULL; +} +#endif + static inline struct mem_cgroup *mem_cgroup_from_seq(struct seq_file *m) { return NULL; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 04cea4fa362a..e6472728fa66 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5018,6 +5018,29 @@ struct mem_cgroup *mem_cgroup_from_id(unsigned short id) return idr_find(&mem_cgroup_idr, id); } +#ifdef CONFIG_SHRINKER_DEBUG +struct mem_cgroup *mem_cgroup_get_from_ino(unsigned long ino) +{ + struct cgroup *cgrp; + struct cgroup_subsys_state *css; + struct mem_cgroup *memcg; + + cgrp = cgroup_get_from_id(ino); + if (!cgrp) + return ERR_PTR(-ENOENT); + + css = cgroup_get_e_css(cgrp, &memory_cgrp_subsys); + if (css) + memcg = container_of(css, struct mem_cgroup, css); + else + memcg = ERR_PTR(-ENOENT); + + cgroup_put(cgrp); + + return memcg; +} +#endif + static int alloc_mem_cgroup_per_node_info(struct mem_cgroup *memcg, int node) { struct mem_cgroup_per_node *pn; -- 2.35.3