Skip to content

mm: memcg: separate legacy cgroup v1 code and put under config option

Roman Gushchin cgroups linux-mm lkml 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest14 patches 16 repliesIn review 12 of 14 applied
  2. v114 patches 25 repliesSuperseded

Changes in v2 from the cover letter

- minor compilation fix
- #else/#endif comments fix (Lance Yang)

Patches in v2 12 of 14 applied

#Subject and filesSizeRepliesApplied
1/14mm: memcg: introduce memcontrol-v1.cmm/Makefile mm/memcontrol-v1.c mm/memcontrol-v1.h+12 -11 reply
2/14mm: memcg: move soft limit reclaim code to memcontrol-v1.cmm/memcontrol-v1.c mm/memcontrol-v1.h mm/memcontrol.c+353 -3331 replyApplied
3/14mm: memcg: rename soft limit reclaim-related functionsinclude/linux/memcontrol.h mm/memcontrol-v1.c mm/memcontrol-v1.h +2 more+18 -181 replyApplied
4/14mm: memcg: move charge migration code to memcontrol-v1.cmm/memcontrol-v1.c mm/memcontrol-v1.h mm/memcontrol.c+1019 -9961 replyApplied
5/14mm: memcg: rename charge move-related functionsmm/memcontrol-v1.c mm/memcontrol-v1.h mm/memcontrol.c+15 -151 replyApplied
6/14mm: memcg: move legacy memcg event code into memcontrol-v1.cinclude/linux/memcontrol.h mm/memcontrol-v1.c mm/memcontrol-v1.h +1 more+709 -6941 replyApplied
7/14mm: memcg: rename memcg_check_events()mm/memcontrol-v1.c mm/memcontrol-v1.h mm/memcontrol.c+8 -81 replyApplied
8/14mm: memcg: move cgroup v1 oom handling code into memcontrol-v1.cmm/memcontrol-v1.c mm/memcontrol-v1.h mm/memcontrol.c+231 -2171 replyApplied
9/14mm: memcg: rename memcg_oom_recover()mm/memcontrol-v1.c mm/memcontrol-v1.h mm/memcontrol.c+7 -71 replyApplied
10/14mm: memcg: move cgroup v1 interface files to memcontrol-v1.cmm/memcontrol-v1.c mm/memcontrol-v1.h mm/memcontrol.c+767 -7221 reply
11/14mm: memcg: make memcg1_update_tree() staticmm/memcontrol-v1.c mm/memcontrol-v1.h+1 -21 replyApplied
12/14mm: memcg: group cgroup v1 memcg related declarationsinclude/linux/memcontrol.h mm/memcontrol-v1.h+123 -1101 replyApplied
13/14mm: memcg: put cgroup v1-related members of task_struct under config optioninclude/linux/memcontrol.h init/Kconfig mm/Makefile +2 more+41 -82 repliesApplied
14/14MAINTAINERS: add mm/memcontrol-v1.c/h to the list of maintained filesMAINTAINERS+2 -00 repliesApplied

Reviews trailers per patch

13 of 14 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchMichal HockoShakeel Butt
SeriesA-b
1/14A-b
2/14A-b
3/14A-b
4/14A-b
5/14A-b
6/14A-b
7/14A-b
8/14A-b
9/14A-b
10/14A-b
11/14A-b
12/14A-b
13/14A-b
14/14

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 00/14] mm: memcg: separate legacy cgroup v1 code and put under config option

Cgroups v2 have been around for a while and many users have fully adopted them, so they never use cgroups v1 features and functionality. Yet they have to "pay" for the cgroup v1 support anyway:
1) the kernel binary contains an unused cgroup v1 code,
2) some code paths have additional checks which are not needed,
3) some common structures like task_struct and mem_cgroup contain unused cgroup v1-specific members.

Cgroup v1's memory controller has a number of features that are not supported by cgroup v2 and their implementation is pretty much self contained. Most notably, these features are: soft limit reclaim, oom handling in userspace, complicated event notification system, charge migration. Cgroup v1-specific code in memcontrol.c is close to 4k lines in size and it's intervened with generic and cgroup v2-specific code. It's a burden on developers and maintainers.

This patchset aims to solve these problems by:
1) moving cgroup v1-specific memcg code to the new mm/memcontrol-v1.c file,
2) putting definitions shared by memcontrol.c and memcontrol-v1.c into the mm/memcontrol-v1.h header,
3) introducing the CONFIG_MEMCG_V1 config option, turned off by default,
4) making memcontrol-v1.c to compile only if CONFIG_MEMCG_V1 is set.

If CONFIG_MEMCG_V1 is not set, cgroup v1 memory controller is still available for mounting, however no memory-specific control knobs are present.

This patchset is based against mm-unstable tree (b610f75d19a34), however a version based on mm-stable can be found here:
https://github.com/rgushchin/linux/tree/memcontrol_v1.1-stable .

v2:
- minor compilation fix
- #else/#endif comments fix (Lance Yang)

v1:
- switched to CONFIG_MEMCG_V1 being off by default based on LSFMMBPF discussion [1]
- switched to memcg1_ prefix (Johannes)
- many minor fixes
- dropped patches which put struct memcg members under CONFIG_MEMCG_V1 (will post as a separate patchset)

rfc:
https://lwn.net/Articles/973082/

[1]: https://lwn.net/Articles/974575/

MAINTAINERS                |    2 +
include/linux/memcontrol.h |  156 ++++---
init/Kconfig               |    9 +
mm/Makefile                |    2 +
mm/memcontrol-v1.c         | 2933 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mm/memcontrol-v1.h         |  132 ++++++
mm/memcontrol.c            | 4169 +++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------
mm/vmscan.c                |   10 +-
8 files changed, 3794 insertions(+), 3619 deletions(-)

Roman Gushchin (14):
mm: memcg: introduce memcontrol-v1.c
mm: memcg: move soft limit reclaim code to memcontrol-v1.c
mm: memcg: rename soft limit reclaim-related functions
mm: memcg: move charge migration code to memcontrol-v1.c
mm: memcg: rename charge move-related functions
mm: memcg: move legacy memcg event code into memcontrol-v1.c
mm: memcg: rename memcg_check_events()
mm: memcg: move cgroup v1 oom handling code into memcontrol-v1.c
mm: memcg: rename memcg_oom_recover()
mm: memcg: move cgroup v1 interface files to memcontrol-v1.c
mm: memcg: make memcg1_update_tree() static
mm: memcg: group cgroup v1 memcg related declarations
mm: memcg: put cgroup v1-related members of task_struct under config
option
MAINTAINERS: add mm/memcontrol-v1.c/h to the list of maintained files

 MAINTAINERS                |    2 +
 include/linux/memcontrol.h |  156 +-
 init/Kconfig               |    9 +
 mm/Makefile                |    2 +
 mm/memcontrol-v1.c         | 2933 +++++++++++++++++++++++++
 mm/memcontrol-v1.h         |  132 ++
 mm/memcontrol.c            | 4141 ++++++------------------------------
 mm/vmscan.c                |   10 +-
 8 files changed, 3780 insertions(+), 3605 deletions(-)
 create mode 100644 mm/memcontrol-v1.c
 create mode 100644 mm/memcontrol-v1.h
Signature · 1 line
2.45.2