From patchwork Wed Mar 19 06:41:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jingxiang zeng X-Patchwork-Id: 14022136 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B08DC35FF1 for ; Wed, 19 Mar 2025 06:42:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 26C7D280005; Wed, 19 Mar 2025 02:42:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 21CF3280001; Wed, 19 Mar 2025 02:42:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0E6E1280005; Wed, 19 Mar 2025 02:42:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id E326C280001 for ; Wed, 19 Mar 2025 02:42:27 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 106A4121977 for ; Wed, 19 Mar 2025 06:42:29 +0000 (UTC) X-FDA: 83237356818.23.A61B535 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf03.hostedemail.com (Postfix) with ESMTP id 2ED8920005 for ; Wed, 19 Mar 2025 06:42:26 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=E7d1PVnF; spf=pass (imf03.hostedemail.com: domain of jingxiangzeng.cas@gmail.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=jingxiangzeng.cas@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742366547; h=from:from:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=sp0DFTtVb9BoLhEjuOHuZHKpQHrM7JXx2GisdIMoCLI=; b=mC5lxzp2yKbnHLfEMaX1EaMNBr5V3eKcPRcVXVDjcu+a5sUecHZ7ugwkDwnt7ZEFwSvYIw /+Vlntby64HEX2W0gH2xmZLs9ucBIBSPgaiQ8m9+v28C/pOC8OwRyGZd6hs99Sfrwx4YId pfz72cAS/lg7Uy4J0TcEfYEGL98yblY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742366547; a=rsa-sha256; cv=none; b=jCVCjhidy0G6a3Lrd+tSZdSR9OSfXoBO+L6lGCYsM/4aWhzL3XQF1yjNNZau76e4sHcBG5 OO2CLHK1ySJgH70pMq1KsSgXBjtY7gflxTUFyO2cGyvrSUjKOBef15AzxzwiNmeZfh7Pj8 J07HDKHvXtFjHL4FYPir1P7EWdqIiIc= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=E7d1PVnF; spf=pass (imf03.hostedemail.com: domain of jingxiangzeng.cas@gmail.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=jingxiangzeng.cas@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-22438c356c8so112168855ad.1 for ; Tue, 18 Mar 2025 23:42:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742366546; x=1742971346; darn=kvack.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=sp0DFTtVb9BoLhEjuOHuZHKpQHrM7JXx2GisdIMoCLI=; b=E7d1PVnFR+k+Qgj7xpU2WUfuZrapokIy+cTXozX1wQwAQpDL0R9KmC0ArN2ig0u8ap hVdGl7wHJr4He9mA+p4D/U9wNu4YnisWdCfnE8R3Wk2HjYU7ATWMcjuiKShW1FZb8do+ rySVMnspprj+pKWCeeOrGs3sCZo9je8TwN5I9sLk67uXsTSFd3x31eGG9hnDXhJwCwMY 6Te6yHTNG8hX7/4WwE/QAfnuQFkfLywZCScO72dXEItJwVmyyzX6qcHYVX6N1SmDJ0xq 4w49EOP5wwybDrmVY/v21pJZPGwsBJk/Va3yzhWRg9SHfuCm4HeoBu0FN2RwD16nhxQ5 d2eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742366546; x=1742971346; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=sp0DFTtVb9BoLhEjuOHuZHKpQHrM7JXx2GisdIMoCLI=; b=HCbgXBpUwmS5JAuG6VdcUqNkIpDge+0TAiQNRQOKXSsnDZknKwpAVLIcx4L+vhiQEo dUDvpf2JjKSww2aBUCUxlPSBpsuop+wAahfqTP/Ihtulf/DhU5TPp62zzABTrpDoCJCP HEZMxIfgnkbqfb4eKB0XJH0Qs7VFHhj6Rne1bDbWqa5KX4EY8RnxBC7XisDiy5aS+lvp bfT6IcjmRUajPlhIecsEy7uOYPjLAVW2tAmKwX4phQq7+GGfeZATvVcZWRK7amdi90nt ZhpU4eVI82cualyPtxOvYdDN7aWyO143V48y9tL93+jV2LhBlokrEhyVKRhqdc+TOgO7 XejA== X-Gm-Message-State: AOJu0Yw1JozReknZExEs0fP2gc0UtjgiPzhTGutCOPUodlzOfqh8On0Y yRVjafMRPHHvWw25A/JtdgmFaivlK08gBxCst+IJGEV7kdnmpFVZ X-Gm-Gg: ASbGncsweyoH+aMZqoByJ4+zngkrp0qWYZm8qRW0EjcZEEvppJMb+8njAjTMqjRAXLk 0ghIjARRgMvs+5gZ/wr2fvW48K5AcNJZYl2n8d0AhNb5iDEhcOZ5e9d7KVT4Pnil96ijhs0ykIr DyE9n1peuekQVc51Cr18IMdw8ikL7Aw3dao2muklmMngB+m8Tk4zJmmxFz0NolWhgliPGR2uuNR zJyUWEoIy3A5quALmk4rP1myrBSGktrvD7RW1CTrbxTdlxtUKkJoBQdm40vdLYTWPjk4Lsf09bA S4qu0PXD/zuGpIoZLVHVj6xs/YYbPrnbutdwHfWIFtOLn3WexCxF0GXK/hbj9gNTXcEVnqQtzI4 r5bl5e7U1jm2Z7A== X-Google-Smtp-Source: AGHT+IHEPdhlKFwFwnOTSvPf4IDO0wzZjBYO2qh3ge8Q7B0xYnKSmm8x+kb9JdKPYwCJ9YhdNLB2kg== X-Received: by 2002:a17:902:e5c9:b0:215:b9a6:5cb9 with SMTP id d9443c01a7336-2264982afffmr25696235ad.5.1742366546036; Tue, 18 Mar 2025 23:42:26 -0700 (PDT) Received: from localhost.localdomain ([14.116.239.35]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a4876sm106191835ad.70.2025.03.18.23.42.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Mar 2025 23:42:25 -0700 (PDT) From: Jingxiang Zeng 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 Subject: [RFC 2/5] memcontrol: add boot option to enable memsw account on dfl Date: Wed, 19 Mar 2025 14:41:45 +0800 Message-ID: <20250319064148.774406-3-jingxiangzeng.cas@gmail.com> X-Mailer: git-send-email 2.41.1 In-Reply-To: <20250319064148.774406-1-jingxiangzeng.cas@gmail.com> References: <20250319064148.774406-1-jingxiangzeng.cas@gmail.com> Reply-To: Jingxiang Zeng MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 2ED8920005 X-Stat-Signature: mwjk91myrpiitdfsguyn868kf9rp6h83 X-HE-Tag: 1742366546-834399 X-HE-Meta: U2FsdGVkX18jr8loCdrPKggRKfGz+fa5bxS0Nj9bOa2LnUus5CCS74dR7rDkqGbJd0Ezs1k9ZwhrgtFBAomupwddJlYC7H1qx3KJGVAJp5ZjxlVmGuJxlE6oCCEgUzJXD+V/+6xoiE6bjAsG3S2EDBCGfmQyg+CbA2rhi5Fg/BuyBqu+cbUqM0RIv/y4HzAixEKqJ2518cLRTzz9G7lwJaZQ7+r8BOqNVWk/msRRFQcrTai5NuWD/V6aFNZhzMbE1d2eIhTe9+UkYRxlwQBB0uUMjXfbYUZHVyRm71za4FLdYfcLx4otkbP/mGtZXJ3VQ/TTqHZpbt0Gi2kGrpNlBpcFp3wPrP9m8HWQbnFysWhAcFcpkKNkjD9KkQSyxkWla4eJmTn3pfiNbu07L+xxPAkjWiINvnhZKvYwuNlNaQNOnHhWMJQQtynWen54nLeCUhpQTNW1xifVk7Z4u/+tcppiUgwRcx4ODFxMI9Q+soTnY4CjazXvjiVImg7pXOV+La0ANTCOyRU36L1+fwKF/Bi8V5TIhrJIDTjrP8ztguNw1eyCXKOfp0zg1nHOposELifXJlPaqPp2NxmppWPEFo//iAliiCYuuZHqIfJ96lUWdPYyZXPCDSqSva2MsXo5Lwu0J06Lj9nxIIDipArGlr4nkzVWowJ+k1YpZ8RGu62F3YjfbN7l/EajsB7XeRoBFTHRFaDV6c1vn/1YUg9Pxlv9gQy4l9dTharXYWxGvL/gyXt/zuduC7wKJMvanQU9KRGVvDGZUyG1J9SX3mrmJQS3ZUPN2qYl/zPL5aKTooLJkYR2r/dBXcT2hpIyT4Wv9ysuR4otx6FBk4tNMKv/TsgUmT2tQBGlhy3LGjgQacvgDHVFGMtO93wRQesd8/fS7qsRs75XXlf5PWYTnyvCWAPf789cRCjYZ6qt4NpT0lBIzrUeJS3KMScDXqyrcnYaAvZFmL8TCVpU8iD9ZN5 sp/RzHKR oLYPUoVDL7OaZUnHtYERxJrhf6wtQCBvINrxfDHt/QqbaykWFUFmM3B4u6zyw/ZOvYGdmUAYhvico0/Jm69EuMqWqy5zARs4dy5AwxALScqu6VCvsuYfeOo3/Co2ktm1IgsRk7GP/mzf2A2jXj4SBCv4bzUV1a6/iZeH4cxRnWhIidOUdBvxBZH2RxcfkCpjpIxqKvTue32Ad/6UqVNMyYQM95LbBVQe99vomoNh+2TKwPbJ5kb6iIcUgAfBqpdB0IRy7OQwVKfsLT/gKNjJiH6iQZpC3+/FWPepjvV5lzK/9eRIPov25pxJjl+hF+yUu4uytl6LAr9+5CGgv77EA4Bxjfw8ugrJwES1AVbjOg4ok+9Sdkk7zhKdFsI0mtr+TreHhUmWqmPSBaCT65GWtZutMgx41Lop4IhBlBiHvaGWEtN/fzEae3sxpN6zfASkO4qLt1dcN3f8eKcBoudJYiyQhK9Fh7wOVSvtcrC3MuLZfK6FYOVFIy7ao5CwIZG3004xT8QwUVR0uYJoUD//DdW6tmXUaOsawir+yTfbdclMo0TWDI8oSB5zQzWfur5gQ92EC0I10P+uG/N71aplgwTeDmpbcmlejh6hA X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Zeng Jingxiang Added cgroup.memsw_account_on_dfl startup parameter, which is off by default. When enabled in cgroupv2 mode, the memory accounting mode of swap will be reverted to cgroupv1 mode. Signed-off-by: Zeng Jingxiang --- include/linux/memcontrol.h | 4 +++- mm/memcontrol.c | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) + \ No newline at end of file diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index dcb087ee6e8d..96f2fad1c351 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -62,10 +62,12 @@ struct mem_cgroup_reclaim_cookie { #ifdef CONFIG_MEMCG +DECLARE_STATIC_KEY_FALSE(memsw_account_on_dfl); /* Whether enable memory+swap account in cgroupv2 */ static inline bool do_memsw_account_on_dfl(void) { - return IS_ENABLED(CONFIG_MEMSW_ACCOUNT_ON_DFL); + return IS_ENABLED(CONFIG_MEMSW_ACCOUNT_ON_DFL) + || static_branch_unlikely(&memsw_account_on_dfl); } #define MEM_CGROUP_ID_SHIFT 16 diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 768d6b15dbfa..c1171fb2bfd6 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5478,3 +5478,14 @@ static int __init mem_cgroup_swap_init(void) subsys_initcall(mem_cgroup_swap_init); #endif /* CONFIG_SWAP */ + +DEFINE_STATIC_KEY_FALSE(memsw_account_on_dfl); +static int __init memsw_account_on_dfl_setup(char *s) +{ + if (!strcmp(s, "1")) + static_branch_enable(&memsw_account_on_dfl); + else if (!strcmp(s, "0")) + static_branch_disable(&memsw_account_on_dfl); + return 1; +} +__setup("cgroup.memsw_account_on_dfl=", memsw_account_on_dfl_setup);