From: Johannes Weiner <hannes@cmpxchg.org>
To: "David S. Miller" <davem@davemloft.net>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Michal Hocko <mhocko@suse.cz>,
Vladimir Davydov <vdavydov@virtuozzo.com>,
Tejun Heo <tj@kernel.org>,
netdev@vger.kernel.org, linux-mm@kvack.org,
cgroups@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 6/8] mm: vmscan: simplify memcg vs. global shrinker invocation
Date: Thu, 22 Oct 2015 00:21:34 -0400 [thread overview]
Message-ID: <1445487696-21545-7-git-send-email-hannes@cmpxchg.org> (raw)
In-Reply-To: <1445487696-21545-1-git-send-email-hannes@cmpxchg.org>
Letting shrink_slab() handle the root_mem_cgroup, and implicitely the
!CONFIG_MEMCG case, allows shrink_zone() to invoke the shrinkers
unconditionally from within the memcg iteration loop.
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
---
include/linux/memcontrol.h | 2 ++
mm/vmscan.c | 31 ++++++++++++++++---------------
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 6f1e0f8..d66ae18 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -482,6 +482,8 @@ void mem_cgroup_split_huge_fixup(struct page *head);
#else /* CONFIG_MEMCG */
struct mem_cgroup;
+#define root_mem_cgroup NULL
+
static inline void mem_cgroup_events(struct mem_cgroup *memcg,
enum mem_cgroup_events_index idx,
unsigned int nr)
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 9b52ecf..ecc2125 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -411,6 +411,10 @@ static unsigned long shrink_slab(gfp_t gfp_mask, int nid,
struct shrinker *shrinker;
unsigned long freed = 0;
+ /* Global shrinker mode */
+ if (memcg == root_mem_cgroup)
+ memcg = NULL;
+
if (memcg && !memcg_kmem_is_active(memcg))
return 0;
@@ -2417,11 +2421,22 @@ static bool shrink_zone(struct zone *zone, struct scan_control *sc,
shrink_lruvec(lruvec, swappiness, sc, &lru_pages);
zone_lru_pages += lru_pages;
- if (memcg && is_classzone)
+ /*
+ * Shrink the slab caches in the same proportion that
+ * the eligible LRU pages were scanned.
+ */
+ if (is_classzone) {
shrink_slab(sc->gfp_mask, zone_to_nid(zone),
memcg, sc->nr_scanned - scanned,
lru_pages);
+ if (reclaim_state) {
+ sc->nr_reclaimed +=
+ reclaim_state->reclaimed_slab;
+ reclaim_state->reclaimed_slab = 0;
+ }
+ }
+
/*
* Direct reclaim and kswapd have to scan all memory
* cgroups to fulfill the overall scan target for the
@@ -2439,20 +2454,6 @@ static bool shrink_zone(struct zone *zone, struct scan_control *sc,
}
} while ((memcg = mem_cgroup_iter(root, memcg, &reclaim)));
- /*
- * Shrink the slab caches in the same proportion that
- * the eligible LRU pages were scanned.
- */
- if (global_reclaim(sc) && is_classzone)
- shrink_slab(sc->gfp_mask, zone_to_nid(zone), NULL,
- sc->nr_scanned - nr_scanned,
- zone_lru_pages);
-
- if (reclaim_state) {
- sc->nr_reclaimed += reclaim_state->reclaimed_slab;
- reclaim_state->reclaimed_slab = 0;
- }
-
vmpressure(sc->gfp_mask, sc->target_mem_cgroup,
sc->nr_scanned - nr_scanned,
sc->nr_reclaimed - nr_reclaimed);
--
2.6.1
next prev parent reply other threads:[~2015-10-22 4:23 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-22 4:21 [PATCH 0/8] mm: memcontrol: account socket memory in unified hierarchy Johannes Weiner
2015-10-22 4:21 ` [PATCH 1/8] mm: page_counter: let page_counter_try_charge() return bool Johannes Weiner
2015-10-23 11:31 ` Michal Hocko
2015-10-22 4:21 ` [PATCH 2/8] mm: memcontrol: export root_mem_cgroup Johannes Weiner
2015-10-23 11:32 ` Michal Hocko
2015-10-22 4:21 ` [PATCH 3/8] net: consolidate memcg socket buffer tracking and accounting Johannes Weiner
2015-10-22 18:46 ` Vladimir Davydov
2015-10-22 19:09 ` Johannes Weiner
2015-10-23 13:42 ` Vladimir Davydov
2015-10-23 12:38 ` Michal Hocko
2015-10-22 4:21 ` [PATCH 4/8] mm: memcontrol: prepare for unified hierarchy socket accounting Johannes Weiner
2015-10-23 12:39 ` Michal Hocko
2015-10-22 4:21 ` [PATCH 5/8] mm: memcontrol: account socket memory on unified hierarchy Johannes Weiner
2015-10-22 18:47 ` Vladimir Davydov
2015-10-23 13:19 ` Michal Hocko
2015-10-23 13:59 ` David Miller
2015-10-26 16:56 ` Johannes Weiner
2015-10-27 12:26 ` Michal Hocko
2015-10-27 13:49 ` David Miller
2015-10-27 15:41 ` Johannes Weiner
2015-10-27 16:15 ` Michal Hocko
2015-10-27 16:42 ` Johannes Weiner
2015-10-28 0:45 ` David Miller
2015-10-28 3:05 ` Johannes Weiner
2015-10-29 15:25 ` Michal Hocko
2015-10-29 16:10 ` Johannes Weiner
2015-11-04 10:42 ` Michal Hocko
2015-11-04 19:50 ` Johannes Weiner
2015-11-05 14:40 ` Michal Hocko
2015-11-05 16:16 ` David Miller
2015-11-05 16:28 ` Michal Hocko
2015-11-05 16:30 ` David Miller
2015-11-05 22:32 ` Johannes Weiner
2015-11-06 12:51 ` Michal Hocko
2015-11-05 20:55 ` Johannes Weiner
2015-11-05 22:52 ` Johannes Weiner
2015-11-06 10:57 ` Michal Hocko
2015-11-06 16:19 ` Johannes Weiner
2015-11-06 16:46 ` Michal Hocko
2015-11-06 17:45 ` Johannes Weiner
2015-11-07 3:45 ` David Miller
2015-11-12 18:36 ` Mel Gorman
2015-11-12 19:12 ` Johannes Weiner
2015-11-06 9:05 ` Vladimir Davydov
2015-11-06 13:29 ` Michal Hocko
2015-11-06 16:35 ` Johannes Weiner
2015-11-06 13:21 ` Michal Hocko
2015-10-22 4:21 ` Johannes Weiner [this message]
2015-10-23 13:26 ` [PATCH 6/8] mm: vmscan: simplify memcg vs. global shrinker invocation Michal Hocko
2015-10-22 4:21 ` [PATCH 7/8] mm: vmscan: report vmpressure at the level of reclaim activity Johannes Weiner
2015-10-22 18:48 ` Vladimir Davydov
2015-10-23 13:49 ` Michal Hocko
2015-10-22 4:21 ` [PATCH 8/8] mm: memcontrol: hook up vmpressure to socket pressure Johannes Weiner
2015-10-22 18:57 ` Vladimir Davydov
2015-10-22 18:45 ` [PATCH 0/8] mm: memcontrol: account socket memory in unified hierarchy Vladimir Davydov
2015-10-26 17:22 ` Johannes Weiner
2015-10-27 8:43 ` Vladimir Davydov
2015-10-27 16:01 ` Johannes Weiner
2015-10-28 8:20 ` Vladimir Davydov
2015-10-28 18:58 ` Johannes Weiner
2015-10-29 9:27 ` Vladimir Davydov
2015-10-29 17:52 ` Johannes Weiner
2015-11-02 14:47 ` Vladimir Davydov
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=1445487696-21545-7-git-send-email-hannes@cmpxchg.org \
--to=hannes@cmpxchg.org \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.cz \
--cc=netdev@vger.kernel.org \
--cc=tj@kernel.org \
--cc=vdavydov@virtuozzo.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).