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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B22F0C433EF for ; Wed, 10 Nov 2021 01:56:29 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3F723610F8 for ; Wed, 10 Nov 2021 01:56:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3F723610F8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chrisdown.name Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id A9F1C6B006C; Tue, 9 Nov 2021 20:56:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A274B6B0071; Tue, 9 Nov 2021 20:56:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C8076B0072; Tue, 9 Nov 2021 20:56:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0026.hostedemail.com [216.40.44.26]) by kanga.kvack.org (Postfix) with ESMTP id 7889D6B006C for ; Tue, 9 Nov 2021 20:56:28 -0500 (EST) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 3BC2F184D7B0F for ; Wed, 10 Nov 2021 01:56:28 +0000 (UTC) X-FDA: 78791356056.13.51F1DD3 Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by imf15.hostedemail.com (Postfix) with ESMTP id E81B3D0004AA for ; Wed, 10 Nov 2021 01:56:14 +0000 (UTC) Received: by mail-ed1-f41.google.com with SMTP id r12so4068815edt.6 for ; Tue, 09 Nov 2021 17:56:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chrisdown.name; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=+T9S2Ka5uunmjDVQ9GtYEQLB2RlYBS5G+VmuCSvgFlE=; b=GphJAXjd57tAonvFra1nrp58exzkrv+MKIoXzrEMOT8tkWV5k4HyN3KAu58jwpZGIp xvibb8tGY1g6GwdOJjHHEbO1v4Xi1AdRq9rJ2RzwAUfOvo7+EL7AUcH6t0tzntM/raqg M9ZhGSckTRpeInMvt513b8FsSdRbmAEiFQ6X8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=+T9S2Ka5uunmjDVQ9GtYEQLB2RlYBS5G+VmuCSvgFlE=; b=gdAYyE0didmcyEzj/l2RLVsQCU0/AAui+aVIaBvx5zCAbWAutO0192jDhrwglYLqZe MnOyrvvvZ6+MRMsS6CRQwx2rwtK0HTDyJEsm1U6jUvX9sVswUS7WCyVs/dgQ8Gs9+bon b5biQ2E2jwl35BqTt635eXecKnss0WZOUqPbcsGP5RRvLnamMKlwb18OaqgfmbN7yIy1 U7Af8r8lcugcrH7wFjrz/8hC68S76lGqBpB0M8wJGe1scoxBWO+rdFVWQvtF6rn0MPMo llV6NPx3aIIVWpSwY8PhYYZVLNoFbp0WhvEA7fi/0fMHIAgXQp9BT4LnpfX6iR5AWIBP yGIg== X-Gm-Message-State: AOAM532npt3Ug5qrW5GaV/C0Dete+W2pd7T+6HFA0SrrWjAY9Q1Skthw lyDdxtbvacGTUoJ2tFcWcrGxLn/x+MdpzZAw X-Google-Smtp-Source: ABdhPJyOqcvtiiEELAtWZ5QMnXn7x/9DRnGtVUxml/orL/3e+WeBFj8qtDbUAgl2ny3vRnEv/6TRoA== X-Received: by 2002:a17:907:3e8a:: with SMTP id hs10mr16025138ejc.404.1636509386503; Tue, 09 Nov 2021 17:56:26 -0800 (PST) Received: from localhost ([2620:10d:c093:400::5:f94d]) by smtp.gmail.com with ESMTPSA id gs17sm5495353ejc.28.2021.11.09.17.56.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Nov 2021 17:56:26 -0800 (PST) Date: Wed, 10 Nov 2021 01:56:25 +0000 From: Chris Down To: Muchun Song Cc: akpm@linux-foundation.org, hannes@cmpxchg.org, mhocko@kernel.org, vdavydov.dev@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] mm: memcontrol: make cgroup_memory_nokmem static Message-ID: References: <20211109065418.21693-1-songmuchun@bytedance.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20211109065418.21693-1-songmuchun@bytedance.com> User-Agent: Mutt/2.1.3 (987dde4c) (2021-09-10) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=chrisdown.name header.s=google header.b=GphJAXjd; spf=pass (imf15.hostedemail.com: domain of chris@chrisdown.name designates 209.85.208.41 as permitted sender) smtp.mailfrom=chris@chrisdown.name; dmarc=pass (policy=none) header.from=chrisdown.name X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: E81B3D0004AA X-Stat-Signature: h8byrr17temeg5xah1kfkx548spg5r5m X-HE-Tag: 1636509374-188682 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: Muchun Song writes: >The commit 494c1dfe855e ("mm: memcg/slab: create a new set of kmalloc-cg- >caches") makes cgroup_memory_nokmem global, however, it is unnecessary >because there is already a function mem_cgroup_kmem_disabled() which >exports it. > >Just make it static and replace it with mem_cgroup_kmem_disabled() >in mm/slab_common.c. > >Signed-off-by: Muchun Song Seems reasonable, thanks. Acked-by: Chris Down >--- > mm/internal.h | 5 ----- > mm/memcontrol.c | 2 +- > mm/slab_common.c | 2 +- > 3 files changed, 2 insertions(+), 7 deletions(-) > >diff --git a/mm/internal.h b/mm/internal.h >index 18256e32a14c..ad15251d7a3c 100644 >--- a/mm/internal.h >+++ b/mm/internal.h >@@ -137,11 +137,6 @@ extern void putback_lru_page(struct page *page); > extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address); > > /* >- * in mm/memcontrol.c: >- */ >-extern bool cgroup_memory_nokmem; >- >-/* > * in mm/page_alloc.c > */ > >diff --git a/mm/memcontrol.c b/mm/memcontrol.c >index 8f1d9c028897..89fc3ca65b2d 100644 >--- a/mm/memcontrol.c >+++ b/mm/memcontrol.c >@@ -84,7 +84,7 @@ EXPORT_PER_CPU_SYMBOL_GPL(int_active_memcg); > static bool cgroup_memory_nosocket __ro_after_init; > > /* Kernel memory accounting disabled? */ >-bool cgroup_memory_nokmem __ro_after_init; >+static bool cgroup_memory_nokmem __ro_after_init; > > /* Whether the swap controller is active */ > #ifdef CONFIG_MEMCG_SWAP >diff --git a/mm/slab_common.c b/mm/slab_common.c >index e5d080a93009..d05203a11201 100644 >--- a/mm/slab_common.c >+++ b/mm/slab_common.c >@@ -849,7 +849,7 @@ new_kmalloc_cache(int idx, enum kmalloc_cache_type type, slab_flags_t flags) > if (type == KMALLOC_RECLAIM) { > flags |= SLAB_RECLAIM_ACCOUNT; > } else if (IS_ENABLED(CONFIG_MEMCG_KMEM) && (type == KMALLOC_CGROUP)) { >- if (cgroup_memory_nokmem) { >+ if (mem_cgroup_kmem_disabled()) { > kmalloc_caches[type][idx] = kmalloc_caches[KMALLOC_NORMAL][idx]; > return; > } >-- >2.11.0 > >