From patchwork Tue Aug 30 05:59:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kairui Song X-Patchwork-Id: 12958779 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 0B72AECAAD5 for ; Tue, 30 Aug 2022 06:00:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7744D6B0074; Tue, 30 Aug 2022 02:00:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6D660940007; Tue, 30 Aug 2022 02:00:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 529386B0078; Tue, 30 Aug 2022 02:00:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 3AD576B0074 for ; Tue, 30 Aug 2022 02:00:10 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 1635DA0C5A for ; Tue, 30 Aug 2022 06:00:10 +0000 (UTC) X-FDA: 79855208580.11.0D29650 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by imf05.hostedemail.com (Postfix) with ESMTP id B2CF410002A for ; Tue, 30 Aug 2022 06:00:09 +0000 (UTC) Received: by mail-pl1-f171.google.com with SMTP id d12so10100349plr.6 for ; Mon, 29 Aug 2022 23:00:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc; bh=Q/bOSV74zP/orRWcu6mpaXasvBllKooATbpIY/UJY9Y=; b=iaukGuuSL1/LSoa2a8zvNDakcBpOAs7MfnIJteuVEJ5NQBob0p1ommjQMhEd5LlEoE 3htxWDIFRvRg9I/rJJYiCqOKiqhZQuESXYz630zXko5IAx1WbGVcshFimeZXWGNB/SnY 5mK/DZ0y9jYAiJ9QBGv+phsOfZG9PcdxwMV469eWeGhIZ95oTwQdHIbM4Dt1LKaGt6FH 881oKRZvjgD5NcinenMX6woRhwbU5swnfG93gJTk69hAqwQ/f1WpTdYSuaXVBIuVuLGx 8pSlJRwM8GFYQHytfTX0l4ArbkcaUnvJiJX1wDG4/wmZc6NG52kB5JqK3ebs3dyjcAr2 kMBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc; bh=Q/bOSV74zP/orRWcu6mpaXasvBllKooATbpIY/UJY9Y=; b=KSnNfOitzP+CbR7ZhrZGzdz4clHs5xkglv87+2zlo/8bk7Z+wo+V3eQlusf4GM43If /xAQiZrRHwo/lbNxy/+EUSSrR1qSRvoMme8XEPtWQiIp7vKJ7+0eyxa4FJ/5FqUGPzAd NA4B3Kkmudsf20yrbEDwKOlphb2B/oUXvlbzhkM3XOK0eVL97/mdX/mRetDuWYmvOg+z mXKonv9GGqxEDffK5QWO5Ml9uBU08zyNy19XE//t+KLs0QQ4lyTr43QvAW59s+ySiGNE zrTZzs9AFtluK66XiSiqGxuj3DitmYHyZbjcGPPUCA1ljdrBSFDzezmXDIdIUMoCEKNc wtlA== X-Gm-Message-State: ACgBeo0EoOPgsUFISoC8fmiD0YDfguIKTO7y7IEvnZxAsct2m7XvAy15 aLvRMt1jZUbPw99iBwrNGZg= X-Google-Smtp-Source: AA6agR7PlXIXR4sqyokZ+7EQDmI6EE9outPPHOElmTSglOYEtJUS2Ps5iwrspbimzGdWpiFrjO8XcA== X-Received: by 2002:a17:90b:3ec9:b0:1f5:7e38:1fd1 with SMTP id rm9-20020a17090b3ec900b001f57e381fd1mr21952406pjb.101.1661839208721; Mon, 29 Aug 2022 23:00:08 -0700 (PDT) Received: from KASONG-MB0.tencent.com ([103.7.29.31]) by smtp.gmail.com with ESMTPSA id m24-20020a17090b069800b001fd962747d4sm5311546pjz.30.2022.08.29.23.00.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Aug 2022 23:00:08 -0700 (PDT) From: Kairui Song To: cgroups@vger.kernel.org, linux-mm@kvack.org Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Andrew Morton , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH 1/2] mm: memcontrol: remove mem_cgroup_kmem_disabled Date: Tue, 30 Aug 2022 13:59:48 +0800 Message-Id: <20220830055949.12640-2-ryncsn@gmail.com> X-Mailer: git-send-email 2.35.2 In-Reply-To: <20220830055949.12640-1-ryncsn@gmail.com> References: <20220830055949.12640-1-ryncsn@gmail.com> Reply-To: Kairui Song MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1661839209; a=rsa-sha256; cv=none; b=Z8C+LHjF7C5cMEirknh5sgdQkc0k3lQ1Li/cQb0bjcUYD/Srj/A3q6Gp7+a6pmRnavSMH9 tdY13eYWyJqBwKg1jAvHWyzaG7jsxR9I/fDUyrP0AbFThslyLJh/TjDRkGe7LGHQqhbXbC yA7oohR4jDNEZqn8qdspGWKd+inWSOw= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=iaukGuuS; spf=pass (imf05.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.214.171 as permitted sender) smtp.mailfrom=ryncsn@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=1661839209; h=from:from:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Q/bOSV74zP/orRWcu6mpaXasvBllKooATbpIY/UJY9Y=; b=cr6kCrxZydZccBx+ky3zaZzkkieJSkdaXQhV7DDFIqDdBYC83ykKacIPhKUriwX1Xa8rUK OLfdUG9wfgWvENo9JNFjCwnCd3UvCtb47MNCPga+9Dgw6BHRobXXsBsw+E8EciWUcOnfXh pGvS7XM/XMIJobmzX7Hpx+2LuIOK7x4= Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=iaukGuuS; spf=pass (imf05.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.214.171 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam05 X-Stat-Signature: f7tq4y73t8ujicxyakfzsd7fh6egnq6z X-Rspamd-Queue-Id: B2CF410002A X-Rspam-User: X-HE-Tag: 1661839209-855904 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: From: Kairui Song There are currently two helpers for checking if cgroup kmem accounting is enabled: - mem_cgroup_kmem_disabled - memcg_kmem_enabled mem_cgroup_kmem_disabled is a simple helper that returns true if cgroup.memory=nokmem is specified, otherwise returns false. memcg_kmem_enabled is a bit different, it returns true if cgroup.memory=nokmem is not specified and there is at least one non-root cgroup ever created. And once there is any non-root memcg created, it won't go back to return false again. This may help improve performance for some corner use cases where the user enables memory cgroup and kmem accounting globally but never create any cgroup. Considering that corner case is rare, especially nowadays cgroup is widely used as a standard way to organize services. And the "once enabled never disable" behavior is kind of strange. This commit simplifies the behavior of memcg_kmem_enabled, making it simply the opposite of mem_cgroup_kmem_disabled, always true if cgroup.memory=nokmem is not specified. So mem_cgroup_kmem_disabled can be dropped. This simplifies the code, and besides, memcg_kmem_enabled makes use of static key so it has a lower overhead. Signed-off-by: Kairui Song Reported-by: kernel test robot --- include/linux/memcontrol.h | 8 +------- mm/memcontrol.c | 17 +++++++---------- mm/percpu.c | 2 +- mm/slab_common.c | 2 +- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 6257867fbf953..9c08464ed6b46 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1731,7 +1731,6 @@ static inline void set_shrinker_bit(struct mem_cgroup *memcg, #endif #ifdef CONFIG_MEMCG_KMEM -bool mem_cgroup_kmem_disabled(void); int __memcg_kmem_charge_page(struct page *page, gfp_t gfp, int order); void __memcg_kmem_uncharge_page(struct page *page, int order); @@ -1779,7 +1778,7 @@ static inline void count_objcg_event(struct obj_cgroup *objcg, { struct mem_cgroup *memcg; - if (mem_cgroup_kmem_disabled()) + if (!memcg_kmem_enabled()) return; rcu_read_lock(); @@ -1825,11 +1824,6 @@ static inline struct mem_cgroup *mem_cgroup_or_root(struct mem_cgroup *memcg) return memcg ? memcg : root_mem_cgroup; } #else -static inline bool mem_cgroup_kmem_disabled(void) -{ - return true; -} - static inline int memcg_kmem_charge_page(struct page *page, gfp_t gfp, int order) { diff --git a/mm/memcontrol.c b/mm/memcontrol.c index b69979c9ced5c..20e26ccd7dddc 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -86,7 +86,7 @@ EXPORT_PER_CPU_SYMBOL_GPL(int_active_memcg); static bool cgroup_memory_nosocket __ro_after_init; /* Kernel memory accounting disabled? */ -static bool cgroup_memory_nokmem __ro_after_init; +static bool cgroup_memory_nokmem __initdata; /* Whether the swap controller is active */ #ifdef CONFIG_MEMCG_SWAP @@ -255,11 +255,6 @@ struct mem_cgroup *vmpressure_to_memcg(struct vmpressure *vmpr) #ifdef CONFIG_MEMCG_KMEM static DEFINE_SPINLOCK(objcg_lock); -bool mem_cgroup_kmem_disabled(void) -{ - return cgroup_memory_nokmem; -} - static void obj_cgroup_uncharge_pages(struct obj_cgroup *objcg, unsigned int nr_pages); @@ -3667,7 +3662,7 @@ static int memcg_online_kmem(struct mem_cgroup *memcg) { struct obj_cgroup *objcg; - if (mem_cgroup_kmem_disabled()) + if (!memcg_kmem_enabled()) return 0; if (unlikely(mem_cgroup_is_root(memcg))) @@ -3680,8 +3675,6 @@ static int memcg_online_kmem(struct mem_cgroup *memcg) objcg->memcg = memcg; rcu_assign_pointer(memcg->objcg, objcg); - static_branch_enable(&memcg_kmem_enabled_key); - memcg->kmemcg_id = memcg->id.id; return 0; @@ -3691,7 +3684,7 @@ static void memcg_offline_kmem(struct mem_cgroup *memcg) { struct mem_cgroup *parent; - if (mem_cgroup_kmem_disabled()) + if (!memcg_kmem_enabled()) return; if (unlikely(mem_cgroup_is_root(memcg))) @@ -7153,6 +7146,10 @@ static int __init cgroup_memory(char *s) if (!strcmp(token, "nokmem")) cgroup_memory_nokmem = true; } + + if (!cgroup_memory_nokmem) + static_branch_enable(&memcg_kmem_enabled_key); + return 1; } __setup("cgroup.memory=", cgroup_memory); diff --git a/mm/percpu.c b/mm/percpu.c index 27697b2429c2e..c62d6e98f7d20 100644 --- a/mm/percpu.c +++ b/mm/percpu.c @@ -1467,7 +1467,7 @@ static struct pcpu_chunk *pcpu_alloc_chunk(gfp_t gfp) goto md_blocks_fail; #ifdef CONFIG_MEMCG_KMEM - if (!mem_cgroup_kmem_disabled()) { + if (memcg_kmem_enabled()) { chunk->obj_cgroups = pcpu_mem_zalloc(pcpu_chunk_map_bits(chunk) * sizeof(struct obj_cgroup *), gfp); diff --git a/mm/slab_common.c b/mm/slab_common.c index 17996649cfe3e..bbdc0fe3c5e34 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -829,7 +829,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 (mem_cgroup_kmem_disabled()) { + if (!memcg_kmem_enabled()) { kmalloc_caches[type][idx] = kmalloc_caches[KMALLOC_NORMAL][idx]; return; }