From: Muchun Song <songmuchun@bytedance.com>
To: willy@infradead.org, akpm@linux-foundation.org,
hannes@cmpxchg.org, mhocko@kernel.org, vdavydov.dev@gmail.com,
shakeelb@google.com, guro@fb.com, shy828301@gmail.com,
alexs@kernel.org, richard.weiyang@gmail.com, david@fromorbit.com,
trond.myklebust@hammerspace.com, anna.schumaker@netapp.com
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, linux-nfs@vger.kernel.org,
zhengqi.arch@bytedance.com, duanxiongchun@bytedance.com,
fam.zheng@bytedance.com, smuchun@gmail.com,
Muchun Song <songmuchun@bytedance.com>
Subject: [PATCH v3 04/76] mm: memcontrol: move memcg_online_kmem() to mem_cgroup_css_online()
Date: Tue, 14 Sep 2021 15:28:26 +0800 [thread overview]
Message-ID: <20210914072938.6440-5-songmuchun@bytedance.com> (raw)
In-Reply-To: <20210914072938.6440-1-songmuchun@bytedance.com>
It will simplify code if moving work of making kmem online to the place
where making memcg online. It is unnecessary to set ->kmemcg_id when the
kmem is offline, memcg_free_kmem() can go away as well.
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
---
mm/memcontrol.c | 42 +++++++++++++++---------------------------
1 file changed, 15 insertions(+), 27 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 6844d8b511d8..a85b52968666 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -3610,7 +3610,8 @@ static int memcg_online_kmem(struct mem_cgroup *memcg)
if (cgroup_memory_nokmem)
return 0;
- BUG_ON(memcg->kmemcg_id >= 0);
+ if (unlikely(mem_cgroup_is_root(memcg)))
+ return 0;
memcg_id = memcg_alloc_cache_id();
if (memcg_id < 0)
@@ -3639,6 +3640,9 @@ static void memcg_offline_kmem(struct mem_cgroup *memcg)
if (cgroup_memory_nokmem)
return;
+ if (unlikely(mem_cgroup_is_root(memcg)))
+ return;
+
parent = parent_mem_cgroup(memcg);
if (!parent)
parent = root_mem_cgroup;
@@ -3646,20 +3650,11 @@ static void memcg_offline_kmem(struct mem_cgroup *memcg)
memcg_reparent_objcgs(memcg, parent);
kmemcg_id = memcg->kmemcg_id;
- BUG_ON(kmemcg_id < 0);
/* memcg_reparent_objcgs() must be called before this. */
memcg_drain_all_list_lrus(kmemcg_id, parent);
memcg_free_cache_id(kmemcg_id);
- memcg->kmemcg_id = -1;
-}
-
-static void memcg_free_kmem(struct mem_cgroup *memcg)
-{
- /* css_alloc() failed, offlining didn't happen */
- if (unlikely(memcg->kmemcg_id != -1))
- memcg_offline_kmem(memcg);
}
#else
static int memcg_online_kmem(struct mem_cgroup *memcg)
@@ -3669,9 +3664,6 @@ static int memcg_online_kmem(struct mem_cgroup *memcg)
static void memcg_offline_kmem(struct mem_cgroup *memcg)
{
}
-static void memcg_free_kmem(struct mem_cgroup *memcg)
-{
-}
#endif /* CONFIG_MEMCG_KMEM */
static int memcg_update_kmem_max(struct mem_cgroup *memcg,
@@ -5183,7 +5175,6 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css)
{
struct mem_cgroup *parent = mem_cgroup_from_css(parent_css);
struct mem_cgroup *memcg, *old_memcg;
- long error = -ENOMEM;
old_memcg = set_active_memcg(parent);
memcg = mem_cgroup_alloc();
@@ -5213,33 +5204,26 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css)
}
/* The following stuff does not apply to the root */
- error = memcg_online_kmem(memcg);
- if (error)
- goto fail;
-
if (cgroup_subsys_on_dfl(memory_cgrp_subsys) && !cgroup_memory_nosocket)
static_branch_inc(&memcg_sockets_enabled_key);
return &memcg->css;
-fail:
- mem_cgroup_id_remove(memcg);
- mem_cgroup_free(memcg);
- return ERR_PTR(error);
}
static int mem_cgroup_css_online(struct cgroup_subsys_state *css)
{
struct mem_cgroup *memcg = mem_cgroup_from_css(css);
+ if (memcg_online_kmem(memcg))
+ goto remove_id;
+
/*
* A memcg must be visible for expand_shrinker_info()
* by the time the maps are allocated. So, we allocate maps
* here, when for_each_mem_cgroup() can't skip it.
*/
- if (alloc_shrinker_info(memcg)) {
- mem_cgroup_id_remove(memcg);
- return -ENOMEM;
- }
+ if (alloc_shrinker_info(memcg))
+ goto offline_kmem;
/* Online state pins memcg ID, memcg ID pins CSS */
refcount_set(&memcg->id.ref, 1);
@@ -5249,6 +5233,11 @@ static int mem_cgroup_css_online(struct cgroup_subsys_state *css)
queue_delayed_work(system_unbound_wq, &stats_flush_dwork,
2UL*HZ);
return 0;
+offline_kmem:
+ memcg_offline_kmem(memcg);
+remove_id:
+ mem_cgroup_id_remove(memcg);
+ return -ENOMEM;
}
static void mem_cgroup_css_offline(struct cgroup_subsys_state *css)
@@ -5306,7 +5295,6 @@ static void mem_cgroup_css_free(struct cgroup_subsys_state *css)
cancel_work_sync(&memcg->high_work);
mem_cgroup_remove_from_trees(memcg);
free_shrinker_info(memcg);
- memcg_free_kmem(memcg);
mem_cgroup_free(memcg);
}
--
2.11.0
next prev parent reply other threads:[~2021-09-14 7:33 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-14 7:28 [PATCH v3 00/76] Optimize list lru memory consumption Muchun Song
2021-09-14 7:28 ` [PATCH v3 01/76] mm: list_lru: fix the return value of list_lru_count_one() Muchun Song
2021-09-14 7:28 ` [PATCH v3 02/76] mm: memcontrol: remove kmemcg_id reparenting Muchun Song
2021-09-14 7:28 ` [PATCH v3 03/76] mm: memcontrol: remove the kmem states Muchun Song
2021-09-14 7:28 ` Muchun Song [this message]
2021-09-14 7:28 ` [PATCH v3 05/76] mm: list_lru: remove holding lru lock Muchun Song
2021-09-14 7:28 ` [PATCH v3 06/76] mm: list_lru: only add memcg-aware lrus to the global lru list Muchun Song
2021-09-14 7:28 ` [PATCH v3 07/76] mm: list_lru: optimize memory consumption of arrays Muchun Song
2021-09-14 7:28 ` [PATCH v3 08/76] mm: introduce kmem_cache_alloc_lru Muchun Song
2021-09-14 7:28 ` [PATCH v3 09/76] fs: introduce alloc_inode_sb() to allocate filesystems specific inode Muchun Song
2021-09-14 7:28 ` [PATCH v3 10/76] dax: allocate inode by using alloc_inode_sb() Muchun Song
2021-09-14 7:28 ` [PATCH v3 11/76] 9p: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 12/76] adfs: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 13/76] affs: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 14/76] afs: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 15/76] befs: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 16/76] bfs: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 17/76] block: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 18/76] btrfs: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 19/76] ceph: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 20/76] cifs: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 21/76] coda: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 22/76] ecryptfs: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 23/76] efs: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 24/76] erofs: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 25/76] exfat: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 26/76] ext2: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 27/76] ext4: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 28/76] fat: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 29/76] freevxfs: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 30/76] fuse: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 31/76] gfs2: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 32/76] hfs: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 33/76] hfsplus: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 34/76] hostfs: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 35/76] hpfs: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 36/76] hugetlbfs: " Muchun Song
2021-09-14 7:28 ` [PATCH v3 37/76] isofs: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 38/76] jffs2: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 39/76] jfs: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 40/76] minix: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 41/76] nfs: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 42/76] nilfs2: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 43/76] ntfs: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 44/76] ocfs2: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 45/76] openpromfs: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 46/76] orangefs: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 47/76] overlayfs: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 48/76] proc: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 49/76] qnx4: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 50/76] qnx6: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 51/76] reiserfs: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 52/76] romfs: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 53/76] squashfs: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 54/76] sysv: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 55/76] ubifs: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 56/76] udf: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 57/76] ufs: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 58/76] vboxsf: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 59/76] xfs: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 60/76] zonefs: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 61/76] ipc: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 62/76] shmem: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 63/76] net: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 64/76] rpc: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 65/76] f2fs: " Muchun Song
2021-09-14 7:29 ` [PATCH v3 66/76] nfs42: use a specific kmem_cache to allocate nfs4_xattr_entry Muchun Song
2021-09-14 7:29 ` [PATCH v3 67/76] mm: dcache: use kmem_cache_alloc_lru() to allocate dentry Muchun Song
2021-09-14 7:29 ` [PATCH v3 68/76] xarray: use kmem_cache_alloc_lru to allocate xa_node Muchun Song
2021-09-14 7:29 ` [PATCH v3 69/76] mm: workingset: use xas_set_lru() to pass shadow_nodes Muchun Song
2021-09-14 7:29 ` [PATCH v3 70/76] mm: list_lru: allocate list_lru_one only when needed Muchun Song
2021-09-14 7:29 ` [PATCH v3 71/76] mm: list_lru: rename memcg_drain_all_list_lrus to memcg_reparent_list_lrus Muchun Song
2021-09-14 7:29 ` [PATCH v3 72/76] mm: list_lru: replace linear array with xarray Muchun Song
2021-09-14 7:29 ` [PATCH v3 73/76] mm: memcontrol: reuse memory cgroup ID for kmem ID Muchun Song
2021-09-14 7:29 ` [PATCH v3 74/76] mm: memcontrol: fix cannot alloc the maximum memcg ID Muchun Song
2021-09-14 7:29 ` [PATCH v3 75/76] mm: list_lru: rename list_lru_per_memcg to list_lru_memcg Muchun Song
2021-09-14 7:29 ` [PATCH v3 76/76] mm: memcontrol: rename memcg_cache_id to memcg_kmem_id Muchun Song
2021-09-14 20:22 ` [PATCH v3 00/76] Optimize list lru memory consumption Theodore Ts'o
2021-09-15 7:30 ` Muchun Song
2021-09-18 6:56 ` Kari Argillander
2021-09-18 7:59 ` Muchun Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210914072938.6440-5-songmuchun@bytedance.com \
--to=songmuchun@bytedance.com \
--cc=akpm@linux-foundation.org \
--cc=alexs@kernel.org \
--cc=anna.schumaker@netapp.com \
--cc=david@fromorbit.com \
--cc=duanxiongchun@bytedance.com \
--cc=fam.zheng@bytedance.com \
--cc=guro@fb.com \
--cc=hannes@cmpxchg.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nfs@vger.kernel.org \
--cc=mhocko@kernel.org \
--cc=richard.weiyang@gmail.com \
--cc=shakeelb@google.com \
--cc=shy828301@gmail.com \
--cc=smuchun@gmail.com \
--cc=trond.myklebust@hammerspace.com \
--cc=vdavydov.dev@gmail.com \
--cc=willy@infradead.org \
--cc=zhengqi.arch@bytedance.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).