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 BFB71C71157 for ; Tue, 17 Jun 2025 19:58:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 631E26B00A7; Tue, 17 Jun 2025 15:58:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 609536B00A8; Tue, 17 Jun 2025 15:58:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 546D16B00A9; Tue, 17 Jun 2025 15:58:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 452336B00A7 for ; Tue, 17 Jun 2025 15:58:03 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 1B217101630 for ; Tue, 17 Jun 2025 19:58:03 +0000 (UTC) X-FDA: 83565953646.08.565942A Received: from out-189.mta1.migadu.com (out-189.mta1.migadu.com [95.215.58.189]) by imf17.hostedemail.com (Postfix) with ESMTP id 5F0C64000C for ; Tue, 17 Jun 2025 19:58:01 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=I9ibs7Iv; spf=pass (imf17.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.189 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=1750190281; 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=jWKQlNbgi84En7rdc7Ces1jXgAAoAmDgDTG2FE3BJjwlxBQlr1y+/PnSoNdxCr6MJqfpcW K3zbKHH4ZK5OffnGUHKYGP43KqXMbesHPAIAPctTkunV5/TKijA6upRPyo4JbtbDW/AKaL gJLeLScAXapr+IgBlae802vpXOHLOOI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750190281; a=rsa-sha256; cv=none; b=S6iQmLadaprEbAUFodViKte+kNwi+gX0tuvOhMOneC9uqSclmgPLT26Lt26KEmbcuRi1Bk 2L3UHHvdRDG8zfKcOmGi/7rX/nf4Xar5g4Vm2gWFPONJVwaNRVWnNf9cm4j2a6RsVrtoMC ik1fnC6vWlJOWw1W6w43fHrKG/IhTtA= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=I9ibs7Iv; spf=pass (imf17.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.189 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev 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=1750190279; 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=I9ibs7Iv16R19VtNHI3r16YWM+R6GMUxfrW9o3AoqGOnyIw7QNWgzHjiBF2OouseZBhI/b cFmoHTCP6F93DIuqWY3swCmM87/IRdkwPldjOW/Ma7hF8p7K1v2rU1Sd61zsYFxxAIm0nW heZJLdNjUGJa8lzobV+R8sh6gXchSE8= From: Shakeel Butt To: Tejun Heo Cc: Andrew Morton , 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 v3 4/4] memcg: cgroup: call css_rstat_updated irrespective of in_nmi() Date: Tue, 17 Jun 2025 12:57:25 -0700 Message-ID: <20250617195725.1191132-5-shakeel.butt@linux.dev> In-Reply-To: <20250617195725.1191132-1-shakeel.butt@linux.dev> References: <20250617195725.1191132-1-shakeel.butt@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 5F0C64000C X-Stat-Signature: ypxizimsujmecfaduihwramkhnu6f9oz X-Rspam-User: X-HE-Tag: 1750190281-802345 X-HE-Meta: U2FsdGVkX1+vgdn8diQjdslPGiQtBIgaApWY/rW3zYotjBmsFTeHSOKEmbdRNwcrJgkLIh+l/nbgF5Tu2XbhTr8ley0NPoXeHXYKAIoDnO2VIKRLn4zNIIqgSco/EY2MWGEcMt6SfKbd5jFIROLSqARWnUI8d6VqhXLOJY0xe2jF/PCK9DPK5oI3HIUh7GvpYR5s6DGHZPWTEejBp8aBf+2MGFd1FVmkkum2+b3KBf8gkZu+75ftBCGWIM0MnQIGDZEwaGXQfqGrO84OzDHU2JYjgTBForXGH6N3R0IJx7BLp6PhirTkkfwRZRcnV0C+e1G2EJOwjgBJpNm8dhOaPQpVhQ3xCbnWzGjDlDkDndSrB+kXznA18EkjUnx+Sb/NQgBgHZCZFW8WMYfd7+ARKZszxitAkpQJAWDk6aQNrWXANQU/vPuP2HySajcnDIV/m4LggUxR80qj3UCaJL9vvHubqKZSdPWDCmOI72FiuAGBfipzQsPBsuUsHdX85pXwdzks98D4b+MIQpzhMvPOccw6GF/HJ65RmQZ3Zq6PlUMHzpvtEjutcJ4ZV/CiUU9plhLLnXw9Hl41DKQCAYF34EX3h7dBs5W7+8T4TjDLBYhJhdtREwSiK7UIKWaoCNEveqdEicGUzVbHzt3OwL+ZHYntc6EDW9BIw4rc4AFCLtR7tFtShCT0oKLCBjecbDhqRN98DME+lBEXE9UPFaAUAjU43+/q/GRJLK+75KFeFjaqCdTImsEFF57U7+p9tBCkumg7aJ2TdE5RSPsel3BRNydUTacAc7ulV0WcAe9njDt3k/gK5yTKfHZhuj9q7Ctk1C6CcDd0B7vh+V3R9IfkhEwFH4fEjC8KEb4xY+AAcNtoQxkwx4ttoP9d5CoMado+TorxwT8yuedjizwx0AswTXliXYRiqzFyMzVovjK4KJxOsqWtlXyYnSwaWnHMXVNa04QPOKCxBkGFdyHWJjl 4H/3S77q rcZWZZZxGHO2ibjZu7t50raKl/P91gM9lsH+aKU+Z55jJ3u0RILOLv98eqQmsGyVipYQGOD1vYnX+0hOFYW3fc77UAzjQI1IY+6WRqLRc8byuh82fFbYx35hfF6s87g/sRfVk74YdKR4U4o0RS4TViv/sKYPUV9CYoykbxSGdaru+RkoFzbANHxQE6dbWsgsYA8VntJBa10B5gd5zOH1VoKssT6WAk5bBvoRnRjkVyMwp89f8MoJopirHYkQBKqB7aEcl 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