From: Jingxiang Zeng <jingxiangzeng.cas@gmail.com>
To: akpm@linux-foundation.org
Cc: linux-mm@kvack.org, cgroups@vger.kernel.org,
linux-kernel@vger.kernel.org, hannes@cmpxchg.org,
mhocko@kernel.org, roman.gushchin@linux.dev,
shakeel.butt@linux.dev, muchun.song@linux.dev,
kasong@tencent.com, Zeng Jingxiang <linuszeng@tencent.com>
Subject: [RFC 1/5] Kconfig: add SWAP_CHARGE_V1_MODE config
Date: Wed, 19 Mar 2025 14:41:44 +0800 [thread overview]
Message-ID: <20250319064148.774406-2-jingxiangzeng.cas@gmail.com> (raw)
In-Reply-To: <20250319064148.774406-1-jingxiangzeng.cas@gmail.com>
From: Zeng Jingxiang <linuszeng@tencent.com>
Added SWAP_CHARGE_V1_MODE config, which is disabled by default.
When enabled in cgroupv2 mode, the memory accounting method of
swap will be restored to cgroupv1 mode.
Signed-off-by: Zeng Jingxiang <linuszeng@tencent.com>
---
include/linux/memcontrol.h | 6 ++++++
init/Kconfig | 16 ++++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 53364526d877..dcb087ee6e8d 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -62,6 +62,12 @@ struct mem_cgroup_reclaim_cookie {
#ifdef CONFIG_MEMCG
+/* Whether enable memory+swap account in cgroupv2 */
+static inline bool do_memsw_account_on_dfl(void)
+{
+ return IS_ENABLED(CONFIG_MEMSW_ACCOUNT_ON_DFL);
+}
+
#define MEM_CGROUP_ID_SHIFT 16
struct mem_cgroup_id {
diff --git a/init/Kconfig b/init/Kconfig
index 7f67d8942a09..669e39214244 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1012,6 +1012,22 @@ config MEMCG_V1
Say N if unsure.
+config MEMSW_ACCOUNT_ON_DFL
+ bool "Whether enable memory+swap account in cgroup v2"
+ depends on MEMCG && MEMCG_V1
+ default n
+ help
+ Say Y here to enable memory+swap account in cgroup v2. Enabling this
+ option means that the semantics of memory.swap.max will align with
+ memory.memsw.limit_in_bytes, and memory.swap.current will align with
+ memory.memsw.usage_in_bytes.
+ This is particularly useful for workloads that require strict memory
+ and swap limits.
+
+ If you are unsure whether to enable this option, it is recommended
+ to leave it disabled (N) unless you specifically need memory and swap
+ accounting features in your cgroup v2 setup.
+
config BLK_CGROUP
bool "IO controller"
depends on BLOCK
--
2.41.1
next prev parent reply other threads:[~2025-03-19 6:42 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-19 6:41 [RFC 0/5] add option to restore swap account to cgroupv1 mode Jingxiang Zeng
2025-03-19 6:41 ` Jingxiang Zeng [this message]
2025-03-19 19:29 ` [RFC 1/5] Kconfig: add SWAP_CHARGE_V1_MODE config Shakeel Butt
2025-03-19 19:31 ` Shakeel Butt
2025-03-19 6:41 ` [RFC 2/5] memcontrol: add boot option to enable memsw account on dfl Jingxiang Zeng
2025-03-19 19:34 ` Shakeel Butt
2025-03-19 22:30 ` Roman Gushchin
2025-03-20 8:43 ` jingxiang zeng
2025-03-20 14:28 ` Johannes Weiner
2025-03-20 15:16 ` Roman Gushchin
2025-03-20 15:33 ` Shakeel Butt
2025-04-02 13:40 ` Michal Koutný
2025-04-03 7:47 ` [External] " Zhongkun He
2025-04-03 9:16 ` jingxiang zeng
2025-04-11 16:57 ` Michal Koutný
2025-04-16 8:29 ` jingxiang zeng
2025-05-05 18:29 ` Michal Koutný
2025-03-20 8:51 ` jingxiang zeng
2025-03-19 6:41 ` [RFC 3/5] mm/memcontrol: do not scan anon pages if memsw limit is hit Jingxiang Zeng
2025-03-19 19:36 ` Shakeel Butt
2025-03-20 8:40 ` jingxiang zeng
2025-03-19 6:41 ` [RFC 4/5] mm/memcontrol: allow memsw account in cgroup v2 Jingxiang Zeng
2025-03-19 6:41 ` [RFC 5/5] Docs/cgroup-v2: add cgroup.memsw_account_on_dfl Documentation Jingxiang Zeng
2025-03-19 19:27 ` [RFC 0/5] add option to restore swap account to cgroupv1 mode Shakeel Butt
2025-03-19 19:38 ` Johannes Weiner
2025-03-19 19:51 ` Shakeel Butt
2025-03-20 8:09 ` jingxiang zeng
2025-03-20 15:08 ` Johannes Weiner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250319064148.774406-2-jingxiangzeng.cas@gmail.com \
--to=jingxiangzeng.cas@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=hannes@cmpxchg.org \
--cc=kasong@tencent.com \
--cc=linuszeng@tencent.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@kernel.org \
--cc=muchun.song@linux.dev \
--cc=roman.gushchin@linux.dev \
--cc=shakeel.butt@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox