mm-memcg-percpu-per-memcg-percpu-memory-statistics.patch removed from -mm tree
The patch titled
Subject: mm: memcg/percpu: per-memcg percpu memory statistics
has been removed from the -mm tree. Its filename was
mm-memcg-percpu-per-memcg-percpu-memory-statistics.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Roman Gushchin <[email protected]>
Subject: mm: memcg/percpu: per-memcg percpu memory statistics
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.
---
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 renamed from Documentation/admin-guide/cgroup-v2.rst~mm-memcg-percpu-per-memcg-percpu-memory-statistics +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 renamed from include/linux/memcontrol.h~mm-memcg-percpu-per-memcg-percpu-memory-statistics +8 -0
@@ -32,6 +32,7 @@ struct kmem_cache;enum memcg_stat_item {MEMCG_SWAP =NR_VM_NODE_STAT_ITEMS ,MEMCG_SOCK , +MEMCG_PERCPU_B ,MEMCG_NR_STAT , };
@@ -339,6 +340,13 @@ struct mem_cgroup {extern struct mem_cgroup *root_mem_cgroup; +static __always_inline bool memcg_stat_item_in_bytes(int idx) +{ +if (idx ==MEMCG_PERCPU_B ) +return true; +return vmstat_item_in_bytes (idx); +} +static inline bool mem_cgroup_is_root (struct mem_cgroup *memcg) {return (memcg == root_mem_cgroup);
mm/memcontrol.c renamed from mm/memcontrol.c~mm-memcg-percpu-per-memcg-percpu-memory-statistics +3 -1
@@ -781,7 +781,7 @@ void __mod_memcg_state(struct mem_cgroupif (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]);
@@ -1488,6 +1488,8 @@ static char *memory_stat_format(struct mseq_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 renamed from mm/percpu.c~mm-memcg-percpu-per-memcg-percpu-memory-statistics +10 -0
@@ -1610,6 +1610,11 @@ static void pcpu_memcg_post_alloc_hook(sif (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);
@@ -1628,6 +1633,11 @@ static void pcpu_memcg_free_hook(structobj_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); }
_
Patches currently in -mm which might be from [email protected] are
mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings.patch mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix.patch