From mboxrd@z Thu Jan 1 00:00:00 1970 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 495F8C28B30 for ; Thu, 20 Mar 2025 14:28:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2C8AC280002; Thu, 20 Mar 2025 10:28:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2782B280001; Thu, 20 Mar 2025 10:28:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 11B3F280002; Thu, 20 Mar 2025 10:28:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id EA000280001 for ; Thu, 20 Mar 2025 10:28:53 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 1FF771C7396 for ; Thu, 20 Mar 2025 14:28:55 +0000 (UTC) X-FDA: 83242161030.28.D88BA86 Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) by imf05.hostedemail.com (Postfix) with ESMTP id D6142100019 for ; Thu, 20 Mar 2025 14:28:52 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=W9Xgz+GQ; spf=pass (imf05.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.219.54 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org; dmarc=pass (policy=none) header.from=cmpxchg.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742480933; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=wCmrNL8RiiTrlyx/pTgIz0D5BwVSzJyDRl0mOvvunyI=; b=piFvOzWT0Ul7XEzpoPC4zkGPPvwWE3RrBkP9yypUHf6JBniKbZvujFftrEZZ9kDsS010T4 r30HIseQg4q5osqokLWSiNqqRLTrm9GNMn336VeD3/sIJUfH80cNNl+9OUse38lq0j2KWn vZU0SbggfOksd52aeYEy3hpeI1NcTAM= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=W9Xgz+GQ; spf=pass (imf05.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.219.54 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org; dmarc=pass (policy=none) header.from=cmpxchg.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742480933; a=rsa-sha256; cv=none; b=0g+H/z8OCxcF56uFmvEFRcmV/Ex9C82baQn64ca5RTo72ePzfvzTWUyZzfy34qP4Hy1GcW g/WH3XcnZPTgy4nH+tprlDlwPgbYImVRe8KyQiXiSnDwQmli6FQVwVpzrokQllTWdOynA2 bB0PzW3fhjZuUlwTj/A0+9Q9Lxd1hEw= Received: by mail-qv1-f54.google.com with SMTP id 6a1803df08f44-6eb1e09f7e4so10364246d6.3 for ; Thu, 20 Mar 2025 07:28:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20230601.gappssmtp.com; s=20230601; t=1742480932; x=1743085732; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=wCmrNL8RiiTrlyx/pTgIz0D5BwVSzJyDRl0mOvvunyI=; b=W9Xgz+GQm6tg7PeL6h3IZqQSs5pc5P/Aq424+cCfuqJOaswaZU8DwFvLsKelJEK3qI ibUFcctP0IpOGLWaJwfeHMZ5AIh1jFnI14Z1XWqKSNXY8samBiA/p8O9J+fnHZveeUrm 5us45qDoh+cvZ0go284Xb54sVCX620BbelBoUrfgZDulBDmkUoNkie8H1i75V0ASszY9 KadfMevi9RmTQCpWNxLHz4WT5xENs/iuCECWL//Hc8Ykf+bi/JtcgqhDf/uZPPRfJvnP 3a5x+ECckV+83/0G3xMRxmsugmHwwr04U8h9Y6bHZQKt+KJScajzjCSfAEcaoGwZGbpU 19UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742480932; x=1743085732; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=wCmrNL8RiiTrlyx/pTgIz0D5BwVSzJyDRl0mOvvunyI=; b=taUj+25qSSXKVD6mLDS5avrfPBGaQIE8SLFK3z1tnQOiUmZfpq5FSntd5c7g8kVGkB bKpkjLkpFabicvmoo8vPx+P2ViQo1zsTAUPrtlRdCBXAE3D6cUSiuy24lPM0CFlpIThW Y8kXpZBJud3L6V2gB/rEZFOL2fFQiJot+rJBfJcA/NjRWOqzjQYIw5DO8GzZJ/LklaS0 SEBLEoLlr36XzqLat9yDwqKzTStImLUDcw481OTXiTi/fExiEaNZbHXUTzTo6Iec6D28 ksh8lMc66wQu6sIEg0hZUGX5IT98wPiT7S/4xNQtY4zL9S1VeQfm/W1x6WsIiWXmW6jX zOpw== X-Forwarded-Encrypted: i=1; AJvYcCV6M4LXnwj0GKZWn9BvfSrnLcKMXKEoKHU00siY2Liur96F/HuoH+AUK8TfxCV9iiXjeL9oVNUs0Q==@kvack.org X-Gm-Message-State: AOJu0YzpVLSEbv5e4sqqQA41CMPbiQXHltEeb8n+ztIs4ob2wJ8YXURL M49ejWog44iGbYsZrEvdSjQ12DqqMbTHEXCbb7smieSNRTjBCm38a3kVwosJ9Ps= X-Gm-Gg: ASbGnctDfKtSTQuzw72cu212cWPAA27gNLcoBBTj58ESeyLKATlRyJd0r9dfCPuoVoT 7n7AA+KrHPXsZ1jocp1w40XM2LY+YFOJEWiHhWzxs3A9eYeUVTQ9BGKNakaqa7KEJ6TEcs1takF WrNYwn69+JgaB6oEFg5+cU58ui31RkHSHrBeRhmetcEXnojJQ1ICWNNhx9UHw2fdv1o9gxN1QMw tjSuSECv19wrCEWQYdGRHXwoNjoXTHO3kzyLrQPju/uFQmMyDUXjKuyxyGBerRPdTMJ3vq/dQOU JGMH4ED5QyQYiZI6n1wWyZlxLHpYsBwGuzA51sIAwvc= X-Google-Smtp-Source: AGHT+IE7+PCwTGsOGLwiN064VEeFPiMK7pULniFiVFZQCjwVIsX+SEk801jpxuToEYuiEcsMECmVLA== X-Received: by 2002:a05:6214:2501:b0:6e8:9e9c:d20f with SMTP id 6a1803df08f44-6eb352b42b9mr46981316d6.21.1742480931559; Thu, 20 Mar 2025 07:28:51 -0700 (PDT) Received: from localhost ([2603:7000:c01:2716:da5e:d3ff:fee7:26e7]) by smtp.gmail.com with UTF8SMTPSA id 6a1803df08f44-6eade34beb0sm95297196d6.105.2025.03.20.07.28.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Mar 2025 07:28:50 -0700 (PDT) Date: Thu, 20 Mar 2025 10:28:46 -0400 From: Johannes Weiner To: Roman Gushchin Cc: Shakeel Butt , Jingxiang Zeng , akpm@linux-foundation.org, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, mhocko@kernel.org, muchun.song@linux.dev, kasong@tencent.com Subject: Re: [RFC 2/5] memcontrol: add boot option to enable memsw account on dfl Message-ID: <20250320142846.GG1876369@cmpxchg.org> References: <20250319064148.774406-1-jingxiangzeng.cas@gmail.com> <20250319064148.774406-3-jingxiangzeng.cas@gmail.com> <7ia4tt7ovekj.fsf@castle.c.googlers.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <7ia4tt7ovekj.fsf@castle.c.googlers.com> X-Rspam-User: X-Rspamd-Queue-Id: D6142100019 X-Rspamd-Server: rspam03 X-Stat-Signature: ux4h1xer4qmc7c4wuxkjw1ooasg6xsrq X-HE-Tag: 1742480932-573357 X-HE-Meta: U2FsdGVkX1917E0GhH7EZP5/FXoisrHaO/ae73HG97oEyJE/Lb5Oc1R/dyrfnSn89T/uZEmzzgYEEN5mLQSvclYXZCyvWN7WgabJcpYaAEMAQekq8dY7y8s+Gl0YExJTtQpYeGfXjDOWBOrH4vkdiWtMvz8p0PEbtBs0rJHF4dlhNaPrb8CgkJWeLqpn26ayabknDA9nPYdZ5tprrbCrSo7+b1g07JLCbYAitl3b7bYCGphobs+2eMBc8ZN3A18RisXqr12YrV6JqCXhumNMm7/PUFTcoJ2/EvxAPg8zf5kS41sCWjLUJ1EX8Ccv9swIciELFCwPS1pD5ugnvgmZiLAlY6SjdOnJAcS3rbbbTVLxPkY7FRwU8NKv5Se7Az1coArxzP3r4amXdeD5mrzncUtkGPiG/gIUrPsk1XiIzin4FWV1UeULSNinoRJpYYabzN2Qyz9FIlpXKq00TOvPJIBLIRjuN/DlBNsHx3S6phoaIBFHqApBom44BTZJoUVSbx9CN1fRMp+MzjKI+Osh7h8mFfGxtbOyLRDoNL9IUFYZffJn1hV8kk4FoAP2+4KWwjKhaeCsn+kKb+ZxRWH64O4bwJbc2Xc6pFxzBe0903z5mLqvUJu3MSawhzZx3FbkoHNPpvpQn5F7+TWtVfU03t7HZ5je5cBo8Dnn6tQGYI1ufpvSlv4syX4bfQSU9GsyuytmpK9icMLZcwDVC+si/MpdxBCFe45e7+ZFiLz2hARf0r4blasRqJlPJIMBoT9aav3QBkdpwhSv6+JPUZcP60Jwu7ZW1Of4/3vBx4Pf5NUAva72WFrtai5QvqCh/uTu8vIMkVUPHVZxEe/iFL8XM2GJl2SwGLjU4xnKyDT34uHvk/utZcxeVy7oUudJOyhXKhY//2h5SEgYTdSdnFTjZGrpFsxoopYIkI9ul6DUK0PRK5Ig/M94VcfqvOCWiK319rB0qcFMJ274r7UR++0 z5XeHl5a U68eEs8DJkcdrtDk265i8gXWVISRkjbvwwMU0CK2fxMPEcHmngv3l4Ia7lNIss5C1SuaPcI3E+zcfhdI+oSJ1AwWpnHjWbm4ewngEGPg++cVLCNjwUH49oprfgPHq3Ecrp5UoKPD3mFNHzMjjkNWHbqfs6pueS+M9WGWdazjLVtc4rzEkcOfGLvD71f7X5ASpwjguz7kc6LCePIcqQxTsRmWItK8dm+0e196iXlXEfrOmcxZHYV+hK2HDjiGEgAUzyEkHL6cnvPg59bvnw9Z2Pk45mw0fdBjY7iXst7lPWXOx+4r8HF4FuPdUwfmRLOPXqd7l8gQa61EO3qG/EMQgJJjd9tpl3Km41ifXziFGhyLraDYzQZoDnvmWvW+QYLaDKiN9Q/IyWIJB2EFQM8y5NbvEFcIRa9KVh07ZLHfqhogaJH1v8+IBqn4jlyu3vF5bfAf+qTg//uB5ZfS6NiI7CZ15lCcQz71Ijvnz/9uoRgOvd5o= 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: On Wed, Mar 19, 2025 at 10:30:20PM +0000, Roman Gushchin wrote: > Shakeel Butt writes: > > > On Wed, Mar 19, 2025 at 02:41:45PM +0800, Jingxiang Zeng wrote: > >> 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(-) > >> > >> 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); > > > > Why || in above condition? Shouldn't it be && ? > > > >> } > >> > >> #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); > > > > Please keep the above in memcontrol-v1.c > > Hm, I'm not sure about this. This feature might be actually useful with > cgroup v2, as some companies are dependent on the old cgroup v1 > semantics here but otherwise would prefer to move to v2. > In other words, I see it as a cgroup v2 feature, not as a cgroup v1. > So there is no reason to move it into the cgroup v1 code. Agreed. Let's think of this proposal as making memsw tracking and control a full-fledged v2 feature. > I think it deserves a separate config option (if we're really concerned > about the memory overhead in struct mem_cgroup) or IMO better a > boot/mount time option. Yeah, a config option forces distros to enable it :/ I'm hesitant to agree with making it optional in any manner. If you consider the functionality that is implemented, the overhead should be fairly minimal. It isn't right now, because page_counter contains a ton of stuff that isn't applicable to this new user. That overhead is still paid for unnecessarily by users who _do_ need to enable it. It seems like a good opportunity to refactor struct page_counter.