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 9AD91C71136 for ; Wed, 11 Jun 2025 22:16:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 39C906B0088; Wed, 11 Jun 2025 18:16:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 34D266B009A; Wed, 11 Jun 2025 18:16:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 28BB56B009B; Wed, 11 Jun 2025 18:16:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 0A4026B009A for ; Wed, 11 Jun 2025 18:16:24 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id BA2751A0521 for ; Wed, 11 Jun 2025 22:16:23 +0000 (UTC) X-FDA: 83544529446.30.A636A80 Received: from out-182.mta1.migadu.com (out-182.mta1.migadu.com [95.215.58.182]) by imf04.hostedemail.com (Postfix) with ESMTP id 15CF140013 for ; Wed, 11 Jun 2025 22:16:21 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=lSQxI91H; spf=pass (imf04.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.182 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749680182; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ffjH9W3JevRTfPRrE/1Jq8fYf5w4/j5rXWB6dZVk6cA=; b=jK8V7RyfVGhl2QD2Re3i1u281DNRB3kLD4R0a/79Yn6iWUhSJorSKwIgH7P65JHy0vGuy8 +mK2CLz5MI1Ydiq7vztiyNwJ+0+wxmPs3er8O42ALeTd6xI/Cm3ALGHFIxE2Hvxq5mfGmW gW5HiczU02T8SL2Ka5Bo590D72hWN1Q= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=lSQxI91H; spf=pass (imf04.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.182 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749680182; a=rsa-sha256; cv=none; b=xlK6APMh2yKD9MUm7fQ/BgeIwaZm1V9gDM06aaR89koXnsxa1hYX0/P2/xYx+EF/ILTy6o EDKmHBoLfiuMGH7l0BnGVL1YKBfsuVGam2yOQFwlX6a/d0GZQkvIWUQ4cWuRad+oPtPKrY 0PNL9AzeV2+IZW5MGHkaLMHh9Q8EFU0= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1749680180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ffjH9W3JevRTfPRrE/1Jq8fYf5w4/j5rXWB6dZVk6cA=; b=lSQxI91H5F+GlORNGReJtTn3xZcEGrrYKuBeb06a7HDXF5w6tidwKZRbwdRJGnI89e63/1 BY2mTqISo55dehhlwbfxDRY528tYIJ9xWj1x4rhM5/wHJr/3Zjvk97PkNmeT0/v/u3WBtd aKleVI3TXZiaCC0I4+dc0EulIJrxb4k= From: Shakeel Butt To: Tejun Heo , Andrew Morton Cc: JP Kobryn , Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Vlastimil Babka , Alexei Starovoitov , Sebastian Andrzej Siewior , =?UTF-8?q?Michal=20Koutn=C3=BD?= , Harry Yoo , Yosry Ahmed , bpf@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: [PATCH v2 4/4] memcg: cgroup: call css_rstat_updated irrespective of in_nmi() Date: Wed, 11 Jun 2025 15:15:32 -0700 Message-ID: <20250611221532.2513772-5-shakeel.butt@linux.dev> In-Reply-To: <20250611221532.2513772-1-shakeel.butt@linux.dev> References: <20250611221532.2513772-1-shakeel.butt@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Stat-Signature: 9zy79ockxk3ap5ux6jjquor318umrxzz X-Rspamd-Queue-Id: 15CF140013 X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1749680181-802631 X-HE-Meta: U2FsdGVkX1+rAIDAe0HKfh7jsiatBzo63SlPDVqRNNTa6SZFKRR+qZMOG0X7PpbLKQ7vRHvdJIw/iMuTW2fTfvxDzkp6Ts6araCPGgGTF7YJNsTJdqUXT5OuBRcVGuOXML+PRIetQwsQ1zVsrQ+o5QztAeMtst1n6ZDmX0s/kNBwaEqeVtJx19A9ZKDd+5umTzVezSKihPWciWCmpMjITs2WuRQYBexNY7gKA3lVVwmj0zAy2LU7zbrVXzG6QOD/R79ff2Meamz4tirUQ3E0JZuzLObGFJq8ZOvXnK5gAN1VRUKIaR4eti3j2nDXJGmW1B8lrJ+hBttf+S0XVIqkHdnPUt8hQcxVtYWrnmrAp8WbMT9cAFZyCERHoewaNfpU/E27K1b3IFlprOm9o/cScCspV2x7WomCMX0AXeJgUmR/S9Vaigk1Aabhbi3Knecjcs3MXpE7asvy92XS5XR/SuH1Yv+SMJ4BFMui6sOXKR+ppl+DgOXLt+BybmGGb2Zgkv8bnfbn8al6bjkl1GLqxcSzkk9z+/1lPXgLYoe+OE5iQNG4uja1mHfcn4Vw3IV3C+keeE77tjsHz7KhwKS/htEE079N4g60WVlGI52kKcaZtwwCs/RmrSpJc7cB15oVz+Kz7ZWLvlxSdYCrRBs8eEF74bJnjPvByFEvbtDd/qdYrYq1LqFwtgysRiWiW7toDQsNek1lCLVsiu1cQrdZnR4gwlHSNzpic9xHAoTYOo2umKfaM4M556cHPbJF7t6Wu2wfNxuBRkgtjBHN0SFo4dQQH8mgHy/CVy6PE82CxxfYDMbkC9hb3zeUQXt8G37RpXLBMKaE1aDZUFQ54OStLDvcr1Gj2QrYJRLJoVYTd4VvyGWzUE0cE2eJvWuBy02q4WG6yuLrBvYWOiDxMbLOgMLLeZikA8tOAIenPdCAlv7LNSCz7ZY2Vuwygd1zpofm/CWBL+rV1ALmJ/8zYBU 5wrSqUKl f4hvRvGfF+ipinjBr2OiChFH3EbBjfS1CNKcFBfRsINsPSD5QvsvTpXnfMav07dLHiVLLNtrJUkQHh77+jaxQgDbebTmiPeNDmg9RvKNcX+xIhaSyQnCt/z/iTsBAGXwp/qgPhL8vi1kqsXx4DHzostsK49ge2LXBINVFj2L/wvsS5lS1sGA09RUsgldQbwEwH/RiGXHhfguar3HCllc8aNVbFxfxa0JuL9xoTffNhIAx2Cd2RnJ/WtBx+AR4/1Y5zhYr 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: css_rstat_updated() is nmi safe, so there is no need to avoid it in in_nmi(), so remove the check. Signed-off-by: Shakeel Butt --- mm/memcontrol.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 902da8a9c643..d122bfe33e98 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -573,9 +573,7 @@ static inline void memcg_rstat_updated(struct mem_cgroup *memcg, int val, if (!val) return; - /* TODO: add to cgroup update tree once it is nmi-safe. */ - if (!in_nmi()) - css_rstat_updated(&memcg->css, cpu); + css_rstat_updated(&memcg->css, cpu); statc_pcpu = memcg->vmstats_percpu; for (; statc_pcpu; statc_pcpu = statc->parent_pcpu) { statc = this_cpu_ptr(statc_pcpu); @@ -2530,7 +2528,8 @@ static inline void account_slab_nmi_safe(struct mem_cgroup *memcg, } else { struct mem_cgroup_per_node *pn = memcg->nodeinfo[pgdat->node_id]; - /* TODO: add to cgroup update tree once it is nmi-safe. */ + /* preemption is disabled in_nmi(). */ + css_rstat_updated(&memcg->css, smp_processor_id()); if (idx == NR_SLAB_RECLAIMABLE_B) atomic_add(nr, &pn->slab_reclaimable); else @@ -2753,7 +2752,8 @@ static inline void account_kmem_nmi_safe(struct mem_cgroup *memcg, int val) if (likely(!in_nmi())) { mod_memcg_state(memcg, MEMCG_KMEM, val); } else { - /* TODO: add to cgroup update tree once it is nmi-safe. */ + /* preemption is disabled in_nmi(). */ + css_rstat_updated(&memcg->css, smp_processor_id()); atomic_add(val, &memcg->kmem_stat); } } -- 2.47.1