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 5C77AC28B30 for ; Thu, 20 Mar 2025 08:51:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A230B280003; Thu, 20 Mar 2025 04:51:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9AB4F280001; Thu, 20 Mar 2025 04:51:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 82688280003; Thu, 20 Mar 2025 04:51:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 608A2280001 for ; Thu, 20 Mar 2025 04:51:54 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 57007B9C44 for ; Thu, 20 Mar 2025 08:51:55 +0000 (UTC) X-FDA: 83241311790.20.9B9ED6C Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by imf12.hostedemail.com (Postfix) with ESMTP id 7CC5D4000A for ; Thu, 20 Mar 2025 08:51:53 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=NrIPunJx; spf=pass (imf12.hostedemail.com: domain of jingxiangzeng.cas@gmail.com designates 209.85.216.43 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=1742460713; 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=Jy4HBkZZvRDagqbLsSywJbH3++NCC91zzn12ux5OSLU=; b=2/n/vBmresb8H0xBj07nzEUuMA8765ZFt3Pcaj0gwkYRCBOP2o6vhca1Rx+myaWn4qQvlA QWmP6q0AofhTyhV6mRoznNubvH9TnPEZc7sHO1Ytr9lQFtKC83qYvEK/pLB7An3d6KT/6W 5QX8hMJx6LKV3BS53qJy6J6tE9ciRsM= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=NrIPunJx; spf=pass (imf12.hostedemail.com: domain of jingxiangzeng.cas@gmail.com designates 209.85.216.43 as permitted sender) smtp.mailfrom=jingxiangzeng.cas@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742460713; a=rsa-sha256; cv=none; b=YY4Lz7EajBuFYVN4Nb+/MaxIZKLXIgB1JBjaUxu/RFJ0KOzLrWTklq73rQlz3oIO1LU8MZ 3tnTLVQgcpVlNOFq8n9of1qdREHNFloVhtOTnVEMYgi9rHHEjp6fgHfNWz6ek2uKI3Rln9 67zM2NkStToKPK1sg1gA1Thk+RT2CyE= Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-3011737dda0so678966a91.1 for ; Thu, 20 Mar 2025 01:51:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742460712; x=1743065512; darn=kvack.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Jy4HBkZZvRDagqbLsSywJbH3++NCC91zzn12ux5OSLU=; b=NrIPunJx6RTLjA842oMcoa1/QdlAOwXRm2Yy+PqumwBCLbONRL2zKiVzOQU9rlWLaY ndx4+SvIm3eF90vM2BjCwKzBqCQOH3OUZJtsiQGzXWDa7tMFTXPsxO75RYPttOscrlbT nvx/aXYrSt3KHRbdAz8teLFXJYQVwxI3vxZpwz+qxd089mLAySCkjEubB+g1R/gGtmKN ZCErAV3dgiO5UbZ6DLkVtFdKOx9sDawjd18pKWBOgn+LKEnJ4diAJ1wd8vydAbnIv6Yo qJkRe0xL4hoK3N8nKUbMPDTkcZ8NHMjNSmkyZySayXAzqoquZ+vpZFj8pWeJBks1YI7R 5oBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742460712; x=1743065512; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Jy4HBkZZvRDagqbLsSywJbH3++NCC91zzn12ux5OSLU=; b=K1FP16Oi3p3XQ2QVpzbM+R4s3OYGqi1CzVfs3QP4ZAx6uu11+d0b+gObzJyonkEDrA YfaL0qvzUN1B3vKMsfIBehAtZaids6K69GRjAcxMhNHY4zE6gCXrfYuqOL3Bxyozdhr6 q7PWixfMQFRmuNHJPVU9pLt8uZ2BfBEWZIUbc1Og88Lkc2s4sF1zlMpa9K8RQ/1508VO KBPRLvs28Jyxbk3ozCNYXDYVaObafNfdeumzL9w18iuAvk0Me9qj/Hjsww7qj9Ie9D71 2+BCEdUuqQ6XZ1RYvhQDV4Xxw12l+e5zdjg1IoeSmEc+DMQsyzreIuVVvBjSOD0a5cWu zJ9A== X-Forwarded-Encrypted: i=1; AJvYcCWeEPMj+5oM8pKmeVNz/uHzFfEAu7Tst5Wbfavv5yyP39w1a4WmTz4t5wTYlt0bpa/ZKk7q09V2hg==@kvack.org X-Gm-Message-State: AOJu0YyF8r/SwB3366LqbNDLgmkbI9YZxfQl4Y1ELnqRZ0H943Lh7Wo4 Q5EwxJrFHS9Q5IePNvBU6yMFCtRl3lOk+OuU02zIK8veNlBKpXN2wXIMUG5yJFjq/jZunhPtZ3f Nl8XE9BgSqkydgquK6FuxOa0ueeE= X-Gm-Gg: ASbGncvsTpwmlmek8DCTV5LHvVz4H1IMOPHEgLk8W6Gj8fsqR4LDiuJQi5XPQi2V3bf 1tL8QQpix8dsW0COacjqRJi5LiWHMq160gQZHAir8fLWbdVWWyiGmBX67YciBIosX5r+u3XKWmP sFRskzM85QXay+ZVdKcsDD2pV0cQ== X-Google-Smtp-Source: AGHT+IFcTv5zxMN4aAEORMfw5s1lJSixMHFvZdzFD0Icd4durPS8AUAcV0rqgs5k1LiI7LJhwlaXZLg+9MC2KBknenQ= X-Received: by 2002:a17:90b:528d:b0:2fa:1a23:c01d with SMTP id 98e67ed59e1d1-301bdf93ec6mr8177668a91.21.1742460712223; Thu, 20 Mar 2025 01:51:52 -0700 (PDT) MIME-Version: 1.0 References: <20250319064148.774406-1-jingxiangzeng.cas@gmail.com> <20250319064148.774406-3-jingxiangzeng.cas@gmail.com> In-Reply-To: From: jingxiang zeng Date: Thu, 20 Mar 2025 16:51:41 +0800 X-Gm-Features: AQ5f1JrO1NBPoxcwIjbhWOaF8a9XArLpBVqRj9GaRCyngTyRamtN9uYt73qeu0U Message-ID: Subject: Re: [RFC 2/5] memcontrol: add boot option to enable memsw account on dfl To: Shakeel Butt Cc: Jingxiang Zeng , 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 Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 7CC5D4000A X-Stat-Signature: e6hsdon4h9eocr9m5t6my7irzqq5p3kj X-HE-Tag: 1742460713-879275 X-HE-Meta: U2FsdGVkX1+z/EsbAJwZciKWnnPPSUt7qkPKqrkvehx3XctOOcj0PWaL/7RCDSdG+FcE7x7/+u4QoFGiMblxusLGEKIO4cGjyqnJfW/QvE/tw+7Gi0INK5EC0SgBvpxLUh5uNxtAl7N6xP36pd64DfEVaunoj3X9BwNaB4i7simERoV0tapxlg7ZWN+IWhGVpX04kyk7ghiOgWrf4m2AnMISWB+5VAXKz/wtszAt/zkLrNzuylNBU6AAsdNo41Lk1OuLXGrPo17eomSR4/s6akKwT0PCLF6RHZD6wxqQ6tJHgJj7aLcMvVvFKh22go4DgDJlHHUggsKWKJs+0lrEEq8QoqnhGDAsAZ0lWeqOTGbvxLeOFgl5b+xRnGT7BudeobpEDvgAGnyoKw2h7qaJVAaU5CfxHQOatFYKUZp7nviU9bzyMb+a4UjkThcxe95zzg4JfNO+X+JrAaPlMC4XZAm7wM/+MhSMo9rPb1KVLH71rT9Bk/mLPf9aZqOY1hRLQN40jh4pU2pXf2u8OpYtGK05yOU+LqHu3gTeEVDARix861MgUXbukSM0SoXlId+QCfZT3Mle7g3ChZABCHIhu/AFptxA4BVzlIEbUOD5s3uuUoKUHhNwfjD0Ck4qaXUVKDEzYVzPC6ejN4Pc58SdHrDBcZvYgirI2sUkvR7TugOX2PHWrzLLL+cd7si8vTV69mLo4kq/TPJ5HfNzfjl/4WArLy1K1YioyAQsfVvk9haATS/FhUPogbWdb/9OmHe9raQP45YjRa/oO2f1yg/xmK6bjMsC4L3yMrQT2cnPza8MabDW7kg22NkYWlpp8Zn6xM9T/TV8aKH/nXcNdmaUM+r1BkWTqvMpU5YH/eP/lzbVX8EkFAKcG/t8dX2xkFLQawOPS/3TcRUB0cLMaejojiJHiXJIISFRRWb2iyTY5hNwlYzZSvM7HSlP6kTZI0G5dmHUdIb6HkpQt6nwuN1 xWfLdqE9 sydaoe3N+6cNWY9C6w6VOTV0lB6jiUSxC03dBCBoNDWOneUV0sUvqoXk3Vzc+f2IQh97zPPGgHdYjvbSk4//s7ZnZ+h+djLzcnf+cKQCP9b3Zr29gdHJgc7aV/1VnKgwTau5ImsMLu5E+S+2gMOrOdIGGQkAZbrss/y5AihTiUIg3uqeqoTCi3d6oLdsXGdM7WA5tj1BL22VHxcPARrjboiJUY+k3uyZp2UmarsHQFRH4vX8kSN2xp1XrZK7nhDEt6SvD2LeftMX8r5M761EXMlTnkaz//Z2CmtjQ57tM9ZEJDZq/V8a0+yUUNa9cvIAzwtXV6msG1vQ1kE7bbw0VpUsVLAL3VdsnArruMIK4cEhwTxAIeHrBSBD9zw== 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 Thu, 20 Mar 2025 at 03:34, Shakeel Butt wrote: > > 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 && ? It seems that changing it to && is better, Thanks. > > > } > > > > #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 > > >