From: Yang Shi <shy828301@gmail.com>
To: guro@fb.com, ktkhai@virtuozzo.com, 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: [v2 PATCH 8/9] mm: memcontrol: reparent nr_deferred when memcg offline
Date: Mon, 14 Dec 2020 14:37:21 -0800 [thread overview]
Message-ID: <20201214223722.232537-9-shy828301@gmail.com> (raw)
In-Reply-To: <20201214223722.232537-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.
Signed-off-by: Yang Shi <shy828301@gmail.com>
---
include/linux/shrinker.h | 4 ++++
mm/memcontrol.c | 24 ++++++++++++++++++++++++
mm/vmscan.c | 2 +-
3 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/include/linux/shrinker.h b/include/linux/shrinker.h
index 1eac79ce57d4..85cfc910dde4 100644
--- a/include/linux/shrinker.h
+++ b/include/linux/shrinker.h
@@ -78,6 +78,10 @@ struct shrinker {
};
#define DEFAULT_SEEKS 2 /* A good number if you don't know better. */
+#ifdef CONFIG_MEMCG
+extern int shrinker_nr_max;
+#endif
+
/* Flags */
#define SHRINKER_REGISTERED (1 << 0)
#define SHRINKER_NUMA_AWARE (1 << 1)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 321d1818ce3d..1f191a15bee1 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -59,6 +59,7 @@
#include <linux/tracehook.h>
#include <linux/psi.h>
#include <linux/seq_buf.h>
+#include <linux/shrinker.h>
#include "internal.h"
#include <net/sock.h>
#include <net/ip.h>
@@ -612,6 +613,28 @@ void memcg_set_shrinker_bit(struct mem_cgroup *memcg, int nid, int shrinker_id)
}
}
+static void memcg_reparent_shrinker_deferred(struct mem_cgroup *memcg)
+{
+ int i, nid;
+ long nr;
+ struct mem_cgroup *parent;
+ struct memcg_shrinker_deferred *child_deferred, *parent_deferred;
+
+ parent = parent_mem_cgroup(memcg);
+ if (!parent)
+ parent = root_mem_cgroup;
+
+ for_each_node(nid) {
+ child_deferred = memcg->nodeinfo[nid]->shrinker_deferred;
+ parent_deferred = parent->nodeinfo[nid]->shrinker_deferred;
+ for (i = 0; i < shrinker_nr_max; i ++) {
+ nr = atomic_long_read(&child_deferred->nr_deferred[i]);
+ atomic_long_add(nr,
+ &parent_deferred->nr_deferred[i]);
+ }
+ }
+}
+
/**
* mem_cgroup_css_from_page - css of the memcg associated with a page
* @page: page of interest
@@ -5543,6 +5566,7 @@ static void mem_cgroup_css_offline(struct cgroup_subsys_state *css)
page_counter_set_low(&memcg->memory, 0);
memcg_offline_kmem(memcg);
+ memcg_reparent_shrinker_deferred(memcg);
wb_memcg_offline(memcg);
drain_all_stock(memcg);
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 8d5bfd818acd..693a41e89969 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -201,7 +201,7 @@ DECLARE_RWSEM(shrinker_rwsem);
#define SHRINKER_REGISTERING ((struct shrinker *)~0UL)
static DEFINE_IDR(shrinker_idr);
-static int shrinker_nr_max;
+int shrinker_nr_max;
static inline bool is_deferred_memcg_aware(struct shrinker *shrinker)
{
--
2.26.2
next prev parent reply other threads:[~2020-12-14 22:38 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-14 22:37 [RFC v2 PATCH 0/9] Make shrinker's nr_deferred memcg aware Yang Shi
2020-12-14 22:37 ` [v2 PATCH 1/9] mm: vmscan: use nid from shrink_control for tracepoint Yang Shi
2020-12-14 22:37 ` [v2 PATCH 2/9] mm: memcontrol: use shrinker_rwsem to protect shrinker_maps allocation Yang Shi
2020-12-15 2:09 ` Dave Chinner
2020-12-15 13:53 ` Johannes Weiner
2020-12-15 21:59 ` Dave Chinner
2020-12-16 13:17 ` Kirill Tkhai
2020-12-16 19:12 ` Johannes Weiner
2020-12-16 21:56 ` Yang Shi
2020-12-16 19:39 ` Roman Gushchin
2020-12-15 14:07 ` Johannes Weiner
2020-12-15 20:32 ` Yang Shi
2020-12-14 22:37 ` [v2 PATCH 3/9] mm: vmscan: guarantee shrinker_slab_memcg() sees valid shrinker_maps for online memcg Yang Shi
2020-12-15 2:04 ` Dave Chinner
[not found] ` <20201215123802.GA379720@cmpxchg.org>
2020-12-15 12:58 ` Kirill Tkhai
2020-12-15 17:14 ` Johannes Weiner
[not found] ` <CAHbLzkrzv48S3ks-x8M=2sHxRS_+c-hLXdt4ScaWD6mC4ZFe8w@mail.gmail.com>
2020-12-28 20:03 ` Yang Shi
2020-12-14 22:37 ` [v2 PATCH 4/9] mm: vmscan: use a new flag to indicate shrinker is registered Yang Shi
2020-12-14 22:37 ` [v2 PATCH 5/9] mm: memcontrol: add per memcg shrinker nr_deferred Yang Shi
2020-12-15 2:22 ` Dave Chinner
2020-12-15 14:45 ` Johannes Weiner
2020-12-15 21:57 ` Yang Shi
2020-12-14 22:37 ` [v2 PATCH 6/9] mm: vmscan: use per memcg nr_deferred of shrinker Yang Shi
2020-12-15 2:46 ` Dave Chinner
2020-12-15 22:27 ` Yang Shi
2020-12-15 23:48 ` Dave Chinner
2020-12-14 22:37 ` [v2 PATCH 7/9] mm: vmscan: don't need allocate shrinker->nr_deferred for memcg aware shrinkers Yang Shi
2020-12-15 3:05 ` Dave Chinner
2020-12-15 23:07 ` Yang Shi
2020-12-18 0:56 ` Yang Shi
2020-12-18 1:09 ` Dave Chinner
2020-12-14 22:37 ` Yang Shi [this message]
2020-12-15 3:07 ` [v2 PATCH 8/9] mm: memcontrol: reparent nr_deferred when memcg offline Dave Chinner
2020-12-15 23:10 ` Yang Shi
2020-12-14 22:37 ` [v2 PATCH 9/9] mm: vmscan: shrink deferred objects proportional to priority Yang Shi
2020-12-15 3:23 ` Dave Chinner
2020-12-15 23:59 ` 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=20201214223722.232537-9-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 \
/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