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 15/17] mm: Generalize shrink_slab() calls in shrink_node()
Date: Fri, 18 May 2018 11:44:11 +0300 [thread overview]
Message-ID: <152663305153.5308.14479673190611499656.stgit@localhost.localdomain> (raw)
In-Reply-To: <152663268383.5308.8660992135988724014.stgit@localhost.localdomain>
From: Vladimir Davydov <vdavydov.dev@gmail.com>
The patch makes shrink_slab() be called for root_mem_cgroup
in the same way as it's called for the rest of cgroups.
This simplifies the logic and improves the readability.
Signed-off-by: Vladimir Davydov <vdavydov.dev@gmail.com>
ktkhai: Description written.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
mm/vmscan.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 2fbf3b476601..f1d23e2df988 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -661,9 +661,6 @@ static unsigned long shrink_slab(gfp_t gfp_mask, int nid,
.memcg = memcg,
};
- if (!!memcg != !!(shrinker->flags & SHRINKER_MEMCG_AWARE))
- continue;
-
if (!(shrinker->flags & SHRINKER_NUMA_AWARE))
sc.nid = 0;
@@ -693,6 +690,7 @@ void drop_slab_node(int nid)
struct mem_cgroup *memcg = NULL;
freed = 0;
+ memcg = mem_cgroup_iter(NULL, NULL, NULL);
do {
freed += shrink_slab(GFP_KERNEL, nid, memcg, 0);
} while ((memcg = mem_cgroup_iter(NULL, memcg, NULL)) != NULL);
@@ -2712,9 +2710,8 @@ static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc)
shrink_node_memcg(pgdat, memcg, sc, &lru_pages);
node_lru_pages += lru_pages;
- if (memcg)
- shrink_slab(sc->gfp_mask, pgdat->node_id,
- memcg, sc->priority);
+ shrink_slab(sc->gfp_mask, pgdat->node_id,
+ memcg, sc->priority);
/* Record the group's reclaim efficiency */
vmpressure(sc->gfp_mask, memcg, false,
@@ -2738,10 +2735,6 @@ static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc)
}
} while ((memcg = mem_cgroup_iter(root, memcg, &reclaim)));
- if (global_reclaim(sc))
- shrink_slab(sc->gfp_mask, pgdat->node_id, NULL,
- sc->priority);
-
if (reclaim_state) {
sc->nr_reclaimed += reclaim_state->reclaimed_slab;
reclaim_state->reclaimed_slab = 0;
next prev parent reply other threads:[~2018-05-18 8:44 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 ` [PATCH v6 03/17] mm: Assign id to every memcg-aware shrinker Kirill Tkhai
2018-05-20 7:08 ` 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 ` Kirill Tkhai [this message]
2018-05-20 8:08 ` [PATCH v6 15/17] mm: Generalize shrink_slab() calls in shrink_node() 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=152663305153.5308.14479673190611499656.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).