Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp2505850iog; Sun, 26 Jun 2022 18:18:36 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uTH9da4EDUz3wsM+s8YalAPEHot8ZQvTFwjs29tA+b29OUYxWeJsUJnHWYfEixXmCG+m7a X-Received: by 2002:a05:6a00:1da5:b0:522:cb12:549b with SMTP id z37-20020a056a001da500b00522cb12549bmr11911963pfw.81.1656292716304; Sun, 26 Jun 2022 18:18:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656292716; cv=none; d=google.com; s=arc-20160816; b=yiSHJjiB+30Wn+MY5v5icD5DYtR2mq4yyb8/+nwEOCkbfdH6KBwfgEGWlFoLaqt3/o KU7wCJVQW9s93UJC/ZB0sn53LUXfpgSoaJQN30NablIoLXlsHMYzxWmcf4T7FYHCPxlT IcnC6SPWs0+BUrEZLa5e4DbXBVlycoSRvBvlGxx/KryTC6H+CIEHMYy9OIL8qFRAnX4k 1HQNzp74Ee4oneHumn1KEFfwpAVNbcKD/DurOHpxfzLkWqdENB3O3w33hkYJFq1yADmt bW8ObndSf4P6yu+aII2jRJWGFqiJb2/De/8Dn2Ry6rRXh/BImtMqbfhBqgS9JOmX6OMf dQ4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=bEDEWM/uIediVqxTgHJ1ffqjVVrgXA7HPhbIDVnGRjA=; b=O3HyHbOJp3Sjivq6NQrFg4k32z1YHM3FNpjGT7E6uzxxZBOgydMfPf3EdekG8jH+EX cv23brrngXTU8Jffi+/fOIVeZ+5KsVOGKoDWQtehjed1FkSNLcUkGVPfEXBrJ32swKfj KKLsOmI79U9JiSqWRmrBLsC26mjYHI1nVHaQEr3bZE28nTqFLUQFho7tb5qt/s2Mp7/U RKm+yiHsQo9yPrg8uDMCVUKJfunC8lc4b/UOnMlnuUwFRzPk00WV8ovE7fHlfZbCL+5v Ldwo8vyvUXVj0zJJNmR9WWLVSj/VgO6VBYH8nBHepzwyzc2bKZFzIpKFMe8X+ii/cmtQ 5SOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=N0kobSzd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w15-20020a1709027b8f00b00168db720192si11706122pll.362.2022.06.26.18.18.13; Sun, 26 Jun 2022 18:18:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=N0kobSzd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229732AbiF0BFn (ORCPT + 99 others); Sun, 26 Jun 2022 21:05:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229463AbiF0BFm (ORCPT ); Sun, 26 Jun 2022 21:05:42 -0400 Received: from mail-oa1-x30.google.com (mail-oa1-x30.google.com [IPv6:2001:4860:4864:20::30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 364052AE6; Sun, 26 Jun 2022 18:05:42 -0700 (PDT) Received: by mail-oa1-x30.google.com with SMTP id 586e51a60fabf-101b4f9e825so11175592fac.5; Sun, 26 Jun 2022 18:05:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=bEDEWM/uIediVqxTgHJ1ffqjVVrgXA7HPhbIDVnGRjA=; b=N0kobSzdTz1T5pZSU48sBPPO1LDhIsX6IU8x3mwYeyaf9BsgbSveanERApsoUkF6e3 2wR3FtV9u/Fx6PCJX7oe/R/5ul4XjCJrnIh3GJEMSR88iF6j3rkjiJoncM+02Z4fLOYB v+QcK249wDse+JdkMxAOzb0lLtvlrlJv/8Qf4iY4B9Vy302menS+GWt0kexRSOQj4bvN HUv0frlzdNtwdCCnJ+gIESQUF0ZynlonbAkkqOFNPPg8MyUnxKZzVb7n/S0KvPajOWF/ tX63CdA8mNYxHFVjGEh9J+rrhsvA3T0EEJ27F1MI8qmjVWMWIIw9zeNB4yqYo2mo52SV b3mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=bEDEWM/uIediVqxTgHJ1ffqjVVrgXA7HPhbIDVnGRjA=; b=lR+DPMbcnwqfvOyjdzqmKeA+LeFzbAIIS3RNFVaVvmhHdTk8EDNzz+I1WzCkf7I6Yr 3tIiFO6eSU/fpmJm6eISm5NvWvvLEl6hUBL+5D1rFf70Keg+vbnYl4i8CGHuSEuyp29+ TAp/K9bhohFAambgjM03WHtJPFb1uoQ/VWbjsaD5L4aKhBM85BEfClU8x0EugDQTnsOP /GKciBUUZbTvQpcv/WfHimmkGCMYYhrtUGErHLDZ5DxeLzzK5ZDyBHOwwCXUIVJvnNGN XKLZgABQzkq+WsRkDmKV3r6Oos5s+ZyBhy59luun5eiilIy0SXk24yRVW6EwEV8L6sSZ oOgg== X-Gm-Message-State: AJIora/+JKWHpvZ5ENX9HusRHrMZxVgvWyarSTf9HvCKkOPs13+ARzGh OHpU2FiIRSNa98Q72VNV7WGhYoeAZK4vh7w6HHc= X-Received: by 2002:a05:6870:b52a:b0:101:d9d7:e879 with SMTP id v42-20020a056870b52a00b00101d9d7e879mr6548422oap.258.1656291940718; Sun, 26 Jun 2022 18:05:40 -0700 (PDT) MIME-Version: 1.0 References: <20220625061844.226764-1-xiangyang3@huawei.com> In-Reply-To: <20220625061844.226764-1-xiangyang3@huawei.com> From: Souptick Joarder Date: Mon, 27 Jun 2022 06:35:28 +0530 Message-ID: Subject: Re: [PATCH -next] mm/memcontrol.c: replace cgroup_memory_nokmem with mem_cgroup_kmem_disabled() To: Xiang Yang Cc: Johannes Weiner , Michal Hocko , roman.gushchin@linux.dev, shakeelb@google.com, songmuchun@bytedance.com, Andrew Morton , cgroups@vger.kernel.org, Linux-MM , linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Jun 25, 2022 at 11:51 AM Xiang Yang wrote: > > mem_cgroup_kmem_disabled() checks whether the kmem accounting is off. > Therefore, replace cgroup_memory_nokmem with mem_cgroup_kmem_disabled(), > which is the same work in percpu.c and slab_common.c. > > Signed-off-by: Xiang Yang Acked-by: Souptick Joarder (HPE) > --- > mm/memcontrol.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 85adc43c5a25..4672c9ddd188 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -3815,7 +3815,7 @@ static u64 mem_cgroup_read_u64(struct cgroup_subsys_state *css, > #ifdef CONFIG_MEMCG_KMEM > static int memcg_online_kmem(struct mem_cgroup *memcg) > { > - if (cgroup_memory_nokmem) > + if (mem_cgroup_kmem_disabled()) > return 0; > > if (unlikely(mem_cgroup_is_root(memcg))) > @@ -3830,7 +3830,7 @@ static int memcg_online_kmem(struct mem_cgroup *memcg) > > static void memcg_offline_kmem(struct mem_cgroup *memcg) > { > - if (cgroup_memory_nokmem) > + if (mem_cgroup_kmem_disabled()) > return; > > if (unlikely(mem_cgroup_is_root(memcg))) > -- > 2.22.0 > >