| Message ID | 1587134624-184860-1-git-send-email-alex.shi@linux.alibaba.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] memcg: folding CONFIG_MEMCG_SWAP as default | expand |
On Fri 17-04-20 22:43:43, Alex Shi wrote: > This patch fold MEMCG_SWAP feature into kernel as default function. That > required a short size memcg id for each of page. As Johannes mentioned > > "the overhead of tracking is tiny - 512k per G of swap (0.04%).' > > So all swapout page could be tracked for its memcg id. I am perfectly OK with dropping the CONFIG_MEMCG_SWAP. The code that is guarded by it is negligible and the resulting code is much easier to read so no objection on that front. I just do not really see any real reason to flip the default for cgroup v1. Why do we want/need that? > Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com> > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: Johannes Weiner <hannes@cmpxchg.org> > Cc: linux-mm@kvack.org > Cc: cgroups@vger.kernel.org > --- > arch/arm/configs/omap2plus_defconfig | 1 - > arch/arm64/configs/defconfig | 1 - > arch/mips/configs/db1xxx_defconfig | 1 - > arch/mips/configs/generic_defconfig | 1 - > arch/mips/configs/loongson3_defconfig | 1 - > arch/parisc/configs/generic-64bit_defconfig | 1 - > arch/powerpc/configs/powernv_defconfig | 1 - > arch/powerpc/configs/pseries_defconfig | 1 - > arch/s390/configs/debug_defconfig | 1 - > arch/s390/configs/defconfig | 1 - > arch/sh/configs/sdk7786_defconfig | 1 - > arch/sh/configs/urquell_defconfig | 1 - > include/linux/memcontrol.h | 2 -- > include/linux/swap.h | 27 -------------------------- > include/linux/swap_cgroup.h | 30 ----------------------------- > init/Kconfig | 20 ------------------- > mm/Makefile | 4 ++-- > mm/memcontrol.c | 18 ----------------- > 18 files changed, 2 insertions(+), 111 deletions(-) > > diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig > index 3cc3ca5fa027..929cfc4c062a 100644 > --- a/arch/arm/configs/omap2plus_defconfig > +++ b/arch/arm/configs/omap2plus_defconfig > @@ -10,7 +10,6 @@ CONFIG_IKCONFIG_PROC=y > CONFIG_LOG_BUF_SHIFT=16 > CONFIG_CGROUPS=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_BLK_CGROUP=y > CONFIG_CGROUP_SCHED=y > CONFIG_CFS_BANDWIDTH=y > diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig > index 24e534d85045..3854c6140a04 100644 > --- a/arch/arm64/configs/defconfig > +++ b/arch/arm64/configs/defconfig > @@ -13,7 +13,6 @@ CONFIG_IKCONFIG=y > CONFIG_IKCONFIG_PROC=y > CONFIG_NUMA_BALANCING=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_BLK_CGROUP=y > CONFIG_CGROUP_PIDS=y > CONFIG_CGROUP_HUGETLB=y > diff --git a/arch/mips/configs/db1xxx_defconfig b/arch/mips/configs/db1xxx_defconfig > index e6f3e8e3da39..4604e826d03f 100644 > --- a/arch/mips/configs/db1xxx_defconfig > +++ b/arch/mips/configs/db1xxx_defconfig > @@ -9,7 +9,6 @@ CONFIG_HIGH_RES_TIMERS=y > CONFIG_LOG_BUF_SHIFT=16 > CONFIG_CGROUPS=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_BLK_CGROUP=y > CONFIG_CGROUP_SCHED=y > CONFIG_CFS_BANDWIDTH=y > diff --git a/arch/mips/configs/generic_defconfig b/arch/mips/configs/generic_defconfig > index 714169e411cf..48e4e251779b 100644 > --- a/arch/mips/configs/generic_defconfig > +++ b/arch/mips/configs/generic_defconfig > @@ -3,7 +3,6 @@ CONFIG_NO_HZ_IDLE=y > CONFIG_IKCONFIG=y > CONFIG_IKCONFIG_PROC=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_BLK_CGROUP=y > CONFIG_CFS_BANDWIDTH=y > CONFIG_RT_GROUP_SCHED=y > diff --git a/arch/mips/configs/loongson3_defconfig b/arch/mips/configs/loongson3_defconfig > index 51675f5000d6..f91f49595100 100644 > --- a/arch/mips/configs/loongson3_defconfig > +++ b/arch/mips/configs/loongson3_defconfig > @@ -13,7 +13,6 @@ CONFIG_TASK_DELAY_ACCT=y > CONFIG_TASK_XACCT=y > CONFIG_TASK_IO_ACCOUNTING=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_BLK_CGROUP=y > CONFIG_CPUSETS=y > CONFIG_SCHED_AUTOGROUP=y > diff --git a/arch/parisc/configs/generic-64bit_defconfig b/arch/parisc/configs/generic-64bit_defconfig > index 59561e04e659..fab4401dd9f6 100644 > --- a/arch/parisc/configs/generic-64bit_defconfig > +++ b/arch/parisc/configs/generic-64bit_defconfig > @@ -10,7 +10,6 @@ CONFIG_TASK_XACCT=y > CONFIG_TASK_IO_ACCOUNTING=y > CONFIG_CGROUPS=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_CGROUP_PIDS=y > CONFIG_CPUSETS=y > CONFIG_RELAY=y > diff --git a/arch/powerpc/configs/powernv_defconfig b/arch/powerpc/configs/powernv_defconfig > index df8bdbaa5d8f..c60c3a4125f7 100644 > --- a/arch/powerpc/configs/powernv_defconfig > +++ b/arch/powerpc/configs/powernv_defconfig > @@ -17,7 +17,6 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=13 > CONFIG_NUMA_BALANCING=y > CONFIG_CGROUPS=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_CGROUP_SCHED=y > CONFIG_CGROUP_FREEZER=y > CONFIG_CPUSETS=y > diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig > index 0bea4d3ffb85..426244f491ec 100644 > --- a/arch/powerpc/configs/pseries_defconfig > +++ b/arch/powerpc/configs/pseries_defconfig > @@ -16,7 +16,6 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=13 > CONFIG_NUMA_BALANCING=y > CONFIG_CGROUPS=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_CGROUP_SCHED=y > CONFIG_CGROUP_FREEZER=y > CONFIG_CPUSETS=y > diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_defconfig > index 46038bc58c9e..864b32403673 100644 > --- a/arch/s390/configs/debug_defconfig > +++ b/arch/s390/configs/debug_defconfig > @@ -14,7 +14,6 @@ CONFIG_IKCONFIG=y > CONFIG_IKCONFIG_PROC=y > CONFIG_NUMA_BALANCING=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_BLK_CGROUP=y > CONFIG_CFS_BANDWIDTH=y > CONFIG_RT_GROUP_SCHED=y > diff --git a/arch/s390/configs/defconfig b/arch/s390/configs/defconfig > index 7cd0648c1f4e..991e60d7c307 100644 > --- a/arch/s390/configs/defconfig > +++ b/arch/s390/configs/defconfig > @@ -13,7 +13,6 @@ CONFIG_IKCONFIG=y > CONFIG_IKCONFIG_PROC=y > CONFIG_NUMA_BALANCING=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_BLK_CGROUP=y > CONFIG_CFS_BANDWIDTH=y > CONFIG_RT_GROUP_SCHED=y > diff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig > index 7fa116b436c3..4a1d19068a8d 100644 > --- a/arch/sh/configs/sdk7786_defconfig > +++ b/arch/sh/configs/sdk7786_defconfig > @@ -17,7 +17,6 @@ CONFIG_CPUSETS=y > # CONFIG_PROC_PID_CPUSET is not set > CONFIG_CGROUP_CPUACCT=y > CONFIG_CGROUP_MEMCG=y > -CONFIG_CGROUP_MEMCG_SWAP=y > CONFIG_CGROUP_SCHED=y > CONFIG_RT_GROUP_SCHED=y > CONFIG_BLK_CGROUP=y > diff --git a/arch/sh/configs/urquell_defconfig b/arch/sh/configs/urquell_defconfig > index cb2f56468fe0..be478f3148f2 100644 > --- a/arch/sh/configs/urquell_defconfig > +++ b/arch/sh/configs/urquell_defconfig > @@ -14,7 +14,6 @@ CONFIG_CPUSETS=y > # CONFIG_PROC_PID_CPUSET is not set > CONFIG_CGROUP_CPUACCT=y > CONFIG_CGROUP_MEMCG=y > -CONFIG_CGROUP_MEMCG_SWAP=y > CONFIG_CGROUP_SCHED=y > CONFIG_RT_GROUP_SCHED=y > CONFIG_BLK_DEV_INITRD=y > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 1b4150ff64be..45842ed8ba53 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -569,9 +569,7 @@ struct mem_cgroup *mem_cgroup_get_oom_group(struct task_struct *victim, > struct mem_cgroup *oom_domain); > void mem_cgroup_print_oom_group(struct mem_cgroup *memcg); > > -#ifdef CONFIG_MEMCG_SWAP > extern int do_swap_account; > -#endif > > struct mem_cgroup *lock_page_memcg(struct page *page); > void __unlock_page_memcg(struct mem_cgroup *memcg); > diff --git a/include/linux/swap.h b/include/linux/swap.h > index b835d8dbea0e..7e44e1e6ef27 100644 > --- a/include/linux/swap.h > +++ b/include/linux/swap.h > @@ -654,38 +654,11 @@ static inline void mem_cgroup_throttle_swaprate(struct mem_cgroup *memcg, > } > #endif > > -#ifdef CONFIG_MEMCG_SWAP > extern void mem_cgroup_swapout(struct page *page, swp_entry_t entry); > extern int mem_cgroup_try_charge_swap(struct page *page, swp_entry_t entry); > extern void mem_cgroup_uncharge_swap(swp_entry_t entry, unsigned int nr_pages); > extern long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg); > extern bool mem_cgroup_swap_full(struct page *page); > -#else > -static inline void mem_cgroup_swapout(struct page *page, swp_entry_t entry) > -{ > -} > - > -static inline int mem_cgroup_try_charge_swap(struct page *page, > - swp_entry_t entry) > -{ > - return 0; > -} > - > -static inline void mem_cgroup_uncharge_swap(swp_entry_t entry, > - unsigned int nr_pages) > -{ > -} > - > -static inline long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg) > -{ > - return get_nr_swap_pages(); > -} > - > -static inline bool mem_cgroup_swap_full(struct page *page) > -{ > - return vm_swap_full(); > -} > -#endif > > #endif /* __KERNEL__*/ > #endif /* _LINUX_SWAP_H */ > diff --git a/include/linux/swap_cgroup.h b/include/linux/swap_cgroup.h > index a12dd1c3966c..5ac87b3b0e08 100644 > --- a/include/linux/swap_cgroup.h > +++ b/include/linux/swap_cgroup.h > @@ -4,8 +4,6 @@ > > #include <linux/swap.h> > > -#ifdef CONFIG_MEMCG_SWAP > - > extern unsigned short swap_cgroup_cmpxchg(swp_entry_t ent, > unsigned short old, unsigned short new); > extern unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id, > @@ -14,32 +12,4 @@ extern unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id, > extern int swap_cgroup_swapon(int type, unsigned long max_pages); > extern void swap_cgroup_swapoff(int type); > > -#else > - > -static inline > -unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id, > - unsigned int nr_ents) > -{ > - return 0; > -} > - > -static inline > -unsigned short lookup_swap_cgroup_id(swp_entry_t ent) > -{ > - return 0; > -} > - > -static inline int > -swap_cgroup_swapon(int type, unsigned long max_pages) > -{ > - return 0; > -} > - > -static inline void swap_cgroup_swapoff(int type) > -{ > - return; > -} > - > -#endif /* CONFIG_MEMCG_SWAP */ > - > #endif /* __LINUX_SWAP_CGROUP_H */ > diff --git a/init/Kconfig b/init/Kconfig > index 9e22ee8fbd75..3b09c71e9b57 100644 > --- a/init/Kconfig > +++ b/init/Kconfig > @@ -834,26 +834,6 @@ config MEMCG > help > Provides control over the memory footprint of tasks in a cgroup. > > -config MEMCG_SWAP > - bool "Swap controller" > - depends on MEMCG && SWAP > - help > - Provides control over the swap space consumed by tasks in a cgroup. > - > -config MEMCG_SWAP_ENABLED > - bool "Swap controller enabled by default" > - depends on MEMCG_SWAP > - default y > - help > - Memory Resource Controller Swap Extension comes with its price in > - a bigger memory consumption. General purpose distribution kernels > - which want to enable the feature but keep it disabled by default > - and let the user enable it by swapaccount=1 boot command line > - parameter should have this option unselected. > - For those who want to have the feature enabled by default should > - select this option (if, for some reason, they need to disable it > - then swapaccount=0 does the trick). > - > config MEMCG_KMEM > bool > depends on MEMCG && !SLOB > diff --git a/mm/Makefile b/mm/Makefile > index fccd3756b25f..812c08323355 100644 > --- a/mm/Makefile > +++ b/mm/Makefile > @@ -58,7 +58,8 @@ ifdef CONFIG_MMU > obj-$(CONFIG_ADVISE_SYSCALLS) += madvise.o > endif > > -obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o swap_slots.o > +obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o swap_slots.o \ > + swap_cgroup.o > obj-$(CONFIG_FRONTSWAP) += frontswap.o > obj-$(CONFIG_ZSWAP) += zswap.o > obj-$(CONFIG_HAS_DMA) += dmapool.o > @@ -80,7 +81,6 @@ obj-$(CONFIG_MIGRATION) += migrate.o > obj-$(CONFIG_TRANSPARENT_HUGEPAGE) += huge_memory.o khugepaged.o > obj-$(CONFIG_PAGE_COUNTER) += page_counter.o > obj-$(CONFIG_MEMCG) += memcontrol.o vmpressure.o > -obj-$(CONFIG_MEMCG_SWAP) += swap_cgroup.o > obj-$(CONFIG_CGROUP_HUGETLB) += hugetlb_cgroup.o > obj-$(CONFIG_GUP_BENCHMARK) += gup_benchmark.o > obj-$(CONFIG_MEMORY_FAILURE) += memory-failure.o > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 5beea03dd58a..446141b6597a 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -82,11 +82,7 @@ > static bool cgroup_memory_nokmem; > > /* Whether the swap controller is active */ > -#ifdef CONFIG_MEMCG_SWAP > int do_swap_account __read_mostly; > -#else > -#define do_swap_account 0 > -#endif > > #ifdef CONFIG_CGROUP_WRITEBACK > static DECLARE_WAIT_QUEUE_HEAD(memcg_cgwb_frn_waitq); > @@ -3020,7 +3016,6 @@ void mem_cgroup_split_huge_fixup(struct page *head) > } > #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ > > -#ifdef CONFIG_MEMCG_SWAP > /** > * mem_cgroup_move_swap_account - move swap charge and swap_cgroup's record. > * @entry: swap entry to be moved > @@ -3050,13 +3045,6 @@ static int mem_cgroup_move_swap_account(swp_entry_t entry, > } > return -EINVAL; > } > -#else > -static inline int mem_cgroup_move_swap_account(swp_entry_t entry, > - struct mem_cgroup *from, struct mem_cgroup *to) > -{ > - return -EINVAL; > -} > -#endif > > static DEFINE_MUTEX(memcg_max_mutex); > > @@ -6936,7 +6924,6 @@ static int __init mem_cgroup_init(void) > } > subsys_initcall(mem_cgroup_init); > > -#ifdef CONFIG_MEMCG_SWAP > static struct mem_cgroup *mem_cgroup_id_get_online(struct mem_cgroup *memcg) > { > while (!refcount_inc_not_zero(&memcg->id.ref)) { > @@ -7137,11 +7124,7 @@ bool mem_cgroup_swap_full(struct page *page) > } > > /* for remember boot option*/ > -#ifdef CONFIG_MEMCG_SWAP_ENABLED > static int really_do_swap_account __initdata = 1; > -#else > -static int really_do_swap_account __initdata; > -#endif > > static int __init enable_swap_account(char *s) > { > @@ -7257,4 +7240,3 @@ static int __init mem_cgroup_swap_init(void) > } > subsys_initcall(mem_cgroup_swap_init); > > -#endif /* CONFIG_MEMCG_SWAP */ > -- > 1.8.3.1 >
On Fri, Apr 17, 2020 at 7:44 AM Alex Shi <alex.shi@linux.alibaba.com> wrote: > > This patch fold MEMCG_SWAP feature into kernel as default function. That > required a short size memcg id for each of page. As Johannes mentioned > > "the overhead of tracking is tiny - 512k per G of swap (0.04%).' > > So all swapout page could be tracked for its memcg id. > > Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com> > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: Johannes Weiner <hannes@cmpxchg.org> > Cc: linux-mm@kvack.org > Cc: cgroups@vger.kernel.org > --- > arch/arm/configs/omap2plus_defconfig | 1 - > arch/arm64/configs/defconfig | 1 - > arch/mips/configs/db1xxx_defconfig | 1 - > arch/mips/configs/generic_defconfig | 1 - > arch/mips/configs/loongson3_defconfig | 1 - > arch/parisc/configs/generic-64bit_defconfig | 1 - > arch/powerpc/configs/powernv_defconfig | 1 - > arch/powerpc/configs/pseries_defconfig | 1 - > arch/s390/configs/debug_defconfig | 1 - > arch/s390/configs/defconfig | 1 - > arch/sh/configs/sdk7786_defconfig | 1 - > arch/sh/configs/urquell_defconfig | 1 - > include/linux/memcontrol.h | 2 -- > include/linux/swap.h | 27 -------------------------- > include/linux/swap_cgroup.h | 30 ----------------------------- > init/Kconfig | 20 ------------------- > mm/Makefile | 4 ++-- > mm/memcontrol.c | 18 ----------------- > 18 files changed, 2 insertions(+), 111 deletions(-) > > diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig > index 3cc3ca5fa027..929cfc4c062a 100644 > --- a/arch/arm/configs/omap2plus_defconfig > +++ b/arch/arm/configs/omap2plus_defconfig > @@ -10,7 +10,6 @@ CONFIG_IKCONFIG_PROC=y > CONFIG_LOG_BUF_SHIFT=16 > CONFIG_CGROUPS=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_BLK_CGROUP=y > CONFIG_CGROUP_SCHED=y > CONFIG_CFS_BANDWIDTH=y > diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig > index 24e534d85045..3854c6140a04 100644 > --- a/arch/arm64/configs/defconfig > +++ b/arch/arm64/configs/defconfig > @@ -13,7 +13,6 @@ CONFIG_IKCONFIG=y > CONFIG_IKCONFIG_PROC=y > CONFIG_NUMA_BALANCING=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_BLK_CGROUP=y > CONFIG_CGROUP_PIDS=y > CONFIG_CGROUP_HUGETLB=y > diff --git a/arch/mips/configs/db1xxx_defconfig b/arch/mips/configs/db1xxx_defconfig > index e6f3e8e3da39..4604e826d03f 100644 > --- a/arch/mips/configs/db1xxx_defconfig > +++ b/arch/mips/configs/db1xxx_defconfig > @@ -9,7 +9,6 @@ CONFIG_HIGH_RES_TIMERS=y > CONFIG_LOG_BUF_SHIFT=16 > CONFIG_CGROUPS=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_BLK_CGROUP=y > CONFIG_CGROUP_SCHED=y > CONFIG_CFS_BANDWIDTH=y > diff --git a/arch/mips/configs/generic_defconfig b/arch/mips/configs/generic_defconfig > index 714169e411cf..48e4e251779b 100644 > --- a/arch/mips/configs/generic_defconfig > +++ b/arch/mips/configs/generic_defconfig > @@ -3,7 +3,6 @@ CONFIG_NO_HZ_IDLE=y > CONFIG_IKCONFIG=y > CONFIG_IKCONFIG_PROC=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_BLK_CGROUP=y > CONFIG_CFS_BANDWIDTH=y > CONFIG_RT_GROUP_SCHED=y > diff --git a/arch/mips/configs/loongson3_defconfig b/arch/mips/configs/loongson3_defconfig > index 51675f5000d6..f91f49595100 100644 > --- a/arch/mips/configs/loongson3_defconfig > +++ b/arch/mips/configs/loongson3_defconfig > @@ -13,7 +13,6 @@ CONFIG_TASK_DELAY_ACCT=y > CONFIG_TASK_XACCT=y > CONFIG_TASK_IO_ACCOUNTING=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_BLK_CGROUP=y > CONFIG_CPUSETS=y > CONFIG_SCHED_AUTOGROUP=y > diff --git a/arch/parisc/configs/generic-64bit_defconfig b/arch/parisc/configs/generic-64bit_defconfig > index 59561e04e659..fab4401dd9f6 100644 > --- a/arch/parisc/configs/generic-64bit_defconfig > +++ b/arch/parisc/configs/generic-64bit_defconfig > @@ -10,7 +10,6 @@ CONFIG_TASK_XACCT=y > CONFIG_TASK_IO_ACCOUNTING=y > CONFIG_CGROUPS=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_CGROUP_PIDS=y > CONFIG_CPUSETS=y > CONFIG_RELAY=y > diff --git a/arch/powerpc/configs/powernv_defconfig b/arch/powerpc/configs/powernv_defconfig > index df8bdbaa5d8f..c60c3a4125f7 100644 > --- a/arch/powerpc/configs/powernv_defconfig > +++ b/arch/powerpc/configs/powernv_defconfig > @@ -17,7 +17,6 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=13 > CONFIG_NUMA_BALANCING=y > CONFIG_CGROUPS=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_CGROUP_SCHED=y > CONFIG_CGROUP_FREEZER=y > CONFIG_CPUSETS=y > diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig > index 0bea4d3ffb85..426244f491ec 100644 > --- a/arch/powerpc/configs/pseries_defconfig > +++ b/arch/powerpc/configs/pseries_defconfig > @@ -16,7 +16,6 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=13 > CONFIG_NUMA_BALANCING=y > CONFIG_CGROUPS=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_CGROUP_SCHED=y > CONFIG_CGROUP_FREEZER=y > CONFIG_CPUSETS=y > diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_defconfig > index 46038bc58c9e..864b32403673 100644 > --- a/arch/s390/configs/debug_defconfig > +++ b/arch/s390/configs/debug_defconfig > @@ -14,7 +14,6 @@ CONFIG_IKCONFIG=y > CONFIG_IKCONFIG_PROC=y > CONFIG_NUMA_BALANCING=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_BLK_CGROUP=y > CONFIG_CFS_BANDWIDTH=y > CONFIG_RT_GROUP_SCHED=y > diff --git a/arch/s390/configs/defconfig b/arch/s390/configs/defconfig > index 7cd0648c1f4e..991e60d7c307 100644 > --- a/arch/s390/configs/defconfig > +++ b/arch/s390/configs/defconfig > @@ -13,7 +13,6 @@ CONFIG_IKCONFIG=y > CONFIG_IKCONFIG_PROC=y > CONFIG_NUMA_BALANCING=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_BLK_CGROUP=y > CONFIG_CFS_BANDWIDTH=y > CONFIG_RT_GROUP_SCHED=y > diff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig > index 7fa116b436c3..4a1d19068a8d 100644 > --- a/arch/sh/configs/sdk7786_defconfig > +++ b/arch/sh/configs/sdk7786_defconfig > @@ -17,7 +17,6 @@ CONFIG_CPUSETS=y > # CONFIG_PROC_PID_CPUSET is not set > CONFIG_CGROUP_CPUACCT=y > CONFIG_CGROUP_MEMCG=y > -CONFIG_CGROUP_MEMCG_SWAP=y > CONFIG_CGROUP_SCHED=y > CONFIG_RT_GROUP_SCHED=y > CONFIG_BLK_CGROUP=y > diff --git a/arch/sh/configs/urquell_defconfig b/arch/sh/configs/urquell_defconfig > index cb2f56468fe0..be478f3148f2 100644 > --- a/arch/sh/configs/urquell_defconfig > +++ b/arch/sh/configs/urquell_defconfig > @@ -14,7 +14,6 @@ CONFIG_CPUSETS=y > # CONFIG_PROC_PID_CPUSET is not set > CONFIG_CGROUP_CPUACCT=y > CONFIG_CGROUP_MEMCG=y > -CONFIG_CGROUP_MEMCG_SWAP=y > CONFIG_CGROUP_SCHED=y > CONFIG_RT_GROUP_SCHED=y > CONFIG_BLK_DEV_INITRD=y > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 1b4150ff64be..45842ed8ba53 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -569,9 +569,7 @@ struct mem_cgroup *mem_cgroup_get_oom_group(struct task_struct *victim, > struct mem_cgroup *oom_domain); > void mem_cgroup_print_oom_group(struct mem_cgroup *memcg); > > -#ifdef CONFIG_MEMCG_SWAP > extern int do_swap_account; This can be removed too. > -#endif > > struct mem_cgroup *lock_page_memcg(struct page *page); > void __unlock_page_memcg(struct mem_cgroup *memcg); > diff --git a/include/linux/swap.h b/include/linux/swap.h > index b835d8dbea0e..7e44e1e6ef27 100644 > --- a/include/linux/swap.h > +++ b/include/linux/swap.h > @@ -654,38 +654,11 @@ static inline void mem_cgroup_throttle_swaprate(struct mem_cgroup *memcg, > } > #endif > > -#ifdef CONFIG_MEMCG_SWAP > extern void mem_cgroup_swapout(struct page *page, swp_entry_t entry); > extern int mem_cgroup_try_charge_swap(struct page *page, swp_entry_t entry); > extern void mem_cgroup_uncharge_swap(swp_entry_t entry, unsigned int nr_pages); > extern long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg); > extern bool mem_cgroup_swap_full(struct page *page); > -#else > -static inline void mem_cgroup_swapout(struct page *page, swp_entry_t entry) > -{ > -} > - > -static inline int mem_cgroup_try_charge_swap(struct page *page, > - swp_entry_t entry) > -{ > - return 0; > -} > - > -static inline void mem_cgroup_uncharge_swap(swp_entry_t entry, > - unsigned int nr_pages) > -{ > -} > - > -static inline long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg) > -{ > - return get_nr_swap_pages(); > -} > - > -static inline bool mem_cgroup_swap_full(struct page *page) > -{ > - return vm_swap_full(); > -} > -#endif > > #endif /* __KERNEL__*/ > #endif /* _LINUX_SWAP_H */ > diff --git a/include/linux/swap_cgroup.h b/include/linux/swap_cgroup.h > index a12dd1c3966c..5ac87b3b0e08 100644 > --- a/include/linux/swap_cgroup.h > +++ b/include/linux/swap_cgroup.h > @@ -4,8 +4,6 @@ > > #include <linux/swap.h> > > -#ifdef CONFIG_MEMCG_SWAP > - > extern unsigned short swap_cgroup_cmpxchg(swp_entry_t ent, > unsigned short old, unsigned short new); > extern unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id, > @@ -14,32 +12,4 @@ extern unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id, > extern int swap_cgroup_swapon(int type, unsigned long max_pages); > extern void swap_cgroup_swapoff(int type); > > -#else > - > -static inline > -unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id, > - unsigned int nr_ents) > -{ > - return 0; > -} > - > -static inline > -unsigned short lookup_swap_cgroup_id(swp_entry_t ent) > -{ > - return 0; > -} > - > -static inline int > -swap_cgroup_swapon(int type, unsigned long max_pages) > -{ > - return 0; > -} > - > -static inline void swap_cgroup_swapoff(int type) > -{ > - return; > -} > - > -#endif /* CONFIG_MEMCG_SWAP */ > - > #endif /* __LINUX_SWAP_CGROUP_H */ > diff --git a/init/Kconfig b/init/Kconfig > index 9e22ee8fbd75..3b09c71e9b57 100644 > --- a/init/Kconfig > +++ b/init/Kconfig > @@ -834,26 +834,6 @@ config MEMCG > help > Provides control over the memory footprint of tasks in a cgroup. > > -config MEMCG_SWAP > - bool "Swap controller" > - depends on MEMCG && SWAP > - help > - Provides control over the swap space consumed by tasks in a cgroup. > - > -config MEMCG_SWAP_ENABLED > - bool "Swap controller enabled by default" > - depends on MEMCG_SWAP > - default y > - help > - Memory Resource Controller Swap Extension comes with its price in > - a bigger memory consumption. General purpose distribution kernels > - which want to enable the feature but keep it disabled by default > - and let the user enable it by swapaccount=1 boot command line > - parameter should have this option unselected. > - For those who want to have the feature enabled by default should > - select this option (if, for some reason, they need to disable it > - then swapaccount=0 does the trick). > - > config MEMCG_KMEM > bool > depends on MEMCG && !SLOB > diff --git a/mm/Makefile b/mm/Makefile > index fccd3756b25f..812c08323355 100644 > --- a/mm/Makefile > +++ b/mm/Makefile > @@ -58,7 +58,8 @@ ifdef CONFIG_MMU > obj-$(CONFIG_ADVISE_SYSCALLS) += madvise.o > endif > > -obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o swap_slots.o > +obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o swap_slots.o \ > + swap_cgroup.o > obj-$(CONFIG_FRONTSWAP) += frontswap.o > obj-$(CONFIG_ZSWAP) += zswap.o > obj-$(CONFIG_HAS_DMA) += dmapool.o > @@ -80,7 +81,6 @@ obj-$(CONFIG_MIGRATION) += migrate.o > obj-$(CONFIG_TRANSPARENT_HUGEPAGE) += huge_memory.o khugepaged.o > obj-$(CONFIG_PAGE_COUNTER) += page_counter.o > obj-$(CONFIG_MEMCG) += memcontrol.o vmpressure.o > -obj-$(CONFIG_MEMCG_SWAP) += swap_cgroup.o > obj-$(CONFIG_CGROUP_HUGETLB) += hugetlb_cgroup.o > obj-$(CONFIG_GUP_BENCHMARK) += gup_benchmark.o > obj-$(CONFIG_MEMORY_FAILURE) += memory-failure.o > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 5beea03dd58a..446141b6597a 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -82,11 +82,7 @@ > static bool cgroup_memory_nokmem; > > /* Whether the swap controller is active */ > -#ifdef CONFIG_MEMCG_SWAP > int do_swap_account __read_mostly; > -#else > -#define do_swap_account 0 > -#endif > > #ifdef CONFIG_CGROUP_WRITEBACK > static DECLARE_WAIT_QUEUE_HEAD(memcg_cgwb_frn_waitq); > @@ -3020,7 +3016,6 @@ void mem_cgroup_split_huge_fixup(struct page *head) > } > #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ > > -#ifdef CONFIG_MEMCG_SWAP > /** > * mem_cgroup_move_swap_account - move swap charge and swap_cgroup's record. > * @entry: swap entry to be moved > @@ -3050,13 +3045,6 @@ static int mem_cgroup_move_swap_account(swp_entry_t entry, > } > return -EINVAL; > } > -#else > -static inline int mem_cgroup_move_swap_account(swp_entry_t entry, > - struct mem_cgroup *from, struct mem_cgroup *to) > -{ > - return -EINVAL; > -} > -#endif > > static DEFINE_MUTEX(memcg_max_mutex); > > @@ -6936,7 +6924,6 @@ static int __init mem_cgroup_init(void) > } > subsys_initcall(mem_cgroup_init); > > -#ifdef CONFIG_MEMCG_SWAP > static struct mem_cgroup *mem_cgroup_id_get_online(struct mem_cgroup *memcg) > { > while (!refcount_inc_not_zero(&memcg->id.ref)) { > @@ -7137,11 +7124,7 @@ bool mem_cgroup_swap_full(struct page *page) > } > > /* for remember boot option*/ > -#ifdef CONFIG_MEMCG_SWAP_ENABLED > static int really_do_swap_account __initdata = 1; > -#else > -static int really_do_swap_account __initdata; > -#endif > > static int __init enable_swap_account(char *s) > { > @@ -7257,4 +7240,3 @@ static int __init mem_cgroup_swap_init(void) > } > subsys_initcall(mem_cgroup_swap_init); > > -#endif /* CONFIG_MEMCG_SWAP */ > -- > 1.8.3.1 >
On Fri, Apr 17, 2020 at 9:03 AM Michal Hocko <mhocko@kernel.org> wrote: > > On Fri 17-04-20 22:43:43, Alex Shi wrote: > > This patch fold MEMCG_SWAP feature into kernel as default function. That > > required a short size memcg id for each of page. As Johannes mentioned > > > > "the overhead of tracking is tiny - 512k per G of swap (0.04%).' > > > > So all swapout page could be tracked for its memcg id. > > I am perfectly OK with dropping the CONFIG_MEMCG_SWAP. The code that is > guarded by it is negligible and the resulting code is much easier to > read so no objection on that front. I just do not really see any real > reason to flip the default for cgroup v1. Why do we want/need that? > Yes, the changelog is lacking the motivation of this change. This is proposed by Johannes and I was actually expecting the patch from him. The motivation is to make the things simpler for per-memcg LRU locking and workingset for anon memory (Johannes has described these really well, lemme find the email). If we keep the differentiation between cgroup v1 and v2, then there is actually no point of this cleanup as per-memcg LRU locking and anon workingset still has to handle the !do_swap_account case. Shakeel
On Fri 17-04-20 09:41:04, Shakeel Butt wrote: > On Fri, Apr 17, 2020 at 9:03 AM Michal Hocko <mhocko@kernel.org> wrote: > > > > On Fri 17-04-20 22:43:43, Alex Shi wrote: > > > This patch fold MEMCG_SWAP feature into kernel as default function. That > > > required a short size memcg id for each of page. As Johannes mentioned > > > > > > "the overhead of tracking is tiny - 512k per G of swap (0.04%).' > > > > > > So all swapout page could be tracked for its memcg id. > > > > I am perfectly OK with dropping the CONFIG_MEMCG_SWAP. The code that is > > guarded by it is negligible and the resulting code is much easier to > > read so no objection on that front. I just do not really see any real > > reason to flip the default for cgroup v1. Why do we want/need that? > > > > Yes, the changelog is lacking the motivation of this change. This is > proposed by Johannes and I was actually expecting the patch from him. > The motivation is to make the things simpler for per-memcg LRU locking > and workingset for anon memory (Johannes has described these really > well, lemme find the email). If we keep the differentiation between > cgroup v1 and v2, then there is actually no point of this cleanup as > per-memcg LRU locking and anon workingset still has to handle the > !do_swap_account case. All those details really have to go into the changelog. I have to say that I still do not understand why the actual accounting swap or not makes any difference for per per-memcg LRU. Especially when your patch keeps the kernel command line parameter still in place. Anyway, it would be much more simpler to have a patch that drops the CONFIG_MEMCG_SWAP and a separate one which switches the default beahvior. I am not saying I am ok with the later but if the justification is convincing then I might change my mind.
On Fri, Apr 17, 2020 at 9:54 AM Michal Hocko <mhocko@kernel.org> wrote: > > On Fri 17-04-20 09:41:04, Shakeel Butt wrote: > > On Fri, Apr 17, 2020 at 9:03 AM Michal Hocko <mhocko@kernel.org> wrote: > > > > > > On Fri 17-04-20 22:43:43, Alex Shi wrote: > > > > This patch fold MEMCG_SWAP feature into kernel as default function. That > > > > required a short size memcg id for each of page. As Johannes mentioned > > > > > > > > "the overhead of tracking is tiny - 512k per G of swap (0.04%).' > > > > > > > > So all swapout page could be tracked for its memcg id. > > > > > > I am perfectly OK with dropping the CONFIG_MEMCG_SWAP. The code that is > > > guarded by it is negligible and the resulting code is much easier to > > > read so no objection on that front. I just do not really see any real > > > reason to flip the default for cgroup v1. Why do we want/need that? > > > > > > > Yes, the changelog is lacking the motivation of this change. This is > > proposed by Johannes and I was actually expecting the patch from him. > > The motivation is to make the things simpler for per-memcg LRU locking > > and workingset for anon memory (Johannes has described these really > > well, lemme find the email). If we keep the differentiation between > > cgroup v1 and v2, then there is actually no point of this cleanup as > > per-memcg LRU locking and anon workingset still has to handle the > > !do_swap_account case. > > All those details really have to go into the changelog. I have to say > that I still do not understand why the actual accounting swap or not > makes any difference for per per-memcg LRU. Here is Johannes explanation: https://lore.kernel.org/linux-mm/20200413180725.GA99267@cmpxchg.org/ > Especially when your patch You mean Alex's patch. > keeps the kernel command line parameter still in place. > > Anyway, it would be much more simpler to have a patch that drops the > CONFIG_MEMCG_SWAP and a separate one which switches the default > beahvior. I am not saying I am ok with the later but if the > justification is convincing then I might change my mind. > -- > Michal Hocko > SUSE Labs
在 2020/4/18 上午12:54, Michal Hocko 写道: > On Fri 17-04-20 09:41:04, Shakeel Butt wrote: >> On Fri, Apr 17, 2020 at 9:03 AM Michal Hocko <mhocko@kernel.org> wrote: >>> >>> On Fri 17-04-20 22:43:43, Alex Shi wrote: >>>> This patch fold MEMCG_SWAP feature into kernel as default function. That >>>> required a short size memcg id for each of page. As Johannes mentioned >>>> >>>> "the overhead of tracking is tiny - 512k per G of swap (0.04%).' >>>> >>>> So all swapout page could be tracked for its memcg id. >>> >>> I am perfectly OK with dropping the CONFIG_MEMCG_SWAP. The code that is >>> guarded by it is negligible and the resulting code is much easier to >>> read so no objection on that front. I just do not really see any real >>> reason to flip the default for cgroup v1. Why do we want/need that? >>> >> >> Yes, the changelog is lacking the motivation of this change. This is >> proposed by Johannes and I was actually expecting the patch from him. >> The motivation is to make the things simpler for per-memcg LRU locking >> and workingset for anon memory (Johannes has described these really >> well, lemme find the email). If we keep the differentiation between >> cgroup v1 and v2, then there is actually no point of this cleanup as >> per-memcg LRU locking and anon workingset still has to handle the >> !do_swap_account case. > > All those details really have to go into the changelog. I have to say > that I still do not understand why the actual accounting swap or not > makes any difference for per per-memcg LRU. Especially when your patch > keeps the kernel command line parameter still in place. > > Anyway, it would be much more simpler to have a patch that drops the > CONFIG_MEMCG_SWAP and a separate one which switches the default > beahvior. I am not saying I am ok with the later but if the > justification is convincing then I might change my mind. > Hi Shakeel & Michal, Thanks for all comments! Yes, we still need to remove swapaccount from cmdline and keep swap_cgroup.id permanently. Just I don't know if this patch could fit into the details of Johannes new solution. Anyway, I will send out v2 for complete memcg id record patch, just in case if they are useful. Thanks Alex
On Sat, Apr 18, 2020 at 6:45 AM Alex Shi <alex.shi@linux.alibaba.com> wrote: > > > > 在 2020/4/18 上午12:54, Michal Hocko 写道: > > On Fri 17-04-20 09:41:04, Shakeel Butt wrote: > >> On Fri, Apr 17, 2020 at 9:03 AM Michal Hocko <mhocko@kernel.org> wrote: > >>> > >>> On Fri 17-04-20 22:43:43, Alex Shi wrote: > >>>> This patch fold MEMCG_SWAP feature into kernel as default function. That > >>>> required a short size memcg id for each of page. As Johannes mentioned > >>>> > >>>> "the overhead of tracking is tiny - 512k per G of swap (0.04%).' > >>>> > >>>> So all swapout page could be tracked for its memcg id. > >>> > >>> I am perfectly OK with dropping the CONFIG_MEMCG_SWAP. The code that is > >>> guarded by it is negligible and the resulting code is much easier to > >>> read so no objection on that front. I just do not really see any real > >>> reason to flip the default for cgroup v1. Why do we want/need that? > >>> > >> > >> Yes, the changelog is lacking the motivation of this change. This is > >> proposed by Johannes and I was actually expecting the patch from him. > >> The motivation is to make the things simpler for per-memcg LRU locking > >> and workingset for anon memory (Johannes has described these really > >> well, lemme find the email). If we keep the differentiation between > >> cgroup v1 and v2, then there is actually no point of this cleanup as > >> per-memcg LRU locking and anon workingset still has to handle the > >> !do_swap_account case. > > > > All those details really have to go into the changelog. I have to say > > that I still do not understand why the actual accounting swap or not > > makes any difference for per per-memcg LRU. Especially when your patch > > keeps the kernel command line parameter still in place. > > > > Anyway, it would be much more simpler to have a patch that drops the > > CONFIG_MEMCG_SWAP and a separate one which switches the default > > beahvior. I am not saying I am ok with the later but if the > > justification is convincing then I might change my mind. > > > > Hi Shakeel & Michal, > > Thanks for all comments! > > Yes, we still need to remove swapaccount from cmdline and keep swap_cgroup.id > permanently. Just I don't know if this patch could fit into the details of > Johannes new solution. > > Anyway, I will send out v2 for complete memcg id record patch, just in case > if they are useful. > I would recommend waiting for Johannes patch series. The cleanup this patch is doing makes more sense to be part of Johannes's lrucare cleanup series. thanks, Shakeel
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 3cc3ca5fa027..929cfc4c062a 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -10,7 +10,6 @@ CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_CGROUPS=y CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y CONFIG_BLK_CGROUP=y CONFIG_CGROUP_SCHED=y CONFIG_CFS_BANDWIDTH=y diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 24e534d85045..3854c6140a04 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -13,7 +13,6 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_NUMA_BALANCING=y CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y CONFIG_BLK_CGROUP=y CONFIG_CGROUP_PIDS=y CONFIG_CGROUP_HUGETLB=y diff --git a/arch/mips/configs/db1xxx_defconfig b/arch/mips/configs/db1xxx_defconfig index e6f3e8e3da39..4604e826d03f 100644 --- a/arch/mips/configs/db1xxx_defconfig +++ b/arch/mips/configs/db1xxx_defconfig @@ -9,7 +9,6 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_CGROUPS=y CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y CONFIG_BLK_CGROUP=y CONFIG_CGROUP_SCHED=y CONFIG_CFS_BANDWIDTH=y diff --git a/arch/mips/configs/generic_defconfig b/arch/mips/configs/generic_defconfig index 714169e411cf..48e4e251779b 100644 --- a/arch/mips/configs/generic_defconfig +++ b/arch/mips/configs/generic_defconfig @@ -3,7 +3,6 @@ CONFIG_NO_HZ_IDLE=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y CONFIG_BLK_CGROUP=y CONFIG_CFS_BANDWIDTH=y CONFIG_RT_GROUP_SCHED=y diff --git a/arch/mips/configs/loongson3_defconfig b/arch/mips/configs/loongson3_defconfig index 51675f5000d6..f91f49595100 100644 --- a/arch/mips/configs/loongson3_defconfig +++ b/arch/mips/configs/loongson3_defconfig @@ -13,7 +13,6 @@ CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y CONFIG_BLK_CGROUP=y CONFIG_CPUSETS=y CONFIG_SCHED_AUTOGROUP=y diff --git a/arch/parisc/configs/generic-64bit_defconfig b/arch/parisc/configs/generic-64bit_defconfig index 59561e04e659..fab4401dd9f6 100644 --- a/arch/parisc/configs/generic-64bit_defconfig +++ b/arch/parisc/configs/generic-64bit_defconfig @@ -10,7 +10,6 @@ CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_CGROUPS=y CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y CONFIG_CGROUP_PIDS=y CONFIG_CPUSETS=y CONFIG_RELAY=y diff --git a/arch/powerpc/configs/powernv_defconfig b/arch/powerpc/configs/powernv_defconfig index df8bdbaa5d8f..c60c3a4125f7 100644 --- a/arch/powerpc/configs/powernv_defconfig +++ b/arch/powerpc/configs/powernv_defconfig @@ -17,7 +17,6 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=13 CONFIG_NUMA_BALANCING=y CONFIG_CGROUPS=y CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y CONFIG_CGROUP_SCHED=y CONFIG_CGROUP_FREEZER=y CONFIG_CPUSETS=y diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index 0bea4d3ffb85..426244f491ec 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig @@ -16,7 +16,6 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=13 CONFIG_NUMA_BALANCING=y CONFIG_CGROUPS=y CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y CONFIG_CGROUP_SCHED=y CONFIG_CGROUP_FREEZER=y CONFIG_CPUSETS=y diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_defconfig index 46038bc58c9e..864b32403673 100644 --- a/arch/s390/configs/debug_defconfig +++ b/arch/s390/configs/debug_defconfig @@ -14,7 +14,6 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_NUMA_BALANCING=y CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y CONFIG_BLK_CGROUP=y CONFIG_CFS_BANDWIDTH=y CONFIG_RT_GROUP_SCHED=y diff --git a/arch/s390/configs/defconfig b/arch/s390/configs/defconfig index 7cd0648c1f4e..991e60d7c307 100644 --- a/arch/s390/configs/defconfig +++ b/arch/s390/configs/defconfig @@ -13,7 +13,6 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_NUMA_BALANCING=y CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y CONFIG_BLK_CGROUP=y CONFIG_CFS_BANDWIDTH=y CONFIG_RT_GROUP_SCHED=y diff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig index 7fa116b436c3..4a1d19068a8d 100644 --- a/arch/sh/configs/sdk7786_defconfig +++ b/arch/sh/configs/sdk7786_defconfig @@ -17,7 +17,6 @@ CONFIG_CPUSETS=y # CONFIG_PROC_PID_CPUSET is not set CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_MEMCG=y -CONFIG_CGROUP_MEMCG_SWAP=y CONFIG_CGROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_CGROUP=y diff --git a/arch/sh/configs/urquell_defconfig b/arch/sh/configs/urquell_defconfig index cb2f56468fe0..be478f3148f2 100644 --- a/arch/sh/configs/urquell_defconfig +++ b/arch/sh/configs/urquell_defconfig @@ -14,7 +14,6 @@ CONFIG_CPUSETS=y # CONFIG_PROC_PID_CPUSET is not set CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_MEMCG=y -CONFIG_CGROUP_MEMCG_SWAP=y CONFIG_CGROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_DEV_INITRD=y diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 1b4150ff64be..45842ed8ba53 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -569,9 +569,7 @@ struct mem_cgroup *mem_cgroup_get_oom_group(struct task_struct *victim, struct mem_cgroup *oom_domain); void mem_cgroup_print_oom_group(struct mem_cgroup *memcg); -#ifdef CONFIG_MEMCG_SWAP extern int do_swap_account; -#endif struct mem_cgroup *lock_page_memcg(struct page *page); void __unlock_page_memcg(struct mem_cgroup *memcg); diff --git a/include/linux/swap.h b/include/linux/swap.h index b835d8dbea0e..7e44e1e6ef27 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -654,38 +654,11 @@ static inline void mem_cgroup_throttle_swaprate(struct mem_cgroup *memcg, } #endif -#ifdef CONFIG_MEMCG_SWAP extern void mem_cgroup_swapout(struct page *page, swp_entry_t entry); extern int mem_cgroup_try_charge_swap(struct page *page, swp_entry_t entry); extern void mem_cgroup_uncharge_swap(swp_entry_t entry, unsigned int nr_pages); extern long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg); extern bool mem_cgroup_swap_full(struct page *page); -#else -static inline void mem_cgroup_swapout(struct page *page, swp_entry_t entry) -{ -} - -static inline int mem_cgroup_try_charge_swap(struct page *page, - swp_entry_t entry) -{ - return 0; -} - -static inline void mem_cgroup_uncharge_swap(swp_entry_t entry, - unsigned int nr_pages) -{ -} - -static inline long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg) -{ - return get_nr_swap_pages(); -} - -static inline bool mem_cgroup_swap_full(struct page *page) -{ - return vm_swap_full(); -} -#endif #endif /* __KERNEL__*/ #endif /* _LINUX_SWAP_H */ diff --git a/include/linux/swap_cgroup.h b/include/linux/swap_cgroup.h index a12dd1c3966c..5ac87b3b0e08 100644 --- a/include/linux/swap_cgroup.h +++ b/include/linux/swap_cgroup.h @@ -4,8 +4,6 @@ #include <linux/swap.h> -#ifdef CONFIG_MEMCG_SWAP - extern unsigned short swap_cgroup_cmpxchg(swp_entry_t ent, unsigned short old, unsigned short new); extern unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id, @@ -14,32 +12,4 @@ extern unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id, extern int swap_cgroup_swapon(int type, unsigned long max_pages); extern void swap_cgroup_swapoff(int type); -#else - -static inline -unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id, - unsigned int nr_ents) -{ - return 0; -} - -static inline -unsigned short lookup_swap_cgroup_id(swp_entry_t ent) -{ - return 0; -} - -static inline int -swap_cgroup_swapon(int type, unsigned long max_pages) -{ - return 0; -} - -static inline void swap_cgroup_swapoff(int type) -{ - return; -} - -#endif /* CONFIG_MEMCG_SWAP */ - #endif /* __LINUX_SWAP_CGROUP_H */ diff --git a/init/Kconfig b/init/Kconfig index 9e22ee8fbd75..3b09c71e9b57 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -834,26 +834,6 @@ config MEMCG help Provides control over the memory footprint of tasks in a cgroup. -config MEMCG_SWAP - bool "Swap controller" - depends on MEMCG && SWAP - help - Provides control over the swap space consumed by tasks in a cgroup. - -config MEMCG_SWAP_ENABLED - bool "Swap controller enabled by default" - depends on MEMCG_SWAP - default y - help - Memory Resource Controller Swap Extension comes with its price in - a bigger memory consumption. General purpose distribution kernels - which want to enable the feature but keep it disabled by default - and let the user enable it by swapaccount=1 boot command line - parameter should have this option unselected. - For those who want to have the feature enabled by default should - select this option (if, for some reason, they need to disable it - then swapaccount=0 does the trick). - config MEMCG_KMEM bool depends on MEMCG && !SLOB diff --git a/mm/Makefile b/mm/Makefile index fccd3756b25f..812c08323355 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -58,7 +58,8 @@ ifdef CONFIG_MMU obj-$(CONFIG_ADVISE_SYSCALLS) += madvise.o endif -obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o swap_slots.o +obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o swap_slots.o \ + swap_cgroup.o obj-$(CONFIG_FRONTSWAP) += frontswap.o obj-$(CONFIG_ZSWAP) += zswap.o obj-$(CONFIG_HAS_DMA) += dmapool.o @@ -80,7 +81,6 @@ obj-$(CONFIG_MIGRATION) += migrate.o obj-$(CONFIG_TRANSPARENT_HUGEPAGE) += huge_memory.o khugepaged.o obj-$(CONFIG_PAGE_COUNTER) += page_counter.o obj-$(CONFIG_MEMCG) += memcontrol.o vmpressure.o -obj-$(CONFIG_MEMCG_SWAP) += swap_cgroup.o obj-$(CONFIG_CGROUP_HUGETLB) += hugetlb_cgroup.o obj-$(CONFIG_GUP_BENCHMARK) += gup_benchmark.o obj-$(CONFIG_MEMORY_FAILURE) += memory-failure.o diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 5beea03dd58a..446141b6597a 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -82,11 +82,7 @@ static bool cgroup_memory_nokmem; /* Whether the swap controller is active */ -#ifdef CONFIG_MEMCG_SWAP int do_swap_account __read_mostly; -#else -#define do_swap_account 0 -#endif #ifdef CONFIG_CGROUP_WRITEBACK static DECLARE_WAIT_QUEUE_HEAD(memcg_cgwb_frn_waitq); @@ -3020,7 +3016,6 @@ void mem_cgroup_split_huge_fixup(struct page *head) } #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ -#ifdef CONFIG_MEMCG_SWAP /** * mem_cgroup_move_swap_account - move swap charge and swap_cgroup's record. * @entry: swap entry to be moved @@ -3050,13 +3045,6 @@ static int mem_cgroup_move_swap_account(swp_entry_t entry, } return -EINVAL; } -#else -static inline int mem_cgroup_move_swap_account(swp_entry_t entry, - struct mem_cgroup *from, struct mem_cgroup *to) -{ - return -EINVAL; -} -#endif static DEFINE_MUTEX(memcg_max_mutex); @@ -6936,7 +6924,6 @@ static int __init mem_cgroup_init(void) } subsys_initcall(mem_cgroup_init); -#ifdef CONFIG_MEMCG_SWAP static struct mem_cgroup *mem_cgroup_id_get_online(struct mem_cgroup *memcg) { while (!refcount_inc_not_zero(&memcg->id.ref)) { @@ -7137,11 +7124,7 @@ bool mem_cgroup_swap_full(struct page *page) } /* for remember boot option*/ -#ifdef CONFIG_MEMCG_SWAP_ENABLED static int really_do_swap_account __initdata = 1; -#else -static int really_do_swap_account __initdata; -#endif static int __init enable_swap_account(char *s) { @@ -7257,4 +7240,3 @@ static int __init mem_cgroup_swap_init(void) } subsys_initcall(mem_cgroup_swap_init); -#endif /* CONFIG_MEMCG_SWAP */
This patch fold MEMCG_SWAP feature into kernel as default function. That required a short size memcg id for each of page. As Johannes mentioned "the overhead of tracking is tiny - 512k per G of swap (0.04%).' So all swapout page could be tracked for its memcg id. Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: linux-mm@kvack.org Cc: cgroups@vger.kernel.org --- arch/arm/configs/omap2plus_defconfig | 1 - arch/arm64/configs/defconfig | 1 - arch/mips/configs/db1xxx_defconfig | 1 - arch/mips/configs/generic_defconfig | 1 - arch/mips/configs/loongson3_defconfig | 1 - arch/parisc/configs/generic-64bit_defconfig | 1 - arch/powerpc/configs/powernv_defconfig | 1 - arch/powerpc/configs/pseries_defconfig | 1 - arch/s390/configs/debug_defconfig | 1 - arch/s390/configs/defconfig | 1 - arch/sh/configs/sdk7786_defconfig | 1 - arch/sh/configs/urquell_defconfig | 1 - include/linux/memcontrol.h | 2 -- include/linux/swap.h | 27 -------------------------- include/linux/swap_cgroup.h | 30 ----------------------------- init/Kconfig | 20 ------------------- mm/Makefile | 4 ++-- mm/memcontrol.c | 18 ----------------- 18 files changed, 2 insertions(+), 111 deletions(-)