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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6EBF1C433EF for ; Mon, 27 Jun 2022 01:05:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229742AbiF0BFo (ORCPT ); Sun, 26 Jun 2022 21:05:44 -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-Google-Smtp-Source: AGRyM1usK8XoCZ+Jm60xYYm5XWgIu/hR2mwVJiqsxvAhVLdVx5kpsc2MfE0Cvr+InPsxFp+qlwuYqkLSOhZFREg+e/I= 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" 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 > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Souptick Joarder Subject: Re: [PATCH -next] mm/memcontrol.c: replace cgroup_memory_nokmem with mem_cgroup_kmem_disabled() Date: Mon, 27 Jun 2022 06:35:28 +0530 Message-ID: References: <20220625061844.226764-1-xiangyang3@huawei.com> Mime-Version: 1.0 Return-path: 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== In-Reply-To: <20220625061844.226764-1-xiangyang3-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> List-ID: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Xiang Yang Cc: Johannes Weiner , Michal Hocko , roman.gushchin-fxUVXftIFDnyG1zEObXtfA@public.gmane.org, shakeelb-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org, songmuchun-EC8Uxl6Npydl57MIdRCFDg@public.gmane.org, Andrew Morton , cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Linux-MM , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.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 > >