From: Yang Shi <shy828301@gmail.com>
To: guro@fb.com, ktkhai@virtuozzo.com, vbabka@suse.cz,
shakeelb@google.com, david@fromorbit.com, hannes@cmpxchg.org,
mhocko@suse.com, akpm@linux-foundation.org
Cc: shy828301@gmail.com, linux-mm@kvack.org,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [v6 PATCH 10/11] mm: memcontrol: reparent nr_deferred when memcg offline
Date: Wed, 3 Feb 2021 09:20:41 -0800 [thread overview]
Message-ID: <20210203172042.800474-11-shy828301@gmail.com> (raw)
In-Reply-To: <20210203172042.800474-1-shy828301@gmail.com>
Now shrinker's nr_deferred is per memcg for memcg aware shrinkers, add to parent's
corresponding nr_deferred when memcg offline.
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Yang Shi <shy828301@gmail.com>
---
include/linux/memcontrol.h | 1 +
mm/memcontrol.c | 1 +
mm/vmscan.c | 24 ++++++++++++++++++++++++
3 files changed, 26 insertions(+)
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index c457fc7bc631..e1c4b93889ad 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -1585,6 +1585,7 @@ static inline bool mem_cgroup_under_socket_pressure(struct mem_cgroup *memcg)
int alloc_shrinker_info(struct mem_cgroup *memcg);
void free_shrinker_info(struct mem_cgroup *memcg);
void set_shrinker_bit(struct mem_cgroup *memcg, int nid, int shrinker_id);
+void reparent_shrinker_deferred(struct mem_cgroup *memcg);
#else
#define mem_cgroup_sockets_enabled 0
static inline void mem_cgroup_sk_alloc(struct sock *sk) { };
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index f64ad0d044d9..21f36b73f36a 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -5282,6 +5282,7 @@ static void mem_cgroup_css_offline(struct cgroup_subsys_state *css)
page_counter_set_low(&memcg->memory, 0);
memcg_offline_kmem(memcg);
+ reparent_shrinker_deferred(memcg);
wb_memcg_offline(memcg);
drain_all_stock(memcg);
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 20a35d26ae12..574d920c4cab 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -386,6 +386,30 @@ static long set_nr_deferred_memcg(long nr, int nid, struct shrinker *shrinker,
return atomic_long_add_return(nr, &info->nr_deferred[shrinker->id]);
}
+void reparent_shrinker_deferred(struct mem_cgroup *memcg)
+{
+ int i, nid;
+ long nr;
+ struct mem_cgroup *parent;
+ struct shrinker_info *child_info, *parent_info;
+
+ parent = parent_mem_cgroup(memcg);
+ if (!parent)
+ parent = root_mem_cgroup;
+
+ /* Prevent from concurrent shrinker_info expand */
+ down_read(&shrinker_rwsem);
+ for_each_node(nid) {
+ child_info = shrinker_info_protected(memcg, nid);
+ parent_info = shrinker_info_protected(parent, nid);
+ for (i = 0; i < shrinker_nr_max; i++) {
+ nr = atomic_long_read(&child_info->nr_deferred[i]);
+ atomic_long_add(nr, &parent_info->nr_deferred[i]);
+ }
+ }
+ up_read(&shrinker_rwsem);
+}
+
static bool cgroup_reclaim(struct scan_control *sc)
{
return sc->target_mem_cgroup;
--
2.26.2
next prev parent reply other threads:[~2021-02-03 17:21 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-03 17:20 [v6 PATCH 0/11] Make shrinker's nr_deferred memcg aware Yang Shi
2021-02-03 17:20 ` [v6 PATCH 01/11] mm: vmscan: use nid from shrink_control for tracepoint Yang Shi
2021-02-04 7:22 ` Kirill Tkhai
2021-02-03 17:20 ` [v6 PATCH 02/11] mm: vmscan: consolidate shrinker_maps handling code Yang Shi
2021-02-04 7:23 ` Kirill Tkhai
2021-02-03 17:20 ` [v6 PATCH 03/11] mm: vmscan: use shrinker_rwsem to protect shrinker_maps allocation Yang Shi
2021-02-04 7:24 ` Kirill Tkhai
2021-02-03 17:20 ` [v6 PATCH 04/11] mm: vmscan: remove memcg_shrinker_map_size Yang Shi
2021-02-04 8:01 ` Kirill Tkhai
2021-02-03 17:20 ` [v6 PATCH 05/11] mm: memcontrol: rename shrinker_map to shrinker_info Yang Shi
2021-02-04 8:03 ` Kirill Tkhai
2021-02-03 17:20 ` [v6 PATCH 06/11] mm: vmscan: use a new flag to indicate shrinker is registered Yang Shi
2021-02-04 8:15 ` Kirill Tkhai
2021-02-03 17:20 ` [v6 PATCH 07/11] mm: vmscan: add per memcg shrinker nr_deferred Yang Shi
2021-02-04 8:30 ` Kirill Tkhai
2021-02-04 17:17 ` Yang Shi
2021-02-05 14:37 ` Kirill Tkhai
2021-02-05 16:49 ` Yang Shi
2021-02-03 17:20 ` [v6 PATCH 08/11] mm: vmscan: use per memcg nr_deferred of shrinker Yang Shi
2021-02-04 8:41 ` Kirill Tkhai
2021-02-04 17:23 ` Yang Shi
2021-02-05 14:41 ` Kirill Tkhai
2021-02-05 16:40 ` Yang Shi
2021-02-05 3:12 ` [mm] [confidence: ] 3510a44e0e: WARNING:suspicious_RCU_usage kernel test robot
2021-02-03 17:20 ` [v6 PATCH 09/11] mm: vmscan: don't need allocate shrinker->nr_deferred for memcg aware shrinkers Yang Shi
2021-02-04 9:29 ` Kirill Tkhai
2021-02-04 10:14 ` Kirill Tkhai
2021-02-04 17:32 ` Yang Shi
2021-02-05 14:44 ` Kirill Tkhai
2021-02-03 17:20 ` Yang Shi [this message]
2021-02-04 10:15 ` [v6 PATCH 10/11] mm: memcontrol: reparent nr_deferred when memcg offline Kirill Tkhai
2021-02-03 17:20 ` [v6 PATCH 11/11] mm: vmscan: shrink deferred objects proportional to priority Yang Shi
2021-02-04 10:23 ` Kirill Tkhai
2021-02-04 17:29 ` Yang Shi
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=20210203172042.800474-11-shy828301@gmail.com \
--to=shy828301@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=david@fromorbit.com \
--cc=guro@fb.com \
--cc=hannes@cmpxchg.org \
--cc=ktkhai@virtuozzo.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=shakeelb@google.com \
--cc=vbabka@suse.cz \
/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).