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 2/8] mm: memcontrol: export root_mem_cgroup
Date: Thu, 22 Oct 2015 00:21:30 -0400 [thread overview]
Message-ID: <1445487696-21545-3-git-send-email-hannes@cmpxchg.org> (raw)
In-Reply-To: <1445487696-21545-1-git-send-email-hannes@cmpxchg.org>
A later patch will need this symbol in files other than memcontrol.c,
so export it now and replace mem_cgroup_root_css at the same time.
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
---
include/linux/memcontrol.h | 3 ++-
mm/backing-dev.c | 2 +-
mm/memcontrol.c | 5 ++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 805da1f..19ff87b 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -275,7 +275,8 @@ struct mem_cgroup {
struct mem_cgroup_per_node *nodeinfo[0];
/* WARNING: nodeinfo must be the last member here */
};
-extern struct cgroup_subsys_state *mem_cgroup_root_css;
+
+extern struct mem_cgroup *root_mem_cgroup;
/**
* mem_cgroup_events - count memory events against a cgroup
diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index 095b23b..73ab967 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -702,7 +702,7 @@ static int cgwb_bdi_init(struct backing_dev_info *bdi)
ret = wb_init(&bdi->wb, bdi, 1, GFP_KERNEL);
if (!ret) {
- bdi->wb.memcg_css = mem_cgroup_root_css;
+ bdi->wb.memcg_css = &root_mem_cgroup->css;
bdi->wb.blkcg_css = blkcg_root_css;
}
return ret;
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index a8ccdbc..e54f434 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -76,9 +76,9 @@
struct cgroup_subsys memory_cgrp_subsys __read_mostly;
EXPORT_SYMBOL(memory_cgrp_subsys);
+struct mem_cgroup *root_mem_cgroup __read_mostly;
+
#define MEM_CGROUP_RECLAIM_RETRIES 5
-static struct mem_cgroup *root_mem_cgroup __read_mostly;
-struct cgroup_subsys_state *mem_cgroup_root_css __read_mostly;
/* Whether the swap controller is active */
#ifdef CONFIG_MEMCG_SWAP
@@ -4213,7 +4213,6 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css)
/* root ? */
if (parent_css == NULL) {
root_mem_cgroup = memcg;
- mem_cgroup_root_css = &memcg->css;
page_counter_init(&memcg->memory, NULL);
memcg->high = PAGE_COUNTER_MAX;
memcg->soft_limit = PAGE_COUNTER_MAX;
--
2.6.1
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2015-10-22 4:22 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 ` Johannes Weiner [this message]
2015-10-23 11:32 ` [PATCH 2/8] mm: memcontrol: export root_mem_cgroup 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 ` [PATCH 6/8] mm: vmscan: simplify memcg vs. global shrinker invocation Johannes Weiner
2015-10-23 13:26 ` 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-3-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).