mm: rework memcg kernel stack accounting
Subsystems (7)
PATCH v3 1/3 mm: rework memcg kernel stack accounting
If CONFIG_VMAP_STACK is set, kernel stacks are allocated using __vmalloc_node_range() with __GFP_ACCOUNT. So kernel stack pages are charged against corresponding memory cgroups on allocation and uncharged on releasing them.
The problem is that we do cache kernel stacks in small per-cpu caches and do reuse them for new tasks, which can belong to different memory cgroups.
Each stack page still holds a reference to the original cgroup, so the cgroup can't be released until the vmap area is released.
To make this happen we need more than two subsequent exits without forks in between on the current cpu, which makes it very unlikely to happen. As a result, I saw a significant number of dying cgroups (in theory, up to 2 * number_of_cpu + number_of_tasks), which can't be released even by significant memory pressure.
As a cgroup structure can take a significant amount of memory (first of all, per-cpu data like memcg statistics), it leads to a noticeable waste of memory.
two thread stacks per CPU if CONFIG_VMAP_STACK=y")
--- include/linux/memcontrol.h | 13 ++++++++- kernel/fork.c | 55 +++++++++++++++++++++++++++++++++----- 2 files changed, 61 insertions(+), 7 deletions(-)
include/linux/memcontrol.h +12 -1
@@ -1268,10 +1268,11 @@ struct kmem_cache *memcg_kmem_get_cache(struct kmem_cache *cachep);void memcg_kmem_put_cache (struct kmem_cache *cachep);int memcg_kmem_charge_memcg (struct page *page,gfp_t gfp,int order,struct mem_cgroup *memcg); + +#ifdef CONFIG_MEMCG_KMEM int memcg_kmem_charge (struct page *page,gfp_t gfp,int order);void memcg_kmem_uncharge (struct page *page,int order); -#ifdef CONFIG_MEMCG_KMEM extern struct static_key_false memcg_kmem_enabled_key;extern struct workqueue_struct *memcg_kmem_cache_wq;
@@ -1307,6 +1308,16 @@ extern int memcg_expand_shrinker_maps(int new_id);extern void memcg_set_shrinker_bit (struct mem_cgroup *memcg,int nid,int shrinker_id);#else + +static inline int memcg_kmem_charge (struct page *page,gfp_t gfp,int order) +{ +return 0 ; +} + +static inline void memcg_kmem_uncharge (struct page *page,int order) +{ +} +#define for_each_memcg_cache_index (_idx) \ for (; NULL; )
kernel/fork.c +49 -6
89 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v3 2/3 mm: drain memcg stocks on css offlining
Memcg charge is batched using per-cpu stocks, so an offline memcg can be pinned by a cached charge up to a moment, when a process belonging to some other cgroup will charge some memory on the same cpu. In other words, cached charges can prevent a memory cgroup from being reclaimed for some time, without any clear need.
Let's optimize it by explicit draining of all stocks on css offlining. As draining is performed asynchronously, and is skipped if any parallel draining is happening, it's cheap.
--- mm/memcontrol.c | 2 ++ 1 file changed, 2 insertions(+)
mm/memcontrol.c +2 -0
@@ -4573,6 +4573,8 @@ static void mem_cgroup_css_offline(struct cgroup_subsys_state *css)memcg_offline_kmem (memcg);wb_memcg_offline (memcg); +drain_all_stock (memcg); +mem_cgroup_id_put (memcg); }
Signature · 1 line
2.17.1
PATCH v3 3/3 mm: don't miss the last page because of round-off error
In reply to Roman GushchinI've noticed, that dying memory cgroups are often pinned in memory by a single pagecache page. Even under moderate memory pressure they sometimes stayed in such state for a long time. That looked strange.
My investigation showed that the problem is caused by applying the LRU pressure balancing math:
scan = div64_u64(scan * fraction[lru], denominator),
where
denominator = fraction[anon] + fraction[file] + 1.
Because fraction[lru] is always less than denominator, if the initial scan size is 1, the result is always 0.
This means the last page is not scanned and has
no chances to be reclaimed.
Fix this by rounding up the result of the division.
In practice this change significantly improves the speed of dying cgroups reclaim.
--- include/linux/math64.h | 2 ++ mm/vmscan.c | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-)
include/linux/math64.h +2 -0
@@ -281,4 +281,6 @@ static inline u64 mul_u64_u32_div(u64 a, u32 mul, u32 divisor) }#endif /* mul_u64_u32_div */ +#define DIV64_U64_ROUND_UP (ll, d) div64_u64((ll) + (d) - 1, (d)) +#endif /* _LINUX_MATH64_H */
mm/vmscan.c +4 -2
@@ -2446,9 +2446,11 @@ static void get_scan_count(struct lruvec *lruvec, struct mem_cgroup *memcg,/* * Scan types proportional to swappiness and * their relative recent reclaim efficiency. +* Make sure we don't miss the last page +* because of a round-off error. */ - scan =div64_u64 (scan * fraction[file], - denominator); + scan =DIV64_U64_ROUND_UP (scan * fraction[file], + denominator);break ;case SCAN_FILE :case SCAN_ANON :
Signature · 1 line
2.17.1
Andrew Morton
maintainerRe: [PATCH v3 3/3] mm: don't miss the last page because of round-off error
Quoted 30 lines · On Mon, 27 Aug 2018 09:26:21 -0700 Roman Gushchin <[email protected]> wrote:
I've noticed, that dying memory cgroups are often pinned in memory by a single pagecache page. Even under moderate memory pressure they sometimes stayed in such state for a long time. That looked strange.
My investigation showed that the problem is caused by applying the LRU pressure balancing math:
scan =
div64_u64(scan * fraction[lru], denominator),where
denominator = fraction[anon] + fraction[file] + 1.
Because fraction[lru] is always less than denominator, if the initial scan size is 1, the result is always 0.
This means the last page is not scanned and has no chances to be reclaimed.
Fix this by rounding up the result of the division.
In practice this change significantly improves the speed of dying cgroups reclaim.
...
include/linux/math64.h static inline u64 mul_u64_u32_div(u64 a, u32 mul, u32 divisor) · line 284
Quoted 4 lines
include/linux/math64.h +1
-0@@ -281,4 +281,6 @@ static inline u64 mul_u64_u32_div(u64 a, u32 mul, u32 divisor) }#endif /* mul_u64_u32_div */ +#define DIV64_U64_ROUND_UP (ll, d) div64_u64((ll) + (d) - 1, (d))
This macro references arg `d' more than once. That can cause problems if the passed expression has side-effects and is poor practice. Can we please redo this with a temporary?
Quoted 19 lines
include/linux/math64.h +0
-0#endif /* _LINUX_MATH64_H */ mm/vmscan.c +4
-2@@ -2446,9 +2446,11 @@ static void get_scan_count(struct lruvec *lruvec, struct mem_cgroup *memcg,/* * Scan types proportional to swappiness and * their relative recent reclaim efficiency. +* Make sure we don't miss the last page +* because of a round-off error. */ - scan =div64_u64 (scan * fraction[file], - denominator); + scan =DIV64_U64_ROUND_UP (scan * fraction[file], + denominator);break ;case SCAN_FILE :case SCAN_ANON :
Re: [PATCH v3 3/3] mm: don't miss the last page because of round-off error
Quoted 35 lines · Andrew Morton
Quoted 33 lines · On Mon, 27 Aug 2018 09:26:21 -0700 Roman Gushchin <[email protected]> wrote:
I've noticed, that dying memory cgroups are often pinned in memory by a single pagecache page. Even under moderate memory pressure they sometimes stayed in such state for a long time. That looked strange.
My investigation showed that the problem is caused by applying the LRU pressure balancing math:
scan =
div64_u64(scan * fraction[lru], denominator),where
denominator = fraction[anon] + fraction[file] + 1.
Because fraction[lru] is always less than denominator, if the initial scan size is 1, the result is always 0.
This means the last page is not scanned and has no chances to be reclaimed.
Fix this by rounding up the result of the division.
In practice this change significantly improves the speed of dying cgroups reclaim.
...
include/linux/math64.h +0
-0@@ -281,4 +281,6 @@ static inline u64 mul_u64_u32_div(u64 a, u32 mul, u32 divisor) }#endif /* mul_u64_u32_div */
Quoted 5 lines
include/linux/math64.h static inline u64 mul_u64_u32_div(u64 a, u32 mul, u32 divisor) · line 284
Quoted 1 line
include/linux/math64.h +1
-0+#define DIV64_U64_ROUND_UP (ll, d) div64_u64((ll) + (d) - 1, (d))This macro references arg `d' more than once. That can cause problems if the passed expression has side-effects and is poor practice. Can we please redo this with a temporary?
Sure. This was copy-pasted to match the existing DIV_ROUND_UP (probably, not the best idea).
So let me fix them both in a separate patch.
Thanks!
Re: [PATCH v3 3/3] mm: don't miss the last page because of round-off error
In reply to Andrew MortonQuoted 35 lines · Andrew Morton
Quoted 33 lines · On Mon, 27 Aug 2018 09:26:21 -0700 Roman Gushchin <[email protected]> wrote:
I've noticed, that dying memory cgroups are often pinned in memory by a single pagecache page. Even under moderate memory pressure they sometimes stayed in such state for a long time. That looked strange.
My investigation showed that the problem is caused by applying the LRU pressure balancing math:
scan =
div64_u64(scan * fraction[lru], denominator),where
denominator = fraction[anon] + fraction[file] + 1.
Because fraction[lru] is always less than denominator, if the initial scan size is 1, the result is always 0.
This means the last page is not scanned and has no chances to be reclaimed.
Fix this by rounding up the result of the division.
In practice this change significantly improves the speed of dying cgroups reclaim.
...
include/linux/math64.h +0
-0@@ -281,4 +281,6 @@ static inline u64 mul_u64_u32_div(u64 a, u32 mul, u32 divisor) }#endif /* mul_u64_u32_div */
Quoted 5 lines
include/linux/math64.h static inline u64 mul_u64_u32_div(u64 a, u32 mul, u32 divisor) · line 284
Quoted 1 line
include/linux/math64.h +1
-0+#define DIV64_U64_ROUND_UP (ll, d) div64_u64((ll) + (d) - 1, (d))This macro references arg `d' more than once. That can cause problems if the passed expression has side-effects and is poor practice. Can we please redo this with a temporary?
Argh, the original DIV_ROUND_UP can't be fixed this way, as it's used in array's size declarations.
So, below is the patch for the new DIV64_U64_ROUND_UP macro only.
Thanks!
--
Andrew Morton
maintainerRe: [PATCH v3 3/3] mm: don't miss the last page because of round-off error
Quoted 21 lines · On Wed, 29 Aug 2018 14:33:19 -0700 Roman Gushchin <[email protected]> wrote:
Quoted 1 line
From
d8237d3df222e6c5a98a74baa04bc52edf8a3677Mon Sep 17 00:00:00 2001From: Roman Gushchin <[email protected]>
Date: Wed, 29 Aug 2018 14:14:48 -0700
Subject: [PATCH] math64: prevent double calculation ofDIV64_U64_ROUND_UP()
argumentsCause the
DIV64_U64_ROUND_UP(ll, d)macro to cache the result of (d) expression in a local variable to avoid double calculation, which might bring unexpected side effects.Signed-off-by Roman Gushchin <[email protected]>--- include/linux/math64.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)include/linux/math64.h +0
-0
include/linux/math64.h static inline u64 mul_u64_u32_div(u64 a, u32 mul, u32 divisor) · line 287
Quoted 8 lines
include/linux/math64.h +2
-1@@ -281,6 +281,7 @@ static inline u64 mul_u64_u32_div(u64 a, u32 mul, u32 divisor) }#endif /* mul_u64_u32_div */ -#define DIV64_U64_ROUND_UP (ll, d) div64_u64((ll) + (d) - 1, (d)) +#define DIV64_U64_ROUND_UP (ll, d) \ + ({ u64 _tmp = (d); div64_u64((ll) + _tmp - 1, _tmp); })#endif /* _LINUX_MATH64_H */
Does it have to be done as a macro? A lot of these things are implemented as nice inline C functions.
Also, most of these functions and macros return a value whereas DIV64_U64_ROUND_UP() does not. Desirable?
(And we're quite pathetic about documenting what those return values _are_, which gets frustrating for the poor schmucks who sit here reviewing code all day).
Andrew Morton
maintainerQuoted 19 lines · On Mon, 27 Aug 2018 09:26:19 -0700 Roman Gushchin <[email protected]> wrote:
If
CONFIG_VMAP_STACKis set, kernel stacks are allocated using__vmalloc_node_range()with__GFP_ACCOUNT. So kernel stack pages are charged against corresponding memory cgroups on allocation and uncharged on releasing them.The problem is that we do cache kernel stacks in small per-cpu caches and do reuse them for new tasks, which can belong to different memory cgroups.
Each stack page still holds a reference to the original cgroup, so the cgroup can't be released until the vmap area is released.
To make this happen we need more than two subsequent exits without forks in between on the current cpu, which makes it very unlikely to happen. As a result, I saw a significant number of dying cgroups (in theory, up to 2 *
number_of_cpu+number_of_tasks), which can't be released even by significant memory pressure.
Quoted 3 lines
As a cgroup structure can take a significant amount of memory (first of all, per-cpu data like memcg statistics), it leads to a noticeable waste of memory.
OK, but this doesn't describe how the patch addresses this issue?
Quoted 7 lines
...
kernel/fork.c +0
-0@@ -371,6 +382,35 @@ static void account_kernel_stack(struct task_struct *tsk, int account) } }
kernel/fork.c static void account_kernel_stack(struct task_struct *tsk, int account) · line 394
Quoted 10 lines
kernel/fork.c +10
-0+static int memcg_charge_kernel_stack (struct task_struct *tsk) +{ +#ifdef CONFIG_VMAP_STACK +struct vm_struct *vm =task_stack_vm_area (tsk); +int ret; + +if (vm) { +int i; + +for (i =0 ; i <THREAD_SIZE /PAGE_SIZE ; i++) {
Can we ever have THREAD_SIZE < PAGE_SIZE? 64k pages?
Quoted 21 lines
kernel/fork.c +18
-0+/* +* If memcg_kmem_charge() fails, page->mem_cgroup +* pointer is NULL, and both memcg_kmem_uncharge() +* and mod_memcg_page_state() in free_thread_stack() +* will ignore this page. So it's safe. +*/ + ret =memcg_kmem_charge (vm->pages[i],GFP_KERNEL ,0 ); +if (ret) +return ret; + +mod_memcg_page_state (vm->pages[i], +MEMCG_KERNEL_STACK_KB , + PAGE_SIZE / 1024); + } + } +#endif +return 0 ; +}
Quoted 21 lines · Andrew Morton
Quoted 19 lines · On Mon, 27 Aug 2018 09:26:19 -0700 Roman Gushchin <[email protected]> wrote:
If
CONFIG_VMAP_STACKis set, kernel stacks are allocated using__vmalloc_node_range()with__GFP_ACCOUNT. So kernel stack pages are charged against corresponding memory cgroups on allocation and uncharged on releasing them.The problem is that we do cache kernel stacks in small per-cpu caches and do reuse them for new tasks, which can belong to different memory cgroups.
Each stack page still holds a reference to the original cgroup, so the cgroup can't be released until the vmap area is released.
To make this happen we need more than two subsequent exits without forks in between on the current cpu, which makes it very unlikely to happen. As a result, I saw a significant number of dying cgroups (in theory, up to 2 *
number_of_cpu+number_of_tasks), which can't be released even by significant memory pressure.
Quoted 5 lines
Quoted 3 lines
As a cgroup structure can take a significant amount of memory (first of all, per-cpu data like memcg statistics), it leads to a noticeable waste of memory.
OK, but this doesn't describe how the patch addresses this issue?
Sorry, missed this part. Let's add the following paragraph to the commit message (the full updated patch is below):
To address the issue, let's charge thread stacks on assigning them to tasks, and uncharge on releasing them and putting into the per-cpu cache. So, cached stacks will not be assigned to any memcg and will not hold any memcg reference.
Quoted 8 lines
Quoted 8 lines
...
(quoted diff) +0
-0@@ -371,6 +382,35 @@ static void account_kernel_stack(struct task_struct *tsk, int account) } }
Quoted 12 lines
Review static void account_kernel_stack(struct task_struct *tsk, int account) · line 394
Quoted 10 lines
(quoted diff) +10
-0+static int memcg_charge_kernel_stack(struct task_struct *tsk) +{ +#ifdef CONFIG_VMAP_STACK + struct vm_struct *vm = task_stack_vm_area(tsk); + int ret; + + if (vm) { + int i; + + for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++) {Can we ever have
THREAD_SIZE<PAGE_SIZE? 64k pages?
Hm, good question!
We can, but I doubt that anyone using 64k pages AND CONFIG_VMAP_STACK, and I *suspect* that it will trigger the BUG_ON() in account_kernel_stack():
static void account_kernel_stack(struct task_struct *tsk, int account) {
...
if (vm) {
...
BUG_ON(vm->nr_pages != THREAD_SIZE / PAGE_SIZE);But I don't see anything that makes such a config illegitimate. Does it makes any sense to use vmap if THREAD_SIZE < PAGE_SIZE?
Quoted 20 lines
Quoted 20 lines
(quoted diff) +18
-0+ /* + * If memcg_kmem_charge() fails, page->mem_cgroup + * pointer is NULL, and both memcg_kmem_uncharge() + * and mod_memcg_page_state() in free_thread_stack() + * will ignore this page. So it's safe. + */ + ret = memcg_kmem_charge(vm->pages[i], GFP_KERNEL, 0); + if (ret) + return ret; + + mod_memcg_page_state(vm->pages[i], + MEMCG_KERNEL_STACK_KB, + PAGE_SIZE / 1024); + } + } +#endif + return 0; +}
Quoted 2 lines
Quoted 2 lines
...
Thanks!
--