mm: memcg accounting of percpu memory
Subsystems (8)
v2 cover mm: memcg accounting of percpu memory
This patchset adds percpu memory accounting to memory cgroups. It's based on the rework of the slab controller and reuses concepts and features introduced for the per-object slab accounting.
Percpu memory is becoming more and more widely used by various subsystems, and the total amount of memory controlled by the percpu allocator can make a good part of the total memory.
As an example, bpf maps can consume a lot of percpu memory, and they are created by a user. Also, some cgroup internals (e.g. memory controller statistics) can be quite large. On a machine with many CPUs and big number of cgroups they can consume hundreds of megabytes.
So the lack of memcg accounting is creating a breach in the memory isolation. Similar to the slab memory, percpu memory should be accounted by default.
Percpu allocations by their nature are scattered over multiple pages, so they can't be tracked on the per-page basis. So the per-object tracking introduced by the new slab controller is reused.
The patchset implements charging of percpu allocations, adds memcg-level statistics, enables accounting for percpu allocations made by memory cgroup internals and provides some basic tests.
To implement the accounting of percpu memory without a significant memory and performance overhead the following approach is used:
all accounted allocations are placed into a separate percpu chunk (or chunks). These chunks are similar to default chunks, except that they do have an attached vector of pointers to obj_cgroup objects, which is big enough to save a pointer for each allocated object. On the allocation, if the allocation has to be accounted (__GFP_ACCOUNT is passed, the allocating process belongs to a non-root memory cgroup, etc), the memory cgroup is getting charged and if the maximum limit is not exceeded the allocation is performed using a memcg-aware chunk. Otherwise -ENOMEM is returned or the allocation is forced over the limit, depending on gfp (as any other kernel memory allocation). The memory cgroup information is saved in the obj_cgroup vector at the corresponding offset. On the release time the memcg information is restored from the vector and the cgroup is getting uncharged.
Unaccounted allocations (at this point the absolute majority
of all percpu allocations) are performed in the old way, so no additional overhead is expected.
To avoid pinning dying memory cgroups by outstanding allocations, obj_cgroup API is used instead of directly saving memory cgroup pointers. obj_cgroup is basically a pointer to a memory cgroup with a standalone reference counter. The trick is that it can be atomically swapped to point at the parent cgroup, so that the original memory cgroup can be released prior to all objects, which has been charged to it. Because all charges and statistics are fully recursive, it's perfectly correct to uncharge the parent cgroup instead. This scheme is used in the slab memory accounting, and percpu memory can just follow the scheme.
This version is based on top of v6 of the new slab controller patchset. The following patches are actually required by this series:
mm: memcg: factor out memcg- and lruvec-level changes out of __mod_lruvec_state()
mm: memcg: prepare for byte-sized vmstat items
mm: memcg: convert vmstat slab counters to bytes
mm: slub: implement SLUB version of obj_to_index()
mm: memcontrol: decouple reference counting from page accounting
mm: memcg/slab: obj_cgroup API
The whole series can be found here:
https://github.com/rgushchin/linux/pull/new/percpu_acc.1
v2:
1) minor cosmetic fixes (Dennis)
2) rebased on top of v6 of the slab controller patchset
v1:
1) fixed a bug with gfp flags handling (Dennis)
2) added some comments (Tejun and Dennis)
3) rebased on top of v5 of the slab controller patchset
RFC:
https://lore.kernel.org/linux-mm/[email protected]/T/#t
Roman Gushchin (5):
percpu: return number of released bytes from pcpu_free_area()
mm: memcg/percpu: account percpu memory to memory cgroups
mm: memcg/percpu: per-memcg percpu memory statistics
mm: memcg: charge memcg percpu memory to the parent cgroup
kselftests: cgroup: add perpcu memory accounting test
Documentation/admin-guide/cgroup-v2.rst | 4 + include/linux/memcontrol.h | 8 + mm/memcontrol.c | 18 +- mm/percpu-internal.h | 55 +++++- mm/percpu-km.c | 5 +- mm/percpu-stats.c | 36 ++-- mm/percpu-vm.c | 5 +- mm/percpu.c | 206 ++++++++++++++++++--- tools/testing/selftests/cgroup/test_kmem.c | 70 ++++++- 9 files changed, 358 insertions(+), 49 deletions(-)
Signature · 1 line
2.25.4
PATCH v2 1/5 percpu: return number of released bytes from pcpu_free_area()
To implement accounting of percpu memory we need the information about the size of freed object. Return it from pcpu_free_area().
--- mm/percpu.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
mm/percpu.c +10 -3
@@ -1211,11 +1211,14 @@ static int pcpu_alloc_area(struct pcpu_chunk *chunk, int alloc_bits,* * This function determines the size of an allocation to free using * the boundary bitmap and clears the allocation map. +* +* RETURNS: +* Number of freed bytes. */ -static void pcpu_free_area (struct pcpu_chunk *chunk,int off) +static int pcpu_free_area (struct pcpu_chunk *chunk,int off) {struct pcpu_block_md *chunk_md = &chunk->chunk_md; -int bit_off, bits, end, oslot; +int bit_off, bits, end, oslot, freed;lockdep_assert_held (&pcpu_lock);pcpu_stats_area_dealloc (chunk);
@@ -1230,8 +1233,10 @@ static void pcpu_free_area(struct pcpu_chunk *chunk, int off) bits = end - bit_off;bitmap_clear (chunk->alloc_map, bit_off, bits); + freed = bits *PCPU_MIN_ALLOC_SIZE ; +/* update metadata */ - chunk->free_bytes += bits *PCPU_MIN_ALLOC_SIZE ; + chunk->free_bytes += freed;/* update first free bit */ chunk_md->first_free =min (chunk_md->first_free, bit_off);
@@ -1239,6 +1244,8 @@ static void pcpu_free_area(struct pcpu_chunk *chunk, int off)pcpu_block_update_hint_free (chunk, bit_off, bits);pcpu_chunk_relocate (chunk, oslot); + +return freed; }static void pcpu_init_md_block (struct pcpu_block_md *block,int nr_bits)
Signature · 1 line
2.25.4
PATCH v2 2/5 mm: memcg/percpu: account percpu memory to memory cgroups
In reply to Roman GushchinPercpu memory is becoming more and more widely used by various subsystems, and the total amount of memory controlled by the percpu allocator can make a good part of the total memory.
As an example, bpf maps can consume a lot of percpu memory, and they are created by a user. Also, some cgroup internals (e.g. memory controller statistics) can be quite large. On a machine with many CPUs and big number of cgroups they can consume hundreds of megabytes.
So the lack of memcg accounting is creating a breach in the memory isolation. Similar to the slab memory, percpu memory should be accounted by default.
To implement the perpcu accounting it's possible to take the slab memory accounting as a model to follow. Let's introduce two types of percpu chunks: root and memcg. What makes memcg chunks different is an additional space allocated to store memcg membership information. If __GFP_ACCOUNT is passed on allocation, a memcg chunk should be be used. If it's possible to charge the corresponding size to the target memory cgroup, allocation is performed, and the memcg ownership data is recorded. System-wide allocations are performed using root chunks, so there is no additional memory overhead.
To implement a fast reparenting of percpu memory on memcg removal, we don't store mem_cgroup pointers directly: instead we use obj_cgroup API, introduced for slab accounting.
--- mm/percpu-internal.h | 55 ++++++++++++- mm/percpu-km.c | 5 +- mm/percpu-stats.c | 36 +++++---- mm/percpu-vm.c | 5 +- mm/percpu.c | 183 ++++++++++++++++++++++++++++++++++++++----- 5 files changed, 244 insertions(+), 40 deletions(-)
mm/percpu-internal.h +54 -1
@@ -5,6 +5,25 @@#include <linux/types.h> #include <linux/percpu.h> +/* +* There are two chunk types: root and memcg-aware. +* Chunks of each type have separate slots list. +* +* Memcg-aware chunks have an attached vector of obj_cgroup pointers, which is +* used to store memcg membership data of a percpu object. Obj_cgroups are +* ref-counted pointers to a memory cgroup with an ability to switch dynamically +* to the parent memory cgroup. This allows to reclaim a deleted memory cgroup +* without reclaiming of all outstanding objects, which hold a reference at it. +*/ +enum pcpu_chunk_type { +PCPU_CHUNK_ROOT , +#ifdef CONFIG_MEMCG_KMEM +PCPU_CHUNK_MEMCG , +#endif +PCPU_NR_CHUNK_TYPES , +PCPU_FAIL_ALLOC =PCPU_NR_CHUNK_TYPES +}; +/* * pcpu_block_md is the metadata block struct. * Each chunk's bitmap is split into a number of full blocks.
@@ -54,6 +73,9 @@ struct pcpu_chunk {int end_offset;/* additional area required to have the region end page aligned */ +#ifdef CONFIG_MEMCG_KMEM +struct obj_cgroup **obj_cgroups;/* vector of object cgroups */ +#endif int nr_pages;/* # of pages served by this chunk */ int nr_populated;/* # of populated pages */
@@ -63,7 +85,7 @@ struct pcpu_chunk {extern spinlock_t pcpu_lock; -extern struct list_head *pcpu_slot; +extern struct list_head *pcpu_chunk_lists;extern int pcpu_nr_slots;extern int pcpu_nr_empty_pop_pages;
@@ -106,6 +128,37 @@ static inline int pcpu_chunk_map_bits(struct pcpu_chunk *chunk)return pcpu_nr_pages_to_map_bits (chunk->nr_pages); } +#ifdef CONFIG_MEMCG_KMEM +static enum pcpu_chunk_type pcpu_chunk_type (struct pcpu_chunk *chunk) +{ +if (chunk->obj_cgroups) +return PCPU_CHUNK_MEMCG ; +return PCPU_CHUNK_ROOT ; +} + +static bool pcpu_is_memcg_chunk (enum pcpu_chunk_type chunk_type) +{ +return chunk_type ==PCPU_CHUNK_MEMCG ; +} + +#else +static enum pcpu_chunk_type pcpu_chunk_type (struct pcpu_chunk *chunk) +{ +return PCPU_CHUNK_ROOT ; +} + +static bool pcpu_is_memcg_chunk (enum pcpu_chunk_type chunk_type) +{ +return false; +} +#endif + +static struct list_head *pcpu_chunk_list (enum pcpu_chunk_type chunk_type) +{ +return &pcpu_chunk_lists[pcpu_nr_slots * +pcpu_is_memcg_chunk (chunk_type)]; +} +#ifdef CONFIG_PERCPU_STATS #include <linux/spinlock.h>
mm/percpu-km.c +3 -2
@@ -44,7 +44,8 @@ static void pcpu_depopulate_chunk(struct pcpu_chunk *chunk,/* nada */ } -static struct pcpu_chunk *pcpu_create_chunk (gfp_t gfp) +static struct pcpu_chunk *pcpu_create_chunk (enum pcpu_chunk_type type, +gfp_t gfp) {const int nr_pages = pcpu_group_sizes[0 ] >>PAGE_SHIFT ;struct pcpu_chunk *chunk;
@@ -52,7 +53,7 @@ static struct pcpu_chunk *pcpu_create_chunk(gfp_t gfp)unsigned long flags;int i; - chunk =pcpu_alloc_chunk (gfp); + chunk =pcpu_alloc_chunk (type, gfp);if (!chunk)return NULL ;
mm/percpu-stats.c +22 -14
@@ -34,11 +34,15 @@ static int find_max_nr_alloc(void) {struct pcpu_chunk *chunk;int slot, max_nr_alloc; +enum pcpu_chunk_type type; max_nr_alloc =0 ; -for (slot =0 ; slot < pcpu_nr_slots; slot++) -list_for_each_entry (chunk, &pcpu_slot[slot], list) - max_nr_alloc =max (max_nr_alloc, chunk->nr_alloc); +for (type =0 ; type <PCPU_NR_CHUNK_TYPES ; type++) +for (slot =0 ; slot < pcpu_nr_slots; slot++) +list_for_each_entry (chunk, &pcpu_chunk_list (type)[slot], + list) + max_nr_alloc =max (max_nr_alloc, + chunk->nr_alloc);return max_nr_alloc; }
@@ -129,6 +133,9 @@ static void chunk_map_stats(struct seq_file *m, struct pcpu_chunk *chunk,P ("cur_min_alloc" , cur_min_alloc);P ("cur_med_alloc" , cur_med_alloc);P ("cur_max_alloc" , cur_max_alloc); +#ifdef CONFIG_MEMCG_KMEM +P ("memcg_aware" ,pcpu_is_memcg_chunk (pcpu_chunk_type (chunk))); +#endif seq_putc (m,'\n' ); }
@@ -137,6 +144,7 @@ static int percpu_stats_show(struct seq_file *m, void *v)struct pcpu_chunk *chunk;int slot, max_nr_alloc;int *buffer; +enum pcpu_chunk_type type; alloc_buffer:spin_lock_irq (&pcpu_lock);
@@ -202,18 +210,18 @@ static int percpu_stats_show(struct seq_file *m, void *v)chunk_map_stats (m, pcpu_reserved_chunk, buffer); } -for (slot =0 ; slot < pcpu_nr_slots; slot++) { -list_for_each_entry (chunk, &pcpu_slot[slot], list) { -if (chunk == pcpu_first_chunk) { -seq_puts (m,"Chunk: <- First Chunk\n" ); -chunk_map_stats (m, chunk, buffer); - - - }else { -seq_puts (m,"Chunk:\n" ); -chunk_map_stats (m, chunk, buffer); +for (type =0 ; type <PCPU_NR_CHUNK_TYPES ; type++) { +for (slot =0 ; slot < pcpu_nr_slots; slot++) { +list_for_each_entry (chunk, &pcpu_chunk_list (type)[slot], + list) { +if (chunk == pcpu_first_chunk) { +seq_puts (m,"Chunk: <- First Chunk\n" ); +chunk_map_stats (m, chunk, buffer); + }else { +seq_puts (m,"Chunk:\n" ); +chunk_map_stats (m, chunk, buffer); + } } - } }
mm/percpu-vm.c +3 -2
@@ -328,12 +328,13 @@ static void pcpu_depopulate_chunk(struct pcpu_chunk *chunk,pcpu_free_pages (chunk, pages, page_start, page_end); } -static struct pcpu_chunk *pcpu_create_chunk (gfp_t gfp) +static struct pcpu_chunk *pcpu_create_chunk (enum pcpu_chunk_type type, +gfp_t gfp) {struct pcpu_chunk *chunk;struct vm_struct **vms; - chunk =pcpu_alloc_chunk (gfp); + chunk =pcpu_alloc_chunk (type, gfp);if (!chunk)return NULL ;
mm/percpu.c +162 -21
341 lines not on this page · raw message
Signature · 1 line
2.25.4
PATCH v2 3/5 mm: memcg/percpu: per-memcg percpu memory statistics
In reply to Roman GushchinPercpu memory can represent a noticeable chunk of the total memory consumption, especially on big machines with many CPUs. Let's track percpu memory usage for each memcg and display it in memory.stat.
A percpu allocation is usually scattered over multiple pages (and nodes), and can be significantly smaller than a page. So let's add a byte-sized counter on the memcg level:MEMCG_PERCPU_B. Byte-sized vmstat infra created for slabs can be perfectly reused for percpu case.
--- Documentation/admin-guide/cgroup-v2.rst | 4 ++++ include/linux/memcontrol.h | 8 ++++++++ mm/memcontrol.c | 4 +++- mm/percpu.c | 10 ++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-)
Documentation/admin-guide/cgroup-v2.rst +4 -0
@@ -1274,6 +1274,10 @@ PAGE_SIZE multiple when read back. Amount of memory used for storing in-kernel data structures. + percpu + Amount of memory used for storing per-cpu kernel + data structures. + sock Amount of memory used in network transmission buffers
include/linux/memcontrol.h +8 -0
@@ -32,11 +32,19 @@ struct kmem_cache;enum memcg_stat_item {MEMCG_SWAP =NR_VM_NODE_STAT_ITEMS ,MEMCG_SOCK , +MEMCG_PERCPU_B ,/* XXX: why are these zone and not node counters? */ MEMCG_KERNEL_STACK_KB ,MEMCG_NR_STAT , }; +static __always_inline bool memcg_stat_item_in_bytes(enum memcg_stat_item item) +{ +if (item ==MEMCG_PERCPU_B ) +return true; +return vmstat_item_in_bytes (item); +} +enum memcg_memory_event {MEMCG_LOW ,MEMCG_HIGH ,
mm/memcontrol.c +3 -1
@@ -783,7 +783,7 @@ void __mod_memcg_state(struct mem_cgroup *memcg, int idx, int val)if (mem_cgroup_disabled ())return ; -if (vmstat_item_in_bytes (idx)) +if (memcg_stat_item_in_bytes (idx)) threshold <<=PAGE_SHIFT ; x = val +__this_cpu_read (memcg->vmstats_percpu->stat[idx]);
@@ -1490,6 +1490,8 @@ static char *memory_stat_format(struct mem_cgroup *memcg)seq_buf_printf (&s,"slab %llu\n" , (u64)(memcg_page_state (memcg,NR_SLAB_RECLAIMABLE_B ) +memcg_page_state (memcg,NR_SLAB_UNRECLAIMABLE_B ))); +seq_buf_printf (&s,"percpu %llu\n" , + (u64 )memcg_page_state (memcg,MEMCG_PERCPU_B ));seq_buf_printf (&s,"sock %llu\n" , (u64 )memcg_page_state (memcg,MEMCG_SOCK ) *PAGE_SIZE );
mm/percpu.c +10 -0
@@ -1608,6 +1608,11 @@ static void pcpu_memcg_post_alloc_hook(struct obj_cgroup *objcg,if (chunk) { chunk->obj_cgroups[off >>PCPU_MIN_ALLOC_SHIFT ] = objcg; + +rcu_read_lock (); +mod_memcg_state (obj_cgroup_memcg (objcg),MEMCG_PERCPU_B , + size *num_possible_cpus ()); +rcu_read_unlock (); }else {obj_cgroup_uncharge (objcg, size *num_possible_cpus ());obj_cgroup_put (objcg);
@@ -1626,6 +1631,11 @@ static void pcpu_memcg_free_hook(struct pcpu_chunk *chunk, int off, size_t size)obj_cgroup_uncharge (objcg, size *num_possible_cpus ()); +rcu_read_lock (); +mod_memcg_state (obj_cgroup_memcg (objcg),MEMCG_PERCPU_B , + -(size *num_possible_cpus ())); +rcu_read_unlock (); +obj_cgroup_put (objcg); }
Signature · 1 line
2.25.4
Re: [PATCH v2 3/5] mm: memcg/percpu: per-memcg percpu memory statistics
Quoted 44 lines · Roman Gushchin
Percpu memory can represent a noticeable chunk of the total memory consumption, especially on big machines with many CPUs. Let's track percpu memory usage for each memcg and display it in memory.stat.
A percpu allocation is usually scattered over multiple pages (and nodes), and can be significantly smaller than a page. So let's add a byte-sized counter on the memcg level:
MEMCG_PERCPU_B. Byte-sized vmstat infra created for slabs can be perfectly reused for percpu case.Signed-off-by Roman Gushchin <[email protected]>Acked-by Dennis Zhou <[email protected]>--- Documentation/admin-guide/cgroup-v2.rst | 4 ++++ include/linux/memcontrol.h | 8 ++++++++ mm/memcontrol.c | 4 +++- mm/percpu.c | 10 ++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-)Documentation/admin-guide/cgroup-v2.rst +4
-0@@ -1274,6 +1274,10 @@ PAGE_SIZE multiple when read back. Amount of memory used for storing in-kernel data structures. + percpu + Amount of memory used for storing per-cpu kernel + data structures. + sock Amount of memory used in network transmission buffersinclude/linux/memcontrol.h +1
-0@@ -32,11 +32,19 @@ struct kmem_cache;enum memcg_stat_item {MEMCG_SWAP =NR_VM_NODE_STAT_ITEMS ,MEMCG_SOCK , +MEMCG_PERCPU_B ,
include/linux/memcontrol.h struct kmem_cache; · line 45
Quoted 10 lines
include/linux/memcontrol.h +5
-0/* XXX: why are these zone and not node counters? */ MEMCG_KERNEL_STACK_KB , MEMCG_NR_STAT, }; +static __always_inline bool memcg_stat_item_in_bytes(enum memcg_stat_item item) +{ +if (item ==MEMCG_PERCPU_B ) +return true; +return vmstat_item_in_bytes (item);
This patch is now in -next and this line causes a warning from clang, which shows up in every translation unit that includes this header, which is a lot:
include/linux/memcontrol.h:45:30: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum node_stat_item' [-Wenum-conversion]
return vmstat_item_in_bytes(item);
~~~~~~~~~~~~~~~~~~~~ ^~~~1 warning generated.
I assume this conversion is intentional; if so, it seems like expecting a specific enum is misleading. Perhaps this should be applied on top?
Cheers,
Nathan
include/linux/memcontrol.h +1 -1
@@ -38,7 +38,7 @@ enum memcg_stat_item { MEMCG_NR_STAT, }; -static __always_inline bool memcg_stat_item_in_bytes(enum memcg_stat_item item) +static __always_inline bool memcg_stat_item_in_bytes(int item) {if (item ==MEMCG_PERCPU_B )return true;
include/linux/mmzone.h +1 -1
@@ -211,7 +211,7 @@ enum node_stat_item {* measured in pages). This defines the API part, the internal representation * might be different. */ -static __always_inline bool vmstat_item_in_bytes(enum node_stat_item item) +static __always_inline bool vmstat_item_in_bytes(int item) {/* * Global and per-node slab counters track slab pages.
Re: [PATCH v2 3/5] mm: memcg/percpu: per-memcg percpu memory statistics
Quoted 63 lines · Nathan Chancellor
Quoted 44 lines · Roman Gushchin
Percpu memory can represent a noticeable chunk of the total memory consumption, especially on big machines with many CPUs. Let's track percpu memory usage for each memcg and display it in memory.stat.
A percpu allocation is usually scattered over multiple pages (and nodes), and can be significantly smaller than a page. So let's add a byte-sized counter on the memcg level:
MEMCG_PERCPU_B. Byte-sized vmstat infra created for slabs can be perfectly reused for percpu case.Signed-off-by Roman Gushchin <[email protected]>Acked-by Dennis Zhou <[email protected]>--- Documentation/admin-guide/cgroup-v2.rst | 4 ++++ include/linux/memcontrol.h | 8 ++++++++ mm/memcontrol.c | 4 +++- mm/percpu.c | 10 ++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-)Documentation/admin-guide/cgroup-v2.rst +4
-0@@ -1274,6 +1274,10 @@ PAGE_SIZE multiple when read back. Amount of memory used for storing in-kernel data structures. + percpu + Amount of memory used for storing per-cpu kernel + data structures. + sock Amount of memory used in network transmission buffersinclude/linux/memcontrol.h +1
-0@@ -32,11 +32,19 @@ struct kmem_cache;enum memcg_stat_item {MEMCG_SWAP =NR_VM_NODE_STAT_ITEMS ,MEMCG_SOCK , +MEMCG_PERCPU_B ,include/linux/memcontrol.h struct kmem_cache; · line 45
Quoted 10 lines
include/linux/memcontrol.h +5
-0/* XXX: why are these zone and not node counters? */ MEMCG_KERNEL_STACK_KB , MEMCG_NR_STAT, }; +static __always_inline bool memcg_stat_item_in_bytes(enum memcg_stat_item item) +{ +if (item ==MEMCG_PERCPU_B ) +return true; +return vmstat_item_in_bytes (item);This patch is now in -next and this line causes a warning from clang, which shows up in every translation unit that includes this header, which is a lot:
include/linux/memcontrol.h:45:30: warning: implicit conversion from enumeration type 'enummemcg_stat_item' to different enumeration type 'enumnode_stat_item' [-Wenum-conversion]
Quoted 6 lines
return vmstat_item_in_bytes(item); ~~~~~~~~~~~~~~~~~~~~ ^~~~1 warning generated.
I assume this conversion is intentional; if so, it seems like expecting a specific enum is misleading. Perhaps this should be applied on top?
Hi Nathan!
Yeah, these enums are kind of stacked on each other, so memcg_stat values extend node_stat values. And I think your patch is correct.
I'm going to refresh the series with some small fixups. If you're not against it, I'll merge your patch into the corresponding patches.
And thank you for reporting the problem!
Quoted 30 lines
Cheers,
Nathaninclude/linux/memcontrol.h +1
-1@@ -38,7 +38,7 @@ enum memcg_stat_item { MEMCG_NR_STAT, }; -static __always_inline bool memcg_stat_item_in_bytes(enum memcg_stat_item item) +static __always_inline bool memcg_stat_item_in_bytes(int item) {if (item ==MEMCG_PERCPU_B )return true;include/linux/mmzone.h +1
-1@@ -211,7 +211,7 @@ enum node_stat_item {* measured in pages). This defines the API part, the internal representation * might be different. */ -static __always_inline bool vmstat_item_in_bytes(enum node_stat_item item) +static __always_inline bool vmstat_item_in_bytes(int item) {/* * Global and per-node slab counters track slab pages.
Re: [PATCH v2 3/5] mm: memcg/percpu: per-memcg percpu memory statistics
Quoted 68 lines · Roman Gushchin
Quoted 67 lines · Nathan Chancellor
Quoted 44 lines · Roman Gushchin
Percpu memory can represent a noticeable chunk of the total memory consumption, especially on big machines with many CPUs. Let's track percpu memory usage for each memcg and display it in memory.stat.
A percpu allocation is usually scattered over multiple pages (and nodes), and can be significantly smaller than a page. So let's add a byte-sized counter on the memcg level:
MEMCG_PERCPU_B. Byte-sized vmstat infra created for slabs can be perfectly reused for percpu case.Signed-off-by Roman Gushchin <[email protected]>Acked-by Dennis Zhou <[email protected]>--- Documentation/admin-guide/cgroup-v2.rst | 4 ++++ include/linux/memcontrol.h | 8 ++++++++ mm/memcontrol.c | 4 +++- mm/percpu.c | 10 ++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-)Documentation/admin-guide/cgroup-v2.rst +4
-0@@ -1274,6 +1274,10 @@ PAGE_SIZE multiple when read back. Amount of memory used for storing in-kernel data structures. + percpu + Amount of memory used for storing per-cpu kernel + data structures. + sock Amount of memory used in network transmission buffersinclude/linux/memcontrol.h +1
-0@@ -32,11 +32,19 @@ struct kmem_cache;enum memcg_stat_item {MEMCG_SWAP =NR_VM_NODE_STAT_ITEMS ,MEMCG_SOCK , +MEMCG_PERCPU_B ,include/linux/memcontrol.h struct kmem_cache; · line 45
Quoted 10 lines
include/linux/memcontrol.h +5
-0/* XXX: why are these zone and not node counters? */ MEMCG_KERNEL_STACK_KB , MEMCG_NR_STAT, }; +static __always_inline bool memcg_stat_item_in_bytes(enum memcg_stat_item item) +{ +if (item ==MEMCG_PERCPU_B ) +return true; +return vmstat_item_in_bytes (item);This patch is now in -next and this line causes a warning from clang, which shows up in every translation unit that includes this header, which is a lot:
include/linux/memcontrol.h:45:30: warning: implicit conversion from enumeration type 'enummemcg_stat_item' to different enumeration type 'enumnode_stat_item' [-Wenum-conversion]return vmstat_item_in_bytes(item); ~~~~~~~~~~~~~~~~~~~~ ^~~~1 warning generated.
Quoted 7 lines
Quoted 2 lines
I assume this conversion is intentional; if so, it seems like expecting a specific enum is misleading. Perhaps this should be applied on top?
Hi Nathan!
Yeah, these enums are kind of stacked on each other, so
memcg_statvalues extendnode_statvalues. And I think your patch is correct.
Yeah, I figured. It happens in the kernel in a couple of different places that we have seen so far. So far, my suggestion seems to be the best one that we have uncovered when dealing with one enum that supplments or extends another. These functions are fairly self explanation so I don't think that blowing away the type safety here is a big deal.
Quoted 2 lines
I'm going to refresh the series with some small fixups. If you're not against it, I'll merge your patch into the corresponding patches.
Please do! Thanks for the quick response.
Cheers,
Nathan
Quoted 32 lines
And thank you for reporting the problem!
Quoted 30 lines
Cheers,
Nathaninclude/linux/memcontrol.h +1
-1@@ -38,7 +38,7 @@ enum memcg_stat_item { MEMCG_NR_STAT, }; -static __always_inline bool memcg_stat_item_in_bytes(enum memcg_stat_item item) +static __always_inline bool memcg_stat_item_in_bytes(int item) {if (item ==MEMCG_PERCPU_B )return true;include/linux/mmzone.h +1
-1@@ -211,7 +211,7 @@ enum node_stat_item {* measured in pages). This defines the API part, the internal representation * might be different. */ -static __always_inline bool vmstat_item_in_bytes(enum node_stat_item item) +static __always_inline bool vmstat_item_in_bytes(int item) {/* * Global and per-node slab counters track slab pages.
PATCH v2 4/5 mm: memcg: charge memcg percpu memory to the parent cgroup
In reply to Roman GushchinMemory cgroups are using large chunks of percpu memory to store vmstat data. Yet this memory is not accounted at all, so in the case when there are many (dying) cgroups, it's not exactly clear where all the memory is.
Because the size of memory cgroup internal structures can dramatically exceed the size of object or page which is pinning it in the memory, it's not a good idea to simple ignore it. It actually breaks the isolation between cgroups.
Let's account the consumed percpu memory to the parent cgroup.
--- mm/memcontrol.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
mm/memcontrol.c +10 -4
@@ -5069,13 +5069,15 @@ static int alloc_mem_cgroup_per_node_info(struct mem_cgroup *memcg, int node)if (!pn)return 1 ; - pn->lruvec_stat_local = alloc_percpu(struct lruvec_stat); + pn->lruvec_stat_local = alloc_percpu_gfp(struct lruvec_stat, +GFP_KERNEL_ACCOUNT );if (!pn->lruvec_stat_local) {kfree (pn);return 1 ; } - pn->lruvec_stat_cpu = alloc_percpu(struct lruvec_stat); + pn->lruvec_stat_cpu = alloc_percpu_gfp(struct lruvec_stat, +GFP_KERNEL_ACCOUNT );if (!pn->lruvec_stat_cpu) {free_percpu (pn->lruvec_stat_local);kfree (pn);
@@ -5149,11 +5151,13 @@ static struct mem_cgroup *mem_cgroup_alloc(void) goto fail; } - memcg->vmstats_local = alloc_percpu(struct memcg_vmstats_percpu); + memcg->vmstats_local = alloc_percpu_gfp(struct memcg_vmstats_percpu, +GFP_KERNEL_ACCOUNT );if (!memcg->vmstats_local) goto fail; - memcg->vmstats_percpu = alloc_percpu(struct memcg_vmstats_percpu); + memcg->vmstats_percpu = alloc_percpu_gfp(struct memcg_vmstats_percpu, +GFP_KERNEL_ACCOUNT );if (!memcg->vmstats_percpu) goto fail;
@@ -5202,7 +5206,9 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css)struct mem_cgroup *memcg;long error = -ENOMEM ; +memalloc_use_memcg (parent); memcg =mem_cgroup_alloc (); +memalloc_unuse_memcg ();if (IS_ERR (memcg))return ERR_CAST (memcg);
Signature · 1 line
2.25.4
PATCH v2 5/5 kselftests: cgroup: add perpcu memory accounting test
In reply to Roman GushchinAdd a simple test to check the percpu memory accounting. The test creates a cgroup tree with 1000 child cgroups and checks values of memory.current and memory.stat::percpu.
--- tools/testing/selftests/cgroup/test_kmem.c | 70 +++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-)
tools/testing/selftests/cgroup/test_kmem.c +69 -1
@@ -18,6 +18,15 @@#include "cgroup_util.h" +/* +* Memory cgroup charging and vmstat data aggregation is performed using +* percpu batches 32 pages big (look at MEMCG_CHARGE_BATCH). So the maximum +* discrepancy between charge and vmstat entries is number of cpus multiplied +* by 32 pages multiplied by 2. +*/ +#define MAX_VMSTAT_ERROR (4096 * 32 * 2 * get_nprocs()) + +static int alloc_dcache (const char *cgroup,void *arg) {unsigned long i;
@@ -180,7 +189,7 @@ static int test_kmem_memcg_deletion(const char *root) goto cleanup; sum = slab + anon + file + kernel_stack; -if (abs (sum - current) <4096 *32 *2 *get_nprocs ()) { +if (abs (sum - current) <MAX_VMSTAT_ERROR ) { ret =KSFT_PASS ; }else {printf ("memory.current = %ld\n" , current);
@@ -331,6 +340,64 @@ static int test_kmem_dead_cgroups(const char *root)return ret; } +/* +* This test creates a sub-tree with 1000 memory cgroups. +* Then it checks that the memory.current on the parent level +* is greater than 0 and approximates matches the percpu value +* from memory.stat. +*/ +static int test_percpu_basic (const char *root) +{ +int ret =KSFT_FAIL ; +char *parent, *child; +long current, percpu; +int i; + + parent =cg_name (root,"percpu_basic_test" ); +if (!parent) + goto cleanup; + +if (cg_create (parent)) + goto cleanup; + +if (cg_write (parent,"cgroup.subtree_control" ,"+memory" )) + goto cleanup; + +for (i =0 ; i <1000 ; i++) { + child =cg_name_indexed (parent,"child" , i); +if (!child) +return -1 ; + +if (cg_create (child)) + goto cleanup_children; + +free (child); + } + + current =cg_read_long (parent,"memory.current" ); + percpu =cg_read_key_long (parent,"memory.stat" ,"percpu " ); + +if (current >0 && percpu >0 &&abs (current - percpu) < +MAX_VMSTAT_ERROR ) + ret =KSFT_PASS ; +else +printf ("memory.current %ld\npercpu %ld\n" , + current, percpu); + +cleanup_children: +for (i =0 ; i <1000 ; i++) { + child =cg_name_indexed (parent,"child" , i); +cg_destroy (child); +free (child); + } + +cleanup: +cg_destroy (parent); +free (parent); + +return ret; +} +#define T (x) { x, #x }struct kmem_test {int (*fn)(const char *root);
@@ -341,6 +408,7 @@ struct kmem_test {T (test_kmem_proc_kpagecgroup),T (test_kmem_kernel_stacks),T (test_kmem_dead_cgroups), + T(test_percpu_basic), };#undef T
Signature · 1 line
2.25.4
Quoted 57 lines · Roman Gushchin
This patchset adds percpu memory accounting to memory cgroups. It's based on the rework of the slab controller and reuses concepts and features introduced for the per-object slab accounting.
Percpu memory is becoming more and more widely used by various subsystems, and the total amount of memory controlled by the percpu allocator can make a good part of the total memory.
As an example, bpf maps can consume a lot of percpu memory, and they are created by a user. Also, some cgroup internals (e.g. memory controller statistics) can be quite large. On a machine with many CPUs and big number of cgroups they can consume hundreds of megabytes.
So the lack of memcg accounting is creating a breach in the memory isolation. Similar to the slab memory, percpu memory should be accounted by default.
Percpu allocations by their nature are scattered over multiple pages, so they can't be tracked on the per-page basis. So the per-object tracking introduced by the new slab controller is reused.
The patchset implements charging of percpu allocations, adds memcg-level statistics, enables accounting for percpu allocations made by memory cgroup internals and provides some basic tests.
To implement the accounting of percpu memory without a significant memory and performance overhead the following approach is used:
all accounted allocations are placed into a separate percpu chunk (or chunks). These chunks are similar to default chunks, except that they do have an attached vector of pointers toobj_cgroupobjects, which is big enough to save a pointer for each allocated object. On the allocation, if the allocation has to be accounted (__GFP_ACCOUNTis passed, the allocating process belongs to a non-root memory cgroup, etc), the memory cgroup is getting charged and if the maximum limit is not exceeded the allocation is performed using a memcg-aware chunk. Otherwise-ENOMEMis returned or the allocation is forced over the limit, depending on gfp (as any other kernel memory allocation). The memory cgroup information is saved in theobj_cgroupvector at the corresponding offset. On the release time the memcg information is restored from the vector and the cgroup is getting uncharged.
Unaccounted allocations (at this point the absolute majority
of all percpu allocations) are performed in the old way, so no additional overhead is expected.To avoid pinning dying memory cgroups by outstanding allocations,
obj_cgroupAPI is used instead of directly saving memory cgroup pointers.obj_cgroupis basically a pointer to a memory cgroup with a standalone reference counter. The trick is that it can be atomically swapped to point at the parent cgroup, so that the original memory cgroup can be released prior to all objects, which has been charged to it. Because all charges and statistics are fully recursive, it's perfectly correct to uncharge the parent cgroup instead. This scheme is used in the slab memory accounting, and percpu memory can just follow the scheme.
Quoted 8 lines
This version is based on top of v6 of the new slab controller patchset. The following patches are actually required by this series:
mm: memcg: factor out memcg- and lruvec-level changes out of__mod_lruvec_state()
mm: memcg: prepare for byte-sized vmstat items
mm: memcg: convert vmstat slab counters to bytes
mm: slub: implement SLUB version ofobj_to_index()
mm: memcontrol: decouple reference counting from page accounting
mm: memcg/slab:obj_cgroupAPI
Hello, Andrew!
How this patchset should be routed: through the mm or percpu tree?
It has been acked by Dennis (the percpu maintainer), but it does depend on first several patches from the slab controller rework patchset.
The slab controller rework is ready to be merged: as in v6 most patches in the series were acked by Johannes and/or Vlastimil and no questions or concerns were raised after v6.
Please, let me know if you want me to resend both patchsets.
Thank you!
Roman
Andrew Morton
maintainerQuoted 10 lines · On Tue, 16 Jun 2020 14:19:01 -0700 Roman Gushchin <[email protected]> wrote:
Quoted 9 lines
This version is based on top of v6 of the new slab controller patchset. The following patches are actually required by this series:
mm: memcg: factor out memcg- and lruvec-level changes out of__mod_lruvec_state()
mm: memcg: prepare for byte-sized vmstat items
mm: memcg: convert vmstat slab counters to bytes
mm: slub: implement SLUB version ofobj_to_index()
mm: memcontrol: decouple reference counting from page accounting
mm: memcg/slab:obj_cgroupAPI
Quoted 6 lines
Hello, Andrew!
How this patchset should be routed: through the mm or percpu tree?
It has been acked by Dennis (the percpu maintainer), but it does depend on first several patches from the slab controller rework patchset.
I can grab both.
Quoted 5 lines
The slab controller rework is ready to be merged: as in v6 most patches in the series were acked by Johannes and/or Vlastimil and no questions or concerns were raised after v6.
Please, let me know if you want me to resend both patchsets.
There was quite a bit of valuable discussion in response to [0/n] which really should have been in the changelog[s] from day one. slab-vs-slub, performance testing, etc.
So, umm, I'll take a look at both series now but I do think an enhanced [0/n] description is warranted?
Quoted 12 lines · Andrew Morton
Quoted 10 lines · On Tue, 16 Jun 2020 14:19:01 -0700 Roman Gushchin <[email protected]> wrote:
Quoted 9 lines
This version is based on top of v6 of the new slab controller patchset. The following patches are actually required by this series:
mm: memcg: factor out memcg- and lruvec-level changes out of__mod_lruvec_state()
mm: memcg: prepare for byte-sized vmstat items
mm: memcg: convert vmstat slab counters to bytes
mm: slub: implement SLUB version ofobj_to_index()
mm: memcontrol: decouple reference counting from page accounting
mm: memcg/slab:obj_cgroupAPI
Quoted 8 lines
Quoted 6 lines
Hello, Andrew!
How this patchset should be routed: through the mm or percpu tree?
It has been acked by Dennis (the percpu maintainer), but it does depend on first several patches from the slab controller rework patchset.
I can grab both.
Perfect, thanks!
Quoted 5 lines
Quoted 5 lines
The slab controller rework is ready to be merged: as in v6 most patches in the series were acked by Johannes and/or Vlastimil and no questions or concerns were raised after v6.
Quoted 9 lines
Quoted 1 line
Please, let me know if you want me to resend both patchsets.
There was quite a bit of valuable discussion in response to [0/n] which really should have been in the changelog[s] from day one. slab-vs-slub, performance testing, etc.
So, umm, I'll take a look at both series now but I do think an enhanced [0/n] description is warranted?
Yes, I'm running suggested tests right now, and will update on the results.
Thanks!