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 5E1E0C61CE8 for ; Mon, 9 Jun 2025 22:56:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E8ACE6B0098; Mon, 9 Jun 2025 18:56:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E3BD26B0099; Mon, 9 Jun 2025 18:56:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D2B8D6B009A; Mon, 9 Jun 2025 18:56:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id AFEE36B0098 for ; Mon, 9 Jun 2025 18:56:34 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 305F180544 for ; Mon, 9 Jun 2025 22:56:34 +0000 (UTC) X-FDA: 83537373108.10.094F548 Received: from out-177.mta0.migadu.com (out-177.mta0.migadu.com [91.218.175.177]) by imf14.hostedemail.com (Postfix) with ESMTP id 80561100005 for ; Mon, 9 Jun 2025 22:56:32 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="UexM/xxs"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf14.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.177 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749509792; a=rsa-sha256; cv=none; b=UKqkrPYjUOsq1haO3YiGyHbWnuDFljnNMlRNMLXSFj7jbRb9VS1MAqzEayDmhK4VHkstYw bByrJ7ovAKWpLbUMGzZZaZO/UzmcE016DMm45Swhez5RgK1CNB9EZD46G9BN0lj2sGogyP rfKrL1lTlr9VxxgkBP16f5aeLdf1DpM= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="UexM/xxs"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf14.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.177 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749509792; 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=zvTjmaLGUrJ18e3aIcIOemXcUW6P0BQAbJx/SIANnVhl4ihNzAfYqT/jNtA9moiRFYjw3B FYQA61ZpIvbnej8mlGBWjFyNrib6NHBnH0R5mVQRAFEoq8LidSA4QrhB3lilDqj1Bg0A3I VTEmREaiGRGyB+BTmITdFvay3Od75vw= 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=1749509791; 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=UexM/xxstuk7PO7WmNao3E6L5a2hvVZU3noOUdaCSK3vBl6w4LkpusCz4PyJwsMfLacYe6 c8w4nELwZor22Ckt10ptR/Q3VtHD9SZHcunTB+jqRx0Z6SEcQh8guT7Xn8VIJbglgM6A6/ fZhsbNRWvYFQuIOtue0oDlEmeuuDChI= From: Shakeel Butt To: Tejun Heo , Andrew Morton Cc: 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 3/3] memcg: cgroup: call memcg_rstat_updated irrespective of in_nmi() Date: Mon, 9 Jun 2025 15:56:11 -0700 Message-ID: <20250609225611.3967338-4-shakeel.butt@linux.dev> In-Reply-To: <20250609225611.3967338-1-shakeel.butt@linux.dev> References: <20250609225611.3967338-1-shakeel.butt@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 80561100005 X-Stat-Signature: 4i5cqerxotfseuf83sokmg8zrrycsqph X-Rspam-User: X-HE-Tag: 1749509792-190794 X-HE-Meta: U2FsdGVkX196dgQrO5QVyuEDhzBrRkx2hPxUcDkg8qz6lb4n6bP+dwvymtYWfZOicnoK7EZK5RGxeRzOq8RZMt+6nxDuH5BHxGGuGZ3vCdszq5ELlTwaBnFLkJgGD6fh+WMznLmva44X4GEDLQuu2FqG8iXqw052AnpRt1MfyRiZforg2s141f9hNqVUHxChILHodjllWQnRfP7GszAhLbFuFiG0P6sNpnxkeF3lPZaYm/DBja6BmFuj74TqCI2/gE6dEcU8CNqRrTz/K1PzUry/gsg6QE/OodGb0BwGD6IdajU7i59S1+5GXQOQSQTT/iIcKF6V/Ew1PqPZqp0myPrnc3xwL7wlpqoaGM4gueNlldQ0sEkFVnThCVq8+eXVKFQ1VAKic6BvzP7Ixkv9JF1lOHaD4muFQi/WW7U0e98le3BcOCCvb5jhkqOLOFoU9KGiAlpMzRvRqo3uBI0mGoVOoHpCtJ97dSpW7i8QdbAL9J4z5bn+ozRbrKG4aWFmsH9zaeHL5+02wGGxD0SJVMImIrt7jBvG2qKML0IV1fFVlPrm9q2wJSxsmfq3sJnXsy2WwL9Pd66L6pzcrw2tChONFWlAu0iSBiFTcXt+RBGmp/rFgISmBNsDUmGgCKwcGOAv0+gwCafYY4dSrSndUHN+YotdYiTSwe/gWl0PbNdGI2Ws8ceAegXFcrMXMQ6ulpB9ma+87w4uFUl+GrEJcg7yZsq43XBSsgvfG1h72haxy7KwyVsZMWlqTrrK/YYC5YyGgGJ1E6nEyiClDBlqnrqtga+xOiXO3GDRuFCZgBjnHNQtB+Hfv9y5TLRy3T3qYFmh80BSmNW+A1qfpFacYT7RkTAYcIMFwk+AyQB/6CKhAoevPgkkMNnwwyv1UvB1GWmeigWdhwYCoacul70cPbNAMEGXPSl1EAXQ1FF1G4ibhE6J6lMtAQafOYxgq9RqXy7NH8PP9y6ZwKK6g0K 5TgEd7hz Ce3wirjd/5/uMag/xQXSiIR03xYtsqwmyeh/Wf1UJohzqbpE4qgkCjXgxN197MQrKSxh9BI8LW/aat0rgPEec8FDjHgWtKdQ4QdeqTyBdQB0nY+WS+Q9DMNr18HaovRHBWUEFVkzG4AHOLmYync0pDWk4uW/0J97pnTdEfvE7Cj9G4TzApPGGZM1VqvfD9t9zOQmvRYKe3+a3X/NJNzYmTEs3HJFDgfbncP+Gsa1JYs85zo7Fd7cnlb/kTE6O0D4D0CuM 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