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 1ACDDC2D0CD for ; Mon, 19 May 2025 06:32:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 00E6A6B0096; Mon, 19 May 2025 02:32:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EE58B6B0098; Mon, 19 May 2025 02:32:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DA46C6B0099; Mon, 19 May 2025 02:32:33 -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 B77D56B0096 for ; Mon, 19 May 2025 02:32:33 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 1732F1D0F64 for ; Mon, 19 May 2025 06:32:38 +0000 (UTC) X-FDA: 83458688796.09.F2A1505 Received: from out-182.mta0.migadu.com (out-182.mta0.migadu.com [91.218.175.182]) by imf18.hostedemail.com (Postfix) with ESMTP id 5B85B1C0011 for ; Mon, 19 May 2025 06:32:36 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=rCAZNv3l; spf=pass (imf18.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.182 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=rCAZNv3l; spf=pass (imf18.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.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=1747636356; 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=Od6jpJx5ju28vO8pb8BvctqBPHbdQyPY9KteJgMsPTU=; b=1d8bEgl2OCtguWO2bZ3jSSaJGLdncOaLDpPbf+qj7xRfEgOZ7NWkKBhRWBJ3aOrMpLelZN X4beIqHx7UPi4TODPy4vOZdS3lFK6LlrDzCMbdu7hCAPRQEiR2YjEW5C9Z9c2U72RBqoKn nAN7PDsPUsNgnpNx01UiDB2JKcE+Tms= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747636356; a=rsa-sha256; cv=none; b=pcWsVmvWYzVa7Q204n5E+gAkKXprDjEh+p918vKyOrYV/vvBzIb5RQmVSekqSStu+a8m7s L0mzrTlvHZ4oY7lT1ceFpR+IteaRucLJja02xoLwKQoeS/UbrYB0180r6y2KHaHG5zz3Ur Htw4BYxr9yaV6sMRzGtwL1UGjyP/ioc= 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=1747636354; 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=Od6jpJx5ju28vO8pb8BvctqBPHbdQyPY9KteJgMsPTU=; b=rCAZNv3lb86WB2sJte64QzU22RTWO0EiLbDEDaeowpcnJK04XQNUyQ8m+R9sW3L1hM15nr NZA3z1Gs1gUwxxrV51Wt9oANofyW/qcDbIBdpdo7/AuRhc/g/2yGB39d149Cdt0ElSVSnI CIE5eI+vEQs1vAeZpDeHilI4S6suu9o= From: Shakeel Butt To: Andrew Morton Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Vlastimil Babka , Alexei Starovoitov , Sebastian Andrzej Siewior , Harry Yoo , Yosry Ahmed , Peter Zijlstra , Mathieu Desnoyers , Tejun Heo , bpf@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: [PATCH v4 4/5] memcg: nmi-safe slab stats updates Date: Sun, 18 May 2025 23:31:41 -0700 Message-ID: <20250519063142.111219-5-shakeel.butt@linux.dev> In-Reply-To: <20250519063142.111219-1-shakeel.butt@linux.dev> References: <20250519063142.111219-1-shakeel.butt@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 5B85B1C0011 X-Stat-Signature: bcpzibktwthij883tmuqqknmpp9srpb1 X-Rspam-User: X-HE-Tag: 1747636356-881189 X-HE-Meta: U2FsdGVkX18NEoar/V/eqt8iAYZ3nL/bakZU43qfNZqFHlCf82TVHqyWL9yyKKXZSKsSqz9aNo0PSGIQxrYKjuVRiWU5HnEWBJtdIeh+5Lmv6nddrbTbRO4Jg0cDmeuJ3lC48emsP87oVK2qDLzEBNZ30lYUKGQPjI+Al1uD+MgLT24ysmo1fOQHMqiDmLG3iOc7fcHNj8zR4I0ZZseKGXJZLUx5562sozJrsuz3h00zWkxiebAGvck8nYWjjoaMzGo7wNdfsMktTyIQ71qaAMxtUU2A/HOhIIPlTtCkDWcPynxJPC1Cd1EpsbXJIdxTfLmNSo++kYERoPQYOIDyabJ05ATBWTlA39k632X9N9/fzzsHbC0PTxutRox929kEbK6SDjS3WJLfI2A/+qwlDotL2xjgBelkhagC1N8iGWhxL8aH6gpU208ldCOXs8mV5YZlfmU3j9XnR+q8FHG9EWxBW8dhUSNxdkYN87vnK/9iLOKd7fc5OHCgrZoonoml4qySICmRbsAY60d/mkBZPiaZOLJSkV+UhZJcSC57DogiDLJ1AxPH1gkp/OGfXjLPDHDkHx/gIiGDJxLH90iVfI2c6xrWQXHddXppv/atLKjxT2V8B3ixkjj8d0MMwzewoQyL4UBCEbcxCgzrlDZXn1Hoeq3CQKFyW1Oq/X4GYZMzGIVld7hJoDQyttWNaxME6OTwmWrsGumyo1PtFoqDnvn0GLhoqLdtUUNvHQl4VInbqwGHrBGoJQF9mFlMzjLTpkVDswT9YhYh95/OHAg7cYJoEONqG2SuIi4EAzCETRjRhVMLDKuiJfF6Nuhx+nLrcPoHaQgIrpBY0wnHvMBCP8Iy6NJz+0StXazESuX184wwr5IL5bL9PlUwo8vSQEEOGP/6VsiY4yKN7G4YKQg9RFeohEkRwN/dvlLj9QndhOfnglxu9zxW38woIlJj/3F9iynLnGMFEfKpX6quk22 qph2upI2 DhGUVcjtNU2ZQxM09/uqbxmbDZMdVHMniThGCwJK84u8uQLnM+QSEwTH3Mjy+YOr2pC0oppNT/IHBWFtdAjungpnhNxDDCvpa7GEYy/dk2rV6EA8JJTowfn4KVOOyY/C2z052t9dlck47axkOY565r3ETspCFq//EZ20h2i1Vy6yt3CA= 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: The objcg based kmem [un]charging can be called in nmi context and it may need to update NR_SLAB_[UN]RECLAIMABLE_B stats. So, let's correctly handle the updates of these stats in the nmi context. Signed-off-by: Shakeel Butt Acked-by: Vlastimil Babka --- mm/memcontrol.c | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 62d7997640db..f1a46c29dde8 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2517,17 +2517,47 @@ static void commit_charge(struct folio *folio, struct mem_cgroup *memcg) folio->memcg_data = (unsigned long)memcg; } +#ifdef CONFIG_MEMCG_NMI_SAFETY_REQUIRES_ATOMIC +static inline void account_slab_nmi_safe(struct mem_cgroup *memcg, + struct pglist_data *pgdat, + enum node_stat_item idx, int nr) +{ + struct lruvec *lruvec; + + if (likely(!in_nmi())) { + lruvec = mem_cgroup_lruvec(memcg, pgdat); + mod_memcg_lruvec_state(lruvec, idx, nr); + } else { + struct mem_cgroup_per_node *pn = memcg->nodeinfo[pgdat->node_id]; + + /* TODO: add to cgroup update tree once it is nmi-safe. */ + if (idx == NR_SLAB_RECLAIMABLE_B) + atomic_add(nr, &pn->slab_reclaimable); + else + atomic_add(nr, &pn->slab_unreclaimable); + } +} +#else +static inline void account_slab_nmi_safe(struct mem_cgroup *memcg, + struct pglist_data *pgdat, + enum node_stat_item idx, int nr) +{ + struct lruvec *lruvec; + + lruvec = mem_cgroup_lruvec(memcg, pgdat); + mod_memcg_lruvec_state(lruvec, idx, nr); +} +#endif + static inline void mod_objcg_mlstate(struct obj_cgroup *objcg, struct pglist_data *pgdat, enum node_stat_item idx, int nr) { struct mem_cgroup *memcg; - struct lruvec *lruvec; rcu_read_lock(); memcg = obj_cgroup_memcg(objcg); - lruvec = mem_cgroup_lruvec(memcg, pgdat); - mod_memcg_lruvec_state(lruvec, idx, nr); + account_slab_nmi_safe(memcg, pgdat, idx, nr); rcu_read_unlock(); } -- 2.47.1