From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E92D22371B for ; Thu, 20 Mar 2025 14:28:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742480936; cv=none; b=CXbVWOEFV2+UYEhr1QZkCg9PPDIctJKW5pICsYr7SoTj7dj4YZaBQlUTu3Z0XX8nUX94MN2KdTSIN/kA3S4Azxnmfcw3Mevl0l8Aiqhg63xz61QKYPHbZKopiFCEuSNzazoynolBGIjaXFiOB+qJs1/ozx0XvIFVUXf9XLlskGw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742480936; c=relaxed/simple; bh=e7SbSL6gVZh5tUbpFhDN0kH6G1Bj0Xle6+XlO+bCBwQ=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=BgOWTb6nQS2qhBL08Mz/9XAxtubL5aat2ZDByXI2k8cJ4ikneMdhJfb/l4vy4VoZ1WhBg84662wnHNljvC++M81Do3kEix4eWUQG0k197krpWrtiBZ0JxcW/S5zlDPaRIsjX7jlIZhjmgoIEe/ZER2ynOoIjty1303iKI2S04hg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=cmpxchg.org; spf=pass smtp.mailfrom=cmpxchg.org; dkim=pass (2048-bit key) header.d=cmpxchg-org.20230601.gappssmtp.com header.i=@cmpxchg-org.20230601.gappssmtp.com header.b=mnIx2gUj; arc=none smtp.client-ip=209.85.219.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=cmpxchg.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cmpxchg.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cmpxchg-org.20230601.gappssmtp.com header.i=@cmpxchg-org.20230601.gappssmtp.com header.b="mnIx2gUj" Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-6eb1e09f7e4so10364256d6.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=vger.kernel.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=mnIx2gUj9al960GDc89fGmlWc8SzwESQFwQpCVhwMKt/uaa+RT/hmmxPsIS40Nnvau PxYZt21K6lR7y8+1+F2pDgyCkcjmO/5Wg58YG0e9Xz//VTk5vvdpVo5gZoKL7orf8D/3 xwP0us+qpk1i/UzCH7F0h+9te789cXikPwvoWK+OU5KGbiizNMr+cvYjNQMJ+1jDY6Kx YfY9hrnsQ8GIP3lVwfGsabucQeRNI/68W1AZ93Fr6Im7trukTp2W3VhXeE6JQylYxuga jmq7lxLrfauKTjzUxF9FNhP7QGdXdLOrzex++AcNqf4I9DcBLQhiPTXP5sKLJysCjgLN 84gA== 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=V2+FnCNr0PcwGNeaUpb+RNPjJRzTPhW/xjR4TiDwV2oA7QTgz7H2hlMB3t5ofY0Jw8 R2l1CdJyZDECU5G62lf4556teiWeMHgV1OkAggH6BLpryko2B8p6jg77j+rmmuyMhOP/ Iz+tUyho9L7dWUtp3m7JWrGieUP8ghUnjYj0neXw1+LEW9CRtRN3O4bvyYzM/M+9zPY6 43/ioo4t9UZyhFahAAr6uvHLzAlXfVcpyx8NROStxNCIbdzcx/xZvHxgZZu18v0ne7Fn v+/z8jMIQbp0HLJFyXtlwLrHWLfuDi9dlHJD86XJ1/qz0vM1S42svejLRC82O0UzmNm4 ZGpg== X-Forwarded-Encrypted: i=1; AJvYcCX6KggGvUS0rIGUGOL0hO2Ewv4h1s/YvYp841JkYLYMmSfn6cD4PN3HjnejIcZoN3xVzTVQSOAa@vger.kernel.org X-Gm-Message-State: AOJu0YziYe910JPMmJdG8slHSvuvsWGa/hdkojkL6BwTvMt1fZnqM27B 5hjBguusTxp+yKg/58NyKm4bQxk+Yb1z504tt/ddOgMoYhKUfOKCWUMGixdTDSTj+I7AJXp9u/j 5 X-Gm-Gg: ASbGncsX1xNWybv76jaSFgmFBdTTWgeGHoIYAq4sV6yqETIXFsxiip2uFbz1zEivvpM wY5Y8r1xJ/qxHgY88X1Yg2F7SQT4hVqUe9Hk6+0ipwieQUq1dt8KYDseg3F6cKi28HYLbrFfC6x yZw0tdN/f6ByOlAn+rCIjPsyoRDal4mg4bIdWisv45E+I+bKUc5MACgWSXvI0k19wSV8AmraTPJ Rx3rCdOtOL9hg859usfYZXNzlBUhmCF4C0pui+U4dYcM67hY84b10fRiXEfrl/knovH/UjzjRk2 FVf/108m+gtpAK77sULvQg4Q2AmXR9OtGKpDspgiiQw= 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> Precedence: bulk X-Mailing-List: cgroups@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <7ia4tt7ovekj.fsf@castle.c.googlers.com> 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.