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 7/8] mm: memcontrol: account "kmem" consumers in cgroup2 memory controller Date: Tue, 8 Dec 2015 13:34:24 -0500 [thread overview] Message-ID: <1449599665-18047-8-git-send-email-hannes@cmpxchg.org> (raw) In-Reply-To: <1449599665-18047-1-git-send-email-hannes@cmpxchg.org> The original cgroup memory controller has an extension to account slab memory (and other "kernel memory" consumers) in a separate "kmem" counter, once the user set an explicit limit on that "kmem" pool. However, this includes various consumers whose sizes are directly linked to userspace activity. Accounting them as an optional "kmem" extension is problematic for several reasons: 1. It leaves the main memory interface with incomplete semantics. A user who puts their workload into a cgroup and configures a memory limit does not expect us to leave holes in the containment as big as the dentry and inode cache, or the kernel stack pages. 2. If the limit set on this random historical subgroup of consumers is reached, subsequent allocations will fail even when the main memory pool available to the cgroup is not yet exhausted and/or has reclaimable memory in it. 3. Calling it 'kernel memory' is misleading. The dentry and inode caches are no more 'kernel' (or no less 'user') memory than the page cache itself. Treating these consumers as different classes is a historical implementation detail that should not leak to users. So, in addition to page cache, anonymous memory, and network socket memory, account the following memory consumers per default in the cgroup2 memory controller: - threadinfo - task_struct - task_delay_info - pid - cred - mm_struct - vm_area_struct and vm_region (nommu) - anon_vma and anon_vma_chain - signal_struct - sighand_struct - fs_struct - files_struct - fdtable and fdtable->full_fds_bits - dentry and external_name - inode for all filesystems. This should give us reasonable memory isolation for most common workloads out of the box. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> --- mm/memcontrol.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index ab72c47..d048137 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2356,13 +2356,14 @@ int __memcg_kmem_charge_memcg(struct page *page, gfp_t gfp, int order, if (!memcg_kmem_online(memcg)) return 0; - if (!page_counter_try_charge(&memcg->kmem, nr_pages, &counter)) - return -ENOMEM; - ret = try_charge(memcg, gfp, nr_pages); - if (ret) { - page_counter_uncharge(&memcg->kmem, nr_pages); + if (ret) return ret; + + if (!cgroup_subsys_on_dfl(memory_cgrp_subsys) && + !page_counter_try_charge(&memcg->kmem, nr_pages, &counter)) { + cancel_charge(memcg, nr_pages); + return -ENOMEM; } page->mem_cgroup = memcg; @@ -2391,7 +2392,9 @@ void __memcg_kmem_uncharge(struct page *page, int order) VM_BUG_ON_PAGE(mem_cgroup_is_root(memcg), page); - page_counter_uncharge(&memcg->kmem, nr_pages); + if (!cgroup_subsys_on_dfl(memory_cgrp_subsys)) + page_counter_uncharge(&memcg->kmem, nr_pages); + page_counter_uncharge(&memcg->memory, nr_pages); if (do_memsw_account()) page_counter_uncharge(&memcg->memsw, nr_pages); @@ -2895,7 +2898,8 @@ static int memcg_propagate_kmem(struct mem_cgroup *memcg) * onlined after this point, because it has at least one child * already. */ - if (memcg_kmem_online(parent)) + if (cgroup_subsys_on_dfl(memory_cgrp_subsys) || + memcg_kmem_online(parent)) ret = memcg_online_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 7/8] mm: memcontrol: account "kmem" consumers in cgroup2 memory controller Date: Tue, 8 Dec 2015 13:34:24 -0500 [thread overview] Message-ID: <1449599665-18047-8-git-send-email-hannes@cmpxchg.org> (raw) In-Reply-To: <1449599665-18047-1-git-send-email-hannes@cmpxchg.org> The original cgroup memory controller has an extension to account slab memory (and other "kernel memory" consumers) in a separate "kmem" counter, once the user set an explicit limit on that "kmem" pool. However, this includes various consumers whose sizes are directly linked to userspace activity. Accounting them as an optional "kmem" extension is problematic for several reasons: 1. It leaves the main memory interface with incomplete semantics. A user who puts their workload into a cgroup and configures a memory limit does not expect us to leave holes in the containment as big as the dentry and inode cache, or the kernel stack pages. 2. If the limit set on this random historical subgroup of consumers is reached, subsequent allocations will fail even when the main memory pool available to the cgroup is not yet exhausted and/or has reclaimable memory in it. 3. Calling it 'kernel memory' is misleading. The dentry and inode caches are no more 'kernel' (or no less 'user') memory than the page cache itself. Treating these consumers as different classes is a historical implementation detail that should not leak to users. So, in addition to page cache, anonymous memory, and network socket memory, account the following memory consumers per default in the cgroup2 memory controller: - threadinfo - task_struct - task_delay_info - pid - cred - mm_struct - vm_area_struct and vm_region (nommu) - anon_vma and anon_vma_chain - signal_struct - sighand_struct - fs_struct - files_struct - fdtable and fdtable->full_fds_bits - dentry and external_name - inode for all filesystems. This should give us reasonable memory isolation for most common workloads out of the box. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> --- mm/memcontrol.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index ab72c47..d048137 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2356,13 +2356,14 @@ int __memcg_kmem_charge_memcg(struct page *page, gfp_t gfp, int order, if (!memcg_kmem_online(memcg)) return 0; - if (!page_counter_try_charge(&memcg->kmem, nr_pages, &counter)) - return -ENOMEM; - ret = try_charge(memcg, gfp, nr_pages); - if (ret) { - page_counter_uncharge(&memcg->kmem, nr_pages); + if (ret) return ret; + + if (!cgroup_subsys_on_dfl(memory_cgrp_subsys) && + !page_counter_try_charge(&memcg->kmem, nr_pages, &counter)) { + cancel_charge(memcg, nr_pages); + return -ENOMEM; } page->mem_cgroup = memcg; @@ -2391,7 +2392,9 @@ void __memcg_kmem_uncharge(struct page *page, int order) VM_BUG_ON_PAGE(mem_cgroup_is_root(memcg), page); - page_counter_uncharge(&memcg->kmem, nr_pages); + if (!cgroup_subsys_on_dfl(memory_cgrp_subsys)) + page_counter_uncharge(&memcg->kmem, nr_pages); + page_counter_uncharge(&memcg->memory, nr_pages); if (do_memsw_account()) page_counter_uncharge(&memcg->memsw, nr_pages); @@ -2895,7 +2898,8 @@ static int memcg_propagate_kmem(struct mem_cgroup *memcg) * onlined after this point, because it has at least one child * already. */ - if (memcg_kmem_online(parent)) + if (cgroup_subsys_on_dfl(memory_cgrp_subsys) || + memcg_kmem_online(parent)) ret = memcg_online_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:36 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 ` [PATCH 2/8] mm: memcontrol: remove double kmem page_counter init Johannes Weiner 2015-12-08 18:34 ` 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 ` Johannes Weiner [this message] 2015-12-08 18:34 ` [PATCH 7/8] mm: memcontrol: account "kmem" consumers in cgroup2 memory controller 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-8-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.