Received: by 2002:a05:6500:1b8f:b0:1fa:5c73:8e2d with SMTP id df15csp223986lqb; Tue, 28 May 2024 13:40:49 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCX1LiasUV8AtY+AH9QKOFu3Faex5x2CRxBt+NmKsO5+GAzaxJwE7OIdpWL0T6YSMXJa22UWaK5XyDTWgAoK1DFkt6W8sf72yhdEo0Kjuw== X-Google-Smtp-Source: AGHT+IFSMtKs4pTVwG8gOMgNOEKkZiaQSpkEZccFgN01/flC1TyXO6tpzN99avizYxl4yiKV179S X-Received: by 2002:a17:902:daca:b0:1f4:adcb:37c9 with SMTP id d9443c01a7336-1f4eac8863emr2528025ad.25.1716928849514; Tue, 28 May 2024 13:40:49 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716928849; cv=pass; d=google.com; s=arc-20160816; b=VIvUkYvSi2+eZ+Rd+rCiCH3AmSYpsqkg2T+o3VavS5QUfehWyy3/VKpELVYnmhD6Gp yCZhGmQNC7C/7hvrLZ76TszHIM+W9CIeyf6OtvCicuWbJ+/szJ8GlBrDc0nXRjFlb8H1 pCYzChcv4JEKHCFAG1mHtviwC06bMceYx5fLQY79NJDa+Lm8Auf76QHPhKVW92VlgrWK NYmUdL5qPcNyHkJx9aMFZSQKp6TA304h45PVNsJWKjqlWDRwoWXGggTN7he4Sd5ZapLX EVWMrRCpsqI6phzjt+tgb6pSqZPRQZdvKeJbVJ+5WUyWIB7k0HHh2pXaKE0lhrwrRbI7 9knA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=iGbJmrdXQEDHzblKOtQb/sJK4TKxsQPjhoG77g1wuwc=; fh=QUOYkrhvYyk//ZoGwHdb2m1c7vfsqYd5CGnq47wy3QU=; b=mnbl7UNaudKd9fPNfSxcacDO9FEd5sewSakGNHfI5QBAFPlO0DMbBxuciHX8aYngPw 60RH2Yx/SW9ejmD/NsCMRvwp6zsZrvhRx/ZqaNl+SLAxbRem8LYYYnBKguKbwS+xWYbo M8D48cwr20FBH6hY9cNNTkvS8VYJx4peBkZB5XyQ5eB9kW6LrBe/Vr4VWlq8pym9cmpP br1ZjmnSl+s3ofPaS9jPGw0+ldMBqbgKkmGqaw2vG1GfMkXaqMx8n09SHRIay5Thj/p8 dBurjLk5ngYH1zBeuzqjhNRAh5Za21nXhvdAchwmcDlhdob5C+CtvWzzT3o7QEzjGnu1 /v2g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=j6BWKFNA; arc=pass (i=1 spf=pass spfdomain=linux.dev dkim=pass dkdomain=linux.dev dmarc=pass fromdomain=linux.dev); spf=pass (google.com: domain of linux-kernel+bounces-193018-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-193018-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id d9443c01a7336-1f44c970f65si19025515ad.250.2024.05.28.13.40.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 May 2024 13:40:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-193018-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=j6BWKFNA; arc=pass (i=1 spf=pass spfdomain=linux.dev dkim=pass dkdomain=linux.dev dmarc=pass fromdomain=linux.dev); spf=pass (google.com: domain of linux-kernel+bounces-193018-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-193018-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 782B9286E2B for ; Tue, 28 May 2024 20:21:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8E8C4178CC4; Tue, 28 May 2024 20:21:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="j6BWKFNA" Received: from out-173.mta1.migadu.com (out-173.mta1.migadu.com [95.215.58.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D5D1E446DB for ; Tue, 28 May 2024 20:21:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716927693; cv=none; b=Fdys6pj1mq31lhRXtqOtOyNc20wX6DHgWHEGlALzQqx2uMFHkIyNAvLQm+0fOa5tY0cQo6KezgQlNT6PEHzbjXIPWoHlwH41b0JsSYCkSdtjN/LGQrIFGrQkPb3jr3qvCHDulg/4tk/QiTpBj9eJ8NOePLtyQ5BpkkAGAJe/s1U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716927693; c=relaxed/simple; bh=aOMAFw8xzFGEjv6w4lb2+0adrSMQjiD9U24WJa9XfmM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=tP+L5bBBfInWf0Ha0tlpq5IywyWCSAMMUgeMFkPsq1boJmXQ3IQzPtSuvkMKnPtKeHmzGHu423L+20xWSnjCjv6vWgLVvw3PvJ3l/I9fVo5v9lON6oVd5GoXFHlj4xMwosWiTxJGQ/3dUgElYpCymw+M5E7X6KxRwTlz093czGo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=j6BWKFNA; arc=none smtp.client-ip=95.215.58.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev X-Envelope-To: akpm@linux-foundation.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1716927688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=iGbJmrdXQEDHzblKOtQb/sJK4TKxsQPjhoG77g1wuwc=; b=j6BWKFNAslF1vP2v1AiFcXZG0qF17CyEnSmTVYpckEqEameDCIuK/5Kz12wwXH7Kxj88PS lc+2hGQBbXtCLV55Ii6zuSdR+xNMY0Z88eSuw1OMu73B5lswmFflyVyN55ezA/yFMJ+wsl 0LQjn/npM02EXDFNd+mmQcIYvKECYVI= X-Envelope-To: muchun.song@linux.dev X-Envelope-To: hannes@cmpxchg.org X-Envelope-To: mhocko@kernel.org X-Envelope-To: shakeel.butt@linux.dev X-Envelope-To: willy@infradead.org X-Envelope-To: linux-mm@kvack.org X-Envelope-To: linux-kernel@vger.kernel.org X-Envelope-To: roman.gushchin@linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Roman Gushchin To: Andrew Morton Cc: Muchun Song , Johannes Weiner , Michal Hocko , Shakeel Butt , Matthew Wilcox , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Roman Gushchin Subject: [PATCH v1 00/14] mm: memcg: separate legacy cgroup v1 code and put under config option Date: Tue, 28 May 2024 13:20:52 -0700 Message-ID: <20240528202101.3099300-1-roman.gushchin@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT 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 . rfc: https://lwn.net/Articles/973082/ 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) [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(-) Suggested-by: Matthew Wilcox (Oracle) Signed-off-by: Roman Gushchin 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 -- 2.45.1