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 EA586C3ABD8 for ; Fri, 16 May 2025 06:50:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DDDA66B00C3; Fri, 16 May 2025 02:50:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D65186B00C4; Fri, 16 May 2025 02:50:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C0A526B00C5; Fri, 16 May 2025 02:50:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 9F8116B00C3 for ; Fri, 16 May 2025 02:50:10 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E5A141416E5 for ; Fri, 16 May 2025 06:50:11 +0000 (UTC) X-FDA: 83447846622.05.F623A36 Received: from out-188.mta1.migadu.com (out-188.mta1.migadu.com [95.215.58.188]) by imf29.hostedemail.com (Postfix) with ESMTP id 3F39E120004 for ; Fri, 16 May 2025 06:50:10 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=YmY1dR1Q; spf=pass (imf29.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.188 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=1747378210; 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=jVWd6gOAyWb026W16IrpTsGOo2lVltd8hq2g+0iLsvs=; b=POCLWHrCK6yZDtgmFe4bfVoDel6a9HI4AGJdqrv7JbudieLNCafrSOk7cx/38F1pmvhTDY FuTx5h+ZH7iUmHivbKhsXslfICPiJB+xk1UUYv7jr4CIFy+qZENc1MKervW5yRfm9pFYbu BFvcBNGuj2Al99/yd6jkVPvfc7iJCok= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747378210; a=rsa-sha256; cv=none; b=cUF+1gYtuKyQAmz8FL9heO/MFOpimVNsR7CrCMLj1mbW9v0//ILQSGSGbJKTOv1J7SCbb5 aRT7g1SMkqNXj35GgaU+mcSrjQs/UB5UMhk6y1MdAQC1zrZmo9pA1rRjmkso8ZKGiJf3L9 +C5fhQ9a+fHIEc8JiIofOU1LwNTfn50= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=YmY1dR1Q; spf=pass (imf29.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.188 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=1747378208; 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=jVWd6gOAyWb026W16IrpTsGOo2lVltd8hq2g+0iLsvs=; b=YmY1dR1QPKkAid5qt778SbUFTBoxhhl1j871LE9ZdYQj2beQaEombFog1irFez8NJxEOC8 hkryeE7Epcg0y8rxeMYkxetCKfXska0Q9ms78R7EgFhGlaXpNtWBnBj9aZs+jNo4KKEBPO cOEtRs6Rqdh/mwvxQxR/Fc16uABoLeo= 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 , bpf@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: [PATCH 4/5] memcg: nmi-safe slab stats updates Date: Thu, 15 May 2025 23:49:11 -0700 Message-ID: <20250516064912.1515065-5-shakeel.butt@linux.dev> In-Reply-To: <20250516064912.1515065-1-shakeel.butt@linux.dev> References: <20250516064912.1515065-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: 3F39E120004 X-Stat-Signature: 7nh548sdbq1zxc45q5fyytrkxoau81qz X-Rspam-User: X-HE-Tag: 1747378210-491293 X-HE-Meta: U2FsdGVkX1/7j5n8O1dba9gJl0PYjLDTlCWHTY3464a0f8xuAcB+stnfoR5nZL7cqrgF5vWXxfQKQ0YO9WzuRHZurMAPDbl3ttimS6co39OJvwQVbFh0okqBp1xZhgP+zb9ii88Xo70MlOfNauRXbs8ZdLSpkgksxIvIwq0Ezda89LSyCcBCyAFdZxAhrZ3c+n8hyw6hcibtJC4AMIYc3A09epaQMGu+4YkcwFSizk8lp+KUZNgRb1870m9e6wwLXv418XD6WJF/GcedzyY80r5J9U0H0nDB2bIH2DFTTossQ+wM+FB0x+NBvE/TXv9yadVT82bug6xlBS53KJm0I9XahlGlKEJMxKLAz4ah4eZ5yeyQAenpUsJDZ2kg9Yhsh177DmFzlRORxV466U37rGR3Ge/FOzm0c/2xJQdeLKGmrCEhb4gEimzSCZ3x5SoFgCFwMDxcyj00yB6QZhMWFWVqVBvGLhKCtWzTj4iKvR57cITJjwazgg3f3JFfw37cUXZh3GUaRcBeIr+wGyIQAtJHJm521LknupaQ+fIaBtY0BvelngCPSgCR5J0aKaYQL6TDJnVVuRE6OXRcJQ+JSo9ZT4TWcxgAaA57hneOgDBg25dMJh8L0UmOLP7o6TeAtH1yZzWvvDeZxVTjxRn8Grw+qTajh7iZJCbyjcGJMBvn9aLJsiWYi2H/DqqnZ3rIcQQ0+5/wq8WaJUxOWDDkbbKDfrZeP6frCZQpIJUOkKtjyMNtZhKBYoifXwhKl+zHhLMRByKdy3F4Vb8bFbBuZc0E6adh7xQ0LCxEfiv4z/q/VJreixzi2jtrTyoJ0fAFUWZXOIXzgvu2Yrg2xz+nkwGfWNoM58Fmk3q5GP7+ekABnmEX5fXlri8qAloJOWI8FTXjOFyWZBHcL6UbZ0Yte1RBPhWNdp7VUi/IUWUFW6GvXKtLWyvTGEBzv3O5Blj6b2HOiawDsMtOzE74/jy qrSbAdH/ DPc/NyiGxCHsO2XvVOXRadzK2nS47JZriSBTfhvsNskbckZ/9KGYneQCu2Y6n1yspnwu21pWwJHibIsz1p0JlUSV/Q5yitdFzOR+IsL5rkXJoCh62aB1lCMH4qPBtA1fTSrtx7S2V2WbhBU5Hz+WWeqNK8gK0ijmssqA5lkKMapYYs6k= 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 --- mm/memcontrol.c | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 899a31e6b087..85519ce37f18 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 MEMCG_NMI_NEED_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