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 63960C35FFA for ; Wed, 19 Mar 2025 19:31:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A067E28000F; Wed, 19 Mar 2025 15:31:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9B644280006; Wed, 19 Mar 2025 15:31:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 859C628000F; Wed, 19 Mar 2025 15:31:34 -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 65288280006 for ; Wed, 19 Mar 2025 15:31:34 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 6B6281A04F2 for ; Wed, 19 Mar 2025 19:31:35 +0000 (UTC) X-FDA: 83239294950.05.0AAB5B4 Received: from out-177.mta1.migadu.com (out-177.mta1.migadu.com [95.215.58.177]) by imf12.hostedemail.com (Postfix) with ESMTP id 872C040015 for ; Wed, 19 Mar 2025 19:31:33 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=r7er10St; spf=pass (imf12.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.177 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=1742412693; 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=bJmD4JThpWIDrNyj3D98K25ipZfZbcbZS/MAziEBkAI=; b=yfWo5J3L/TnAxCgVhj2Kiy9uNPqKyexQo5E80nlE45m+8HIuwU6Ar2X9kvpbTtdkmetBJ0 hO1nyVlLWk+wc19sHoxVG3Ir5wbcBBfZ+TkcZPJzCsEn2x7ZL1oAfgtIE2972CRK/YBoJd q2lBMD2XBwFO5utSgoOvnqisTOamsao= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=r7er10St; spf=pass (imf12.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.177 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742412693; a=rsa-sha256; cv=none; b=ivq7qeinOO0tQJn48sQYA7/NrCmSa1w34ZlTCpMQQt3VdFoxJybQLIP70e/pJQJ9QUOxl7 Kd+UAKQgerBvdMNkQ+s+voIuLHseZyHZJRrAIkXCDSwF3HVll82EbmDlvoJJsB9SoS2qFx FFx9zo5niG/kgXc8I/nO3HVRBt9Yo84= Date: Wed, 19 Mar 2025 12:31:27 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1742412691; 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=bJmD4JThpWIDrNyj3D98K25ipZfZbcbZS/MAziEBkAI=; b=r7er10St4B2nq9xW3QqA7S+QCwT7p/McoYiG4uK80ar/+oIw0AePrzgZ20M3bGz266O4Ex xocg1R6CiRf+xsUghV2VOJnvX2UWSwCgF48/gxcQTbsbWFnlbY6nvNqr99MdWkhKfkleH7 hB2DSc8CwwKwu16Xt2p9uiBqXljcENo= 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 1/5] Kconfig: add SWAP_CHARGE_V1_MODE config Message-ID: References: <20250319064148.774406-1-jingxiangzeng.cas@gmail.com> <20250319064148.774406-2-jingxiangzeng.cas@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Queue-Id: 872C040015 X-Rspamd-Server: rspam08 X-Stat-Signature: o531993jngrrdfari4cbwwnrz18qc91z X-HE-Tag: 1742412693-487592 X-HE-Meta: U2FsdGVkX19U1mL0K1YQqm+cyhd2MJSmt9sV3zAjkDVi3z6GtLmhwF24wmGawsN68tNMamDfhlh8GVC6A7TTdbUwixos5xXaduXUi4pahQDJML/8tSB6/Ut7sZX76DSJEroGvnVVAvmRbyPJ3+ez3NlCT0kLt0r112qcRWuvLBVAammf0paCMp28fdRhB6q38iX8ASrLllknAk4TPDoEHkXRryPwl6gSRl4V/q1sOXzobqj/FGm52+22Twd+QkwhI4hMwlb92BJiZa1BrZW0TLbSOo/e+oeUh8gkwEJW0CcDD91BGUharz9p9T0ohsBN5VjM0dycTpn6x83d1pKBCsOa9EGiIgQKE19hhJtkKamWnpdisdIvkWUEvPxKv4ZH4kCZwL2kU6Wh9nTiab2lJ3ZK8kxYsaxggpsXSzRG9Wm6awkt2wIwaAkmMjUuZeIGE3/t4D593Eq4m0xpKA6Dpxt5LG4V90cO2fMPhpdvSKBKZyYJyYJi+Q7fMpJK0cQmTIRXcUMKd8udK8P4bX/iftpiJLJz2mIkluAuJ9+F+A4x+So7sTpsPD8sIdPVJwSdKL7jEQ4b98aEQIRd013a5WJNmUfGXkSQsqBk9CRF/uWqFbJuhXQS8/yobUntaZmDhuaEZmX/dzjH9vqgNWvWmqkhW2N0VMk/pdo+KnjHtRjoZ3GPXh9hEwp2xZzy498/PuXw5uZhz6nLyvsYE6/dp4yq8UZ3h7zWUetUQLX+/o/tYz9KcnQjw53LU7RSGHDZqy2TT4k31xqyjsznIAyv2JKZ/PvRlCHvy2ALPma6oMCxVu59npnDN57FhYDmSoMeDg38LYeTQGgAcOEheyoCW4qlsorkr9bhnAC8K9Klm2A4m1aIKBCk/k/t6x2BvqI4tGuqgDtmllaP7Rm26SYPkwCK/HehwEcuvbSqTZgW4bgwlSEwH8ZdbUNr+IXoMBfhwEJvauRf049CXiNwxF3 zJ1KNaKD Zdat2Qg8WKT0AkDy6ZGVQFtDdN/G+QHEsn6JpLvXKAlr+jO+d0mBfoFy11pUJ4rUWhnbieu+7mf6pNVq6Muwn3/r6Lgelz7S2URuslI7WBIuoxqIrm6DQrHczcOfvspdwWherXkdsD5XauBRyNKitTxjRreSWQzslmXSvJjdk6f+87cgUr6g0d3f+zeyMlsKsuoE7ZJrwn/5pKob6Quli5V6KKX6mKK61XkhqHqC4GcUeKKWG/H2aiut9vyQQR7c96x3v 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 12:29:11PM -0700, Shakeel Butt wrote: > On Wed, Mar 19, 2025 at 02:41:44PM +0800, Jingxiang Zeng wrote: > > From: Zeng Jingxiang > > > > 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 > > --- > > 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); > > +} > > + > > Please move the above to memcontrol-v1.h file. > And under CONFIG_MEMCG_V1 similar to do_memsw_account().