From: Johannes Weiner <hannes@cmpxchg.org> To: Andrew Morton <akpm@linux-foundation.org> Cc: Michal Hocko <mhocko@suse.cz>, Vladimir Davydov <vdavydov@virtuozzo.com>, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 2/8] mm: memcontrol: remove double kmem page_counter init Date: Tue, 8 Dec 2015 13:34:19 -0500 [thread overview] Message-ID: <1449599665-18047-3-git-send-email-hannes@cmpxchg.org> (raw) In-Reply-To: <1449599665-18047-1-git-send-email-hannes@cmpxchg.org> The kmem page_counter's limit is initialized to PAGE_COUNTER_MAX inside mem_cgroup_css_online(). There is no need to repeat this from memcg_propagate_kmem(). Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> --- mm/memcontrol.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index eda8d43..02167db 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2840,8 +2840,7 @@ static u64 mem_cgroup_read_u64(struct cgroup_subsys_state *css, } #ifdef CONFIG_MEMCG_KMEM -static int memcg_activate_kmem(struct mem_cgroup *memcg, - unsigned long nr_pages) +static int memcg_activate_kmem(struct mem_cgroup *memcg) { int err = 0; int memcg_id; @@ -2876,13 +2875,6 @@ static int memcg_activate_kmem(struct mem_cgroup *memcg, goto out; } - /* - * We couldn't have accounted to this cgroup, because it hasn't got - * activated yet, so this should succeed. - */ - err = page_counter_limit(&memcg->kmem, nr_pages); - VM_BUG_ON(err); - static_branch_inc(&memcg_kmem_enabled_key); /* * A memory cgroup is considered kmem-active as soon as it gets @@ -2903,10 +2895,14 @@ static int memcg_update_kmem_limit(struct mem_cgroup *memcg, int ret; mutex_lock(&memcg_limit_mutex); - if (!memcg_kmem_is_active(memcg)) - ret = memcg_activate_kmem(memcg, limit); - else - ret = page_counter_limit(&memcg->kmem, limit); + /* Top-level cgroup doesn't propagate from root */ + if (!memcg_kmem_is_active(memcg)) { + ret = memcg_activate_kmem(memcg); + if (ret) + goto out; + } + ret = page_counter_limit(&memcg->kmem, limit); +out: mutex_unlock(&memcg_limit_mutex); return ret; } @@ -2925,7 +2921,7 @@ static int memcg_propagate_kmem(struct mem_cgroup *memcg) * after this point, because it has at least one child already. */ if (memcg_kmem_is_active(parent)) - ret = memcg_activate_kmem(memcg, PAGE_COUNTER_MAX); + ret = memcg_activate_kmem(memcg); mutex_unlock(&memcg_limit_mutex); return ret; } -- 2.6.3
WARNING: multiple messages have this Message-ID (diff)
From: Johannes Weiner <hannes@cmpxchg.org> To: Andrew Morton <akpm@linux-foundation.org> Cc: Michal Hocko <mhocko@suse.cz>, Vladimir Davydov <vdavydov@virtuozzo.com>, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 2/8] mm: memcontrol: remove double kmem page_counter init Date: Tue, 8 Dec 2015 13:34:19 -0500 [thread overview] Message-ID: <1449599665-18047-3-git-send-email-hannes@cmpxchg.org> (raw) In-Reply-To: <1449599665-18047-1-git-send-email-hannes@cmpxchg.org> The kmem page_counter's limit is initialized to PAGE_COUNTER_MAX inside mem_cgroup_css_online(). There is no need to repeat this from memcg_propagate_kmem(). Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> --- mm/memcontrol.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index eda8d43..02167db 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2840,8 +2840,7 @@ static u64 mem_cgroup_read_u64(struct cgroup_subsys_state *css, } #ifdef CONFIG_MEMCG_KMEM -static int memcg_activate_kmem(struct mem_cgroup *memcg, - unsigned long nr_pages) +static int memcg_activate_kmem(struct mem_cgroup *memcg) { int err = 0; int memcg_id; @@ -2876,13 +2875,6 @@ static int memcg_activate_kmem(struct mem_cgroup *memcg, goto out; } - /* - * We couldn't have accounted to this cgroup, because it hasn't got - * activated yet, so this should succeed. - */ - err = page_counter_limit(&memcg->kmem, nr_pages); - VM_BUG_ON(err); - static_branch_inc(&memcg_kmem_enabled_key); /* * A memory cgroup is considered kmem-active as soon as it gets @@ -2903,10 +2895,14 @@ static int memcg_update_kmem_limit(struct mem_cgroup *memcg, int ret; mutex_lock(&memcg_limit_mutex); - if (!memcg_kmem_is_active(memcg)) - ret = memcg_activate_kmem(memcg, limit); - else - ret = page_counter_limit(&memcg->kmem, limit); + /* Top-level cgroup doesn't propagate from root */ + if (!memcg_kmem_is_active(memcg)) { + ret = memcg_activate_kmem(memcg); + if (ret) + goto out; + } + ret = page_counter_limit(&memcg->kmem, limit); +out: mutex_unlock(&memcg_limit_mutex); return ret; } @@ -2925,7 +2921,7 @@ static int memcg_propagate_kmem(struct mem_cgroup *memcg) * after this point, because it has at least one child already. */ if (memcg_kmem_is_active(parent)) - ret = memcg_activate_kmem(memcg, PAGE_COUNTER_MAX); + ret = memcg_activate_kmem(memcg); mutex_unlock(&memcg_limit_mutex); return ret; } -- 2.6.3 -- 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-12-08 18:34 UTC|newest] Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-12-08 18:34 [PATCH 0/8] mm: memcontrol: account "kmem" in cgroup2 Johannes Weiner 2015-12-08 18:34 ` Johannes Weiner 2015-12-08 18:34 ` Johannes Weiner 2015-12-08 18:34 ` [PATCH 1/8] mm: memcontrol: drop unused @css argument in memcg_init_kmem Johannes Weiner 2015-12-08 18:34 ` Johannes Weiner 2015-12-09 9:01 ` Vladimir Davydov 2015-12-09 9:01 ` Vladimir Davydov 2015-12-09 9:01 ` Vladimir Davydov 2015-12-10 12:37 ` Michal Hocko 2015-12-10 12:37 ` Michal Hocko 2015-12-10 12:37 ` Michal Hocko 2015-12-08 18:34 ` Johannes Weiner [this message] 2015-12-08 18:34 ` [PATCH 2/8] mm: memcontrol: remove double kmem page_counter init Johannes Weiner 2015-12-09 9:05 ` Vladimir Davydov 2015-12-09 9:05 ` Vladimir Davydov 2015-12-10 12:40 ` Michal Hocko 2015-12-10 12:40 ` Michal Hocko 2015-12-10 12:40 ` Michal Hocko 2015-12-08 18:34 ` [PATCH 3/8] mm: memcontrol: give the kmem states more descriptive names Johannes Weiner 2015-12-08 18:34 ` Johannes Weiner 2015-12-09 9:10 ` Vladimir Davydov 2015-12-09 9:10 ` Vladimir Davydov 2015-12-09 9:10 ` Vladimir Davydov 2015-12-10 12:47 ` Michal Hocko 2015-12-10 12:47 ` Michal Hocko 2015-12-08 18:34 ` [PATCH 4/8] mm: memcontrol: group kmem init and exit functions together Johannes Weiner 2015-12-08 18:34 ` Johannes Weiner 2015-12-09 9:14 ` Vladimir Davydov 2015-12-09 9:14 ` Vladimir Davydov 2015-12-09 9:14 ` Vladimir Davydov 2015-12-10 12:56 ` Michal Hocko 2015-12-10 12:56 ` Michal Hocko 2015-12-08 18:34 ` [PATCH 5/8] mm: memcontrol: separate kmem code from legacy tcp accounting code Johannes Weiner 2015-12-08 18:34 ` Johannes Weiner 2015-12-09 9:23 ` Vladimir Davydov 2015-12-09 9:23 ` Vladimir Davydov 2015-12-09 9:23 ` Vladimir Davydov 2015-12-10 12:59 ` Michal Hocko 2015-12-10 12:59 ` Michal Hocko 2015-12-10 12:59 ` Michal Hocko 2015-12-08 18:34 ` [PATCH 6/8] mm: memcontrol: move kmem accounting code to CONFIG_MEMCG Johannes Weiner 2015-12-08 18:34 ` Johannes Weiner 2015-12-09 9:32 ` Vladimir Davydov 2015-12-09 9:32 ` Vladimir Davydov 2015-12-09 9:32 ` Vladimir Davydov 2015-12-10 13:17 ` Michal Hocko 2015-12-10 13:17 ` Michal Hocko 2015-12-10 14:00 ` Johannes Weiner 2015-12-10 14:00 ` Johannes Weiner 2015-12-10 14:00 ` Johannes Weiner 2015-12-10 20:22 ` [PATCH 6/8 v2] " Johannes Weiner 2015-12-10 20:22 ` Johannes Weiner 2015-12-10 20:22 ` Johannes Weiner 2015-12-10 20:50 ` Johannes Weiner 2015-12-10 20:50 ` Johannes Weiner 2015-12-10 20:50 ` Johannes Weiner 2015-12-08 18:34 ` [PATCH 7/8] mm: memcontrol: account "kmem" consumers in cgroup2 memory controller Johannes Weiner 2015-12-08 18:34 ` Johannes Weiner 2015-12-09 11:30 ` Vladimir Davydov 2015-12-09 11:30 ` Vladimir Davydov 2015-12-09 11:30 ` Vladimir Davydov 2015-12-09 14:32 ` Johannes Weiner 2015-12-09 14:32 ` Johannes Weiner 2015-12-09 14:32 ` Johannes Weiner 2015-12-10 13:28 ` Michal Hocko 2015-12-10 13:28 ` Michal Hocko 2015-12-10 13:28 ` Michal Hocko 2015-12-10 15:16 ` Johannes Weiner 2015-12-10 15:16 ` Johannes Weiner 2015-12-10 16:25 ` Michal Hocko 2015-12-10 16:25 ` Michal Hocko 2015-12-10 16:25 ` Michal Hocko 2015-12-10 14:21 ` Michal Hocko 2015-12-10 14:21 ` Michal Hocko 2015-12-08 18:34 ` [PATCH 8/8] mm: memcontrol: introduce CONFIG_MEMCG_LEGACY_KMEM Johannes Weiner 2015-12-08 18:34 ` Johannes Weiner 2015-12-09 11:31 ` Vladimir Davydov 2015-12-09 11:31 ` Vladimir Davydov 2015-12-09 11:31 ` 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=1449599665-18047-3-git-send-email-hannes@cmpxchg.org \ --to=hannes@cmpxchg.org \ --cc=akpm@linux-foundation.org \ --cc=cgroups@vger.kernel.org \ --cc=kernel-team@fb.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mhocko@suse.cz \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.