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 CCA9CC35FFA for ; Wed, 19 Mar 2025 19:34:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C22EB28001A; Wed, 19 Mar 2025 15:34:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BD13A280010; Wed, 19 Mar 2025 15:34:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A9ACF28001A; Wed, 19 Mar 2025 15:34:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 8922E280010 for ; Wed, 19 Mar 2025 15:34:08 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id D49315616E for ; Wed, 19 Mar 2025 19:34:09 +0000 (UTC) X-FDA: 83239301418.05.9D90727 Received: from out-176.mta1.migadu.com (out-176.mta1.migadu.com [95.215.58.176]) by imf11.hostedemail.com (Postfix) with ESMTP id C423540008 for ; Wed, 19 Mar 2025 19:34:07 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=NmUCr7H6; spf=pass (imf11.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.176 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742412848; 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=7iiFyfv8ZcZH4P9FmMSSbT74XJienNrg0Fu09eyZfBw=; b=3KIQh+lp7yAK7m/Be1ta6JWHaAYXfsvyaTSY8MHLen9W5fuF2/Alm9KxVJanEXejDnmL2d geS8WZct2wG3g+3HPk89P2S2TZa8eJmmJi5DDrR3wZRbENW5owRmBhu4kgGXgm6J7eX46Y 09VKtK+qTZk6phgRhHZWj2CCaO8ftQU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742412848; a=rsa-sha256; cv=none; b=TvM2rDNLG9cHuSLB+/nKWFAfWDiMe6Fz7ftWAPB9dvlc+vz2Jib+ywSwA3W27L+MeUkoUO D5M7+DtnjzuB17HBcHrbG2QcmNKyrNDZV6FkVsUjpOSTDTIU8Y8Ux37yTMCtf6zwtUt4lV 96o8S05eRM95Ox+ADGiF0IIxHpK6HTA= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=NmUCr7H6; spf=pass (imf11.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.176 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev Date: Wed, 19 Mar 2025 12:34:00 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1742412845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=7iiFyfv8ZcZH4P9FmMSSbT74XJienNrg0Fu09eyZfBw=; b=NmUCr7H6RP7IncbOChFoOSmP9R6xYH6qvsP2HZNDBfwBnEn7qbLk3K4GZJVLT415nd/Vny y/qMy5hyBg4uABkfPfaBvFagE//kiW759upydTR1QjgkhUudT64O/iFIyueQD6KVnMPz0c 0cbsT6xrjfFAAzDVzmNBNsQF+4Ta6d0= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Shakeel Butt To: Jingxiang Zeng Cc: akpm@linux-foundation.org, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, muchun.song@linux.dev, kasong@tencent.com Subject: Re: [RFC 2/5] memcontrol: add boot option to enable memsw account on dfl Message-ID: References: <20250319064148.774406-1-jingxiangzeng.cas@gmail.com> <20250319064148.774406-3-jingxiangzeng.cas@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250319064148.774406-3-jingxiangzeng.cas@gmail.com> X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: C423540008 X-Stat-Signature: wnbptdpzbp9tn6aaneeiisguq9x1ipas X-HE-Tag: 1742412847-89683 X-HE-Meta: U2FsdGVkX19ZK7Bxy3qhapqaHNX/hJ81Z7FF2j9WeDIrM72+EuGHReoZt2a7rCHOQQ/2Oif0UPWfnxQP9fOhwg3qfyrQBA3EnlgQlgOGCNmSwR+2Aztvpv0kqgD/nTvEI9DZWVXGhINMw0PQe7KB36GUTO0UzaoVkrLWWeu0KFKSB5wv/CXGb8A6U1F5iHZJ0C1Bs/vnm60FxC1+S/hONQpeq5kCYSmpb6Z1T/7+V5IGgd4xrjXObzVu0ErWRykVxI6kG9oBUtrXU9hfD/wvQQwWjf62Kr3yW5Kbyq3lhmrA8/sNqTBIzZUyG/a/eaTmZkYS1r+Nk/VDEAvABz4+801+PmJ7oqVNmr1LN6g//a/Mlb3n2RBEnNqWEyX8XAxtB6mU8Rl1oot66T7BxdgFbjRpAJvOv8w3Cl0n7s7p67JMaGp3Ni/HoTxErEzx4CD3xWVBhPDWXQVp/MQRO/kUKIOHOhd5rWTWF/qmEdBLwprQ8LV1rD440UcT3eHqem54+T1Sh6/7FULpNbsdK6ZjFQVKIr7IbBJ8GRKiMGqUthwmR4KrhnoQ1lQuUevoRCho5oc9wGp0eaQFDyhJCsRq/zqExeRarweCWwrmrvTDw/ocMqiZCVSMUdtsLvi/oiMgqntLbIaZSWVDLopCqalDtdiTG1STlGNjZDWFCOromaGH9i39rQZxeqEcMyVSD0wURXYJMoVn9lEBjwBHIJ2SsZnPrsJ+ePeCI/Y0ZT8H9EBAyofZJiccBFciojyK8HcxIFE7tAYUvsm4NW0+3jyClpNZ5IAJWkE47zZYvf2o/pMltNJmq9wTVF5CI1+fKE/bTR+NHcjnuVy0T7E9TMjgcB/vv+si2cp/TUPGXkVHGQjJwoyNH689sz9mXqsY1PqrATIu8qicB9pWx4Tzgam4pPf+ZIYbFkTjQqD4gdcKBfgX1+SVYzdZY4EzeEf8lneH5s8ConTLQvOjXDU7CPo wxwnVnUq dgvJq/5g6hfR2BS9pXbYw4am8+Qtht6l49Ta0th/mkxL4tvSyYhlkK75nquFSFlSXG2l2IpfhkD0dbgKgfh+ahcj2vcZs+SqMMWRm1etaiccmzKghyKxoIi08eeDwkS5b1VbSvcFjdmmnw8mhfoFvJsUvXlLdCER0byjQ33gzaEHGsZCj3lBfLlAHb3JIvgrtb+TMUIchaqgDbpI= 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 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 > + > \ No newline at end of file > -- > 2.41.1 >