From: Kirill Tkhai <ktkhai@virtuozzo.com>
To: akpm@linux-foundation.org, vdavydov.dev@gmail.com,
shakeelb@google.com, viro@zeniv.linux.org.uk, hannes@cmpxchg.org,
mhocko@kernel.org, ktkhai@virtuozzo.com, tglx@linutronix.de,
pombredanne@nexb.com, stummala@codeaurora.org,
gregkh@linuxfoundation.org, sfr@canb.auug.org.au, guro@fb.com,
mka@chromium.org, penguin-kernel@I-love.SAKURA.ne.jp,
chris@chris-wilson.co.uk, longman@redhat.com, minchan@kernel.org,
ying.huang@intel.com, mgorman@techsingularity.net, jbacik@fb.com,
linux@roeck-us.net, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, willy@infradead.org, lirongqing@baidu.com,
aryabinin@virtuozzo.com
Subject: [PATCH v6 03/17] mm: Assign id to every memcg-aware shrinker
Date: Fri, 18 May 2018 11:42:08 +0300 [thread overview]
Message-ID: <152663292827.5308.15476497557507652648.stgit@localhost.localdomain> (raw)
In-Reply-To: <152663268383.5308.8660992135988724014.stgit@localhost.localdomain>
The patch introduces shrinker::id number, which is used to enumerate
memcg-aware shrinkers. The number start from 0, and the code tries
to maintain it as small as possible.
This will be used as to represent a memcg-aware shrinkers in memcg
shrinkers map.
Since all memcg-aware shrinkers are based on list_lru, which is per-memcg
in case of !CONFIG_MEMCG_KMEM only, the new functionality will be under
this config option.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
include/linux/shrinker.h | 4 +++
mm/vmscan.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 64 insertions(+)
diff --git a/include/linux/shrinker.h b/include/linux/shrinker.h
index 6794490f25b2..7ca9c18cf130 100644
--- a/include/linux/shrinker.h
+++ b/include/linux/shrinker.h
@@ -66,6 +66,10 @@ struct shrinker {
/* These are for internal use */
struct list_head list;
+#ifdef CONFIG_MEMCG_KMEM
+ /* ID in shrinker_idr */
+ int id;
+#endif
/* objs pending delete, per node */
atomic_long_t *nr_deferred;
};
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 50055d72f294..3de12a9bdf85 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -169,6 +169,48 @@ unsigned long vm_total_pages;
static LIST_HEAD(shrinker_list);
static DECLARE_RWSEM(shrinker_rwsem);
+#ifdef CONFIG_MEMCG_KMEM
+static DEFINE_IDR(shrinker_idr);
+
+static int prealloc_memcg_shrinker(struct shrinker *shrinker)
+{
+ int id, ret;
+
+ shrinker->id = -1;
+ down_write(&shrinker_rwsem);
+ ret = id = idr_alloc(&shrinker_idr, shrinker, 0, 0, GFP_KERNEL);
+ if (ret < 0)
+ goto unlock;
+ shrinker->id = id;
+ ret = 0;
+unlock:
+ up_write(&shrinker_rwsem);
+ return ret;
+}
+
+static void unregister_memcg_shrinker(struct shrinker *shrinker)
+{
+ int id = shrinker->id;
+
+ if (id < 0)
+ return;
+
+ down_write(&shrinker_rwsem);
+ idr_remove(&shrinker_idr, id);
+ up_write(&shrinker_rwsem);
+ shrinker->id = -1;
+}
+#else /* CONFIG_MEMCG_KMEM */
+static int prealloc_memcg_shrinker(struct shrinker *shrinker)
+{
+ return 0;
+}
+
+static void unregister_memcg_shrinker(struct shrinker *shrinker)
+{
+}
+#endif /* CONFIG_MEMCG_KMEM */
+
#ifdef CONFIG_MEMCG
static bool global_reclaim(struct scan_control *sc)
{
@@ -306,6 +348,7 @@ unsigned long lruvec_lru_size(struct lruvec *lruvec, enum lru_list lru, int zone
int prealloc_shrinker(struct shrinker *shrinker)
{
size_t size = sizeof(*shrinker->nr_deferred);
+ int ret;
if (shrinker->flags & SHRINKER_NUMA_AWARE)
size *= nr_node_ids;
@@ -313,11 +356,26 @@ int prealloc_shrinker(struct shrinker *shrinker)
shrinker->nr_deferred = kzalloc(size, GFP_KERNEL);
if (!shrinker->nr_deferred)
return -ENOMEM;
+
+ if (shrinker->flags & SHRINKER_MEMCG_AWARE) {
+ ret = prealloc_memcg_shrinker(shrinker);
+ if (ret)
+ goto free_deferred;
+ }
+
return 0;
+
+free_deferred:
+ kfree(shrinker->nr_deferred);
+ shrinker->nr_deferred = NULL;
+ return -ENOMEM;
}
void free_prealloced_shrinker(struct shrinker *shrinker)
{
+ if (shrinker->flags & SHRINKER_MEMCG_AWARE)
+ unregister_memcg_shrinker(shrinker);
+
kfree(shrinker->nr_deferred);
shrinker->nr_deferred = NULL;
}
@@ -347,6 +405,8 @@ void unregister_shrinker(struct shrinker *shrinker)
{
if (!shrinker->nr_deferred)
return;
+ if (shrinker->flags & SHRINKER_MEMCG_AWARE)
+ unregister_memcg_shrinker(shrinker);
down_write(&shrinker_rwsem);
list_del(&shrinker->list);
up_write(&shrinker_rwsem);
next prev parent reply other threads:[~2018-05-18 8:42 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-18 8:41 [PATCH v6 00/17] Improve shrink_slab() scalability (old complexity was O(n^2), new is O(n)) Kirill Tkhai
2018-05-18 8:41 ` [PATCH v6 01/17] list_lru: Combine code under the same define Kirill Tkhai
2018-05-18 8:41 ` [PATCH v6 02/17] mm: Introduce CONFIG_MEMCG_KMEM as combination of CONFIG_MEMCG && !CONFIG_SLOB Kirill Tkhai
2018-05-18 8:42 ` Kirill Tkhai [this message]
2018-05-20 7:08 ` [PATCH v6 03/17] mm: Assign id to every memcg-aware shrinker Vladimir Davydov
2018-05-18 8:42 ` [PATCH v6 04/17] memcg: Move up for_each_mem_cgroup{, _tree} defines Kirill Tkhai
2018-05-18 8:42 ` [PATCH v6 05/17] mm: Assign memcg-aware shrinkers bitmap to memcg Kirill Tkhai
2018-05-20 7:27 ` Vladimir Davydov
2018-05-21 10:16 ` Kirill Tkhai
2018-05-21 18:40 ` Vladimir Davydov
2018-05-18 8:42 ` [PATCH v6 06/17] mm: Refactoring in workingset_init() Kirill Tkhai
2018-05-18 8:42 ` [PATCH v6 07/17] fs: Refactoring in alloc_super() Kirill Tkhai
2018-05-18 8:43 ` [PATCH v6 08/17] fs: Propagate shrinker::id to list_lru Kirill Tkhai
2018-05-18 8:43 ` [PATCH v6 09/17] list_lru: Add memcg argument to list_lru_from_kmem() Kirill Tkhai
2018-05-18 8:43 ` [PATCH v6 10/17] list_lru: Pass dst_memcg argument to memcg_drain_list_lru_node() Kirill Tkhai
2018-05-18 8:43 ` [PATCH v6 11/17] list_lru: Pass lru " Kirill Tkhai
2018-05-18 8:43 ` [PATCH v6 12/17] mm: Set bit in memcg shrinker bitmap on first list_lru item apearance Kirill Tkhai
2018-05-20 7:55 ` Vladimir Davydov
2018-05-21 9:31 ` Kirill Tkhai
2018-05-21 18:16 ` Vladimir Davydov
2018-05-18 8:43 ` [PATCH v6 13/17] mm: Export mem_cgroup_is_root() Kirill Tkhai
2018-05-20 7:57 ` Vladimir Davydov
2018-05-18 8:44 ` [PATCH v6 14/17] mm: Iterate only over charged shrinkers during memcg shrink_slab() Kirill Tkhai
2018-05-20 8:00 ` Vladimir Davydov
2018-05-21 9:17 ` Kirill Tkhai
2018-05-21 17:56 ` Vladimir Davydov
2018-05-18 8:44 ` [PATCH v6 15/17] mm: Generalize shrink_slab() calls in shrink_node() Kirill Tkhai
2018-05-20 8:08 ` Vladimir Davydov
2018-05-21 9:19 ` Kirill Tkhai
2018-05-18 8:44 ` [PATCH v6 16/17] mm: Add SHRINK_EMPTY shrinker methods return value Kirill Tkhai
2018-05-18 8:44 ` [PATCH v6 17/17] mm: Clear shrinker bit if there are no objects related to memcg Kirill Tkhai
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=152663292827.5308.15476497557507652648.stgit@localhost.localdomain \
--to=ktkhai@virtuozzo.com \
--cc=akpm@linux-foundation.org \
--cc=aryabinin@virtuozzo.com \
--cc=chris@chris-wilson.co.uk \
--cc=gregkh@linuxfoundation.org \
--cc=guro@fb.com \
--cc=hannes@cmpxchg.org \
--cc=jbacik@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux@roeck-us.net \
--cc=lirongqing@baidu.com \
--cc=longman@redhat.com \
--cc=mgorman@techsingularity.net \
--cc=mhocko@kernel.org \
--cc=minchan@kernel.org \
--cc=mka@chromium.org \
--cc=penguin-kernel@I-love.SAKURA.ne.jp \
--cc=pombredanne@nexb.com \
--cc=sfr@canb.auug.org.au \
--cc=shakeelb@google.com \
--cc=stummala@codeaurora.org \
--cc=tglx@linutronix.de \
--cc=vdavydov.dev@gmail.com \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.org \
--cc=ying.huang@intel.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).